From e003d981002ad5940caa212d4694e8c5cca22a82 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 30 Mar 2023 10:10:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9A=E3=80=90=E4=BD=99?= =?UTF-8?q?=E9=A2=9D=E6=98=8E=E7=BB=86,=E5=85=85=E5=80=BC=E8=AE=B0?= =?UTF-8?q?=E5=BD=95,=E4=BD=99=E9=A2=9D=E8=B0=83=E6=95=B4=E3=80=91?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/AlbumsController.java | 8 +- .../admin/controller/ArtCateController.java | 6 +- .../admin/controller/ArticleController.java | 6 +- .../admin/controller/CrontabController.java | 4 +- ...ersController.java => UserController.java} | 29 ++++--- .../decorate/DecoratePagesController.java | 2 +- .../decorate/DecorateTabbarController.java | 2 +- .../finance/FinanceRechargerController.java | 34 ++++++++ .../finance/FinanceRefundController.java | 34 ++++++++ .../finance/FinanceWalletController.java | 34 ++++++++ .../com/mdd/admin/service/IAlbumsService.java | 4 +- .../mdd/admin/service/IArtCateService.java | 6 +- .../mdd/admin/service/IArticleService.java | 6 +- .../mdd/admin/service/ICrontabService.java | 4 +- .../admin/service/IDecoratePageService.java | 2 +- .../admin/service/IDecorateTabbarService.java | 2 +- .../service/IFinanceRechargerService.java | 23 ++++++ .../admin/service/IFinanceRefundService.java | 23 ++++++ .../admin/service/IFinanceWalletService.java | 15 ++++ .../{IUsersService.java => IUserService.java} | 21 +++-- .../admin/service/impl/AlbumsServiceImpl.java | 4 +- .../service/impl/ArtCateServiceImpl.java | 6 +- .../service/impl/ArticleServiceImpl.java | 6 +- .../service/impl/CrontabServiceImpl.java | 4 +- .../service/impl/DecoratePageServiceImpl.java | 6 +- .../impl/DecorateTabbarServiceImpl.java | 6 +- .../impl/FinanceRechargerServiceImpl.java | 80 +++++++++++++++++++ .../impl/FinanceRefundServiceImpl.java | 29 +++++++ .../impl/FinanceWalletServiceImpl.java | 69 ++++++++++++++++ ...sServiceImpl.java => UserServiceImpl.java} | 60 ++++++++++++-- .../{ => album}/AlbumCateValidate.java | 2 +- .../{ => album}/AlbumMoveValidate.java | 2 +- .../{ => album}/AlbumRenameValidate.java | 2 +- .../{ => album}/AlbumSearchValidate.java | 2 +- .../{ => article}/ArtCateCreateValidate.java | 2 +- .../{ => article}/ArtCateSearchValidate.java | 2 +- .../{ => article}/ArtCateUpdateValidate.java | 2 +- .../{ => article}/ArticleCreateValidate.java | 2 +- .../{ => article}/ArticleSearchValidate.java | 2 +- .../{ => article}/ArticleUpdateValidate.java | 2 +- .../{ => crontab}/CrontabCreateValidate.java | 2 +- .../{ => crontab}/CrontabUpdateValidate.java | 2 +- .../{ => decorate}/DecoratePageValidate.java | 2 +- .../{ => decorate}/DecorateTabsValidate.java | 2 +- .../FinanceRechargeSearchValidate.java | 30 +++++++ .../finance/FinanceRefundSearchValidate.java | 14 ++++ .../finance/FinanceWalletSearchValidate.java | 27 +++++++ .../UserSearchValidate.java} | 4 +- .../UserUpdateValidate.java} | 4 +- .../validate/user/UserWalletValidate.java | 29 +++++++ .../vo/finance/FinanceRechargeListVo.java | 46 +++++++++++ .../admin/vo/finance/FinanceRefundListVo.java | 14 ++++ .../admin/vo/finance/FinanceWalletListVo.java | 43 ++++++++++ .../entity/{ => decorate}/DecoratePage.java | 2 +- .../entity/{ => decorate}/DecorateTabbar.java | 2 +- .../mdd/common/entity/{ => log}/LogMoney.java | 2 +- .../com/mdd/common/enums/PaymentEnum.java | 16 ++++ .../{ => decorate}/DecoratePageMapper.java | 4 +- .../{ => decorate}/DecorateTabbarMapper.java | 4 +- .../mapper/{ => log}/LogMoneyMapper.java | 4 +- .../front/service/impl/IndexServiceImpl.java | 8 +- .../front/service/impl/LogsServiceImpl.java | 8 +- .../front/service/impl/PayServiceImpl.java | 10 +-- .../mdd/front/service/impl/PcServiceImpI.java | 4 +- uniapp/src/manifest.json | 2 +- 65 files changed, 725 insertions(+), 115 deletions(-) rename server/like-admin/src/main/java/com/mdd/admin/controller/{UsersController.java => UserController.java} (55%) create mode 100644 server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRechargerController.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRefundController.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceWalletController.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/service/IFinanceRechargerService.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/service/IFinanceRefundService.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/service/IFinanceWalletService.java rename server/like-admin/src/main/java/com/mdd/admin/service/{IUsersService.java => IUserService.java} (55%) create mode 100644 server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRefundServiceImpl.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceWalletServiceImpl.java rename server/like-admin/src/main/java/com/mdd/admin/service/impl/{UsersServiceImpl.java => UserServiceImpl.java} (76%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => album}/AlbumCateValidate.java (96%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => album}/AlbumMoveValidate.java (94%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => album}/AlbumRenameValidate.java (95%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => album}/AlbumSearchValidate.java (92%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => article}/ArtCateCreateValidate.java (96%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => article}/ArtCateSearchValidate.java (91%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => article}/ArtCateUpdateValidate.java (97%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => article}/ArticleCreateValidate.java (98%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => article}/ArticleSearchValidate.java (94%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => article}/ArticleUpdateValidate.java (98%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => crontab}/CrontabCreateValidate.java (97%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => crontab}/CrontabUpdateValidate.java (98%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => decorate}/DecoratePageValidate.java (94%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => decorate}/DecorateTabsValidate.java (93%) create mode 100644 server/like-admin/src/main/java/com/mdd/admin/validate/finance/FinanceRechargeSearchValidate.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/validate/finance/FinanceRefundSearchValidate.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/validate/finance/FinanceWalletSearchValidate.java rename server/like-admin/src/main/java/com/mdd/admin/validate/{UsersSearchValidate.java => user/UserSearchValidate.java} (84%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{UsersUpdateValidate.java => user/UserUpdateValidate.java} (81%) create mode 100644 server/like-admin/src/main/java/com/mdd/admin/validate/user/UserWalletValidate.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListVo.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRefundListVo.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceWalletListVo.java rename server/like-common/src/main/java/com/mdd/common/entity/{ => decorate}/DecoratePage.java (95%) rename server/like-common/src/main/java/com/mdd/common/entity/{ => decorate}/DecorateTabbar.java (95%) rename server/like-common/src/main/java/com/mdd/common/entity/{ => log}/LogMoney.java (97%) rename server/like-common/src/main/java/com/mdd/common/mapper/{ => decorate}/DecoratePageMapper.java (69%) rename server/like-common/src/main/java/com/mdd/common/mapper/{ => decorate}/DecorateTabbarMapper.java (69%) rename server/like-common/src/main/java/com/mdd/common/mapper/{ => log}/LogMoneyMapper.java (98%) diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/AlbumsController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/AlbumsController.java index a89183fa..fe45a630 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/AlbumsController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/AlbumsController.java @@ -3,10 +3,10 @@ package com.mdd.admin.controller; import com.alibaba.fastjson2.JSONArray; import com.mdd.admin.aop.Log; import com.mdd.admin.service.IAlbumsService; -import com.mdd.admin.validate.AlbumCateValidate; -import com.mdd.admin.validate.AlbumMoveValidate; -import com.mdd.admin.validate.AlbumRenameValidate; -import com.mdd.admin.validate.AlbumSearchValidate; +import com.mdd.admin.validate.album.AlbumCateValidate; +import com.mdd.admin.validate.album.AlbumMoveValidate; +import com.mdd.admin.validate.album.AlbumRenameValidate; +import com.mdd.admin.validate.album.AlbumSearchValidate; import com.mdd.admin.validate.commons.IdValidate; import com.mdd.admin.validate.commons.IdsValidate; import com.mdd.admin.validate.commons.PageValidate; diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/ArtCateController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/ArtCateController.java index 3eda39fa..b94ea2c4 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/ArtCateController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/ArtCateController.java @@ -3,9 +3,9 @@ package com.mdd.admin.controller; import com.mdd.admin.aop.Log; import com.mdd.common.aop.NotPower; import com.mdd.admin.service.IArtCateService; -import com.mdd.admin.validate.ArtCateCreateValidate; -import com.mdd.admin.validate.ArtCateUpdateValidate; -import com.mdd.admin.validate.ArtCateSearchValidate; +import com.mdd.admin.validate.article.ArtCateCreateValidate; +import com.mdd.admin.validate.article.ArtCateUpdateValidate; +import com.mdd.admin.validate.article.ArtCateSearchValidate; import com.mdd.admin.validate.commons.IdValidate; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.article.ArticleCateVo; diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/ArticleController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/ArticleController.java index 8156bd70..6ccf719b 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/ArticleController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/ArticleController.java @@ -2,9 +2,9 @@ package com.mdd.admin.controller; import com.mdd.admin.aop.Log; import com.mdd.admin.service.IArticleService; -import com.mdd.admin.validate.ArticleCreateValidate; -import com.mdd.admin.validate.ArticleSearchValidate; -import com.mdd.admin.validate.ArticleUpdateValidate; +import com.mdd.admin.validate.article.ArticleCreateValidate; +import com.mdd.admin.validate.article.ArticleSearchValidate; +import com.mdd.admin.validate.article.ArticleUpdateValidate; import com.mdd.admin.validate.commons.IdValidate; import com.mdd.admin.validate.commons.PageValidate; diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/CrontabController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/CrontabController.java index ab038b32..b98ff80a 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/CrontabController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/CrontabController.java @@ -2,8 +2,8 @@ package com.mdd.admin.controller; import com.mdd.admin.aop.Log; import com.mdd.admin.service.ICrontabService; -import com.mdd.admin.validate.CrontabCreateValidate; -import com.mdd.admin.validate.CrontabUpdateValidate; +import com.mdd.admin.validate.crontab.CrontabCreateValidate; +import com.mdd.admin.validate.crontab.CrontabUpdateValidate; import com.mdd.admin.validate.commons.IdValidate; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.CrontabDetailVo; diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/UsersController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/UserController.java similarity index 55% rename from server/like-admin/src/main/java/com/mdd/admin/controller/UsersController.java rename to server/like-admin/src/main/java/com/mdd/admin/controller/UserController.java index 9dbb3c6d..7cc3c6db 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/UsersController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/UserController.java @@ -1,10 +1,11 @@ package com.mdd.admin.controller; import com.mdd.admin.aop.Log; -import com.mdd.admin.service.IUsersService; -import com.mdd.admin.validate.UsersSearchValidate; -import com.mdd.admin.validate.UsersUpdateValidate; +import com.mdd.admin.service.IUserService; +import com.mdd.admin.validate.user.UserSearchValidate; +import com.mdd.admin.validate.user.UserUpdateValidate; import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.user.UserWalletValidate; import com.mdd.admin.vo.user.UserVo; import com.mdd.common.core.AjaxResult; import com.mdd.common.core.PageResult; @@ -19,31 +20,39 @@ import javax.annotation.Resource; @RestController @RequestMapping("api/user") @Api(tags = "用户数据管理") -public class UsersController { +public class UserController { @Resource - IUsersService iUsersService; + IUserService iUserService; @GetMapping("/list") @ApiOperation(value="用户列表") public AjaxResult> list(@Validated PageValidate pageValidate, - @Validated UsersSearchValidate searchValidate) { - PageResult list = iUsersService.list(pageValidate, searchValidate); + @Validated UserSearchValidate searchValidate) { + PageResult list = iUserService.list(pageValidate, searchValidate); return AjaxResult.success(list); } @GetMapping("/detail") @ApiOperation(value="用户详情") public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { - UserVo vo = iUsersService.detail(id); + UserVo vo = iUserService.detail(id); return AjaxResult.success(vo); } @Log(title = "用户编辑") @PostMapping("/edit") @ApiOperation(value="用户编辑") - public AjaxResult edit(@Validated @RequestBody UsersUpdateValidate updateValidate) { - iUsersService.edit(updateValidate); + public AjaxResult edit(@Validated @RequestBody UserUpdateValidate updateValidate) { + iUserService.edit(updateValidate); + return AjaxResult.success(); + } + + @Log(title = "余额调整") + @PostMapping("/adjustWallet") + @ApiOperation(value="余额调整") + public AjaxResult adjustWallet(@Validated @RequestBody UserWalletValidate walletValidate) { + iUserService.adjustWallet(walletValidate); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecoratePagesController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecoratePagesController.java index 5696363e..25b5a84b 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecoratePagesController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecoratePagesController.java @@ -2,7 +2,7 @@ package com.mdd.admin.controller.decorate; import com.mdd.admin.aop.Log; import com.mdd.admin.service.IDecoratePageService; -import com.mdd.admin.validate.DecoratePageValidate; +import com.mdd.admin.validate.decorate.DecoratePageValidate; import com.mdd.admin.vo.decorate.DecoratePageVo; import com.mdd.common.core.AjaxResult; import com.mdd.common.validator.annotation.IDMust; diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateTabbarController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateTabbarController.java index e1615095..dfd13082 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateTabbarController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateTabbarController.java @@ -2,7 +2,7 @@ package com.mdd.admin.controller.decorate; import com.mdd.admin.aop.Log; import com.mdd.admin.service.IDecorateTabbarService; -import com.mdd.admin.validate.DecorateTabsValidate; +import com.mdd.admin.validate.decorate.DecorateTabsValidate; import com.mdd.admin.vo.decorate.DecorateTabbarVo; import com.mdd.common.core.AjaxResult; import io.swagger.annotations.Api; diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRechargerController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRechargerController.java new file mode 100644 index 00000000..ffbcd477 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRechargerController.java @@ -0,0 +1,34 @@ +package com.mdd.admin.controller.finance; + +import com.mdd.admin.service.IFinanceRechargerService; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.finance.FinanceRechargeSearchValidate; +import com.mdd.admin.vo.finance.FinanceRechargeListVo; +import com.mdd.common.core.AjaxResult; +import com.mdd.common.core.PageResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@RestController +@RequestMapping("api/finance/recharger") +@Api("充值记录管理") +public class FinanceRechargerController { + + @Resource + IFinanceRechargerService iFinanceRechargerService; + + @GetMapping("/list") + @ApiOperation("记录列表") + public AjaxResult list(@Validated PageValidate pageValidate, + @Validated FinanceRechargeSearchValidate searchValidate) { + PageResult list = iFinanceRechargerService.list(pageValidate, searchValidate); + return AjaxResult.success(list); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRefundController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRefundController.java new file mode 100644 index 00000000..3390ee36 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRefundController.java @@ -0,0 +1,34 @@ +package com.mdd.admin.controller.finance; + +import com.mdd.admin.service.IFinanceRefundService; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.finance.FinanceRefundSearchValidate; +import com.mdd.admin.vo.finance.FinanceRefundListVo; +import com.mdd.common.core.AjaxResult; +import com.mdd.common.core.PageResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@RestController +@RequestMapping("api/finance/refund") +@Api("退款记录管理") +public class FinanceRefundController { + + @Resource + IFinanceRefundService iFinanceRefundService; + + @GetMapping("/list") + @ApiOperation("记录列表") + public AjaxResult list(@Validated PageValidate pageValidate, + @Validated FinanceRefundSearchValidate searchValidate) { + PageResult list = iFinanceRefundService.list(pageValidate, searchValidate); + return AjaxResult.success(list); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceWalletController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceWalletController.java new file mode 100644 index 00000000..871c6869 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceWalletController.java @@ -0,0 +1,34 @@ +package com.mdd.admin.controller.finance; + +import com.mdd.admin.service.IFinanceWalletService; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.finance.FinanceWalletSearchValidate; +import com.mdd.admin.vo.finance.FinanceWalletListVo; +import com.mdd.common.core.AjaxResult; +import com.mdd.common.core.PageResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@RestController +@RequestMapping("api/finance/wallet") +@Api("余额明细管理") +public class FinanceWalletController { + + @Resource + IFinanceWalletService iFinanceWalletService; + + @GetMapping("/list") + @ApiOperation("记录列表") + public AjaxResult list(@Validated PageValidate pageValidate, + @Validated FinanceWalletSearchValidate searchValidate) { + PageResult list = iFinanceWalletService.list(pageValidate, searchValidate); + return AjaxResult.success(list); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/IAlbumsService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IAlbumsService.java index f07b8ccb..3b3d8431 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/IAlbumsService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IAlbumsService.java @@ -1,8 +1,8 @@ package com.mdd.admin.service; import com.alibaba.fastjson2.JSONArray; -import com.mdd.admin.validate.AlbumCateValidate; -import com.mdd.admin.validate.AlbumSearchValidate; +import com.mdd.admin.validate.album.AlbumCateValidate; +import com.mdd.admin.validate.album.AlbumSearchValidate; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.album.AlbumVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/IArtCateService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IArtCateService.java index 6894db48..619b40e6 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/IArtCateService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IArtCateService.java @@ -1,8 +1,8 @@ package com.mdd.admin.service; -import com.mdd.admin.validate.ArtCateCreateValidate; -import com.mdd.admin.validate.ArtCateUpdateValidate; -import com.mdd.admin.validate.ArtCateSearchValidate; +import com.mdd.admin.validate.article.ArtCateCreateValidate; +import com.mdd.admin.validate.article.ArtCateUpdateValidate; +import com.mdd.admin.validate.article.ArtCateSearchValidate; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.article.ArticleCateVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/IArticleService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IArticleService.java index 6c31ec94..b2648204 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/IArticleService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IArticleService.java @@ -1,8 +1,8 @@ package com.mdd.admin.service; -import com.mdd.admin.validate.ArticleCreateValidate; -import com.mdd.admin.validate.ArticleSearchValidate; -import com.mdd.admin.validate.ArticleUpdateValidate; +import com.mdd.admin.validate.article.ArticleCreateValidate; +import com.mdd.admin.validate.article.ArticleSearchValidate; +import com.mdd.admin.validate.article.ArticleUpdateValidate; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.article.ArticleDetailVo; import com.mdd.admin.vo.article.ArticleListedVo; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/ICrontabService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ICrontabService.java index 89a7a178..640a095e 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/ICrontabService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ICrontabService.java @@ -1,7 +1,7 @@ package com.mdd.admin.service; -import com.mdd.admin.validate.CrontabCreateValidate; -import com.mdd.admin.validate.CrontabUpdateValidate; +import com.mdd.admin.validate.crontab.CrontabCreateValidate; +import com.mdd.admin.validate.crontab.CrontabUpdateValidate; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.CrontabDetailVo; import com.mdd.admin.vo.CrontabListedVo; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/IDecoratePageService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IDecoratePageService.java index 1a66af11..b0fca7ea 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/IDecoratePageService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IDecoratePageService.java @@ -1,6 +1,6 @@ package com.mdd.admin.service; -import com.mdd.admin.validate.DecoratePageValidate; +import com.mdd.admin.validate.decorate.DecoratePageValidate; import com.mdd.admin.vo.decorate.DecoratePageVo; public interface IDecoratePageService { diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/IDecorateTabbarService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IDecorateTabbarService.java index a8ba91db..a0293046 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/IDecorateTabbarService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IDecorateTabbarService.java @@ -1,6 +1,6 @@ package com.mdd.admin.service; -import com.mdd.admin.validate.DecorateTabsValidate; +import com.mdd.admin.validate.decorate.DecorateTabsValidate; import com.mdd.admin.vo.decorate.DecorateTabbarVo; /** diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/IFinanceRechargerService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IFinanceRechargerService.java new file mode 100644 index 00000000..9f165509 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IFinanceRechargerService.java @@ -0,0 +1,23 @@ +package com.mdd.admin.service; + +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.finance.FinanceRechargeSearchValidate; +import com.mdd.admin.vo.finance.FinanceRechargeListVo; +import com.mdd.common.core.PageResult; + +/** + * 充值记录服务接口类 + */ +public interface IFinanceRechargerService { + + /** + * 充值记录列表 + * + * @author fzr + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ + PageResult list(PageValidate pageValidate, FinanceRechargeSearchValidate searchValidate); + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/IFinanceRefundService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IFinanceRefundService.java new file mode 100644 index 00000000..42fa35a2 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IFinanceRefundService.java @@ -0,0 +1,23 @@ +package com.mdd.admin.service; + +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.finance.FinanceRefundSearchValidate; +import com.mdd.admin.vo.finance.FinanceRefundListVo; +import com.mdd.common.core.PageResult; + +/** + * 退款记录服务接口类 + */ +public interface IFinanceRefundService { + + /** + * 退款记录列表 + * + * @author fzr + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ + PageResult list(PageValidate pageValidate, FinanceRefundSearchValidate searchValidate); + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/IFinanceWalletService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IFinanceWalletService.java new file mode 100644 index 00000000..76cad1e3 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IFinanceWalletService.java @@ -0,0 +1,15 @@ +package com.mdd.admin.service; + +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.finance.FinanceWalletSearchValidate; +import com.mdd.admin.vo.finance.FinanceWalletListVo; +import com.mdd.common.core.PageResult; + +/** + * 用户余额记录服务接口类 + */ +public interface IFinanceWalletService { + + PageResult list(PageValidate pageValidate, FinanceWalletSearchValidate searchValidate); + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/IUsersService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IUserService.java similarity index 55% rename from server/like-admin/src/main/java/com/mdd/admin/service/IUsersService.java rename to server/like-admin/src/main/java/com/mdd/admin/service/IUserService.java index d3309868..68b3f96d 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/IUsersService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IUserService.java @@ -1,17 +1,16 @@ package com.mdd.admin.service; -import com.mdd.admin.validate.UsersSearchValidate; -import com.mdd.admin.validate.UsersUpdateValidate; +import com.mdd.admin.validate.user.UserSearchValidate; +import com.mdd.admin.validate.user.UserUpdateValidate; import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.user.UserWalletValidate; import com.mdd.admin.vo.user.UserVo; import com.mdd.common.core.PageResult; -import java.util.Map; - /** * 用户服务接口类 */ -public interface IUsersService { +public interface IUserService { /** * 用户列表 @@ -21,7 +20,7 @@ public interface IUsersService { * @param searchValidate (搜索参数) * @return PageResult */ - PageResult list(PageValidate pageValidate, UsersSearchValidate searchValidate); + PageResult list(PageValidate pageValidate, UserSearchValidate searchValidate); /** * 用户详情 @@ -38,6 +37,14 @@ public interface IUsersService { * @author fzr * @param updateValidate 参数 */ - void edit(UsersUpdateValidate updateValidate); + void edit(UserUpdateValidate updateValidate); + + /** + * 余额调整 + * + * @author fzr + * @param userWalletValidate 余额 + */ + void adjustWallet(UserWalletValidate userWalletValidate); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/AlbumsServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/AlbumsServiceImpl.java index 5f07ae13..8921da70 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/AlbumsServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/AlbumsServiceImpl.java @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mdd.admin.service.IAlbumsService; -import com.mdd.admin.validate.AlbumCateValidate; -import com.mdd.admin.validate.AlbumSearchValidate; +import com.mdd.admin.validate.album.AlbumCateValidate; +import com.mdd.admin.validate.album.AlbumSearchValidate; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.album.AlbumCateVo; import com.mdd.admin.vo.album.AlbumVo; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/ArtCateServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ArtCateServiceImpl.java index 8bb87a10..fb1c17ce 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/ArtCateServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ArtCateServiceImpl.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mdd.admin.service.IArtCateService; -import com.mdd.admin.validate.ArtCateCreateValidate; -import com.mdd.admin.validate.ArtCateUpdateValidate; -import com.mdd.admin.validate.ArtCateSearchValidate; +import com.mdd.admin.validate.article.ArtCateCreateValidate; +import com.mdd.admin.validate.article.ArtCateUpdateValidate; +import com.mdd.admin.validate.article.ArtCateSearchValidate; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.article.ArticleCateVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/ArticleServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ArticleServiceImpl.java index 08c10eec..ba8e6f3c 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/ArticleServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ArticleServiceImpl.java @@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; import com.mdd.admin.service.IArticleService; -import com.mdd.admin.validate.ArticleCreateValidate; -import com.mdd.admin.validate.ArticleSearchValidate; -import com.mdd.admin.validate.ArticleUpdateValidate; +import com.mdd.admin.validate.article.ArticleCreateValidate; +import com.mdd.admin.validate.article.ArticleSearchValidate; +import com.mdd.admin.validate.article.ArticleUpdateValidate; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.article.ArticleDetailVo; import com.mdd.admin.vo.article.ArticleListedVo; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/CrontabServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/CrontabServiceImpl.java index a3afd75a..7ae98cf5 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/CrontabServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/CrontabServiceImpl.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mdd.admin.config.quartz.QuartzUtils; import com.mdd.admin.service.ICrontabService; -import com.mdd.admin.validate.CrontabCreateValidate; -import com.mdd.admin.validate.CrontabUpdateValidate; +import com.mdd.admin.validate.crontab.CrontabCreateValidate; +import com.mdd.admin.validate.crontab.CrontabUpdateValidate; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.CrontabDetailVo; import com.mdd.admin.vo.CrontabListedVo; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/DecoratePageServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/DecoratePageServiceImpl.java index 1771468f..98207bd6 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/DecoratePageServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/DecoratePageServiceImpl.java @@ -2,10 +2,10 @@ package com.mdd.admin.service.impl; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.mdd.admin.service.IDecoratePageService; -import com.mdd.admin.validate.DecoratePageValidate; +import com.mdd.admin.validate.decorate.DecoratePageValidate; import com.mdd.admin.vo.decorate.DecoratePageVo; -import com.mdd.common.entity.DecoratePage; -import com.mdd.common.mapper.DecoratePageMapper; +import com.mdd.common.entity.decorate.DecoratePage; +import com.mdd.common.mapper.decorate.DecoratePageMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/DecorateTabbarServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/DecorateTabbarServiceImpl.java index df2381dc..7952c9dd 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/DecorateTabbarServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/DecorateTabbarServiceImpl.java @@ -3,11 +3,11 @@ package com.mdd.admin.service.impl; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mdd.admin.service.IDecorateTabbarService; -import com.mdd.admin.validate.DecorateTabsValidate; +import com.mdd.admin.validate.decorate.DecorateTabsValidate; import com.mdd.admin.vo.decorate.DecorateTabsListsVo; import com.mdd.admin.vo.decorate.DecorateTabbarVo; -import com.mdd.common.entity.DecorateTabbar; -import com.mdd.common.mapper.DecorateTabbarMapper; +import com.mdd.common.entity.decorate.DecorateTabbar; +import com.mdd.common.mapper.decorate.DecorateTabbarMapper; import com.mdd.common.util.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java new file mode 100644 index 00000000..f5e2b6fe --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java @@ -0,0 +1,80 @@ +package com.mdd.admin.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.query.MPJQueryWrapper; +import com.mdd.admin.service.IFinanceRechargerService; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.finance.FinanceRechargeSearchValidate; +import com.mdd.admin.vo.finance.FinanceRechargeListVo; +import com.mdd.common.config.GlobalConfig; +import com.mdd.common.core.PageResult; +import com.mdd.common.entity.RechargeOrder; +import com.mdd.common.enums.PaymentEnum; +import com.mdd.common.mapper.RechargeOrderMapper; +import com.mdd.common.util.StringUtils; +import com.mdd.common.util.TimeUtils; +import com.mdd.common.util.UrlUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * 充值记录服务实现类 + */ +@Service +public class FinanceRechargerServiceImpl implements IFinanceRechargerService { + + @Resource + RechargeOrderMapper rechargeOrderMapper; + + /** + * 充值记录列表 + * + * @author fzr + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ + @Override + public PageResult list(PageValidate pageValidate, FinanceRechargeSearchValidate searchValidate) { + Integer pageNo = pageValidate.getPageNo(); + Integer pageSize = pageValidate.getPageSize(); + + MPJQueryWrapper mpjQueryWrapper = new MPJQueryWrapper<>(); + mpjQueryWrapper.selectAll(RechargeOrder.class) + .select("U.id as user_id,U.sn as user_sn,U.nickname,U.avatar") + .leftJoin("?_user U ON U.id=t.user_id".replace("?_", GlobalConfig.tablePrefix)) + .orderByDesc("id"); + + rechargeOrderMapper.setSearch(mpjQueryWrapper, searchValidate, new String[]{ + "like:sn@t.order_sn:str", + "=:payWay@t.pay_way:int", + "=:payStatus@t.pay_status:int", + ">=:payTime@pay_time:long" + }); + + if (StringUtils.isNotEmpty(searchValidate.getKeyword())) { + String keyword = searchValidate.getKeyword(); + mpjQueryWrapper.nested(wq->wq + .like("U.nickname", keyword).or() + .like("U.sn", keyword).or() + .like("U.mobile", keyword)); + } + + IPage iPage = rechargeOrderMapper.selectJoinPage( + new Page<>(pageNo, pageSize), + FinanceRechargeListVo.class, + mpjQueryWrapper); + + for (FinanceRechargeListVo vo : iPage.getRecords()) { + vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime())); + vo.setPayTime(TimeUtils.timestampToDate(vo.getPayTime())); + vo.setAvatar(UrlUtils.toAbsoluteUrl(vo.getAvatar())); + vo.setPayWay(PaymentEnum.getMsgByCode(Integer.parseInt(vo.getPayWay()))); + } + + return PageResult.iPageHandle(iPage); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRefundServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRefundServiceImpl.java new file mode 100644 index 00000000..bfb26fd5 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRefundServiceImpl.java @@ -0,0 +1,29 @@ +package com.mdd.admin.service.impl; + +import com.mdd.admin.service.IFinanceRefundService; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.finance.FinanceRefundSearchValidate; +import com.mdd.admin.vo.finance.FinanceRefundListVo; +import com.mdd.common.core.PageResult; +import org.springframework.stereotype.Service; + +/** + * 退款记录服务实现类 + */ +@Service +public class FinanceRefundServiceImpl implements IFinanceRefundService { + + /** + * 退款记录列表 + * + * @author fzr + * @param pageValidate 分页参数 + * @param searchValidate 搜索参数 + * @return PageResult + */ + @Override + public PageResult list(PageValidate pageValidate, FinanceRefundSearchValidate searchValidate) { + return null; + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceWalletServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceWalletServiceImpl.java new file mode 100644 index 00000000..3204432d --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceWalletServiceImpl.java @@ -0,0 +1,69 @@ +package com.mdd.admin.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.query.MPJQueryWrapper; +import com.mdd.admin.service.IFinanceWalletService; +import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.finance.FinanceWalletSearchValidate; +import com.mdd.admin.vo.finance.FinanceWalletListVo; +import com.mdd.common.config.GlobalConfig; +import com.mdd.common.core.PageResult; +import com.mdd.common.entity.log.LogMoney; +import com.mdd.common.enums.LogMoneyEnum; +import com.mdd.common.mapper.log.LogMoneyMapper; +import com.mdd.common.util.StringUtils; +import com.mdd.common.util.TimeUtils; +import com.mdd.common.util.UrlUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * 用户余额记录服务实现类 + */ +@Service +public class FinanceWalletServiceImpl implements IFinanceWalletService { + + @Resource + LogMoneyMapper logMoneyMapper; + + @Override + public PageResult list(PageValidate pageValidate, FinanceWalletSearchValidate searchValidate) { + Integer pageNo = pageValidate.getPageNo(); + Integer pageSize = pageValidate.getPageSize(); + + MPJQueryWrapper mpjQueryWrapper = new MPJQueryWrapper<>(); + mpjQueryWrapper.selectAll(LogMoney.class) + .select("U.id as user_id,U.sn as user_sn,U.nickname,U.avatar") + .leftJoin("?_user U ON U.id=t.user_id".replace("?_", GlobalConfig.tablePrefix)) + .orderByDesc("id"); + + logMoneyMapper.setSearch(mpjQueryWrapper, searchValidate, new String[]{ + "=:type@change_type:int", + "datetime:startTime-endTime@create_time:long", + }); + + if (StringUtils.isNotEmpty(searchValidate.getKeyword())) { + String keyword = searchValidate.getKeyword(); + mpjQueryWrapper.nested(wq->wq + .like("U.nickname", keyword).or() + .like("U.sn", keyword).or() + .like("U.mobile", keyword)); + } + + IPage iPage = logMoneyMapper.selectJoinPage( + new Page<>(pageNo, pageSize), + FinanceWalletListVo.class, + mpjQueryWrapper); + + for (FinanceWalletListVo vo : iPage.getRecords()) { + vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime())); + vo.setChangeType(LogMoneyEnum.getMsgByCode(Integer.parseInt(vo.getChangeType()))); + vo.setAvatar(UrlUtils.toAbsoluteUrl(vo.getAvatar())); + } + + return PageResult.iPageHandle(iPage); + } + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/UsersServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/UserServiceImpl.java similarity index 76% rename from server/like-admin/src/main/java/com/mdd/admin/service/impl/UsersServiceImpl.java rename to server/like-admin/src/main/java/com/mdd/admin/service/impl/UserServiceImpl.java index cff2659a..ed56a76a 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/UsersServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/UserServiceImpl.java @@ -4,23 +4,28 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.mdd.admin.service.IUsersService; -import com.mdd.admin.validate.UsersSearchValidate; -import com.mdd.admin.validate.UsersUpdateValidate; +import com.mdd.admin.service.IUserService; +import com.mdd.admin.validate.user.UserSearchValidate; +import com.mdd.admin.validate.user.UserUpdateValidate; import com.mdd.admin.validate.commons.PageValidate; +import com.mdd.admin.validate.user.UserWalletValidate; import com.mdd.admin.vo.user.UserVo; import com.mdd.common.core.PageResult; import com.mdd.common.entity.user.User; import com.mdd.common.enums.ClientEnum; +import com.mdd.common.enums.LogMoneyEnum; import com.mdd.common.exception.OperateException; +import com.mdd.common.mapper.log.LogMoneyMapper; import com.mdd.common.mapper.user.UserMapper; import com.mdd.common.util.StringUtils; import com.mdd.common.util.TimeUtils; import com.mdd.common.util.UrlUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.LinkedList; import java.util.List; import java.util.regex.Pattern; @@ -29,11 +34,14 @@ import java.util.regex.Pattern; * 用户服务实现类 */ @Service -public class UsersServiceImpl implements IUsersService { +public class UserServiceImpl implements IUserService { @Resource UserMapper userMapper; + @Resource + LogMoneyMapper logMoneyMapper; + /** * 用户列表 * @@ -43,7 +51,7 @@ public class UsersServiceImpl implements IUsersService { * @return PageResult */ @Override - public PageResult list(PageValidate pageValidate, UsersSearchValidate searchValidate) { + public PageResult list(PageValidate pageValidate, UserSearchValidate searchValidate) { Integer pageNo = pageValidate.getPageNo(); Integer pageSize = pageValidate.getPageSize(); @@ -141,7 +149,7 @@ public class UsersServiceImpl implements IUsersService { * @param updateValidate 参数 */ @Override - public void edit(UsersUpdateValidate updateValidate) { + public void edit(UserUpdateValidate updateValidate) { Integer id = updateValidate.getId(); String field = updateValidate.getField(); String value = updateValidate.getValue(); @@ -176,7 +184,7 @@ public class UsersServiceImpl implements IUsersService { user.setSex(Integer.parseInt(value)); break; case "mobile": - if (!Pattern.matches("^[1][3,4,5,6,7,8,9][0-9]{9}$", value)) { + if (!Pattern.matches("^[1][3-9][0-9]{9}$", value)) { throw new OperateException("手机号格式不正确!"); } user.setMobile(value); @@ -189,4 +197,42 @@ public class UsersServiceImpl implements IUsersService { userMapper.updateById(user); } + /** + * 余额调整 + * + * @author cjh + * @param userWalletValidate 余额 + */ + @Override + @Transactional + public void adjustWallet(UserWalletValidate userWalletValidate) { + User user = userMapper.selectOne(new QueryWrapper() + .eq("id", userWalletValidate.getUserId()) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(user,"用户不存在!"); + + BigDecimal userMoney = user.getMoney(); + BigDecimal amount = userWalletValidate.getAmount(); + BigDecimal surplusAmount; + int changeType; + + if(userWalletValidate.getAction().equals(0) ){ + surplusAmount = userMoney.subtract(amount); + if(surplusAmount.compareTo(BigDecimal.ZERO) < 0){ + throw new OperateException("用户余额仅剩："+ userMoney); + } + changeType = LogMoneyEnum.UM_DEC_ADMIN.getCode(); + logMoneyMapper.dec(user.getId(), changeType, amount, 0, "", userWalletValidate.getRemark(), null); + }else{ + surplusAmount = userMoney.add(amount); + changeType = LogMoneyEnum.UM_INC_ADMIN.getCode(); + logMoneyMapper.add(user.getId(), changeType, amount, 0, "", userWalletValidate.getRemark(), null); + } + + user.setMoney(surplusAmount); + userMapper.updateById(user); + } + } diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/AlbumCateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/album/AlbumCateValidate.java similarity index 96% rename from server/like-admin/src/main/java/com/mdd/admin/validate/AlbumCateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/album/AlbumCateValidate.java index c24e790a..148ed87d 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/AlbumCateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/album/AlbumCateValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.album; import com.mdd.common.validator.annotation.IntegerContains; import io.swagger.annotations.ApiModel; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/AlbumMoveValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/album/AlbumMoveValidate.java similarity index 94% rename from server/like-admin/src/main/java/com/mdd/admin/validate/AlbumMoveValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/album/AlbumMoveValidate.java index 4bd28463..93aa0587 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/AlbumMoveValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/album/AlbumMoveValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.album; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/AlbumRenameValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/album/AlbumRenameValidate.java similarity index 95% rename from server/like-admin/src/main/java/com/mdd/admin/validate/AlbumRenameValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/album/AlbumRenameValidate.java index c5c3afff..0051e69b 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/AlbumRenameValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/album/AlbumRenameValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.album; import com.mdd.common.validator.annotation.IDMust; import io.swagger.annotations.ApiModel; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/AlbumSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/album/AlbumSearchValidate.java similarity index 92% rename from server/like-admin/src/main/java/com/mdd/admin/validate/AlbumSearchValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/album/AlbumSearchValidate.java index 7a8d8bca..dc76657c 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/AlbumSearchValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/album/AlbumSearchValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.album; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/ArtCateCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArtCateCreateValidate.java similarity index 96% rename from server/like-admin/src/main/java/com/mdd/admin/validate/ArtCateCreateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/article/ArtCateCreateValidate.java index b1b418eb..17164a4b 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/ArtCateCreateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArtCateCreateValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.article; import com.mdd.common.validator.annotation.IntegerContains; import io.swagger.annotations.ApiModel; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/ArtCateSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArtCateSearchValidate.java similarity index 91% rename from server/like-admin/src/main/java/com/mdd/admin/validate/ArtCateSearchValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/article/ArtCateSearchValidate.java index 6e8e69f0..f8252263 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/ArtCateSearchValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArtCateSearchValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.article; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/ArtCateUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArtCateUpdateValidate.java similarity index 97% rename from server/like-admin/src/main/java/com/mdd/admin/validate/ArtCateUpdateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/article/ArtCateUpdateValidate.java index 69b771c7..77bffa49 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/ArtCateUpdateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArtCateUpdateValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.article; import com.mdd.common.validator.annotation.IDMust; import com.mdd.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/ArticleCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleCreateValidate.java similarity index 98% rename from server/like-admin/src/main/java/com/mdd/admin/validate/ArticleCreateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleCreateValidate.java index dd308cd4..4ac4a336 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/ArticleCreateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleCreateValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.article; import com.mdd.common.validator.annotation.IDMust; import com.mdd.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/ArticleSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleSearchValidate.java similarity index 94% rename from server/like-admin/src/main/java/com/mdd/admin/validate/ArticleSearchValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleSearchValidate.java index 9825edd6..67f8208f 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/ArticleSearchValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleSearchValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.article; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/ArticleUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleUpdateValidate.java similarity index 98% rename from server/like-admin/src/main/java/com/mdd/admin/validate/ArticleUpdateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleUpdateValidate.java index a8caac31..ad433814 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/ArticleUpdateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleUpdateValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.article; import com.mdd.common.validator.annotation.IDMust; import com.mdd.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/CrontabCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/crontab/CrontabCreateValidate.java similarity index 97% rename from server/like-admin/src/main/java/com/mdd/admin/validate/CrontabCreateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/crontab/CrontabCreateValidate.java index 53a825c7..2a954a5e 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/CrontabCreateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/crontab/CrontabCreateValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.crontab; import com.mdd.common.validator.annotation.IntegerContains; import io.swagger.annotations.ApiModel; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/CrontabUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/crontab/CrontabUpdateValidate.java similarity index 98% rename from server/like-admin/src/main/java/com/mdd/admin/validate/CrontabUpdateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/crontab/CrontabUpdateValidate.java index 991a4d2c..2c0aed7c 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/CrontabUpdateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/crontab/CrontabUpdateValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.crontab; import com.mdd.common.validator.annotation.IDMust; import com.mdd.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/DecoratePageValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/decorate/DecoratePageValidate.java similarity index 94% rename from server/like-admin/src/main/java/com/mdd/admin/validate/DecoratePageValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/decorate/DecoratePageValidate.java index 5701106b..ce1d0f44 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/DecoratePageValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/decorate/DecoratePageValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.decorate; import com.mdd.common.validator.annotation.IDMust; import io.swagger.annotations.ApiModel; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/DecorateTabsValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/decorate/DecorateTabsValidate.java similarity index 93% rename from server/like-admin/src/main/java/com/mdd/admin/validate/DecorateTabsValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/decorate/DecorateTabsValidate.java index d6cd1425..0be67c7b 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/DecorateTabsValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/decorate/DecorateTabsValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.decorate; import com.mdd.admin.vo.decorate.DecorateTabsListsVo; import com.mdd.admin.vo.decorate.DecorateTabsStyleVo; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/finance/FinanceRechargeSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/finance/FinanceRechargeSearchValidate.java new file mode 100644 index 00000000..a9a85625 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/finance/FinanceRechargeSearchValidate.java @@ -0,0 +1,30 @@ +package com.mdd.admin.validate.finance; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("充值订单搜索参数") +public class FinanceRechargeSearchValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "订单编号") + private String sn; + + @ApiModelProperty(value = "关键词") + private String keyword; + + @ApiModelProperty(value = "支付方式") + private Integer payWay; + + @ApiModelProperty(value = "支付状态") + private Integer payStatus; + + @ApiModelProperty(value = "支付时间") + private Integer payTime; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/finance/FinanceRefundSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/finance/FinanceRefundSearchValidate.java new file mode 100644 index 00000000..65ef9365 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/finance/FinanceRefundSearchValidate.java @@ -0,0 +1,14 @@ +package com.mdd.admin.validate.finance; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("退款记录搜索参数") +public class FinanceRefundSearchValidate implements Serializable { + + private static final long serialVersionUID = 1L; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/finance/FinanceWalletSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/finance/FinanceWalletSearchValidate.java new file mode 100644 index 00000000..349490de --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/finance/FinanceWalletSearchValidate.java @@ -0,0 +1,27 @@ +package com.mdd.admin.validate.finance; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("余额记录搜索参数") +public class FinanceWalletSearchValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "关键词") + private String keyword; + + @ApiModelProperty(value = "类型") + private Integer type; + + @ApiModelProperty(value = "创建时间") + private Integer startTime; + + @ApiModelProperty(value = "结束时间") + private Integer endTime; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/UsersSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/user/UserSearchValidate.java similarity index 84% rename from server/like-admin/src/main/java/com/mdd/admin/validate/UsersSearchValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/user/UserSearchValidate.java index 394ca05f..cb566ba5 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/UsersSearchValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/user/UserSearchValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.user; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -8,7 +8,7 @@ import java.io.Serializable; @Data @ApiModel("用户搜索参数") -public class UsersSearchValidate implements Serializable { +public class UserSearchValidate implements Serializable { private static final long serialVersionUID = 1L; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/UsersUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/user/UserUpdateValidate.java similarity index 81% rename from server/like-admin/src/main/java/com/mdd/admin/validate/UsersUpdateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/user/UserUpdateValidate.java index 70cf3641..f5864c20 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/UsersUpdateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/user/UserUpdateValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.user; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -8,7 +8,7 @@ import java.io.Serializable; @Data @ApiModel("用户更新参数") -public class UsersUpdateValidate implements Serializable { +public class UserUpdateValidate implements Serializable { private static final long serialVersionUID = 1L; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/user/UserWalletValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/user/UserWalletValidate.java new file mode 100644 index 00000000..2b1cd76c --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/user/UserWalletValidate.java @@ -0,0 +1,29 @@ +package com.mdd.admin.validate.user; + +import com.mdd.common.validator.annotation.IntegerContains; +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class UserWalletValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "缺少用户id参数") + @Min(value = 0, message = "用户id必须为数字") + private Integer userId; + + @NotNull(message = "请输入变动类型") + @IntegerContains(values = {0,1}, message = "变动类型错误") + private Integer action; + + @NotNull(message = "请输入变动金额") + private BigDecimal amount; + + private String remark; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListVo.java new file mode 100644 index 00000000..d10b211b --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListVo.java @@ -0,0 +1,46 @@ +package com.mdd.admin.vo.finance; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +@ApiModel("充值记录列表Vo") +public class FinanceRechargeListVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("ID") + private Integer id; + + @ApiModelProperty("用户昵称") + private String nickname; + + @ApiModelProperty("用户头像") + private String avatar; + + @ApiModelProperty("用户编号") + private String userSn; + + @ApiModelProperty("订单编号") + private String orderSn; + + @ApiModelProperty("支付方式: [2=微信支付, 3=支付宝支付]") + private String payWay; + + @ApiModelProperty("支付状态: [0=待支付, 1=已支付]") + private Integer payStatus; + + @ApiModelProperty("支付金额") + private BigDecimal orderAmount; + + @ApiModelProperty("支付时间") + private String payTime; + + @ApiModelProperty("创建时间") + private String createTime; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRefundListVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRefundListVo.java new file mode 100644 index 00000000..68010405 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRefundListVo.java @@ -0,0 +1,14 @@ +package com.mdd.admin.vo.finance; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("退款记录列表Vo") +public class FinanceRefundListVo implements Serializable { + + private static final long serialVersionUID = 1L; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceWalletListVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceWalletListVo.java new file mode 100644 index 00000000..a4a5aac2 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceWalletListVo.java @@ -0,0 +1,43 @@ +package com.mdd.admin.vo.finance; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +@ApiModel("余额记录列表Vo") +public class FinanceWalletListVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "记录ID") + private Integer id; + + @ApiModelProperty(value = "用户编号") + private String userSn; + + @ApiModelProperty(value = "u屏幕估计头皮屑") + private String avatar; + + @ApiModelProperty(value = "用户昵称") + private String nickname; + + @ApiModelProperty(value = "变动金额") + private BigDecimal changeAmount; + + @ApiModelProperty(value = "剩余金额") + private BigDecimal leftAmount; + + @ApiModelProperty(value = "变动类型") + private String changeType; + + @ApiModelProperty(value = "来源单号") + private String sourceSn; + + @ApiModelProperty(value = "记录时间") + private String createTime; + +} diff --git a/server/like-common/src/main/java/com/mdd/common/entity/DecoratePage.java b/server/like-common/src/main/java/com/mdd/common/entity/decorate/DecoratePage.java similarity index 95% rename from server/like-common/src/main/java/com/mdd/common/entity/DecoratePage.java rename to server/like-common/src/main/java/com/mdd/common/entity/decorate/DecoratePage.java index 0d2b1f2b..36533d7a 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/DecoratePage.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/decorate/DecoratePage.java @@ -1,4 +1,4 @@ -package com.mdd.common.entity; +package com.mdd.common.entity.decorate; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/server/like-common/src/main/java/com/mdd/common/entity/DecorateTabbar.java b/server/like-common/src/main/java/com/mdd/common/entity/decorate/DecorateTabbar.java similarity index 95% rename from server/like-common/src/main/java/com/mdd/common/entity/DecorateTabbar.java rename to server/like-common/src/main/java/com/mdd/common/entity/decorate/DecorateTabbar.java index 7fc267d9..61394b4d 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/DecorateTabbar.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/decorate/DecorateTabbar.java @@ -1,4 +1,4 @@ -package com.mdd.common.entity; +package com.mdd.common.entity.decorate; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/server/like-common/src/main/java/com/mdd/common/entity/LogMoney.java b/server/like-common/src/main/java/com/mdd/common/entity/log/LogMoney.java similarity index 97% rename from server/like-common/src/main/java/com/mdd/common/entity/LogMoney.java rename to server/like-common/src/main/java/com/mdd/common/entity/log/LogMoney.java index 034ba234..05cdd840 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/LogMoney.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/log/LogMoney.java @@ -1,4 +1,4 @@ -package com.mdd.common.entity; +package com.mdd.common.entity.log; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/server/like-common/src/main/java/com/mdd/common/enums/PaymentEnum.java b/server/like-common/src/main/java/com/mdd/common/enums/PaymentEnum.java index 70d4bae8..042ef4c1 100644 --- a/server/like-common/src/main/java/com/mdd/common/enums/PaymentEnum.java +++ b/server/like-common/src/main/java/com/mdd/common/enums/PaymentEnum.java @@ -42,4 +42,20 @@ public enum PaymentEnum { return this.msg; } + /** + * 根据编码获取Msg + * + * @author fzr + * @param code 类型 + * @return String + */ + public static String getMsgByCode(Integer code){ + for(PaymentEnum enumItem: PaymentEnum.values()) { + if (enumItem.getCode() == code) { + return enumItem.getMsg(); + } + } + return null; + } + } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/DecoratePageMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/decorate/DecoratePageMapper.java similarity index 69% rename from server/like-common/src/main/java/com/mdd/common/mapper/DecoratePageMapper.java rename to server/like-common/src/main/java/com/mdd/common/mapper/decorate/DecoratePageMapper.java index 744ba996..9f105932 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/DecoratePageMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/decorate/DecoratePageMapper.java @@ -1,7 +1,7 @@ -package com.mdd.common.mapper; +package com.mdd.common.mapper.decorate; import com.mdd.common.core.basics.IBaseMapper; -import com.mdd.common.entity.DecoratePage; +import com.mdd.common.entity.decorate.DecoratePage; import org.apache.ibatis.annotations.Mapper; /** diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/DecorateTabbarMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/decorate/DecorateTabbarMapper.java similarity index 69% rename from server/like-common/src/main/java/com/mdd/common/mapper/DecorateTabbarMapper.java rename to server/like-common/src/main/java/com/mdd/common/mapper/decorate/DecorateTabbarMapper.java index a08c0902..454701f9 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/DecorateTabbarMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/decorate/DecorateTabbarMapper.java @@ -1,7 +1,7 @@ -package com.mdd.common.mapper; +package com.mdd.common.mapper.decorate; import com.mdd.common.core.basics.IBaseMapper; -import com.mdd.common.entity.DecorateTabbar; +import com.mdd.common.entity.decorate.DecorateTabbar; import org.apache.ibatis.annotations.Mapper; /** diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/LogMoneyMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/log/LogMoneyMapper.java similarity index 98% rename from server/like-common/src/main/java/com/mdd/common/mapper/LogMoneyMapper.java rename to server/like-common/src/main/java/com/mdd/common/mapper/log/LogMoneyMapper.java index 1e7ab080..d57b9a55 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/LogMoneyMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/log/LogMoneyMapper.java @@ -1,8 +1,8 @@ -package com.mdd.common.mapper; +package com.mdd.common.mapper.log; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mdd.common.core.basics.IBaseMapper; -import com.mdd.common.entity.LogMoney; +import com.mdd.common.entity.log.LogMoney; import com.mdd.common.entity.user.User; import com.mdd.common.mapper.user.UserMapper; import com.mdd.common.util.SpringUtils; diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java index 54d027f8..aea82cf3 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java @@ -4,12 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.mdd.common.config.GlobalConfig; import com.mdd.common.entity.article.Article; -import com.mdd.common.entity.DecoratePage; -import com.mdd.common.entity.DecorateTabbar; +import com.mdd.common.entity.decorate.DecoratePage; +import com.mdd.common.entity.decorate.DecorateTabbar; import com.mdd.common.entity.setting.HotSearch; import com.mdd.common.mapper.article.ArticleMapper; -import com.mdd.common.mapper.DecoratePageMapper; -import com.mdd.common.mapper.DecorateTabbarMapper; +import com.mdd.common.mapper.decorate.DecoratePageMapper; +import com.mdd.common.mapper.decorate.DecorateTabbarMapper; import com.mdd.common.mapper.setting.HotSearchMapper; import com.mdd.common.util.*; import com.mdd.front.service.IIndexService; diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java index d1212cd7..216af9f3 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java @@ -4,17 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mdd.common.core.PageResult; -import com.mdd.common.entity.LogMoney; -import com.mdd.common.entity.article.Article; +import com.mdd.common.entity.log.LogMoney; import com.mdd.common.enums.LogMoneyEnum; -import com.mdd.common.mapper.LogMoneyMapper; +import com.mdd.common.mapper.log.LogMoneyMapper; import com.mdd.common.util.TimeUtils; -import com.mdd.common.util.UrlUtils; import com.mdd.front.service.ILogsService; import com.mdd.front.validate.common.PageValidate; import com.mdd.front.vo.LogRecordDataVo; -import com.mdd.front.vo.article.ArticleListedVo; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java index 4efb1572..7b51eea7 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java @@ -1,21 +1,15 @@ package com.mdd.front.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderV3Request; -import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderV3Result; -import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum; -import com.github.binarywang.wxpay.service.WxPayService; -import com.mdd.common.core.AjaxResult; import com.mdd.common.entity.RechargeOrder; import com.mdd.common.entity.setting.DevPayConfig; import com.mdd.common.entity.setting.DevPayWay; import com.mdd.common.entity.user.User; import com.mdd.common.entity.user.UserAuth; -import com.mdd.common.enums.ClientEnum; import com.mdd.common.enums.LogMoneyEnum; import com.mdd.common.enums.PaymentEnum; import com.mdd.common.exception.PaymentException; -import com.mdd.common.mapper.LogMoneyMapper; +import com.mdd.common.mapper.log.LogMoneyMapper; import com.mdd.common.mapper.RechargeOrderMapper; import com.mdd.common.mapper.setting.DevPayConfigMapper; import com.mdd.common.mapper.setting.DevPayWayMapper; @@ -32,8 +26,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.Arrays; import java.util.Collections; import java.util.LinkedList; import java.util.List; diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/PcServiceImpI.java b/server/like-front/src/main/java/com/mdd/front/service/impl/PcServiceImpI.java index 6add538b..a6e8299c 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/PcServiceImpI.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/PcServiceImpI.java @@ -2,12 +2,12 @@ package com.mdd.front.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mdd.common.config.GlobalConfig; -import com.mdd.common.entity.DecoratePage; +import com.mdd.common.entity.decorate.DecoratePage; import com.mdd.common.entity.article.Article; import com.mdd.common.entity.article.ArticleCategory; import com.mdd.common.entity.article.ArticleCollect; import com.mdd.common.exception.OperateException; -import com.mdd.common.mapper.DecoratePageMapper; +import com.mdd.common.mapper.decorate.DecoratePageMapper; import com.mdd.common.mapper.article.ArticleCategoryMapper; import com.mdd.common.mapper.article.ArticleCollectMapper; import com.mdd.common.mapper.article.ArticleMapper; diff --git a/uniapp/src/manifest.json b/uniapp/src/manifest.json index 124ffce8..39434135 100644 --- a/uniapp/src/manifest.json +++ b/uniapp/src/manifest.json @@ -50,7 +50,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wx65b3824de0b3d3b0", + "appid" : "wx386a75e518b38935", "setting" : { "urlCheck" : false },