From 80102a56fc5f726660c3ed6d9b5d3c76502cb4a8 Mon Sep 17 00:00:00 2001
From: admin <1752476835@qq.com>
Date: Wed, 5 Jun 2024 15:54:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
play-admin/pom.xml | 7 +
.../java/com/starry/admin/Application.java | 8 +
.../admin/common/component/JwtToken.java | 6 +-
...dler.java => AbstractListTypeHandler.java} | 17 +-
.../admin/common/conf/StringTypeHandler.java | 7 +-
.../mybatis/handler/MyMetaObjectHandler.java | 28 +-
.../oss/service/impl/OssFileServiceImpl.java | 4 +-
.../admin/common/play/wx/CommonText.java | 38 -
.../common/play/wx/WxCustomPayUtils.java | 4 +-
.../common/task/ClerkWagesSettlementTask.java | 158 ++++
.../task/OrderRankingSettlementTask.java | 118 +++
.../PlayClerkArticleInfoController.java | 87 ---
.../module/vo/PlayClerkArticleReturnVo.java | 68 --
.../impl/PlayClerkArticleInfoServiceImpl.java | 106 ---
.../PlayBalanceDetailsInfoController.java | 5 +-
.../entity/PlayBalanceDetailsInfoEntity.java | 8 +-
.../module/vo/PlayBalanceDetailsQueryVo.java | 26 +
.../module/vo/PlayBalanceDetailsReturnVo.java | 40 +-
.../IPlayBalanceDetailsInfoService.java | 6 +-
.../PlayBalanceDetailsInfoServiceImpl.java | 35 +-
.../PlayClerkArticleInfoController.java | 70 ++
.../PlayClerkDataReviewInfoController.java | 97 +--
.../PlayClerkGroupInfoController.java | 77 ++
.../PlayClerkGroupUserInfoController.java | 77 ++
.../PlayClerkRankingInfoController.java | 77 ++
.../PlayClerkTypeInfoController.java | 78 ++
.../PlayClerkUserInfoController.java | 86 ++-
.../PlayClerkUserReviewInfoController.java | 55 ++
.../PlayClerkWagesDetailsInfoController.java | 77 ++
.../PlayClerkWagesInfoController.java | 107 +++
.../PlayCustomArticleInfoController.java | 6 +-
.../mapper/PlayClerkArticleInfoMapper.java | 4 +-
.../mapper/PlayClerkDataReviewInfoMapper.java | 6 +-
.../mapper/PlayClerkGroupInfoMapper.java | 16 +
.../mapper/PlayClerkGroupUserInfoMapper.java | 16 +
.../mapper/PlayClerkRankingInfoMapper.java | 16 +
.../clerk/mapper/PlayClerkTypeInfoMapper.java | 16 +
.../mapper/PlayClerkTypeUserInfoMapper.java | 16 +
.../mapper/PlayClerkUserReviewInfoMapper.java | 16 +
.../PlayClerkWagesDetailsInfoMapper.java | 16 +
.../mapper/PlayClerkWagesInfoMapper.java | 16 +
.../mapper/PlayCustomArticleInfoMapper.java | 4 +-
.../entity/PlayClerkArticleInfoEntity.java | 50 +-
.../entity/PlayClerkCommodityEntity.java | 20 +-
.../entity/PlayClerkDataReviewInfoEditVo.java | 2 +-
.../entity/PlayClerkDataReviewInfoEntity.java | 45 +-
.../PlayClerkDataReviewInfoQueryVo.java | 2 +-
.../entity/PlayClerkGroupInfoEntity.java | 41 +
.../entity/PlayClerkGroupUserInfoEntity.java | 51 ++
.../entity/PlayClerkRankingInfoEntity.java | 90 +++
.../entity/PlayClerkTypeInfoEntity.java | 45 ++
.../entity/PlayClerkTypeUserInfoEntity.java | 45 ++
.../entity/PlayClerkUserInfoEntity.java | 24 +-
.../module/entity/PlayClerkUserQueryVo.java | 133 ++++
.../module/entity/PlayClerkUserReturnVo.java | 156 ++++
.../entity/PlayClerkUserReviewInfoEntity.java | 119 +++
.../PlayClerkWagesDetailsInfoEntity.java | 69 ++
.../entity/PlayClerkWagesInfoEntity.java | 114 +++
.../entity/PlayCustomArticleInfoEntity.java | 17 +-
.../module/vo/PlayClerkArticleQueryVo.java | 39 +
.../module/vo/PlayClerkArticleReturnVo.java | 82 ++
.../vo/PlayClerkArticleReviewStateEditVo.java | 36 +
.../module/vo/PlayClerkCommodityQueryVo.java | 5 +
.../module/vo/PlayClerkDataReviewQueryVo.java | 38 +
.../vo/PlayClerkDataReviewReturnVo.java | 80 ++
.../vo/PlayClerkDataReviewStateEditVo.java | 36 +
.../module/vo/PlayClerkTypeInfoAddVo.java | 33 +
.../PlayClerkUnsettledWagesInfoQueryVo.java | 25 +
.../PlayClerkUnsettledWagesInfoReturnVo.java | 74 ++
.../module/vo/PlayClerkUserAddToWxVo.java | 2 +-
.../clerk/module/vo/PlayClerkUserAddVo.java | 2 +-
.../clerk/module/vo/PlayClerkUserEditVo.java | 2 +-
.../module/vo/PlayClerkUserReviewQueryVo.java | 57 ++
.../vo/PlayClerkUserReviewReturnVo.java | 118 +++
.../vo/PlayClerkUserReviewStateEditVo.java | 36 +
.../module/vo/PlayClerkUserStateEditVo.java | 12 +-
.../module/vo/PlayClerkWagesInfoQueryVo.java | 33 +
.../module/vo/PlayClerkWagesInfoReturnVo.java | 108 +++
.../service/IPlayClerkArticleInfoService.java | 23 +-
.../service/IPlayClerkCommodityService.java | 8 +-
.../IPlayClerkDataReviewInfoService.java | 33 +-
.../service/IPlayClerkGroupInfoService.java | 61 ++
.../IPlayClerkGroupUserInfoService.java | 61 ++
.../service/IPlayClerkRankingInfoService.java | 109 +++
.../service/IPlayClerkTypeInfoService.java | 71 ++
.../IPlayClerkTypeUserInfoService.java | 61 ++
.../service/IPlayClerkUserInfoService.java | 62 +-
.../IPlayClerkUserReviewInfoService.java | 84 +++
.../IPlayClerkWagesDetailsInfoService.java | 89 +++
.../service/IPlayClerkWagesInfoService.java | 111 +++
.../IPlayCustomArticleInfoService.java | 15 +-
.../impl/PlayClerkArticleInfoServiceImpl.java | 207 ++++++
...layClerkClassificationInfoServiceImpl.java | 4 +-
.../impl/PlayClerkCommodityServiceImpl.java | 35 +-
.../PlayClerkDataReviewInfoServiceImpl.java | 119 ++-
.../impl/PlayClerkGroupInfoServiceImpl.java | 97 +++
.../PlayClerkGroupUserInfoServiceImpl.java | 97 +++
.../impl/PlayClerkLevelInfoServiceImpl.java | 6 +-
.../impl/PlayClerkRankingInfoServiceImpl.java | 186 +++++
.../impl/PlayClerkTypeInfoServiceImpl.java | 104 +++
.../PlayClerkTypeUserInfoServiceImpl.java | 97 +++
.../impl/PlayClerkUserInfoServiceImpl.java | 229 ++++--
.../PlayClerkUserReviewInfoServiceImpl.java | 177 +++++
.../PlayClerkWagesDetailsInfoServiceImpl.java | 123 +++
.../impl/PlayClerkWagesInfoServiceImpl.java | 173 +++++
.../PlayCustomArticleInfoServiceImpl.java | 23 +-
.../impl/PlayClerkServiceServiceImpl.java | 4 +-
.../impl/PlayServiceInfoServiceImpl.java | 4 +-
.../PlayCustomLeaveMsgController.java | 5 +-
.../PlayCustomLevelInfoController.java | 3 +-
.../PlayCustomRankingController.java | 37 +
.../PlayCustomUserInfoController.java | 8 +-
.../mapper/PlayCustomUserInfoMapper.java | 4 +-
.../entity/PlayCustomUserInfoEntity.java | 29 +-
.../module/vo/PlayCustomLeaveMsgReturnVo.java | 6 +-
.../module/vo/PlayCustomLevelReturnVo.java | 44 ++
.../module/vo/PlayCustomRankingQueryVo.java | 27 +
.../module/vo/PlayCustomRankingReturnVo.java | 81 ++
.../module/vo/PlayCustomUserQueryVo.java | 113 +++
.../module/vo/PlayCustomUserReturnVo.java | 174 +++++
.../module/vo/PlayCustomUserStateEditVo.java | 5 +-
.../service/IPlayCustomUserInfoService.java | 33 +-
.../impl/PlayCustomLeaveMsgServiceImpl.java | 6 +-
.../impl/PlayCustomLevelInfoServiceImpl.java | 4 +-
.../impl/PlayCustomUserInfoServiceImpl.java | 179 ++++-
.../mapper/PlayCustomFollowInfoMapper.java | 4 +-
.../entity/PlayCustomFollowInfoEntity.java | 4 +-
.../service/IPlayCustomFollowInfoService.java | 13 +
.../impl/PlayCustomFollowInfoServiceImpl.java | 44 +-
.../PlayClerkGiftInfoController.java | 77 ++
.../gift/mapper/PlayClerkGiftInfoMapper.java | 16 +
.../gift/mapper/PlayGiftInfoMapper.java | 4 +-
.../entity/PlayClerkGiftInfoEntity.java | 46 ++
.../module/entity/PlayGiftInfoEntity.java | 12 +-
.../service/IPlayClerkGiftInfoService.java | 72 ++
.../gift/service/IPlayGiftInfoService.java | 13 +
.../impl/PlayClerkGiftInfoServiceImpl.java | 112 +++
.../service/impl/PlayGiftInfoServiceImpl.java | 47 +-
.../PlayOrderComplaintInfoController.java | 5 +-
.../PlayOrderContinueInfoController.java | 46 ++
.../PlayOrderEvaluateInfoController.java | 42 +-
.../controller/PlayOrderInfoController.java | 5 +-
.../PlayOrderRefundInfoController.java | 80 ++
.../PlayOrderRewardInfoController.java | 2 +-
.../mapper/PlayOrderContinueInfoMapper.java | 16 +
.../mapper/PlayOrderRandomInfoMapper.java | 17 +
.../mapper/PlayOrderRefundInfoMapper.java | 16 +
.../entity/PlayOrderComplaintInfoEntity.java | 5 +
.../entity/PlayOrderContinueInfoEntity.java | 119 +++
.../entity/PlayOrderEvaluateInfoEntity.java | 6 +-
.../module/entity/PlayOrderInfoEntity.java | 139 +++-
.../entity/PlayOrderRandomInfoEntity.java | 97 +++
.../entity/PlayOrderRefundInfoEntity.java | 119 +++
.../order/module/vo/OrderInfoAddVo.java | 11 +-
.../module/vo/PlayOrderComplaintQueryVo.java | 36 +
.../module/vo/PlayOrderComplaintReturnVo.java | 51 ++
.../module/vo/PlayOrderContinueQueryVo.java | 44 ++
.../module/vo/PlayOrderContinueReturnVo.java | 123 +++
.../module/vo/PlayOrderDetailsReturnVo.java | 35 +-
.../vo/PlayOrderEvaluateEditStateVo.java | 29 +
.../module/vo/PlayOrderEvaluateEditVo.java | 24 -
.../module/vo/PlayOrderEvaluateQueryVo.java | 37 +
.../module/vo/PlayOrderEvaluateReturnVo.java | 58 +-
.../order/module/vo/PlayOrderInfoQueryVo.java | 71 +-
.../module/vo/PlayOrderInfoReturnVo.java | 59 +-
.../module/vo/PlayOrderRefundQueryVo.java | 14 +
.../module/vo/PlayOrderRefundReturnVo.java | 8 +
.../module/vo/PlayOrderReviewStateEditVo.java | 30 +
.../module/vo/PlayOrderRewardQueryVo.java | 43 ++
.../order/module/vo/PlayOrderStateEditVo.java | 34 +
.../IPlayOrderContinueInfoService.java | 90 +++
.../IPlayOrderEvaluateInfoService.java | 25 +
.../order/service/IPlayOrderInfoService.java | 255 ++++++-
.../service/IPlayOrderRandomInfoService.java | 83 +++
.../service/IPlayOrderRefundInfoService.java | 80 ++
.../PlayOrderComplaintInfoServiceImpl.java | 40 +-
.../PlayOrderContinueInfoServiceImpl.java | 169 +++++
.../PlayOrderEvaluateInfoServiceImpl.java | 68 +-
.../impl/PlayOrderInfoServiceImpl.java | 698 ++++++++++++++----
.../impl/PlayOrderRandomInfoServiceImpl.java | 133 ++++
.../impl/PlayOrderRefundInfoServiceImpl.java | 114 +++
.../platform/service/ISysTenantService.java | 7 +
.../impl/SysTenantPackageServiceImpl.java | 4 +-
.../service/impl/SysTenantServiceImpl.java | 13 +-
.../modules/platform/vo/SysTenantAddVo.java | 8 +-
.../platform/vo/SysTenantPackageVo.java | 1 -
.../play/mapper/PlayCommodityInfoMapper.java | 16 +-
.../entity/PlayCommodityInfoEntity.java | 21 +-
.../play/module/vo/PlayCommodityInfoVo.java | 35 +
.../service/IPlayCommodityInfoService.java | 39 +
.../impl/PlayCommodityInfoServiceImpl.java | 84 ++-
.../impl/PlayNoticeInfoServiceImpl.java | 4 +-
.../impl/PlayResourcesInfoServiceImpl.java | 4 +-
.../service/impl/PlayUserInfoServiceImpl.java | 4 +-
.../PlayShopCarouselInfoController.java | 83 +++
.../mapper/PlayShopCarouselInfoMapper.java | 16 +
.../entity/PlayShopCarouselInfoEntity.java | 66 ++
.../module/vo/PlayShopCarouselInfoAddVo.java | 47 ++
.../vo/PlayShopCarouselInfoQueryVo.java | 35 +
.../vo/PlayShopCarouselInfoReturnVo.java | 14 +
.../vo/PlayShopCarouselInfoUpdateStateVo.java | 22 +
.../service/IPlayShopCarouselInfoService.java | 63 ++
.../impl/PlayShopCarouselInfoServiceImpl.java | 104 +++
...AdministrativeAreaDictInfoServiceImpl.java | 4 +-
.../service/impl/SysUserServiceImpl.java | 4 +-
.../controller/WxArticleController.java | 148 ++++
.../WxClerkCommodityController.java | 41 +
.../weichat/controller/WxClerkController.java | 310 ++++----
.../controller/WxClerkLeveController.java | 50 ++
.../controller/WxClerkWagesController.java | 140 ++++
.../controller/WxCommonController.java | 8 +-
.../controller/WxCustomController.java | 225 ++++--
.../weichat/controller/WxGiftController.java | 36 +-
.../weichat/controller/WxLevelController.java | 48 ++
.../weichat/controller/WxOauthController.java | 4 +-
.../controller/WxOrderInfoController.java | 166 +++++
.../weichat/controller/WxPlayController.java | 12 +-
.../WxPlayOrderRankingController.java | 52 ++
.../entity/PlayClerkFollowQueryVo.java | 23 +
.../entity/PlayClerkFollowReturnVo.java | 74 ++
.../entity/PlayClerkUserLoginResponseVo.java | 2 +-
.../weichat/entity/PlayCommodityReturnVo.java | 41 +
.../entity/PlayOrderCancellationVo.java | 35 +
...eryVo.java => WxPlayClerkUserQueryVo.java} | 2 +-
.../entity/article/PlayClerkAddArticleVo.java | 58 ++
.../PlayClerkArticleCustomQueryVo.java | 27 +
.../PlayClerkArticleCustomReturnVo.java | 87 +++
...cleFollowCustomFollowStateEditStateVo.java | 30 +
...icleFollowCustomGreedStateEditStateVo.java | 30 +
.../clerk}/PlayClerkUserInfoQueryVo.java | 4 +-
.../clerk/PlayClerkUserInfoResultVo.java} | 5 +-
.../PlayCustomHideLevelStateEditVo.java | 29 +
.../PlayCustomHideRankingStateEditVo.java | 28 +
.../PlayCustomOrderEvaluateReturnVo.java | 41 +
.../entity/gift/PlayClerkGiftReturnVo.java | 52 ++
.../entity/level/PlayClerkLevelReturnVo.java | 15 +
.../order/PlayClearOrderInfoQueryVo.java | 45 ++
.../order/PlayClerkOrderDetailsReturnVo.java | 198 +++++
.../order/PlayClerkOrderInfoQueryVo.java | 45 ++
.../order/PlayClerkOrderListReturnVo.java | 141 ++++
.../PlayClerkRandomOrderDetailReturnVo.java | 126 ++++
.../order/PlayCustomOrderDetailsReturnVo.java | 194 +++++
.../order/PlayCustomOrderInfoQueryVo.java | 45 ++
.../order/PlayCustomOrderListReturnVo.java | 132 ++++
.../PlayOrderHistoryRankingReturnVo.java | 36 +
.../PlayOrderInfoCommodityAdd.java | 4 +-
.../order/PlayOrderInfoContinueAdd.java | 37 +
.../order/PlayOrderInfoContinueQueryVo.java | 21 +
.../order/PlayOrderInfoRandomQueryVo.java} | 10 +-
.../order/PlayOrderInfoRandomReturnVo.java | 130 ++++
.../entity/order/PlayOrderRankingListVo.java | 50 ++
.../entity/order/PlayOrderRankingQueryVo.java | 18 +
.../order/PlayOrderRankingReturnVo.java | 106 +++
.../order/PlayRandomOrderInfoReturnVo.java | 123 +++
.../entity/order/PlayRewardInfoReturnVo.java | 67 ++
.../entity/order/PlayRewardOrderQueryVo.java | 12 +
.../user/PlayCustomUserReturnDetailVo.java | 143 ++++
.../vo/PlayCustomLevelInfoReturnVo.java | 31 +
.../ClerkCurrentPeriodWagesReturnVo.java | 49 ++
.../wages/ClerkHistoricalWagesReturnVo.java | 43 ++
.../wages/ClerkUnsettledWagesReturnVo.java | 38 +
.../wages/ClerkWagesDetailsReturnVo.java | 62 ++
.../entity/wages/OrderWagesReturnVo.java | 49 ++
.../weichat/service/WxOauthService.java | 6 +-
.../src/main/resources/application-test.yml | 10 +-
.../platform/SysTenantPackageMapper.xml | 3 +-
.../resources/mapper/system/SysDictMapper.xml | 3 +-
.../mapper/system/SysLoginLogMapper.xml | 3 +-
.../mapper/system/SysOperationLogMapper.xml | 4 +-
.../context/CustomSecurityContextHolder.java | 4 +
.../com/starry/common/domain/BaseEntity.java | 5 -
.../java/com/starry/common/utils/IdUtils.java | 20 +
.../resources/vm/java/serviceImpl.java.vm | 4 +-
pom.xml | 6 +
274 files changed, 13634 insertions(+), 1347 deletions(-)
rename play-admin/src/main/java/com/starry/admin/common/conf/{ListTypeHandler.java => AbstractListTypeHandler.java} (75%)
delete mode 100644 play-admin/src/main/java/com/starry/admin/common/play/wx/CommonText.java
create mode 100644 play-admin/src/main/java/com/starry/admin/common/task/ClerkWagesSettlementTask.java
create mode 100644 play-admin/src/main/java/com/starry/admin/common/task/OrderRankingSettlementTask.java
delete mode 100644 play-admin/src/main/java/com/starry/admin/modules/article/controller/PlayClerkArticleInfoController.java
delete mode 100644 play-admin/src/main/java/com/starry/admin/modules/article/module/vo/PlayClerkArticleReturnVo.java
delete mode 100644 play-admin/src/main/java/com/starry/admin/modules/article/service/impl/PlayClerkArticleInfoServiceImpl.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkArticleInfoController.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkGroupInfoController.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkGroupUserInfoController.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkRankingInfoController.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkTypeInfoController.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserReviewInfoController.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkWagesDetailsInfoController.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkWagesInfoController.java
rename play-admin/src/main/java/com/starry/admin/modules/{article => clerk}/controller/PlayCustomArticleInfoController.java (92%)
rename play-admin/src/main/java/com/starry/admin/modules/{article => clerk}/mapper/PlayClerkArticleInfoMapper.java (64%)
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkGroupInfoMapper.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkGroupUserInfoMapper.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkRankingInfoMapper.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkTypeInfoMapper.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkTypeUserInfoMapper.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkUserReviewInfoMapper.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkWagesDetailsInfoMapper.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkWagesInfoMapper.java
rename play-admin/src/main/java/com/starry/admin/modules/{article => clerk}/mapper/PlayCustomArticleInfoMapper.java (65%)
rename play-admin/src/main/java/com/starry/admin/modules/{article => clerk}/module/entity/PlayClerkArticleInfoEntity.java (55%)
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkGroupInfoEntity.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkGroupUserInfoEntity.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkRankingInfoEntity.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkTypeInfoEntity.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkTypeUserInfoEntity.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserQueryVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReviewInfoEntity.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkWagesDetailsInfoEntity.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkWagesInfoEntity.java
rename play-admin/src/main/java/com/starry/admin/modules/{article => clerk}/module/entity/PlayCustomArticleInfoEntity.java (71%)
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkArticleQueryVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkArticleReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkArticleReviewStateEditVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewQueryVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewStateEditVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkTypeInfoAddVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUnsettledWagesInfoQueryVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUnsettledWagesInfoReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewQueryVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewStateEditVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkWagesInfoQueryVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkWagesInfoReturnVo.java
rename play-admin/src/main/java/com/starry/admin/modules/{article => clerk}/service/IPlayClerkArticleInfoService.java (63%)
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkGroupInfoService.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkGroupUserInfoService.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkRankingInfoService.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkTypeInfoService.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkTypeUserInfoService.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkUserReviewInfoService.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkWagesDetailsInfoService.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkWagesInfoService.java
rename play-admin/src/main/java/com/starry/admin/modules/{article => clerk}/service/IPlayCustomArticleInfoService.java (79%)
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkArticleInfoServiceImpl.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkGroupInfoServiceImpl.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkGroupUserInfoServiceImpl.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkRankingInfoServiceImpl.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkTypeInfoServiceImpl.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkTypeUserInfoServiceImpl.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserReviewInfoServiceImpl.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkWagesDetailsInfoServiceImpl.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkWagesInfoServiceImpl.java
rename play-admin/src/main/java/com/starry/admin/modules/{article => clerk}/service/impl/PlayCustomArticleInfoServiceImpl.java (76%)
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomRankingController.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/custom/module/vo/PlayCustomLevelReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/custom/module/vo/PlayCustomRankingQueryVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/custom/module/vo/PlayCustomRankingReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/custom/module/vo/PlayCustomUserQueryVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/custom/module/vo/PlayCustomUserReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/gift/controller/PlayClerkGiftInfoController.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/gift/mapper/PlayClerkGiftInfoMapper.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/gift/module/entity/PlayClerkGiftInfoEntity.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/gift/service/IPlayClerkGiftInfoService.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/gift/service/impl/PlayClerkGiftInfoServiceImpl.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderContinueInfoController.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderRefundInfoController.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderContinueInfoMapper.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderRandomInfoMapper.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderRefundInfoMapper.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderContinueInfoEntity.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderRandomInfoEntity.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderRefundInfoEntity.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderContinueQueryVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderContinueReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateEditStateVo.java
delete mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateEditVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRefundQueryVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRefundReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderReviewStateEditVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderStateEditVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderContinueInfoService.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderRandomInfoService.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderRefundInfoService.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderContinueInfoServiceImpl.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderRandomInfoServiceImpl.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderRefundInfoServiceImpl.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/play/module/vo/PlayCommodityInfoVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayShopCarouselInfoController.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayShopCarouselInfoMapper.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayShopCarouselInfoEntity.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopCarouselInfoAddVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopCarouselInfoQueryVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopCarouselInfoReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopCarouselInfoUpdateStateVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayShopCarouselInfoService.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayShopCarouselInfoServiceImpl.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxArticleController.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkCommodityController.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkLeveController.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkWagesController.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxLevelController.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxOrderInfoController.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayOrderRankingController.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkFollowQueryVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkFollowReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayCommodityReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderCancellationVo.java
rename play-admin/src/main/java/com/starry/admin/modules/weichat/entity/{PlayClerkUserQueryVo.java => WxPlayClerkUserQueryVo.java} (89%)
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkAddArticleVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkArticleCustomQueryVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkArticleCustomReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkArticleFollowCustomFollowStateEditStateVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/article/PlayClerkArticleFollowCustomGreedStateEditStateVo.java
rename play-admin/src/main/java/com/starry/admin/modules/{clerk/module/entity => weichat/entity/clerk}/PlayClerkUserInfoQueryVo.java (91%)
rename play-admin/src/main/java/com/starry/admin/modules/{clerk/module/entity/PlayClerkUserListResultVo.java => weichat/entity/clerk/PlayClerkUserInfoResultVo.java} (95%)
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/costom/PlayCustomHideLevelStateEditVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/costom/PlayCustomHideRankingStateEditVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/evaluate/PlayCustomOrderEvaluateReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/gift/PlayClerkGiftReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/level/PlayClerkLevelReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClearOrderInfoQueryVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkOrderDetailsReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkOrderInfoQueryVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkOrderListReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayClerkRandomOrderDetailReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayCustomOrderDetailsReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayCustomOrderInfoQueryVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayCustomOrderListReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderHistoryRankingReturnVo.java
rename play-admin/src/main/java/com/starry/admin/modules/weichat/entity/{ => order}/PlayOrderInfoCommodityAdd.java (86%)
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoContinueAdd.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoContinueQueryVo.java
rename play-admin/src/main/java/com/starry/admin/modules/{article/module/vo/PlayClerkArticleQueryVo.java => weichat/entity/order/PlayOrderInfoRandomQueryVo.java} (54%)
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoRandomReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderRankingListVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderRankingQueryVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderRankingReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayRandomOrderInfoReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayRewardInfoReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayRewardOrderQueryVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/user/PlayCustomUserReturnDetailVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/vo/PlayCustomLevelInfoReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/ClerkCurrentPeriodWagesReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/ClerkHistoricalWagesReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/ClerkUnsettledWagesReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/ClerkWagesDetailsReturnVo.java
create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/wages/OrderWagesReturnVo.java
create mode 100644 play-common/src/main/java/com/starry/common/utils/IdUtils.java
diff --git a/play-admin/pom.xml b/play-admin/pom.xml
index 0a4847c..16c6a88 100644
--- a/play-admin/pom.xml
+++ b/play-admin/pom.xml
@@ -100,6 +100,13 @@
4.5.0
+
+ com.squareup.okio
+ okio
+ 3.4.0
+
+
+
com.tencentcloudapi
tencentcloud-sdk-java-dnspod
diff --git a/play-admin/src/main/java/com/starry/admin/Application.java b/play-admin/src/main/java/com/starry/admin/Application.java
index 4c6bdfd..ec7e469 100644
--- a/play-admin/src/main/java/com/starry/admin/Application.java
+++ b/play-admin/src/main/java/com/starry/admin/Application.java
@@ -3,15 +3,23 @@ package com.starry.admin;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
/**
* @author admin
*/
+@EnableTransactionManagement
@SpringBootApplication
+@EnableScheduling
@ComponentScan("com.starry")
public class Application {
public static void main(String[] args) {
SpringApplication.run(Application.class, args);
}
+
+
+
+
}
diff --git a/play-admin/src/main/java/com/starry/admin/common/component/JwtToken.java b/play-admin/src/main/java/com/starry/admin/common/component/JwtToken.java
index 81844bb..73f0ea0 100644
--- a/play-admin/src/main/java/com/starry/admin/common/component/JwtToken.java
+++ b/play-admin/src/main/java/com/starry/admin/common/component/JwtToken.java
@@ -1,6 +1,6 @@
package com.starry.admin.common.component;
-import cn.hutool.core.util.IdUtil;
+import com.starry.common.utils.IdUtils;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.servlet.ServletUtil;
import cn.hutool.http.useragent.UserAgent;
@@ -96,7 +96,7 @@ public class JwtToken {
* @return 令牌
*/
public String createToken(JwtUser jwtUser) {
- String token = IdUtil.fastSimpleUUID();
+ String token = IdUtils.getUuid();
jwtUser.setToken(token);
setUserAgent(jwtUser);
refersToken(jwtUser);
@@ -243,7 +243,7 @@ public class JwtToken {
* 创建令牌
*/
public Map createToken(LoginUser loginUser) {
- String token = IdUtil.fastSimpleUUID();
+ String token = IdUtils.getUuid();
String userId = loginUser.getUser().getUserId();
String userName = loginUser.getUser().getUserCode();
String tenantId = loginUser.getUser().getTenantId();
diff --git a/play-admin/src/main/java/com/starry/admin/common/conf/ListTypeHandler.java b/play-admin/src/main/java/com/starry/admin/common/conf/AbstractListTypeHandler.java
similarity index 75%
rename from play-admin/src/main/java/com/starry/admin/common/conf/ListTypeHandler.java
rename to play-admin/src/main/java/com/starry/admin/common/conf/AbstractListTypeHandler.java
index fc0272f..3aca90d 100644
--- a/play-admin/src/main/java/com/starry/admin/common/conf/ListTypeHandler.java
+++ b/play-admin/src/main/java/com/starry/admin/common/conf/AbstractListTypeHandler.java
@@ -1,5 +1,6 @@
package com.starry.admin.common.conf;
+import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.TypeReference;
import lombok.extern.slf4j.Slf4j;
@@ -7,7 +8,6 @@ import org.apache.ibatis.type.BaseTypeHandler;
import org.apache.ibatis.type.JdbcType;
import org.apache.ibatis.type.MappedJdbcTypes;
import org.apache.ibatis.type.MappedTypes;
-import org.springframework.util.StringUtils;
import java.sql.CallableStatement;
import java.sql.PreparedStatement;
@@ -16,13 +16,18 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
+/**
+ * 数据库数据-String 和 List 自动转换
+ *
+ * @author admin
+ */
@Slf4j
-@MappedJdbcTypes(JdbcType.VARCHAR) //数据库类型
-@MappedTypes({List.class}) //java数据类型
-public abstract class ListTypeHandler extends BaseTypeHandler> {
+@MappedJdbcTypes(JdbcType.VARCHAR)
+@MappedTypes({List.class})
+public abstract class AbstractListTypeHandler extends BaseTypeHandler> {
@Override
public void setNonNullParameter(PreparedStatement ps, int i, List parameter, JdbcType jdbcType) throws SQLException {
- String content = StringUtils.isEmpty(parameter) ? null : JSON.toJSONString(parameter);
+ String content = StrUtil.isEmptyIfStr(parameter) ? null : JSON.toJSONString(parameter);
ps.setString(i, content);
}
@@ -42,7 +47,7 @@ public abstract class ListTypeHandler extends BaseTypeHandler> {
}
private List getListByJsonArrayString(String content) {
- return StringUtils.isEmpty(content) ? new ArrayList<>() : JSON.parseObject(content, this.specificType());
+ return StrUtil.isEmptyIfStr(content) ? new ArrayList<>() : JSON.parseObject(content, this.specificType());
}
/**
diff --git a/play-admin/src/main/java/com/starry/admin/common/conf/StringTypeHandler.java b/play-admin/src/main/java/com/starry/admin/common/conf/StringTypeHandler.java
index a6ca59b..428405f 100644
--- a/play-admin/src/main/java/com/starry/admin/common/conf/StringTypeHandler.java
+++ b/play-admin/src/main/java/com/starry/admin/common/conf/StringTypeHandler.java
@@ -1,10 +1,13 @@
package com.starry.admin.common.conf;
import com.alibaba.fastjson2.TypeReference;
+
import java.util.List;
-public class StringTypeHandler extends ListTypeHandler {
- // 将ListTypeHandler（T为任意对象），具体为特定的对象String
+/**
+ * @author admin
+ */
+public class StringTypeHandler extends AbstractListTypeHandler {
@Override
protected TypeReference> specificType() {
return new TypeReference>() {
diff --git a/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyMetaObjectHandler.java b/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyMetaObjectHandler.java
index 4e36f5f..715169f 100644
--- a/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyMetaObjectHandler.java
+++ b/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyMetaObjectHandler.java
@@ -63,20 +63,26 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
}
public String getOperatorId() {
- if (request.getServletPath().startsWith("/wx/")) {
- String tenantKey = request.getHeader("tenantkey");
- if (StrUtil.isBlankIfStr(tenantKey)) {
- String clerkToken = request.getHeader(Constants.CLERK_USER_LOGIN_TOKEN);
- String customToken = request.getHeader(Constants.CUSTOM_USER_LOGIN_TOKEN);
- if (clerkToken != null) {
- return tokenService.getWxUserIdByToken(clerkToken);
+ try {
+ if (request.getServletPath().startsWith("/wx/")) {
+ String tenantKey = request.getHeader("tenantkey");
+ if (StrUtil.isBlankIfStr(tenantKey)) {
+ String clerkToken = request.getHeader(Constants.CLERK_USER_LOGIN_TOKEN);
+ String customToken = request.getHeader(Constants.CUSTOM_USER_LOGIN_TOKEN);
+ if (clerkToken != null) {
+ return tokenService.getWxUserIdByToken(clerkToken);
+ }
+ if (customToken != null) {
+ return tokenService.getWxUserIdByToken(customToken);
+ }
}
- if (customToken != null) {
- return tokenService.getWxUserIdByToken(customToken);
+ return "";
+ } else {
+ if (SecurityUtils.isLogin()) {
+ return SecurityUtils.getUserId();
}
}
- return "";
- } else {
+ } catch (Exception ignored) {
if (SecurityUtils.isLogin()) {
return SecurityUtils.getUserId();
}
diff --git a/play-admin/src/main/java/com/starry/admin/common/oss/service/impl/OssFileServiceImpl.java b/play-admin/src/main/java/com/starry/admin/common/oss/service/impl/OssFileServiceImpl.java
index 21f1b8f..f902cdc 100644
--- a/play-admin/src/main/java/com/starry/admin/common/oss/service/impl/OssFileServiceImpl.java
+++ b/play-admin/src/main/java/com/starry/admin/common/oss/service/impl/OssFileServiceImpl.java
@@ -3,7 +3,7 @@ package com.starry.admin.common.oss.service.impl;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.io.FileTypeUtil;
-import cn.hutool.core.util.IdUtil;
+import com.starry.common.utils.IdUtils;
import com.aliyun.oss.ClientException;
import com.aliyun.oss.OSS;
import com.aliyun.oss.OSSClientBuilder;
@@ -58,7 +58,7 @@ public class OssFileServiceImpl implements IOssFileService {
// 文件名：uuid.扩展名
- filename = IdUtil.fastSimpleUUID() + "." + fileType;
+ filename = IdUtils.getUuid() + "." + fileType;
// 文件根路径
String key = module + "/" + folder + "/" + filename;
// 创建PutObjectRequest对象。
diff --git a/play-admin/src/main/java/com/starry/admin/common/play/wx/CommonText.java b/play-admin/src/main/java/com/starry/admin/common/play/wx/CommonText.java
deleted file mode 100644
index 31da476..0000000
--- a/play-admin/src/main/java/com/starry/admin/common/play/wx/CommonText.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.starry.admin.common.play.wx;
-
-public class CommonText {
-
- public static final String DATA_NOT_EXIST = "数据不存在";
-
- /**
- * 微信公众号
- */
- public static final String WECHAT_CONFIG_DOES_NOT_EXIST = "未配置公司微信公众号的相关信息";
- public static final String WECHAT_PAY_CONFIG_DOES_NOT_EXIST = "未配置公司微信支付的相关信息";
- public static final String OPENID_DOES_NOT_EXIST = "请上传微信用户openid";
- public static final String WECHAT_TRADE_TYPE_DOES_NOT_EXIST = "请上传微信支付交易类型";
- public static final String OPENID_ALREADY_BIND = "该微信号已被其他账号绑定！";
- public static final String ADMIN_OPENID_DOES_NOT_EXIST = "请上传管理员openid";
- public static final String OPENID_DOES_NOT_FIND = "未获取到对应微信用户openid";
- public static final String WECHAT_CODE_DOES_NOT_EXIST = "请上传微信用户code";
- public static final String WECHAT_USER_TOKEN_DOES_ERR = "获取微信用户token失败";
- public static final String UNIFIEDORDER_ERR = "统一下单失败";
- public static final String UNIFIEDORDER_ERR_PREPAY_ID_NOT_FIND = "统一下单失败,未生成PREPAY_ID";
-
- /**
- * 微信小程序
- */
- public static final String MINI_OPENID_DOES_NOT_EXIST = "请上传小程序用户openid";
- public static final String WECHAT_MINI_CONFIG_DOES_NOT_EXIST = "未配置公司微信小程序的相关信息";
- public static final String WECHAT_MINI_PARAM_NOT_EXIST = "缺少所需小程序参数!";
- public static final String WECHAT_MINI_IV_NOT_EXIST = "请上传iv参数";
- public static final String WECHAT_MINI_SESSION_KEY_DOES_NOT_EXIST = "请上传session_key参数";
- public static final String WECHAT_MINI_ENCRYPTED_DATA_DOES_NOT_EXIST = "请上传encrypted_data参数";
- public static final String WECHAT_MINI_ENCRYPTED_DATA_PARSE_ERR = "encrypted_data解析失败";
- public static final String WECHAT_MINI_ENCRYPTED_DATA_NOT_HAVE_PHONE_NUM = "encrypted_data中未解析出电话号码";
-
- /**
- * 支付相关
- */
- public static final String ORDER_PAY_TYPE_NOT_EXIST = "请上传支付方式！";
-}
diff --git a/play-admin/src/main/java/com/starry/admin/common/play/wx/WxCustomPayUtils.java b/play-admin/src/main/java/com/starry/admin/common/play/wx/WxCustomPayUtils.java
index fc4dfdf..39aa1f8 100644
--- a/play-admin/src/main/java/com/starry/admin/common/play/wx/WxCustomPayUtils.java
+++ b/play-admin/src/main/java/com/starry/admin/common/play/wx/WxCustomPayUtils.java
@@ -1,6 +1,6 @@
package com.starry.admin.common.play.wx;
-import cn.hutool.core.util.IdUtil;
+import com.starry.common.utils.IdUtils;
import cn.hutool.crypto.digest.MD5;
import com.github.wxpay.sdk.WXPayUtil;
import com.starry.admin.common.exception.CustomException;
@@ -114,7 +114,7 @@ public class WxCustomPayUtils {
Map paraMap = new HashMap();
paraMap.put("appid", wechat_appid);
paraMap.put("mch_id", wechat_mchid);
- paraMap.put("nonce_str", IdUtil.fastSimpleUUID());
+ paraMap.put("nonce_str", IdUtils.getUuid());
paraMap.put("out_trade_no", out_trade_no);// 订单号
String sign = WXPayUtil.generateSignature(paraMap, wechat_seckey);
paraMap.put("sign", sign);
diff --git a/play-admin/src/main/java/com/starry/admin/common/task/ClerkWagesSettlementTask.java b/play-admin/src/main/java/com/starry/admin/common/task/ClerkWagesSettlementTask.java
new file mode 100644
index 0000000..8350694
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/common/task/ClerkWagesSettlementTask.java
@@ -0,0 +1,158 @@
+package com.starry.admin.common.task;
+
+import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesDetailsInfoEntity;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesInfoEntity;
+import com.starry.admin.modules.clerk.service.IPlayClerkRankingInfoService;
+import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
+import com.starry.admin.modules.clerk.service.IPlayClerkWagesDetailsInfoService;
+import com.starry.admin.modules.clerk.service.IPlayClerkWagesInfoService;
+import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
+import com.starry.admin.modules.order.service.IPlayOrderInfoService;
+import com.starry.admin.modules.platform.entity.SysTenantEntity;
+import com.starry.admin.modules.platform.service.ISysTenantService;
+import com.starry.admin.utils.SecurityUtils;
+import com.starry.common.utils.IdUtils;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+
+/**
+ * 订单工资结算
+ *
+ * @author admin
+ * @since 2024/5/28 下午2:42
+ **/
+@Component
+public class ClerkWagesSettlementTask {
+
+ @Resource
+ ISysTenantService sysTenantService;
+
+ @Resource
+ private IPlayClerkUserInfoService clerkUserInfoService;
+
+ @Resource
+ private IPlayOrderInfoService playOrderInfoService;
+
+ @Resource
+ private IPlayClerkRankingInfoService clerkRankingInfoService;
+
+ @Resource
+ private IPlayClerkWagesInfoService playClerkWagesInfoService;
+
+ @Resource
+ private IPlayClerkWagesDetailsInfoService playClerkWagesDetailsInfoService;
+
+ /**
+ * 每分钟查询未结算订单
+ * 如果订单完成时间超过24小时，可进行结算，生成工资
+ */
+// @Scheduled(cron = "0 0/1 * * * ?")
+ public void dailyRanking() {
+ //1、查询所有的租户信息
+ List tenantEntities = sysTenantService.listAll();
+ for (SysTenantEntity tenantEntity : tenantEntities) {
+ SecurityUtils.setTenantId(tenantEntity.getTenantId());
+ List clerkUserReturnVos = clerkUserInfoService.listAll();
+ //生成每个人的工资信息
+ for (PlayClerkUserInfoEntity clerkUserInfo : clerkUserReturnVos) {
+ updateClerkWagesInfo(clerkUserInfo.getId());
+ }
+ }
+ }
+
+
+ /**
+ * 活动24小时前完成的订单，对订单进行结算
+ *
+ * @param clerkId 店员ID
+ */
+ public void updateClerkWagesInfo(String clerkId) {
+ //获得24小时前完成,并且未结算的订单
+ LocalDateTime lastTime = LocalDateTime.now().minusDays(1);
+ //查询当前店员上次结算工资到现在的订单
+ List orderInfoEntities = playOrderInfoService.listByEndTime(clerkId, lastTime);
+ PlayClerkWagesInfoEntity entity = playClerkWagesInfoService.getLastSettlement(clerkId);
+ //更新订单信息
+ updateClerkWagesInfo(clerkId, entity == null ? IdUtils.getUuid() : entity.getId(), orderInfoEntities);
+ }
+
+
+ /**
+ * 更新最新一次工资统计信息
+ * 更新订单记录
+ *
+ * @param orderInfoEntities 订单列表
+ */
+ public void updateClerkWagesInfo(String clerkId, String wagesId, List orderInfoEntities) {
+ //修改订单状态并且新增订单结算详情
+ for (PlayOrderInfoEntity orderInfo : orderInfoEntities) {
+ //修改订单状态
+ orderInfo.setOrderSettlementState("1");
+ orderInfo.setOrderSettlementTime(LocalDateTime.now());
+ playOrderInfoService.update(orderInfo);
+
+ PlayClerkWagesDetailsInfoEntity wagesDetailsInfo = playClerkWagesDetailsInfoService.selectByOrderId(orderInfo.getId());
+ if (wagesDetailsInfo == null) {
+ wagesDetailsInfo = new PlayClerkWagesDetailsInfoEntity();
+ wagesDetailsInfo.setId(IdUtils.getUuid());
+ }
+ //新增订单结算详情
+ wagesDetailsInfo.setWagesId(wagesId);
+ wagesDetailsInfo.setClerkId(clerkId);
+ wagesDetailsInfo.setOrderId(orderInfo.getId());
+ wagesDetailsInfo.setOrderNo(orderInfo.getOrderNo());
+ wagesDetailsInfo.setFinalAmount(orderInfo.getFinalAmount());
+ wagesDetailsInfo.setEstimatedRevenue(orderInfo.getEstimatedRevenue());
+ wagesDetailsInfo.setEndOrderTime(orderInfo.getOrderEndTime());
+ playClerkWagesDetailsInfoService.saveOrUpdate(wagesDetailsInfo);
+ }
+ //新增订单结算信息
+ BigDecimal finalAmount = BigDecimal.ZERO;
+ Integer orderContinueNumber = 0;
+ BigDecimal orderContinueMoney = BigDecimal.ZERO;
+ Integer ordersExpiredNumber = 0;
+ BigDecimal estimatedRevenue = BigDecimal.ZERO;
+ Integer orderNumber = 0;
+ LocalDate lastTime = playClerkWagesInfoService.getLastSettlementTime(clerkId);
+ for (PlayClerkWagesDetailsInfoEntity entity : playClerkWagesDetailsInfoService.selectByWagesId(wagesId)) {
+ PlayOrderInfoEntity orderInfo = playOrderInfoService.selectOrderInfoById(entity.getOrderId());
+ finalAmount = finalAmount.add(orderInfo.getFinalAmount());
+ orderNumber++;
+ estimatedRevenue = estimatedRevenue.add(orderInfo.getEstimatedRevenue());
+ if ("0".equals(orderInfo.getFirstOrder())) {
+ orderContinueNumber++;
+ orderContinueMoney = orderContinueMoney.add(orderInfo.getFinalAmount());
+ }
+ if ("1".equals(orderInfo.getOrdersExpiredState())) {
+ ordersExpiredNumber++;
+ }
+ }
+
+ PlayClerkWagesInfoEntity wagesInfo = new PlayClerkWagesInfoEntity();
+ wagesInfo.setId(wagesId);
+ wagesInfo.setClerkId(clerkId);
+ wagesInfo.setStartCountDate(lastTime);
+ wagesInfo.setEndCountDate(LocalDate.now());
+ wagesInfo.setOrderNumber(orderNumber);
+ wagesInfo.setFinalAmount(finalAmount);
+ wagesInfo.setOrderContinueNumber(orderContinueNumber);
+ wagesInfo.setOrderContinueMoney(orderContinueMoney);
+ wagesInfo.setOrdersExpiredNumber(ordersExpiredNumber);
+ wagesInfo.setSettlementDate(LocalDate.now());
+ wagesInfo.setEstimatedRevenue(estimatedRevenue);
+ if (ChronoUnit.DAYS.between(LocalDate.now(), lastTime) <= 7) {
+ wagesInfo.setHistoricalStatistics("0");
+ } else {
+ wagesInfo.setHistoricalStatistics("1");
+ }
+
+ playClerkWagesInfoService.saveOrUpdate(wagesInfo);
+ }
+}
diff --git a/play-admin/src/main/java/com/starry/admin/common/task/OrderRankingSettlementTask.java b/play-admin/src/main/java/com/starry/admin/common/task/OrderRankingSettlementTask.java
new file mode 100644
index 0000000..243c041
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/common/task/OrderRankingSettlementTask.java
@@ -0,0 +1,118 @@
+package com.starry.admin.common.task;
+
+import com.starry.admin.modules.clerk.module.entity.PlayClerkRankingInfoEntity;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
+import com.starry.admin.modules.clerk.service.IPlayClerkRankingInfoService;
+import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
+import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
+import com.starry.admin.modules.order.service.IPlayOrderInfoService;
+import com.starry.admin.modules.platform.entity.SysTenantEntity;
+import com.starry.admin.modules.platform.service.ISysTenantService;
+import com.starry.admin.utils.SecurityUtils;
+import com.starry.common.utils.IdUtils;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * 订单排名结算信息
+ *
+ * @author admin
+ * @since 2024/5/28 下午2:42
+ **/
+@Component
+public class OrderRankingSettlementTask {
+
+ @Resource
+ ISysTenantService sysTenantService;
+
+ @Resource
+ private IPlayClerkUserInfoService clerkUserInfoService;
+
+ @Resource
+ private IPlayOrderInfoService orderInfoService;
+
+ @Resource
+ private IPlayClerkRankingInfoService clerkRankingInfoService;
+
+ /**
+ * 当日订单结算，查询前一日的订单信息，生成订单排名数据
+ * 每天凌晨0点5分0秒时触发执行
+ */
+// @Scheduled(cron = "0 10 0 * * ?")
+ public void dailyRanking() {
+ //1、查询所有的租户信息
+ List tenantEntities = sysTenantService.listAll();
+ LocalDate startTime = LocalDate.now().minusDays(1);
+ LocalDate endTime = LocalDate.now();
+ //2、查询每个租户的用户，以及他们的订单信息
+ Integer newSerialNumber = clerkRankingInfoService.selectSerialNumber();
+ for (SysTenantEntity tenantEntity : tenantEntities) {
+ SecurityUtils.setTenantId(tenantEntity.getTenantId());
+ List clerkUserReturnVos = clerkUserInfoService.listAll();
+ //生成每个人的订单排行信息
+ for (PlayClerkUserInfoEntity clerkUserInfo : clerkUserReturnVos) {
+ //查询当前店员一定时间的订单信息
+ List orderInfoEntities = orderInfoService.listByTime(clerkUserInfo.getId(), startTime, endTime);
+ PlayClerkRankingInfoEntity rankingInfo = clerkRankingInfoService.selectByTime(clerkUserInfo.getId(), startTime, endTime);
+ //3、根据订单信息，生成对应排名数据
+ updateClerkRanking(clerkUserInfo.getId(), startTime, endTime, rankingInfo, orderInfoEntities, newSerialNumber);
+ }
+ //根据订单数量，更新排行名词
+ List list = clerkRankingInfoService.selectMaxSerialNumber();
+ // 使用匿名比较器排序
+ list.sort((p1, p2) -> p2.getOrderNumber() - p1.getOrderNumber());
+ for (int i = 0; i < list.size(); i++) {
+ PlayClerkRankingInfoEntity item = list.get(i);
+ item.setRankingIndex(i + 1);
+ if (i > 0) {
+ item.setPreviousMoney(list.get(i - 1).getOrderMoney().subtract(item.getOrderMoney()));
+ }
+ clerkRankingInfoService.update(item);
+ }
+ }
+ }
+
+ /**
+ * 更新当前店员的排名信息
+ *
+ * @param clerkId 店员ID
+ * @param rankingInfo 店员排名信息
+ * @param orderInfoEntities 店员订单信息
+ */
+ public void updateClerkRanking(String clerkId, LocalDate startTime, LocalDate endTime, PlayClerkRankingInfoEntity rankingInfo, List orderInfoEntities, Integer newSerialNumber) {
+ //排行-订单信息
+ BigDecimal orderMoney = BigDecimal.ZERO;
+ Integer orderContinueNumber = 0;
+ BigDecimal orderContinueMoney = BigDecimal.ZERO;
+ Integer ordersExpiredNumber = 0;
+ for (PlayOrderInfoEntity orderInfoEntity : orderInfoEntities) {
+ orderMoney = orderMoney.add(orderInfoEntity.getOrderMoney());
+ if ("0".equals(orderInfoEntity.getFirstOrder())) {
+ orderContinueNumber++;
+ orderContinueMoney = orderContinueMoney.add(orderInfoEntity.getOrderMoney());
+ }
+ }
+
+ if (rankingInfo == null) {
+ rankingInfo = new PlayClerkRankingInfoEntity();
+ rankingInfo.setId(IdUtils.getUuid());
+ rankingInfo.setSerialNumber(newSerialNumber + 1);
+ }
+ rankingInfo.setClerkId(clerkId);
+ rankingInfo.setStartCountDate(startTime);
+ rankingInfo.setEndCountDate(endTime);
+ rankingInfo.setOrderNumber(orderInfoEntities.size());
+ rankingInfo.setSerialNumber(newSerialNumber);
+ rankingInfo.setOrderMoney(orderMoney);
+ rankingInfo.setOrderContinueMoney(orderContinueMoney);
+ rankingInfo.setOrderContinueNumber(orderContinueNumber);
+ rankingInfo.setOrdersExpiredNumber(ordersExpiredNumber);
+ clerkRankingInfoService.saveOrUpdate(rankingInfo);
+ }
+
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/article/controller/PlayClerkArticleInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/article/controller/PlayClerkArticleInfoController.java
deleted file mode 100644
index 7d2b78c..0000000
--- a/play-admin/src/main/java/com/starry/admin/modules/article/controller/PlayClerkArticleInfoController.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.starry.admin.modules.article.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.starry.admin.modules.article.module.entity.PlayClerkArticleInfoEntity;
-import com.starry.admin.modules.article.module.vo.PlayClerkArticleQueryVo;
-import com.starry.admin.modules.article.module.vo.PlayClerkArticleReturnVo;
-import com.starry.admin.modules.article.service.IPlayClerkArticleInfoService;
-import com.starry.admin.modules.article.service.IPlayCustomArticleInfoService;
-import com.starry.common.annotation.Log;
-import com.starry.common.enums.BusinessType;
-import com.starry.common.result.R;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-/**
- * 店员动态信息Controller
- *
- * @author admin
- * @since 2024-05-04
- */
-@RestController
-@RequestMapping("/clerk/article")
-public class PlayClerkArticleInfoController {
- @Resource
- private IPlayClerkArticleInfoService playClerkArticleInfoService;
- @Resource
- private IPlayCustomArticleInfoService playCustomArticleInfoService;
-
-
- /**
- * 查询店员动态信息列表
- */
- @PostMapping("/list")
- public R list(PlayClerkArticleQueryVo vo) {
- IPage list = playClerkArticleInfoService.selectPlayClerkArticleInfoByPage(vo);
- return R.ok(list);
- }
-
- /**
- * 获取店员动态信息详细信息
- */
- @GetMapping(value = "/{id}")
- public R getInfo(@PathVariable("id") String id) {
- return R.ok(playClerkArticleInfoService.selectPlayClerkArticleInfoById(id));
- }
-
- /**
- * 新增店员动态信息
- */
- @Log(title = "店员动态信息", businessType = BusinessType.INSERT)
- @PostMapping("/create")
- public R create(@RequestBody PlayClerkArticleInfoEntity playClerkArticleInfo) {
- boolean success = playClerkArticleInfoService.create(playClerkArticleInfo);
- if (success) {
- return R.ok();
- }
- return R.error("添加失败");
- }
-
- /**
- * 修改店员动态信息
- */
- @Log(title = "店员动态信息", businessType = BusinessType.UPDATE)
- @PostMapping(value = "/update/{id}")
- public R update(@PathVariable String id, @RequestBody PlayClerkArticleInfoEntity playClerkArticleInfo) {
- playClerkArticleInfo.setId(id);
- boolean success = playClerkArticleInfoService.update(playClerkArticleInfo);
- if (success) {
- return R.ok();
- }
- return R.error("修改失败");
- }
-
- /**
- * 删除店员动态信息
- */
- @Log(title = "店员动态信息", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public R remove(@PathVariable String[] ids) {
- for (String id : ids) {
- playClerkArticleInfoService.deletePlayClerkArticleInfoById(id);
- playCustomArticleInfoService.deleteByArticleId(id);
- }
- return R.ok();
- }
-}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/article/module/vo/PlayClerkArticleReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/article/module/vo/PlayClerkArticleReturnVo.java
deleted file mode 100644
index e4e45a5..0000000
--- a/play-admin/src/main/java/com/starry/admin/modules/article/module/vo/PlayClerkArticleReturnVo.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.starry.admin.modules.article.module.vo;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author admin
- * 动态信息查询返回对象
- */
-@Data
-public class PlayClerkArticleReturnVo {
-
-
- /**
- * UUID
- */
- private String id;
- /**
- * 陪聊用户ID
- */
- private String userId;
-
- /**
- * 陪聊用户昵称
- */
- private String nickname;
-
- /**
- * 陪聊用户头像
- */
- private String avatar;
-
- /**
- * 动态标题
- */
- private String articleTitle;
-
- /**
- * 动态内容类型（0：图片，1：视频）
- */
- private String articleType;
-
- /**
- * 动态内容
- */
- private String articleCon;
-
- /**
- * 发布时间
- */
- private Date releaseTime;
-
- /**
- * 备注
- */
- private String remark;
-
- /**
- * 点赞人数
- */
- private Long agreedQuantity;
-
- /**
- * 审核状态（0：未审核:1：审核通过，2：审核不通过）
- */
- private String reviewState;
-}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/article/service/impl/PlayClerkArticleInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/article/service/impl/PlayClerkArticleInfoServiceImpl.java
deleted file mode 100644
index b00e036..0000000
--- a/play-admin/src/main/java/com/starry/admin/modules/article/service/impl/PlayClerkArticleInfoServiceImpl.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.starry.admin.modules.article.service.impl;
-
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.starry.admin.modules.article.mapper.PlayClerkArticleInfoMapper;
-import com.starry.admin.modules.article.module.entity.PlayClerkArticleInfoEntity;
-import com.starry.admin.modules.article.module.vo.PlayClerkArticleQueryVo;
-import com.starry.admin.modules.article.module.vo.PlayClerkArticleReturnVo;
-import com.starry.admin.modules.article.service.IPlayClerkArticleInfoService;
-import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Arrays;
-
-/**
- * 店员动态信息Service业务层处理
- *
- * @author admin
- * @since 2024-05-04
- */
-@Service
-public class PlayClerkArticleInfoServiceImpl extends ServiceImpl implements IPlayClerkArticleInfoService {
- @Resource
- private PlayClerkArticleInfoMapper playClerkArticleInfoMapper;
-
- /**
- * 查询店员动态信息
- *
- * @param id 店员动态信息主键
- * @return 店员动态信息
- */
- @Override
- public PlayClerkArticleInfoEntity selectPlayClerkArticleInfoById(String id) {
- return this.baseMapper.selectById(id);
- }
-
- /**
- * 查询店员动态信息列表
- *
- * @param vo 店员动态信息查询对象
- * @return 店员动态信息
- */
- @Override
- public IPage selectPlayClerkArticleInfoByPage(PlayClerkArticleQueryVo vo) {
- MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper()
- //查询主表全部字段
- .selectAll(PlayClerkArticleInfoEntity.class)
- //陪聊用户表全部字段
- .selectAll(PlayClerkUserInfoEntity.class)
- //陪聊用户表
- .leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkArticleInfoEntity::getPlayUserId);
- return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkArticleReturnVo.class, lambdaQueryWrapper);
- }
-
- /**
- * 新增店员动态信息
- *
- * @param playClerkArticleInfo 店员动态信息
- * @return 结果
- */
- @Override
- public boolean create(PlayClerkArticleInfoEntity playClerkArticleInfo) {
- if (StrUtil.isBlankIfStr(playClerkArticleInfo.getId())) {
- playClerkArticleInfo.setId(IdUtil.fastSimpleUUID());
- }
- return save(playClerkArticleInfo);
- }
-
- /**
- * 修改店员动态信息
- *
- * @param playClerkArticleInfo 店员动态信息
- * @return 结果
- */
- @Override
- public boolean update(PlayClerkArticleInfoEntity playClerkArticleInfo) {
- return updateById(playClerkArticleInfo);
- }
-
- /**
- * 批量删除店员动态信息
- *
- * @param ids 需要删除的店员动态信息主键
- * @return 结果
- */
- @Override
- public int deletePlayClerkArticleInfoByIds(String[] ids) {
- return playClerkArticleInfoMapper.deleteBatchIds(Arrays.asList(ids));
- }
-
- /**
- * 删除店员动态信息信息
- *
- * @param id 店员动态信息主键
- * @return 结果
- */
- @Override
- public int deletePlayClerkArticleInfoById(String id) {
- return playClerkArticleInfoMapper.deleteById(id);
- }
-}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/balance/controller/PlayBalanceDetailsInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/balance/controller/PlayBalanceDetailsInfoController.java
index 92b1bbf..c0c0d1d 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/balance/controller/PlayBalanceDetailsInfoController.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/balance/controller/PlayBalanceDetailsInfoController.java
@@ -6,6 +6,7 @@ import com.starry.admin.modules.balance.service.IPlayBalanceDetailsInfoService;
import com.starry.common.annotation.Log;
import com.starry.common.enums.BusinessType;
import com.starry.common.result.R;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -26,8 +27,8 @@ public class PlayBalanceDetailsInfoController {
/**
* 查询余额明细列表
*/
- @PostMapping("/list")
- public R list(@RequestBody PlayBalanceDetailsQueryVo vo) {
+ @PostMapping("/listByPage")
+ public R list(@Validated @RequestBody PlayBalanceDetailsQueryVo vo) {
return R.ok(playBalanceDetailsInfoService.selectByPage(vo));
}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/balance/module/entity/PlayBalanceDetailsInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/balance/module/entity/PlayBalanceDetailsInfoEntity.java
index f34642e..8d5c8ae 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/balance/module/entity/PlayBalanceDetailsInfoEntity.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/balance/module/entity/PlayBalanceDetailsInfoEntity.java
@@ -50,11 +50,17 @@ public class PlayBalanceDetailsInfoEntity extends BaseEntity operationTime;
}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/balance/module/vo/PlayBalanceDetailsReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/balance/module/vo/PlayBalanceDetailsReturnVo.java
index 3c75bbd..ceafbe1 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/balance/module/vo/PlayBalanceDetailsReturnVo.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/balance/module/vo/PlayBalanceDetailsReturnVo.java
@@ -1,15 +1,17 @@
package com.starry.admin.modules.balance.module.vo;
-import com.starry.common.domain.BasePageEntity;
import lombok.Data;
-import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
-@EqualsAndHashCode(callSuper = true)
+/**
+ * 余额明细查询对象
+ *
+ * @author admin
+ */
@Data
-public class PlayBalanceDetailsReturnVo extends BasePageEntity {
+public class PlayBalanceDetailsReturnVo {
/**
* UUID
@@ -27,10 +29,15 @@ public class PlayBalanceDetailsReturnVo extends BasePageEntity {
private BigDecimal balanceAfterOperation;
/**
- * 操作类型
+ * 操作类型（0:充值;1:消费;2:服务）
*/
private String operationType;
+ /**
+ * 操作动作
+ */
+ private String operationAction;
+
/**
* 操作时间
*/
@@ -41,21 +48,28 @@ public class PlayBalanceDetailsReturnVo extends BasePageEntity {
*/
private BigDecimal balanceMoney;
+ /**
+ * 支付方式，0：余额支付,1:微信支付,2:支付宝支付
+ */
+ private String payMethod;
+
+
/**
* 订单ID
*/
private String orderId;
+ /**
+ * 订单ID
+ */
+ private String orderNo;
+
/**
* 订单金额
*/
private BigDecimal orderMoney;
- /**
- * 支付方式，0：余额支付,1:微信支付,2:支付宝支付
- */
- private String payMethod;
/**
* 赠送金额
@@ -77,15 +91,15 @@ public class PlayBalanceDetailsReturnVo extends BasePageEntity {
/**
* 顾客Id
*/
- private String customUserId;
+ private String customId;
/**
* 顾客昵称
*/
- private String nickname;
+ private String customNickname;
/**
- * 头像
+ * 顾客头像
*/
- private String avatar;
+ private String customAvatar;
}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/balance/service/IPlayBalanceDetailsInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/balance/service/IPlayBalanceDetailsInfoService.java
index a329b37..aa007cf 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/balance/service/IPlayBalanceDetailsInfoService.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/balance/service/IPlayBalanceDetailsInfoService.java
@@ -49,10 +49,12 @@ public interface IPlayBalanceDetailsInfoService extends IService(vo.getPageNum(), vo.getPageSize()), PlayBalanceDetailsReturnVo.class, lambdaQueryWrapper);
@@ -78,9 +94,9 @@ public class PlayBalanceDetailsInfoServiceImpl extends ServiceImpl list = playClerkArticleInfoService.selectByPage(vo);
+ return R.ok(list);
+ }
+
+
+ /**
+ * 修改店员动态信息
+ */
+ @Log(title = "店员动态信息", businessType = BusinessType.UPDATE)
+ @PostMapping(value = "/update")
+ public R update(@RequestBody PlayClerkArticleReviewStateEditVo vo) {
+ PlayClerkArticleInfoEntity entity = ConvertUtil.entityToVo(vo, PlayClerkArticleInfoEntity.class);
+ boolean success = playClerkArticleInfoService.update(entity);
+ if (success) {
+ return R.ok();
+ }
+ return R.error("修改失败");
+ }
+
+ /**
+ * 删除店员动态信息
+ */
+ @Log(title = "店员动态信息", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public R remove(@PathVariable String[] ids) {
+ for (String id : ids) {
+ playClerkArticleInfoService.deletePlayClerkArticleInfoById(id);
+ playCustomArticleInfoService.deleteByArticleId(id);
+ }
+ return R.ok();
+ }
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkDataReviewInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkDataReviewInfoController.java
index d09cb0f..4fbaaa3 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkDataReviewInfoController.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkDataReviewInfoController.java
@@ -1,23 +1,14 @@
package com.starry.admin.modules.clerk.controller;
-import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.starry.admin.modules.clerk.module.entity.PlayClerkDataReviewInfoEditVo;
-import com.starry.admin.modules.clerk.module.entity.PlayClerkDataReviewInfoEntity;
-import com.starry.admin.modules.clerk.module.entity.PlayClerkDataReviewInfoQueryVo;
-import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
-import com.starry.admin.modules.clerk.service.IPlayClerkCommodityService;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkDataReviewQueryVo;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkDataReviewReturnVo;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkDataReviewStateEditVo;
import com.starry.admin.modules.clerk.service.IPlayClerkDataReviewInfoService;
-import com.starry.admin.modules.clerk.service.impl.PlayClerkUserInfoServiceImpl;
-import com.starry.admin.modules.weichat.entity.PlayClerkUserAlbumVo;
-import com.starry.admin.modules.weichat.entity.PlayClerkUserAudioVo;
-import com.starry.admin.modules.weichat.entity.PlayClerkUserAvatarVo;
import com.starry.common.annotation.Log;
import com.starry.common.enums.BusinessType;
import com.starry.common.result.R;
-import com.starry.common.utils.ConvertUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -26,99 +17,33 @@ import javax.annotation.Resource;
* 店员资料审核Controller
*
* @author admin
- * @since 2024-04-11
+ * @since 2024-05-19
*/
@RestController
@RequestMapping("/clerk/data/review")
public class PlayClerkDataReviewInfoController {
- private static final Logger log = LoggerFactory.getLogger(PlayClerkDataReviewInfoController.class);
+
@Resource
private IPlayClerkDataReviewInfoService playClerkDataReviewInfoService;
- @Resource
- private PlayClerkUserInfoServiceImpl playClerkUserInfoService;
-
-
- @Resource
- private IPlayClerkCommodityService playClerkCommodityService;
-
-
/**
* 查询店员资料审核列表
*/
@PostMapping("/listByPage")
- public R list(PlayClerkDataReviewInfoQueryVo vo) {
- IPage list = playClerkDataReviewInfoService.selectPlayClerkDataReviewInfoByPage(vo);
+ public R list(@Validated @RequestBody PlayClerkDataReviewQueryVo vo) {
+ IPage list = playClerkDataReviewInfoService.selectByPage(vo);
return R.ok(list);
}
- /**
- * 获取店员资料审核详细信息
- */
- @GetMapping(value = "/{id}")
- public R getInfo(@PathVariable("id") String id) {
- return R.ok(playClerkDataReviewInfoService.selectPlayClerkDataReviewInfoById(id));
- }
-
-
/**
* 修改店员资料审核
*/
-
@Log(title = "店员资料审核", businessType = BusinessType.UPDATE)
@PostMapping(value = "/update")
- public R update(@RequestBody PlayClerkDataReviewInfoEditVo vo) {
- PlayClerkDataReviewInfoEntity entity = ConvertUtil.entityToVo(vo, PlayClerkDataReviewInfoEntity.class);
- boolean success = playClerkDataReviewInfoService.update(entity);
- if (success) {
- entity = playClerkDataReviewInfoService.selectPlayClerkDataReviewInfoById(entity.getId());
- if (entity != null && "1".equals(entity.getState())) {
- switch (entity.getDataType()) {
- case "0": {
- //陪聊申请审批通过，初始化陪聊信息
- PlayClerkUserInfoEntity item = JSONObject.parseObject(entity.getContent(), PlayClerkUserInfoEntity.class);
- item.setId(entity.getPlayUserId());
- item.setClerkState("1");
- playClerkUserInfoService.update(item);
- //初始化陪聊服务项目
- playClerkCommodityService.initClerkCommodity(entity.getPlayUserId());
- break;
- }
- case "1": {
- PlayClerkUserAvatarVo item = JSONObject.parseObject(entity.getContent(), PlayClerkUserAvatarVo.class);
- PlayClerkUserInfoEntity userInfo = new PlayClerkUserInfoEntity();
- userInfo.setId(entity.getPlayUserId());
- userInfo.setAvatar(item.getAvatar());
- playClerkUserInfoService.update(userInfo);
- break;
- }
- case "2": {
- PlayClerkUserAlbumVo item = JSONObject.parseObject(entity.getContent(), PlayClerkUserAlbumVo.class);
- PlayClerkUserInfoEntity userInfo = new PlayClerkUserInfoEntity();
- userInfo.setId(entity.getPlayUserId());
- userInfo.setAlbum(item.getAlbum());
- playClerkUserInfoService.update(userInfo);
-
- break;
- }
- case "3": {
- PlayClerkUserAudioVo item = JSONObject.parseObject(entity.getContent(), PlayClerkUserAudioVo.class);
- PlayClerkUserInfoEntity userInfo = new PlayClerkUserInfoEntity();
- userInfo.setId(entity.getPlayUserId());
- userInfo.setAudio(item.getAudio());
- playClerkUserInfoService.update(userInfo);
- break;
- }
- default:
- log.error("dataType not,dataType = {}", entity.getDataType());
- }
-
- }
-
- return R.ok();
- }
- return R.error("修改失败");
+ public R update(@Validated @RequestBody PlayClerkDataReviewStateEditVo vo) {
+ playClerkDataReviewInfoService.updateDataReviewState(vo);
+ return R.ok();
}
/**
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkGroupInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkGroupInfoController.java
new file mode 100644
index 0000000..b0ae521
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkGroupInfoController.java
@@ -0,0 +1,77 @@
+package com.starry.admin.modules.clerk.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkGroupInfoEntity;
+import com.starry.admin.modules.clerk.service.IPlayClerkGroupInfoService;
+import com.starry.common.annotation.Log;
+import com.starry.common.enums.BusinessType;
+import com.starry.common.result.R;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 店员分组信息Controller
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+@RestController
+@RequestMapping("/clerk/group")
+public class PlayClerkGroupInfoController {
+ @Resource
+ private IPlayClerkGroupInfoService playClerkGroupInfoService;
+
+ /**
+ * 查询店员分组信息列表
+ */
+ @GetMapping("/list")
+ public R list(PlayClerkGroupInfoEntity playClerkGroupInfo) {
+ IPage list = playClerkGroupInfoService.selectPlayClerkGroupInfoByPage(playClerkGroupInfo);
+ return R.ok(list);
+ }
+
+ /**
+ * 获取店员分组信息详细信息
+ */
+ @GetMapping(value = "/{id}")
+ public R getInfo(@PathVariable("id") String id) {
+ return R.ok(playClerkGroupInfoService.selectPlayClerkGroupInfoById(id));
+ }
+
+ /**
+ * 新增店员分组信息
+ */
+ @Log(title = "店员分组信息", businessType = BusinessType.INSERT)
+ @PostMapping("/create")
+ public R create(@RequestBody PlayClerkGroupInfoEntity playClerkGroupInfo) {
+ boolean success = playClerkGroupInfoService.create(playClerkGroupInfo);
+ if (success) {
+ return R.ok();
+ }
+ return R.error("添加失败");
+ }
+
+ /**
+ * 修改店员分组信息
+ */
+ @Log(title = "店员分组信息", businessType = BusinessType.UPDATE)
+ @PostMapping(value = "/update/{id}")
+ public R update(@PathVariable String id, @RequestBody PlayClerkGroupInfoEntity playClerkGroupInfo) {
+ playClerkGroupInfo.setId(id);
+ boolean success = playClerkGroupInfoService.update(playClerkGroupInfo);
+ if (success) {
+ return R.ok();
+ }
+ return R.error("修改失败");
+ }
+
+ /**
+ * 删除店员分组信息
+ */
+ @Log(title = "店员分组信息", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public R remove(@PathVariable String[] ids) {
+ return R.ok(playClerkGroupInfoService.deletePlayClerkGroupInfoByIds(ids));
+ }
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkGroupUserInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkGroupUserInfoController.java
new file mode 100644
index 0000000..19e48e6
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkGroupUserInfoController.java
@@ -0,0 +1,77 @@
+package com.starry.admin.modules.clerk.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkGroupUserInfoEntity;
+import com.starry.admin.modules.clerk.service.IPlayClerkGroupUserInfoService;
+import com.starry.common.annotation.Log;
+import com.starry.common.enums.BusinessType;
+import com.starry.common.result.R;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 店员和分组关系Controller
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+@RestController
+@RequestMapping("/group/clerk")
+public class PlayClerkGroupUserInfoController {
+ @Resource
+ private IPlayClerkGroupUserInfoService playClerkGroupUserInfoService;
+
+ /**
+ * 查询店员和分组关系列表
+ */
+ @GetMapping("/list")
+ public R list(PlayClerkGroupUserInfoEntity playClerkGroupUserInfo) {
+ IPage list = playClerkGroupUserInfoService.selectPlayClerkGroupUserInfoByPage(playClerkGroupUserInfo);
+ return R.ok(list);
+ }
+
+ /**
+ * 获取店员和分组关系详细信息
+ */
+ @GetMapping(value = "/{id}")
+ public R getInfo(@PathVariable("id") String id) {
+ return R.ok(playClerkGroupUserInfoService.selectPlayClerkGroupUserInfoById(id));
+ }
+
+ /**
+ * 新增店员和分组关系
+ */
+ @Log(title = "店员和分组关系", businessType = BusinessType.INSERT)
+ @PostMapping("/create")
+ public R create(@RequestBody PlayClerkGroupUserInfoEntity playClerkGroupUserInfo) {
+ boolean success = playClerkGroupUserInfoService.create(playClerkGroupUserInfo);
+ if (success) {
+ return R.ok();
+ }
+ return R.error("添加失败");
+ }
+
+ /**
+ * 修改店员和分组关系
+ */
+ @Log(title = "店员和分组关系", businessType = BusinessType.UPDATE)
+ @PostMapping(value = "/update/{id}")
+ public R update(@PathVariable String id, @RequestBody PlayClerkGroupUserInfoEntity playClerkGroupUserInfo) {
+ playClerkGroupUserInfo.setId(id);
+ boolean success = playClerkGroupUserInfoService.update(playClerkGroupUserInfo);
+ if (success) {
+ return R.ok();
+ }
+ return R.error("修改失败");
+ }
+
+ /**
+ * 删除店员和分组关系
+ */
+ @Log(title = "店员和分组关系", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public R remove(@PathVariable String[] ids) {
+ return R.ok(playClerkGroupUserInfoService.deletePlayClerkGroupUserInfoByIds(ids));
+ }
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkRankingInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkRankingInfoController.java
new file mode 100644
index 0000000..1ad8d56
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkRankingInfoController.java
@@ -0,0 +1,77 @@
+package com.starry.admin.modules.clerk.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkRankingInfoEntity;
+import com.starry.admin.modules.clerk.service.IPlayClerkRankingInfoService;
+import com.starry.common.annotation.Log;
+import com.starry.common.enums.BusinessType;
+import com.starry.common.result.R;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 店员排行Controller
+ *
+ * @author admin
+ * @since 2024-05-25
+ */
+@RestController
+@RequestMapping("/clerk/ranking")
+public class PlayClerkRankingInfoController {
+ @Resource
+ private IPlayClerkRankingInfoService playClerkRankingInfoService;
+
+ /**
+ * 查询店员排行列表
+ */
+ @GetMapping("/listByPage")
+ public R list(PlayClerkRankingInfoEntity playClerkRankingInfo) {
+ IPage list = playClerkRankingInfoService.selectPlayClerkRankingInfoByPage(playClerkRankingInfo);
+ return R.ok(list);
+ }
+
+ /**
+ * 获取店员排行详细信息
+ */
+ @GetMapping(value = "/{id}")
+ public R getInfo(@PathVariable("id") String id) {
+ return R.ok(playClerkRankingInfoService.selectPlayClerkRankingInfoById(id));
+ }
+
+ /**
+ * 新增店员排行
+ */
+ @Log(title = "店员排行", businessType = BusinessType.INSERT)
+ @PostMapping("/create")
+ public R create(@RequestBody PlayClerkRankingInfoEntity playClerkRankingInfo) {
+ boolean success = playClerkRankingInfoService.create(playClerkRankingInfo);
+ if (success) {
+ return R.ok();
+ }
+ return R.error("添加失败");
+ }
+
+ /**
+ * 修改店员排行
+ */
+ @Log(title = "店员排行", businessType = BusinessType.UPDATE)
+ @PostMapping(value = "/update/{id}")
+ public R update(@PathVariable String id, @RequestBody PlayClerkRankingInfoEntity playClerkRankingInfo) {
+ playClerkRankingInfo.setId(id);
+ boolean success = playClerkRankingInfoService.update(playClerkRankingInfo);
+ if (success) {
+ return R.ok();
+ }
+ return R.error("修改失败");
+ }
+
+ /**
+ * 删除店员排行
+ */
+ @Log(title = "店员排行", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public R remove(@PathVariable String[] ids) {
+ return R.ok(playClerkRankingInfoService.deletePlayClerkRankingInfoByIds(ids));
+ }
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkTypeInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkTypeInfoController.java
new file mode 100644
index 0000000..8e47eef
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkTypeInfoController.java
@@ -0,0 +1,78 @@
+package com.starry.admin.modules.clerk.controller;
+
+import com.starry.admin.modules.clerk.module.entity.PlayClerkTypeInfoEntity;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkTypeInfoAddVo;
+import com.starry.admin.modules.clerk.service.IPlayClerkTypeInfoService;
+import com.starry.common.annotation.Log;
+import com.starry.common.enums.BusinessType;
+import com.starry.common.result.R;
+import com.starry.common.utils.ConvertUtil;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 店员分类信息Controller
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+@RestController
+@RequestMapping("/clerk/type")
+public class PlayClerkTypeInfoController {
+ @Resource
+ private IPlayClerkTypeInfoService playClerkTypeInfoService;
+
+ /**
+ * 查询店员分类信息列表
+ */
+ @GetMapping("/listByAll")
+ public R listByAll() {
+ return R.ok(playClerkTypeInfoService.selectByAll());
+ }
+
+ /**
+ * 获取店员分类信息详细信息
+ */
+ @GetMapping(value = "/{id}")
+ public R getInfo(@PathVariable("id") String id) {
+ return R.ok(playClerkTypeInfoService.selectPlayClerkTypeInfoById(id));
+ }
+
+ /**
+ * 新增店员分类信息
+ */
+ @Log(title = "店员分类信息", businessType = BusinessType.INSERT)
+ @PostMapping("/create")
+ public R create(@Validated @RequestBody PlayClerkTypeInfoAddVo vo) {
+ boolean success = playClerkTypeInfoService.create(ConvertUtil.entityToVo(vo, PlayClerkTypeInfoEntity.class));
+ if (success) {
+ return R.ok();
+ }
+ return R.error("添加失败");
+ }
+
+ /**
+ * 修改店员分类信息
+ */
+ @Log(title = "店员分类信息", businessType = BusinessType.UPDATE)
+ @PostMapping(value = "/update/{id}")
+ public R update(@PathVariable String id, @RequestBody PlayClerkTypeInfoEntity playClerkTypeInfo) {
+ playClerkTypeInfo.setId(id);
+ boolean success = playClerkTypeInfoService.update(playClerkTypeInfo);
+ if (success) {
+ return R.ok();
+ }
+ return R.error("修改失败");
+ }
+
+ /**
+ * 删除店员分类信息
+ */
+ @Log(title = "店员分类信息", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public R remove(@PathVariable String[] ids) {
+ return R.ok(playClerkTypeInfoService.deletePlayClerkTypeInfoByIds(ids));
+ }
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserInfoController.java
index a633ab3..23090b9 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserInfoController.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserInfoController.java
@@ -1,18 +1,16 @@
package com.starry.admin.modules.clerk.controller;
-import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
-import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoQueryVo;
-import com.starry.admin.modules.clerk.module.entity.PlayClerkUserListResultVo;
-import com.starry.admin.modules.clerk.module.vo.PlayClerkUserAddToWxVo;
-import com.starry.admin.modules.clerk.module.vo.PlayClerkUserAddVo;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkUserQueryVo;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkUserReturnVo;
import com.starry.admin.modules.clerk.module.vo.PlayClerkUserEditVo;
import com.starry.admin.modules.clerk.module.vo.PlayClerkUserStateEditVo;
import com.starry.admin.modules.clerk.service.IPlayClerkCommodityService;
import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
-import com.starry.admin.modules.play.module.entity.PlayUserInfoEntity;
import com.starry.admin.modules.play.service.IPlayUserInfoService;
+import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoQueryVo;
+import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoResultVo;
import com.starry.common.annotation.Log;
import com.starry.common.enums.BusinessType;
import com.starry.common.result.R;
@@ -44,8 +42,8 @@ public class PlayClerkUserInfoController {
* 查询店员列表
*/
@PostMapping("listByPage")
- public R listByPage(PlayClerkUserInfoQueryVo vo) {
- IPage list = playClerkUserInfoService.selectPlayClerkUserInfoByPage(vo);
+ public R listByPage(@Validated @RequestBody PlayClerkUserQueryVo vo) {
+ IPage list = playClerkUserInfoService.selectByPage(vo);
return R.ok(list);
}
@@ -55,7 +53,7 @@ public class PlayClerkUserInfoController {
*/
@GetMapping("/list")
public R list(PlayClerkUserInfoQueryVo vo) {
- IPage list = playClerkUserInfoService.selectPlayClerkUserInfoByPage(vo);
+ IPage list = playClerkUserInfoService.selectPlayClerkUserInfoByPage(vo);
return R.ok(list);
}
@@ -67,43 +65,43 @@ public class PlayClerkUserInfoController {
return R.ok(playClerkUserInfoService.selectById(id));
}
-
- /**
- * 微信端口新增店员
- */
- @Log(title = "店员", businessType = BusinessType.INSERT)
- @PostMapping("/wx/add")
- public R add(@Validated @RequestBody PlayClerkUserAddToWxVo vo) {
- //微信申请成为店员，需要先创建账户。
- PlayUserInfoEntity userInfoEntity = ConvertUtil.entityToVo(vo, PlayUserInfoEntity.class);
- userInfoEntity.setId(IdUtil.fastSimpleUUID());
- playUserInfoService.create(userInfoEntity);
- //账号创建完成后，创建店员
- PlayClerkUserInfoEntity clerkUserInfoEntity = ConvertUtil.entityToVo(vo, PlayClerkUserInfoEntity.class);
- clerkUserInfoEntity.setPlayUserId(userInfoEntity.getId());
- boolean success = playClerkUserInfoService.create(clerkUserInfoEntity);
- if (success) {
- clerkCommodityService.initClerkCommodity(userInfoEntity.getId());
- return R.ok();
- }
- return R.error("添加失败");
- }
+//
+// /**
+// * 微信端口新增店员
+// */
+// @Log(title = "店员", businessType = BusinessType.INSERT)
+// @PostMapping("/wx/add")
+// public R add(@Validated @RequestBody PlayClerkUserAddToWxVo vo) {
+// //微信申请成为店员，需要先创建账户。
+// PlayUserInfoEntity userInfoEntity = ConvertUtil.entityToVo(vo, PlayUserInfoEntity.class);
+// userInfoEntity.setId(IdUtils.getUuid());
+// playUserInfoService.create(userInfoEntity);
+// //账号创建完成后，创建店员
+// PlayClerkUserInfoEntity clerkUserInfoEntity = ConvertUtil.entityToVo(vo, PlayClerkUserInfoEntity.class);
+// clerkUserInfoEntity.setPlayUserId(userInfoEntity.getId());
+// boolean success = playClerkUserInfoService.create(clerkUserInfoEntity);
+// if (success) {
+// clerkCommodityService.initClerkCommodity(userInfoEntity.getId());
+// return R.ok();
+// }
+// return R.error("添加失败");
+// }
- /**
- * 新增店员
- */
- @Log(title = "店员", businessType = BusinessType.INSERT)
- @PostMapping("/create")
- public R create(@Validated @RequestBody PlayClerkUserAddVo vo) {
- PlayClerkUserInfoEntity entity = ConvertUtil.entityToVo(vo, PlayClerkUserInfoEntity.class);
- boolean success = playClerkUserInfoService.create(entity);
- if (success) {
- clerkCommodityService.initClerkCommodity(vo.getPlayUserId());
- return R.ok();
- }
- return R.error("添加失败");
- }
+// /**
+// * 新增店员
+// */
+// @Log(title = "店员", businessType = BusinessType.INSERT)
+// @PostMapping("/create")
+// public R create(@Validated @RequestBody PlayClerkUserAddVo vo) {
+// PlayClerkUserInfoEntity entity = ConvertUtil.entityToVo(vo, PlayClerkUserInfoEntity.class);
+// boolean success = playClerkUserInfoService.create(entity);
+// if (success) {
+// clerkCommodityService.initClerkCommodity(vo.getPlayUserId());
+// return R.ok();
+// }
+// return R.error("添加失败");
+// }
/**
* 修改店员
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserReviewInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserReviewInfoController.java
new file mode 100644
index 0000000..f8aa67d
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserReviewInfoController.java
@@ -0,0 +1,55 @@
+package com.starry.admin.modules.clerk.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkUserReviewQueryVo;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkUserReviewReturnVo;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkUserReviewStateEditVo;
+import com.starry.admin.modules.clerk.service.IPlayClerkUserReviewInfoService;
+import com.starry.common.annotation.Log;
+import com.starry.common.enums.BusinessType;
+import com.starry.common.result.R;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 店员资料审核Controller
+ *
+ * @author admin
+ * @since 2024-05-19
+ */
+@RestController
+@RequestMapping("/clerk/user/review")
+public class PlayClerkUserReviewInfoController {
+ @Resource
+ private IPlayClerkUserReviewInfoService playClerkUserReviewInfoService;
+
+ /**
+ * 查询店员资料审核列表
+ */
+ @PostMapping("/listByPage")
+ public R listByPage(@Validated @RequestBody PlayClerkUserReviewQueryVo vo) {
+ IPage list = playClerkUserReviewInfoService.selectByPage(vo);
+ return R.ok(list);
+ }
+
+ /**
+ * 修改店员资料审核
+ */
+ @Log(title = "店员资料审核", businessType = BusinessType.UPDATE)
+ @PostMapping(value = "/update")
+ public R update(@Validated @RequestBody PlayClerkUserReviewStateEditVo vo) {
+ playClerkUserReviewInfoService.updateDataReviewState(vo);
+ return R.ok("修改成功");
+ }
+
+ /**
+ * 删除店员资料审核
+ */
+ @Log(title = "店员资料审核", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public R remove(@PathVariable String[] ids) {
+ return R.ok(playClerkUserReviewInfoService.deletePlayClerkUserReviewInfoByIds(ids));
+ }
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkWagesDetailsInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkWagesDetailsInfoController.java
new file mode 100644
index 0000000..41452ab
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkWagesDetailsInfoController.java
@@ -0,0 +1,77 @@
+package com.starry.admin.modules.clerk.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesDetailsInfoEntity;
+import com.starry.admin.modules.clerk.service.IPlayClerkWagesDetailsInfoService;
+import com.starry.common.annotation.Log;
+import com.starry.common.enums.BusinessType;
+import com.starry.common.result.R;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 店员工资明细信息Controller
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+@RestController
+@RequestMapping("/wages/details")
+public class PlayClerkWagesDetailsInfoController {
+ @Resource
+ private IPlayClerkWagesDetailsInfoService playClerkWagesDetailsInfoService;
+
+ /**
+ * 查询店员工资明细信息列表
+ */
+ @GetMapping("/list")
+ public R list(PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo) {
+ IPage list = playClerkWagesDetailsInfoService.selectPlayClerkWagesDetailsInfoByPage(playClerkWagesDetailsInfo);
+ return R.ok(list);
+ }
+
+ /**
+ * 获取店员工资明细信息详细信息
+ */
+ @GetMapping(value = "/{id}")
+ public R getInfo(@PathVariable("id") String id) {
+ return R.ok(playClerkWagesDetailsInfoService.selectPlayClerkWagesDetailsInfoById(id));
+ }
+
+ /**
+ * 新增店员工资明细信息
+ */
+ @Log(title = "店员工资明细信息", businessType = BusinessType.INSERT)
+ @PostMapping("/create")
+ public R create(@RequestBody PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo) {
+ boolean success = playClerkWagesDetailsInfoService.create(playClerkWagesDetailsInfo);
+ if (success) {
+ return R.ok();
+ }
+ return R.error("添加失败");
+ }
+
+ /**
+ * 修改店员工资明细信息
+ */
+ @Log(title = "店员工资明细信息", businessType = BusinessType.UPDATE)
+ @PostMapping(value = "/update/{id}")
+ public R update(@PathVariable String id, @RequestBody PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo) {
+ playClerkWagesDetailsInfo.setId(id);
+ boolean success = playClerkWagesDetailsInfoService.update(playClerkWagesDetailsInfo);
+ if (success) {
+ return R.ok();
+ }
+ return R.error("修改失败");
+ }
+
+ /**
+ * 删除店员工资明细信息
+ */
+ @Log(title = "店员工资明细信息", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public R remove(@PathVariable String[] ids) {
+ return R.ok(playClerkWagesDetailsInfoService.deletePlayClerkWagesDetailsInfoByIds(ids));
+ }
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkWagesInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkWagesInfoController.java
new file mode 100644
index 0000000..44e9c8b
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkWagesInfoController.java
@@ -0,0 +1,107 @@
+package com.starry.admin.modules.clerk.controller;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.starry.admin.common.exception.CustomException;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesDetailsInfoEntity;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkUnsettledWagesInfoQueryVo;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkUnsettledWagesInfoReturnVo;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkWagesInfoQueryVo;
+import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
+import com.starry.admin.modules.clerk.service.IPlayClerkWagesDetailsInfoService;
+import com.starry.admin.modules.clerk.service.IPlayClerkWagesInfoService;
+import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
+import com.starry.admin.modules.weichat.entity.wages.ClerkWagesDetailsReturnVo;
+import com.starry.common.result.R;
+import com.starry.common.utils.ConvertUtil;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 店员工资结算信息Controller
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+@RestController
+@RequestMapping("/clerk/wages")
+public class PlayClerkWagesInfoController {
+ @Resource
+ private IPlayClerkWagesInfoService playClerkWagesInfoService;
+
+ @Resource
+ private IPlayClerkWagesDetailsInfoService playClerkWagesDetailsInfoService;
+
+ @Resource
+ private IPlayClerkUserInfoService playClerkUserInfoService;
+
+ /**
+ * 查询店员工资结算信息列表
+ */
+ @PostMapping("/listByPage")
+ public R list(@Validated @RequestBody PlayClerkWagesInfoQueryVo vo) {
+ return R.ok(playClerkWagesInfoService.selectHistoricalByPage(vo));
+ }
+
+ /**
+ * 查询店员工未结算工资
+ */
+ @PostMapping("/listUnsettledWagesByPage")
+ public R list(@Validated @RequestBody PlayClerkUnsettledWagesInfoQueryVo vo) {
+ IPage page = playClerkUserInfoService.listUnsettledWagesByPage(vo);
+ for (PlayClerkUnsettledWagesInfoReturnVo record : page.getRecords()) {
+ Integer orderState1Number = 0;
+ BigDecimal orderState1Money = BigDecimal.ZERO;
+ Integer orderState2Number = 0;
+ BigDecimal orderState2Money = BigDecimal.ZERO;
+ BigDecimal orderState2Revenue = BigDecimal.ZERO;
+ Integer orderState3Number = 0;
+ BigDecimal orderState3Money = BigDecimal.ZERO;
+ BigDecimal orderState3Revenue = BigDecimal.ZERO;
+ for (PlayOrderInfoEntity orderInfoEntity : record.getOrderInfoEntities()) {
+ if ("1".equals(orderInfoEntity.getOrderStatus())) {
+ orderState1Number++;
+ orderState1Money = orderState1Money.add(orderInfoEntity.getFinalAmount());
+ } else if ("2".equals(orderInfoEntity.getOrderStatus())) {
+ orderState2Number++;
+ orderState2Money = orderState2Money.add(orderInfoEntity.getFinalAmount());
+ orderState2Revenue = orderState2Revenue.add(orderInfoEntity.getEstimatedRevenue());
+ } else if ("3".equals(orderInfoEntity.getOrderStatus())) {
+ orderState3Number++;
+ orderState3Money = orderState3Money.add(orderInfoEntity.getFinalAmount());
+ orderState3Revenue = orderState3Revenue.add(orderInfoEntity.getEstimatedRevenue());
+ }
+ }
+ record.setOrderState1Number(orderState1Number);
+ record.setOrderState1Money(orderState1Money);
+ record.setOrderState2Number(orderState2Number);
+ record.setOrderState2Money(orderState2Money);
+ record.setOrderState2Revenue(orderState2Revenue);
+ record.setOrderState3Number(orderState3Number);
+ record.setOrderState3Money(orderState3Money);
+ record.setOrderState3Revenue(orderState3Revenue);
+ }
+ return R.ok(page);
+ }
+
+
+ @GetMapping("queryWagesDetailsById")
+ public R clerkQueryWagesDetails(@RequestParam("id") String id) {
+ if (StrUtil.isBlankIfStr(id)) {
+ throw new CustomException("ID不能为空");
+ }
+ List list = playClerkWagesDetailsInfoService.selectByWagesId(id);
+ List returnVos = new ArrayList<>(list.size());
+ for (PlayClerkWagesDetailsInfoEntity entity : list) {
+ returnVos.add(ConvertUtil.entityToVo(entity, ClerkWagesDetailsReturnVo.class));
+ }
+ return R.ok(returnVos);
+ }
+
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/article/controller/PlayCustomArticleInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayCustomArticleInfoController.java
similarity index 92%
rename from play-admin/src/main/java/com/starry/admin/modules/article/controller/PlayCustomArticleInfoController.java
rename to play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayCustomArticleInfoController.java
index 8f09cd1..469df5d 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/article/controller/PlayCustomArticleInfoController.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayCustomArticleInfoController.java
@@ -1,8 +1,8 @@
-package com.starry.admin.modules.article.controller;
+package com.starry.admin.modules.clerk.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.starry.admin.modules.article.module.entity.PlayCustomArticleInfoEntity;
-import com.starry.admin.modules.article.service.IPlayCustomArticleInfoService;
+import com.starry.admin.modules.clerk.module.entity.PlayCustomArticleInfoEntity;
+import com.starry.admin.modules.clerk.service.IPlayCustomArticleInfoService;
import com.starry.common.annotation.Log;
import com.starry.common.enums.BusinessType;
import com.starry.common.result.R;
diff --git a/play-admin/src/main/java/com/starry/admin/modules/article/mapper/PlayClerkArticleInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkArticleInfoMapper.java
similarity index 64%
rename from play-admin/src/main/java/com/starry/admin/modules/article/mapper/PlayClerkArticleInfoMapper.java
rename to play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkArticleInfoMapper.java
index 6c47a35..fdd01e6 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/article/mapper/PlayClerkArticleInfoMapper.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkArticleInfoMapper.java
@@ -1,8 +1,8 @@
-package com.starry.admin.modules.article.mapper;
+package com.starry.admin.modules.clerk.mapper;
import com.github.yulichang.base.MPJBaseMapper;
-import com.starry.admin.modules.article.module.entity.PlayClerkArticleInfoEntity;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkArticleInfoEntity;
/**
* 店员动态信息Mapper接口
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkDataReviewInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkDataReviewInfoMapper.java
index 8215950..cc132d4 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkDataReviewInfoMapper.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkDataReviewInfoMapper.java
@@ -1,16 +1,16 @@
package com.starry.admin.modules.clerk.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
import com.starry.admin.modules.clerk.module.entity.PlayClerkDataReviewInfoEntity;
/**
* 店员资料审核Mapper接口
*
* @author admin
- * @since 2024-04-11
+ * @since 2024-05-19
*/
-public interface PlayClerkDataReviewInfoMapper extends BaseMapper {
+public interface PlayClerkDataReviewInfoMapper extends MPJBaseMapper {
}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkGroupInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkGroupInfoMapper.java
new file mode 100644
index 0000000..39dceef
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkGroupInfoMapper.java
@@ -0,0 +1,16 @@
+package com.starry.admin.modules.clerk.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkGroupInfoEntity;
+
+/**
+ * 店员分组信息Mapper接口
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+public interface PlayClerkGroupInfoMapper extends BaseMapper {
+
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkGroupUserInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkGroupUserInfoMapper.java
new file mode 100644
index 0000000..debb054
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkGroupUserInfoMapper.java
@@ -0,0 +1,16 @@
+package com.starry.admin.modules.clerk.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkGroupUserInfoEntity;
+
+/**
+ * 店员和分组关系Mapper接口
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+public interface PlayClerkGroupUserInfoMapper extends BaseMapper {
+
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkRankingInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkRankingInfoMapper.java
new file mode 100644
index 0000000..6ceb053
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkRankingInfoMapper.java
@@ -0,0 +1,16 @@
+package com.starry.admin.modules.clerk.mapper;
+
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkRankingInfoEntity;
+
+/**
+ * 店员排行Mapper接口
+ *
+ * @author admin
+ * @since 2024-05-25
+ */
+public interface PlayClerkRankingInfoMapper extends MPJBaseMapper {
+
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkTypeInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkTypeInfoMapper.java
new file mode 100644
index 0000000..fef83fe
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkTypeInfoMapper.java
@@ -0,0 +1,16 @@
+package com.starry.admin.modules.clerk.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkTypeInfoEntity;
+
+/**
+ * 店员分类信息Mapper接口
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+public interface PlayClerkTypeInfoMapper extends BaseMapper {
+
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkTypeUserInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkTypeUserInfoMapper.java
new file mode 100644
index 0000000..e4901a8
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkTypeUserInfoMapper.java
@@ -0,0 +1,16 @@
+package com.starry.admin.modules.clerk.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkTypeUserInfoEntity;
+
+/**
+ * 店员和分类关系Mapper接口
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+public interface PlayClerkTypeUserInfoMapper extends BaseMapper {
+
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkUserReviewInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkUserReviewInfoMapper.java
new file mode 100644
index 0000000..1d636e8
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkUserReviewInfoMapper.java
@@ -0,0 +1,16 @@
+package com.starry.admin.modules.clerk.mapper;
+
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkUserReviewInfoEntity;
+
+/**
+ * 店员资料审核Mapper接口
+ *
+ * @author admin
+ * @since 2024-05-19
+ */
+public interface PlayClerkUserReviewInfoMapper extends MPJBaseMapper {
+
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkWagesDetailsInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkWagesDetailsInfoMapper.java
new file mode 100644
index 0000000..5b2028d
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkWagesDetailsInfoMapper.java
@@ -0,0 +1,16 @@
+package com.starry.admin.modules.clerk.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesDetailsInfoEntity;
+
+/**
+ * 店员工资明细信息Mapper接口
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+public interface PlayClerkWagesDetailsInfoMapper extends BaseMapper {
+
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkWagesInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkWagesInfoMapper.java
new file mode 100644
index 0000000..fa1ce81
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayClerkWagesInfoMapper.java
@@ -0,0 +1,16 @@
+package com.starry.admin.modules.clerk.mapper;
+
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesInfoEntity;
+
+/**
+ * 店员工资结算信息Mapper接口
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+public interface PlayClerkWagesInfoMapper extends MPJBaseMapper {
+
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/article/mapper/PlayCustomArticleInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayCustomArticleInfoMapper.java
similarity index 65%
rename from play-admin/src/main/java/com/starry/admin/modules/article/mapper/PlayCustomArticleInfoMapper.java
rename to play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayCustomArticleInfoMapper.java
index e74b5a4..88064f7 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/article/mapper/PlayCustomArticleInfoMapper.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/mapper/PlayCustomArticleInfoMapper.java
@@ -1,8 +1,8 @@
-package com.starry.admin.modules.article.mapper;
+package com.starry.admin.modules.clerk.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.starry.admin.modules.article.module.entity.PlayCustomArticleInfoEntity;
+import com.starry.admin.modules.clerk.module.entity.PlayCustomArticleInfoEntity;
/**
* 陪聊点赞动态信息Mapper接口
diff --git a/play-admin/src/main/java/com/starry/admin/modules/article/module/entity/PlayClerkArticleInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkArticleInfoEntity.java
similarity index 55%
rename from play-admin/src/main/java/com/starry/admin/modules/article/module/entity/PlayClerkArticleInfoEntity.java
rename to play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkArticleInfoEntity.java
index 11aff81..c1b0586 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/article/module/entity/PlayClerkArticleInfoEntity.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkArticleInfoEntity.java
@@ -1,11 +1,14 @@
-package com.starry.admin.modules.article.module.entity;
+package com.starry.admin.modules.clerk.module.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.starry.admin.common.conf.StringTypeHandler;
import com.starry.common.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import java.util.Date;
+import java.time.LocalDateTime;
+import java.util.List;
/**
* 店员动态信息对象 play_clerk_article_info
@@ -15,7 +18,7 @@ import java.util.Date;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@TableName("play_clerk_article_info")
+@TableName(value = "play_clerk_article_info", autoResultMap = true)
public class PlayClerkArticleInfoEntity extends BaseEntity {
@@ -32,32 +35,30 @@ public class PlayClerkArticleInfoEntity extends BaseEntity annexCon;
+
+
/**
* 发布时间
*/
- private Date releaseTime;
-
- /**
- * 点赞人数
- */
- private Long agreedQuantity;
+ private LocalDateTime releaseTime;
/**
* 审核状态（0：未审核:1：审核通过，2：审核不通过）
@@ -65,9 +66,14 @@ public class PlayClerkArticleInfoEntity extends BaseEntity {
@@ -32,55 +35,47 @@ public class PlayClerkDataReviewInfoEntity extends BaseEntity dataContent;
/**
- * 审核状态
- * 0：未审核
- * 1：审核通过
- * 2：审核未通过
+ * 审核状态（0：未审核:1：审核通过，2：审核不通过）
*/
- private String state;
+ private String reviewState;
/**
* 资料添加时间
*/
- private Date addTime;
+ private LocalDateTime addTime;
/**
* 审核时间
*/
- private Date reviewTime;
+ private LocalDateTime reviewTime;
/**
* 审核人
*/
private String reviewBy;
+ /**
+ * 审核内容
+ */
+ private String reviewCon;
+
/**
* 备注
*/
private String remark;
-
}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkDataReviewInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkDataReviewInfoQueryVo.java
index b9308a2..7cc22d9 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkDataReviewInfoQueryVo.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkDataReviewInfoQueryVo.java
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
import java.util.Date;
/**
- * 店员资料审核对象 play_clerk_data_review_info
+ * 店员申请对象 play_clerk_data_review_info
*
* @author admin
* @since 2024-04-11
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkGroupInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkGroupInfoEntity.java
new file mode 100644
index 0000000..c68acb4
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkGroupInfoEntity.java
@@ -0,0 +1,41 @@
+package com.starry.admin.modules.clerk.module.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.starry.common.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 店员分组信息对象 play_clerk_group_info
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("play_clerk_group_info")
+public class PlayClerkGroupInfoEntity extends BaseEntity {
+
+
+ /**
+ * UUID
+ */
+ private String id;
+
+ /**
+ * 租户ID
+ */
+ private String tenantId;
+
+ /**
+ * 分组名称
+ */
+ private String groupName;
+
+ /**
+ * 排序
+ */
+ private Long sort;
+
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkGroupUserInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkGroupUserInfoEntity.java
new file mode 100644
index 0000000..7c40a06
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkGroupUserInfoEntity.java
@@ -0,0 +1,51 @@
+package com.starry.admin.modules.clerk.module.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.starry.common.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 店员和分组关系对象 play_clerk_group_user_info
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("play_clerk_group_user_info")
+public class PlayClerkGroupUserInfoEntity extends BaseEntity {
+
+
+ /**
+ * UUID
+ */
+ private String id;
+
+ /**
+ * 租户ID
+ */
+ private String tenantId;
+
+ /**
+ * 分组ID
+ */
+ private String groupId;
+
+ /**
+ * 店员ID
+ */
+ private String clerkId;
+
+ /**
+ * 排序
+ */
+ private Integer sort;
+
+ /**
+ * 创建人的id
+ */
+ private String createdBy;
+
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkRankingInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkRankingInfoEntity.java
new file mode 100644
index 0000000..22e51fb
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkRankingInfoEntity.java
@@ -0,0 +1,90 @@
+package com.starry.admin.modules.clerk.module.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.starry.common.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * 店员排行对象 play_clerk_ranking_info
+ *
+ * @author admin
+ * @since 2024-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("play_clerk_ranking_info")
+public class PlayClerkRankingInfoEntity extends BaseEntity {
+
+
+ /**
+ * UUID
+ */
+ private String id;
+
+ /**
+ * 租户ID
+ */
+ private String tenantId;
+
+ /**
+ * 店员ID
+ */
+ private String clerkId;
+
+ /**
+ * 统计批次
+ */
+ private Integer serialNumber;
+
+ /**
+ * 排序名词
+ */
+ private Integer rankingIndex;
+
+ /**
+ * 开始统计时间
+ */
+ private LocalDate startCountDate;
+
+ /**
+ * 结束统计时间
+ */
+ private LocalDate endCountDate;
+
+ /**
+ * 订单总数
+ */
+ private Integer orderNumber;
+
+ /**
+ * 订单金额
+ */
+ private BigDecimal orderMoney;
+
+ /**
+ * 续单数
+ */
+ private Integer orderContinueNumber;
+
+ /**
+ * 续单金额
+ */
+ private BigDecimal orderContinueMoney;
+
+ /**
+ * 超时未接单数量
+ */
+ private Integer ordersExpiredNumber = 0;
+
+
+ /**
+ * 距离前一名相差金额
+ */
+ private BigDecimal previousMoney;
+
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkTypeInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkTypeInfoEntity.java
new file mode 100644
index 0000000..e8365f9
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkTypeInfoEntity.java
@@ -0,0 +1,45 @@
+package com.starry.admin.modules.clerk.module.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.starry.common.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 店员分类信息对象 play_clerk_type_info
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("play_clerk_type_info")
+public class PlayClerkTypeInfoEntity extends BaseEntity {
+
+
+ /**
+ * UUID
+ */
+ private String id;
+
+ /**
+ * 租户ID
+ */
+ private String tenantId;
+
+ /**
+ * 分类名称
+ */
+ private String typeName;
+
+ /**
+ * 是否在首页显示（0:不显示,1:显示）
+ */
+ private String homeDisplayed;
+
+ /**
+ * 排序
+ */
+ private Integer sort;
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkTypeUserInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkTypeUserInfoEntity.java
new file mode 100644
index 0000000..e4db33e
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkTypeUserInfoEntity.java
@@ -0,0 +1,45 @@
+package com.starry.admin.modules.clerk.module.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.starry.common.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 店员和分类关系对象 play_clerk_type_user_info
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("play_clerk_type_user_info")
+public class PlayClerkTypeUserInfoEntity extends BaseEntity {
+
+
+ /**
+ * UUID
+ */
+ private String id;
+
+ /**
+ * 租户ID
+ */
+ private String tenantId;
+
+ /**
+ * 分组ID
+ */
+ private String typeId;
+
+ /**
+ * 店员ID
+ */
+ private String clerkId;
+
+ /**
+ * 排序
+ */
+ private Integer sort;
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserInfoEntity.java
index 158726b..e131832 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserInfoEntity.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserInfoEntity.java
@@ -58,12 +58,21 @@ public class PlayClerkUserInfoEntity extends BaseEntity
*/
private String nickname;
+ /**
+ * 是否固定等级(0:固定等级，1:不固定)
+ */
+ private String fixingLevel;
+
+ /**
+ * 分组ID
+ */
+ private String groupId;
+
/**
* 店员等级
*/
private String levelId;
-
/**
* 店员类型
*/
@@ -74,6 +83,11 @@ public class PlayClerkUserInfoEntity extends BaseEntity
*/
private String sex;
+ /**
+ * 身份证号码
+ */
+ private String code;
+
/**
* 头像
*/
@@ -171,7 +185,7 @@ public class PlayClerkUserInfoEntity extends BaseEntity
private String realState;
/**
- * 是否必须实名【1：必须实名，0：非必须实名】
+ * 是否必须实名【0:非必须实名;1:必须实名;2:跟随店铺设置】
*/
private String mandatoryRealState;
@@ -210,5 +224,11 @@ public class PlayClerkUserInfoEntity extends BaseEntity
@JsonIgnore
private String token;
+ public PlayClerkUserInfoEntity() {
+ }
+ public PlayClerkUserInfoEntity(String id, BigDecimal accountBalance) {
+ this.id = id;
+ this.accountBalance = accountBalance;
+ }
}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserQueryVo.java
new file mode 100644
index 0000000..d22f3b8
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserQueryVo.java
@@ -0,0 +1,133 @@
+package com.starry.admin.modules.clerk.module.entity;
+
+import com.starry.common.domain.BasePageEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * 店员对象 play_clerk_user_info
+ *
+ * @author admin
+ * @since 2024-03-30
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class PlayClerkUserQueryVo extends BasePageEntity {
+
+ /**
+ * UUID
+ */
+ private String id;
+
+ /**
+ * 昵称
+ */
+ private String nickname;
+
+ /**
+ * 电话号码
+ */
+ private String phone;
+
+ /**
+ * 分组ID
+ */
+ private String groupId;
+
+
+ /**
+ * 性别[0:未知;1:男;2:女]
+ */
+ private String sex;
+
+
+ /**
+ * 是否固定等级(0:固定等级，1:不固定)
+ */
+ private String fixingLevel;
+
+ /**
+ * 店员等级
+ */
+ private String levelId;
+
+ /**
+ * 年龄
+ */
+ private List ages;
+
+ /**
+ * 所在国家
+ */
+ private String country;
+
+ /**
+ * 所在省份
+ */
+ private String province;
+
+ /**
+ * 所在城市
+ */
+ private String city;
+
+
+ /**
+ * 在职状态（1：在职，0：离职）
+ */
+ private String onboardingState = "1";
+
+ /**
+ * 是否推荐状态（1：已推荐，0：未推荐）
+ */
+ private String recommendationState;
+
+ /**
+ * 是否置顶状态（1：已置顶，0：未置顶）
+ */
+ private String pinToTopState;
+
+ /**
+ * 在线状态【1：在线，0：离线】
+ */
+ private String onlineState;
+
+ /**
+ * 上架状态【1：上架，0：下架】
+ */
+ private String listingState;
+
+ /**
+ * 显示状态【1：显示，0：隐藏】
+ */
+ private String displayState;
+
+ /**
+ * 实名状态【1：已实名，0：未实名】
+ */
+ private String realState;
+
+ /**
+ * 是否必须实名【0:非必须实名;1:必须实名;2:跟随店铺设置】
+ */
+ private String mandatoryRealState;
+
+ /**
+ * 随机接单状态【1：允许，0：禁止】
+ */
+ private String randomOrderState;
+
+ /**
+ * 店员状态（0:不是陪聊，1:陪聊，2:资料审核中）
+ */
+ private String clerkState = "1";
+
+ /**
+ * 身份证号
+ */
+ private String code;
+
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java
new file mode 100644
index 0000000..4a1ccd0
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java
@@ -0,0 +1,156 @@
+package com.starry.admin.modules.clerk.module.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 店员分页查询对象
+ *
+ * @author admin
+ * @since 2024-03-30
+ */
+@Data
+public class PlayClerkUserReturnVo {
+
+
+ /**
+ * UUID
+ */
+ private String id;
+
+ /**
+ * 店员昵称
+ */
+ private String nickname;
+
+ /**
+ * 店员等级
+ */
+ private String levelId;
+
+ /**
+ * 店员等级
+ */
+ private String levelName;
+
+
+ /**
+ * 分组ID
+ */
+ private String groupId;
+
+
+ /**
+ * 分组ID
+ */
+ private String groupName;
+
+
+ /**
+ * 性别[0:未知;1:男;2:女]
+ */
+ private String sex;
+
+ /**
+ * 头像
+ */
+ private String avatar;
+
+ /**
+ * 音频
+ */
+ private String audio;
+
+ /**
+ * 星座
+ */
+ private String constellation;
+
+ /**
+ * 标签
+ */
+ private List label = new ArrayList<>();
+
+ /**
+ * 相册
+ */
+ private List album = new ArrayList<>();
+
+ /**
+ * 个性签名
+ */
+ private String signature;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 所在省份
+ */
+ private String province;
+
+ /**
+ * 所在城市
+ */
+ private String city;
+
+ /**
+ * 在线状态【1：在线，0：离线】
+ */
+ private String onlineState;
+
+ /**
+ * 上架状态【1：上架，0：下架】
+ */
+ private String listingState;
+
+ /**
+ * 实名状态【1：已实名，0：未实名】
+ */
+ private String realState;
+
+ /**
+ * 是否必须实名【0:非必须实名;1:必须实名;2:跟随店铺设置】
+ */
+ private String mandatoryRealState;
+
+ /**
+ * 随机接单状态【1：允许，0：禁止】
+ */
+ private String randomOrderState;
+
+ /**
+ * 地址
+ */
+ private String address;
+
+ /**
+ * 订单列表
+ */
+ @JsonIgnore
+ private List orderInfos;
+
+ /**
+ * 订单总数
+ */
+ private String orderNumber;
+
+ /**
+ * 续单总数
+ */
+ private String orderContinueNumber;
+
+ /**
+ * 订单总金额
+ */
+ private BigDecimal orderTotalAmount;
+
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReviewInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReviewInfoEntity.java
new file mode 100644
index 0000000..4b50247
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReviewInfoEntity.java
@@ -0,0 +1,119 @@
+package com.starry.admin.modules.clerk.module.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.starry.admin.common.conf.StringTypeHandler;
+import com.starry.common.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 店员申请对象 play_clerk_user_review_info
+ *
+ * @author admin
+ * @since 2024-05-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName(value = "play_clerk_user_review_info", autoResultMap = true)
+public class PlayClerkUserReviewInfoEntity extends BaseEntity {
+
+ /**
+ * UUID
+ */
+ private String id;
+
+ /**
+ * 租户ID
+ */
+ private String tenantId;
+
+ /**
+ * 店员ID
+ */
+ private String clerkId;
+
+ /**
+ * 微信号码
+ */
+ private String weiChatCode;
+
+ /**
+ * 手机号码
+ */
+ private String phone;
+
+ /**
+ * 昵称
+ */
+ private String nickname;
+
+ /**
+ * 性别[0:未知;1:男;2:女]
+ */
+ private String sex;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 所在省份
+ */
+ private String province;
+
+ /**
+ * 所在城市
+ */
+ private String city;
+
+ /**
+ * 备注（相关经验）
+ */
+ private String remark;
+
+ /**
+ * 音频
+ */
+ private String audio;
+
+ /**
+ * 照片
+ */
+ @TableField(typeHandler = StringTypeHandler.class)
+ private List album;
+
+ /**
+ * 申请时间
+ */
+ private LocalDateTime addTime;
+
+
+ /**
+ * 审核状态（0：未审核:1：审核通过，2：审核不通过）
+ */
+ private String reviewState;
+
+ /**
+ * 审核时间
+ */
+ private LocalDateTime reviewTime;
+
+ /**
+ * 审核人
+ */
+ private String reviewBy;
+
+ /**
+ * 审核内容
+ */
+ private String reviewCon;
+
+
+
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkWagesDetailsInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkWagesDetailsInfoEntity.java
new file mode 100644
index 0000000..f8a5d2b
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkWagesDetailsInfoEntity.java
@@ -0,0 +1,69 @@
+package com.starry.admin.modules.clerk.module.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.starry.common.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 店员工资明细信息对象 play_clerk_wages_details_info
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("play_clerk_wages_details_info")
+public class PlayClerkWagesDetailsInfoEntity extends BaseEntity {
+
+
+ /**
+ * UUID
+ */
+ private String id;
+
+ /**
+ * 租户ID
+ */
+ private String tenantId;
+
+ /**
+ * 工资统计ID
+ */
+ private String wagesId;
+
+ /**
+ * 店员ID
+ */
+ private String clerkId;
+
+ /**
+ * 订单ID
+ */
+ private String orderId;
+
+ /**
+ * 订单编号
+ */
+ private String orderNo;
+
+ /**
+ * 订单最终金额（支付金额）
+ */
+ private BigDecimal finalAmount;
+
+ /**
+ * 店员收入
+ */
+ private BigDecimal estimatedRevenue;
+
+ /**
+ * 订单完成时间
+ */
+ private LocalDateTime endOrderTime;
+
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkWagesInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkWagesInfoEntity.java
new file mode 100644
index 0000000..0f2955b
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkWagesInfoEntity.java
@@ -0,0 +1,114 @@
+package com.starry.admin.modules.clerk.module.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.starry.common.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * 店员工资结算信息对象 play_clerk_wages_info
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("play_clerk_wages_info")
+public class PlayClerkWagesInfoEntity extends BaseEntity {
+
+
+ /**
+ * UUID
+ */
+ private String id;
+
+ /**
+ * 租户ID
+ */
+ private String tenantId;
+
+ /**
+ * 店员ID
+ */
+ private String clerkId;
+
+
+ /**
+ * 是否为往期统计(1:是;0:不是)
+ **/
+ private String historicalStatistics;
+
+ /**
+ * 统计序号
+ */
+ private Long serialNumber;
+
+ /**
+ * 排行序号
+ */
+ private Long rankingIndex;
+
+ /**
+ * 开始统计时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate startCountDate;
+
+ /**
+ * 结束统计时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate endCountDate;
+
+
+ /**
+ * 结算时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate settlementDate;
+
+ /**
+ * 订单总数
+ */
+ private Integer orderNumber;
+
+ /**
+ * 订单金额
+ */
+ private BigDecimal finalAmount;
+
+ /**
+ * 续单数
+ */
+ private Integer orderContinueNumber;
+
+ /**
+ * 续单比例
+ */
+ private double orderContinueProportion = 0.0;
+
+ /**
+ * 续单金额
+ */
+ private BigDecimal orderContinueMoney;
+
+ /**
+ * 超时未接单数
+ */
+ private Integer ordersExpiredNumber;
+
+ /**
+ * 店员收入
+ */
+ private BigDecimal estimatedRevenue;
+
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/article/module/entity/PlayCustomArticleInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayCustomArticleInfoEntity.java
similarity index 71%
rename from play-admin/src/main/java/com/starry/admin/modules/article/module/entity/PlayCustomArticleInfoEntity.java
rename to play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayCustomArticleInfoEntity.java
index af0d4fb..e57761e 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/article/module/entity/PlayCustomArticleInfoEntity.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayCustomArticleInfoEntity.java
@@ -1,11 +1,11 @@
-package com.starry.admin.modules.article.module.entity;
+package com.starry.admin.modules.clerk.module.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.starry.common.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import java.util.Date;
+import java.time.LocalDateTime;
/**
* 陪聊点赞动态信息对象 play_custom_article_info
@@ -47,7 +47,18 @@ public class PlayCustomArticleInfoEntity extends BaseEntity releaseTime;
+
+
+ /**
+ * 顾客ID
+ */
+ private String customId;
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkArticleReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkArticleReturnVo.java
new file mode 100644
index 0000000..f838904
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkArticleReturnVo.java
@@ -0,0 +1,82 @@
+package com.starry.admin.modules.clerk.module.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.starry.admin.modules.clerk.module.entity.PlayCustomArticleInfoEntity;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author admin
+ * 动态信息查询返回对象
+ */
+@Data
+public class PlayClerkArticleReturnVo {
+
+ /**
+ * UUID
+ */
+ private String id;
+ /**
+ * 陪聊用户ID
+ */
+ private String clerkId;
+
+ /**
+ * 陪聊用户昵称
+ */
+ private String clerkNickname;
+
+ /**
+ * 陪聊用户头像
+ */
+ private String clerkAvatar;
+
+ /**
+ * 动态内容
+ */
+ private String articleCon;
+
+
+ /**
+ * 动态附件类型（0:图片;1:视频;2:音频）
+ */
+ private String annexType;
+
+ /**
+ * 动态附件内容
+ */
+ private List annexCon;
+
+
+ /**
+ * 发布时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime releaseTime;
+
+ /**
+ * 备注(审核理由)
+ */
+ private String reviewCon;
+
+ /**
+ * 点赞人数
+ */
+ private Integer agreedQuantity = 0;
+
+ /**
+ * 审核状态（0：未审核:1：审核通过，2：审核不通过）
+ */
+ private String reviewState;
+
+ /**
+ * 陪聊点赞动态
+ */
+ @JsonIgnore
+ private List articleInfoEntities;
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkArticleReviewStateEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkArticleReviewStateEditVo.java
new file mode 100644
index 0000000..610d90e
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkArticleReviewStateEditVo.java
@@ -0,0 +1,36 @@
+package com.starry.admin.modules.clerk.module.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import java.time.LocalDateTime;
+
+/**
+ * @author admin
+ * 动态审核
+ */
+@Data
+public class PlayClerkArticleReviewStateEditVo {
+
+
+ @NotBlank(message = "ID不能为空")
+ private String id;
+
+ /**
+ * 审核状态（0：未审核:1：审核通过，2：审核不通过）
+ */
+ @NotBlank(message = "审核状态不能为空")
+ @Pattern(regexp = "[12]", message = "审核状态必须为1或2")
+ private String reviewState;
+
+ /**
+ * 发布时间
+ */
+ private String remark;
+
+ /**
+ * 审核时间
+ */
+ private LocalDateTime reviewTime = LocalDateTime.now();
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkCommodityQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkCommodityQueryVo.java
index 3f4d788..57d6de4 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkCommodityQueryVo.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkCommodityQueryVo.java
@@ -20,4 +20,9 @@ public class PlayClerkCommodityQueryVo {
* 1:启用
*/
private String enablingState;
+
+ public PlayClerkCommodityQueryVo(String commodityType, String enablingState) {
+ this.commodityType = commodityType;
+ this.enablingState = enablingState;
+ }
}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewQueryVo.java
new file mode 100644
index 0000000..9655395
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewQueryVo.java
@@ -0,0 +1,38 @@
+package com.starry.admin.modules.clerk.module.vo;
+
+import com.starry.common.domain.BasePageEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * 店员资料审核对象 play_clerk_data_review_info
+ *
+ * @author admin
+ * @since 2024-05-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class PlayClerkDataReviewQueryVo extends BasePageEntity {
+
+ /**
+ * UUID
+ */
+ private String clerkId;
+
+ /**
+ * 资料类型[0:昵称;1:头像;2:相册;3:录音]
+ */
+ private String dataType;
+
+ /**
+ * 审核状态（0：未审核:1：审核通过，2：审核不通过）
+ */
+ private String reviewState;
+
+ /**
+ * 资料添加时间
+ */
+ private List addTime;
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewReturnVo.java
new file mode 100644
index 0000000..6f2a4f3
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewReturnVo.java
@@ -0,0 +1,80 @@
+package com.starry.admin.modules.clerk.module.vo;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 店员资料审核对象 play_clerk_data_review_info
+ *
+ * @author admin
+ * @since 2024-05-19
+ */
+@Data
+public class PlayClerkDataReviewReturnVo {
+
+
+ /**
+ * UUID
+ */
+ private String id;
+
+
+ /**
+ * 店员ID
+ */
+ private String clerkId;
+
+ /**
+ * 店员昵称
+ */
+ private String clerkNickname;
+
+ /**
+ * 店员头像
+ */
+ private String clerkAvatar;
+
+
+ /**
+ * 资料类型[0:昵称;1:头像;2:相册;3:录音]
+ */
+ private String dateType;
+
+ /**
+ * 资料内容
+ */
+ private List dateContent;
+
+ /**
+ * 审核状态（0：未审核:1：审核通过，2：审核不通过）
+ */
+ private String reviewState;
+
+ /**
+ * 资料添加时间
+ */
+ private LocalDateTime addTime;
+
+ /**
+ * 审核时间
+ */
+ private LocalDateTime reviewTime;
+
+ /**
+ * 审核人
+ */
+ private String reviewBy;
+
+ /**
+ * 审核内容
+ */
+ private String reviewCon;
+
+ /**
+ * 备注
+ */
+ private String remark;
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewStateEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewStateEditVo.java
new file mode 100644
index 0000000..feb6852
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewStateEditVo.java
@@ -0,0 +1,36 @@
+package com.starry.admin.modules.clerk.module.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import java.time.LocalDateTime;
+
+/**
+ * @author admin
+ * 动态审核
+ */
+@Data
+public class PlayClerkDataReviewStateEditVo {
+
+
+ @NotBlank(message = "ID不能为空")
+ private String id;
+
+ /**
+ * 审核状态（0：未审核:1：审核通过，2：审核不通过）
+ */
+ @NotBlank(message = "审核状态不能为空")
+ @Pattern(regexp = "[12]", message = "审核状态必须为1或2")
+ private String reviewState;
+
+ /**
+ * 审核内容
+ */
+ private String reviewCon;
+
+ /**
+ * 审核时间
+ */
+ private LocalDateTime reviewTime = LocalDateTime.now();
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkTypeInfoAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkTypeInfoAddVo.java
new file mode 100644
index 0000000..5965be6
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkTypeInfoAddVo.java
@@ -0,0 +1,33 @@
+package com.starry.admin.modules.clerk.module.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author admin
+ * @since 2024/6/2 下午5:59
+ **/
+@Data
+public class PlayClerkTypeInfoAddVo {
+
+
+ /**
+ * 分类名称
+ */
+ @NotNull(message = "分类名称不能为空")
+ private String typeName;
+
+ /**
+ * 是否在首页显示（0:不显示,1:显示）
+ */
+ @NotNull(message = "是否在首页显示不能为空")
+ private String homeDisplayed;
+
+ /**
+ * 排序
+ */
+ @NotNull(message = "排序不能为空")
+ private Integer sort;
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUnsettledWagesInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUnsettledWagesInfoQueryVo.java
new file mode 100644
index 0000000..4eb06c2
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUnsettledWagesInfoQueryVo.java
@@ -0,0 +1,25 @@
+package com.starry.admin.modules.clerk.module.vo;
+
+import com.starry.common.domain.BasePageEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author admin
+ * @since 2024/6/3 下午10:08
+ **/
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class PlayClerkUnsettledWagesInfoQueryVo extends BasePageEntity {
+
+ /**
+ * 店员ID
+ */
+ private String clerkId;
+
+ /**
+ * 店员上架状态
+ */
+ private String listingState;
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUnsettledWagesInfoReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUnsettledWagesInfoReturnVo.java
new file mode 100644
index 0000000..23b6532
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUnsettledWagesInfoReturnVo.java
@@ -0,0 +1,74 @@
+package com.starry.admin.modules.clerk.module.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author admin
+ * @since 2024/6/3 下午10:08
+ **/
+@Data
+public class PlayClerkUnsettledWagesInfoReturnVo {
+
+ private String clerkId;
+
+
+ private String clerkNickname;
+
+ @JsonIgnore
+ private List orderInfoEntities;
+
+
+ /**
+ * 待开始订单-数量
+ */
+ private Integer orderState1Number;
+
+
+ /**
+ * 待开始订单-金额
+ */
+ private BigDecimal orderState1Money;
+
+
+ /**
+ * 服务中订单-数量
+ */
+ private Integer orderState2Number;
+
+
+ /**
+ * 服务中订单-金额
+ */
+ private BigDecimal orderState2Money;
+
+
+
+ /**
+ * 服务中订单-店员收入
+ */
+ private BigDecimal orderState2Revenue;
+
+
+
+ /**
+ * 已完成未结算订单-数量
+ */
+ private Integer orderState3Number;
+
+
+ /**
+ * 已完成未结算订单-金额
+ */
+ private BigDecimal orderState3Money;
+
+ /**
+ * 已完成未结算订单-店员收入
+ */
+ private BigDecimal orderState3Revenue;
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserAddToWxVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserAddToWxVo.java
index 12a66eb..1e60188 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserAddToWxVo.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserAddToWxVo.java
@@ -20,7 +20,7 @@ public class PlayClerkUserAddToWxVo {
/**
- * 店员性别（1：男：0：女）
+ * 性别[0:未知;1:男;2:女]
*/
@NotNull(message = "性别不能为空")
private Integer sex;
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserAddVo.java
index 65d09c6..aba162f 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserAddVo.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserAddVo.java
@@ -36,7 +36,7 @@ public class PlayClerkUserAddVo {
private String levelId;
/**
- * 店员性别（1：男：0：女）
+ * 性别[0:未知;1:男;2:女]
*/
@NotNull(message = "性别不能为空")
private Integer sex;
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserEditVo.java
index 5c7e80e..c325653 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserEditVo.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserEditVo.java
@@ -42,7 +42,7 @@ public class PlayClerkUserEditVo {
private String levelId;
/**
- * 店员性别（1：男：0：女）
+ * 性别[0:未知;1:男;2:女]
*/
@NotNull(message = "性别不能为空")
private String sex;
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewQueryVo.java
new file mode 100644
index 0000000..76817c1
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewQueryVo.java
@@ -0,0 +1,57 @@
+package com.starry.admin.modules.clerk.module.vo;
+
+import com.starry.common.domain.BasePageEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * 店员申请审核
+ *
+ * @author admin
+ * @since 2024/5/19 下午4:21
+ **/
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class PlayClerkUserReviewQueryVo extends BasePageEntity {
+
+ /**
+ * 店员ID
+ */
+ private String clerkId;
+
+
+ /**
+ * 店员昵称
+ */
+ private String nickname;
+
+
+ /**
+ * 性别[0:未知;1:男;2:女]
+ */
+ private String sex;
+
+
+ /**
+ * 手机号码
+ */
+ private String phone;
+
+
+ /**
+ * 微信号
+ */
+ private String weiChatCode;
+
+ /**
+ * 审核状态（0：未审核:1：审核通过，2：审核不通过）
+ */
+ private String reviewState;
+
+ /**
+ * 申请时间
+ */
+ private List addTime;
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewReturnVo.java
new file mode 100644
index 0000000..d73b6cd
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewReturnVo.java
@@ -0,0 +1,118 @@
+package com.starry.admin.modules.clerk.module.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.starry.admin.common.conf.StringTypeHandler;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 店员申请审核
+ *
+ * @author admin
+ * @since 2024/5/19 下午4:21
+ **/
+@Data
+public class PlayClerkUserReviewReturnVo {
+
+ private String id;
+
+ /**
+ * 店员ID
+ */
+ private String clerkId;
+
+ /**
+ * 店员昵称
+ */
+ private String clerkNickname;
+
+ /**
+ * 店员头像
+ */
+ private String clerkAvatar;
+
+ /**
+ * 微信号码
+ */
+ private String weiChatCode;
+
+ /**
+ * 手机号码
+ */
+ private String phone;
+
+ /**
+ * 昵称
+ */
+ private String nickname;
+
+ /**
+ * 性别[0:未知;1:男;2:女]
+ */
+ private String sex;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 所在省份
+ */
+ private String province;
+
+ /**
+ * 所在城市
+ */
+ private String city;
+
+ /**
+ * 备注（相关经验）
+ */
+ private String remark;
+
+ /**
+ * 音频
+ */
+ private String audio;
+
+ /**
+ * 照片
+ */
+ @TableField(typeHandler = StringTypeHandler.class)
+ private List album = new ArrayList<>();
+
+ /**
+ * 申请时间
+ */
+ private LocalDateTime addTime;
+
+ /**
+ * 审核状态（0：未审核:1：审核通过，2：审核不通过）
+ */
+ private String reviewState;
+
+ /**
+ * 审核时间
+ */
+ private LocalDateTime reviewTime;
+
+ /**
+ * 审核人
+ */
+ private String reviewBy;
+
+ /**
+ * 审核内容
+ */
+ private String reviewCon;
+
+ /**
+ * 个性签名
+ */
+ private String signature;
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewStateEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewStateEditVo.java
new file mode 100644
index 0000000..4b46f6a
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserReviewStateEditVo.java
@@ -0,0 +1,36 @@
+package com.starry.admin.modules.clerk.module.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import java.time.LocalDateTime;
+
+/**
+ * @author admin
+ * 动态审核
+ */
+@Data
+public class PlayClerkUserReviewStateEditVo {
+
+
+ @NotBlank(message = "ID不能为空")
+ private String id;
+
+ /**
+ * 审核状态（0：未审核:1：审核通过，2：审核不通过）
+ */
+ @NotBlank(message = "审核状态不能为空")
+ @Pattern(regexp = "[12]", message = "审核状态必须为1或2")
+ private String reviewState;
+
+ /**
+ * 发布时间
+ */
+ private String reviewCon;
+
+ /**
+ * 审核时间
+ */
+ private LocalDateTime reviewTime = LocalDateTime.now();
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserStateEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserStateEditVo.java
index aca2b68..cb04d8e 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserStateEditVo.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserStateEditVo.java
@@ -48,7 +48,7 @@ public class PlayClerkUserStateEditVo {
private String realState;
/**
- * 是否必须实名【1：必须实名，0：非必须实名】
+ * 是否必须实名【0:非必须实名;1:必须实名;2:跟随店铺设置】
*/
private String mandatoryRealState;
@@ -57,5 +57,15 @@ public class PlayClerkUserStateEditVo {
*/
private String randomOrderState;
+ /**
+ * 是否固定等级(0:固定等级，1:不固定)
+ */
+ private String fixingLevel;
+
+
+ /**
+ * 在职状态（1：在职，0：离职）
+ */
+ private String onboardingState = "1";
}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkWagesInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkWagesInfoQueryVo.java
new file mode 100644
index 0000000..0a5607c
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkWagesInfoQueryVo.java
@@ -0,0 +1,33 @@
+package com.starry.admin.modules.clerk.module.vo;
+
+import com.starry.common.domain.BasePageEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author admin
+ * @since 2024/6/3 下午10:08
+ **/
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class PlayClerkWagesInfoQueryVo extends BasePageEntity {
+
+ /**
+ * 店员ID
+ */
+ private String clerkId;
+
+ /**
+ * 店员分组
+ */
+ private String groupId;
+ /**
+ * 店员上架状态
+ */
+ private String listingState;
+
+ /**
+ * 统计时间
+ */
+ private String settlementDate;
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkWagesInfoReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkWagesInfoReturnVo.java
new file mode 100644
index 0000000..6510e91
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkWagesInfoReturnVo.java
@@ -0,0 +1,108 @@
+package com.starry.admin.modules.clerk.module.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @author admin
+ * @since 2024/6/3 下午10:08
+ **/
+@Data
+public class PlayClerkWagesInfoReturnVo {
+
+ /**
+ * UUID
+ */
+ private String id;
+
+ /**
+ * 租户ID
+ */
+ private String tenantId;
+
+ /**
+ * 店员ID
+ */
+ private String clerkId;
+
+
+ /**
+ * 店员昵称
+ */
+ private String clerkNickname;
+
+
+ /**
+ * 是否为往期统计(1:是;0:不是)
+ **/
+ private String historicalStatistics;
+
+ /**
+ * 统计序号
+ */
+ private Long serialNumber;
+
+ /**
+ * 排行序号
+ */
+ private Long rankingIndex;
+
+ /**
+ * 开始统计时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate startCountDate;
+
+ /**
+ * 结束统计时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate endCountDate;
+
+
+ /**
+ * 结算时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDateTime settlementDate;
+
+ /**
+ * 订单总数
+ */
+ private Integer orderNumber;
+
+ /**
+ * 订单金额
+ */
+ private BigDecimal finalAmount;
+
+ /**
+ * 续单数
+ */
+ private Integer orderContinueNumber;
+
+ /**
+ * 续单金额
+ */
+ private BigDecimal orderContinueMoney;
+
+ /**
+ * 超时未接单数
+ */
+ private Integer ordersExpiredNumber;
+
+
+ /**
+ * 店员收入
+ */
+ private BigDecimal estimatedRevenue = BigDecimal.ZERO;
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/article/service/IPlayClerkArticleInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkArticleInfoService.java
similarity index 63%
rename from play-admin/src/main/java/com/starry/admin/modules/article/service/IPlayClerkArticleInfoService.java
rename to play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkArticleInfoService.java
index 1b68aa3..ecba840 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/article/service/IPlayClerkArticleInfoService.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkArticleInfoService.java
@@ -1,10 +1,12 @@
-package com.starry.admin.modules.article.service;
+package com.starry.admin.modules.clerk.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.starry.admin.modules.article.module.entity.PlayClerkArticleInfoEntity;
-import com.starry.admin.modules.article.module.vo.PlayClerkArticleQueryVo;
-import com.starry.admin.modules.article.module.vo.PlayClerkArticleReturnVo;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkArticleInfoEntity;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkArticleQueryVo;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkArticleReturnVo;
+import com.starry.admin.modules.weichat.entity.article.PlayClerkArticleCustomQueryVo;
+import com.starry.admin.modules.weichat.entity.article.PlayClerkArticleCustomReturnVo;
/**
@@ -29,7 +31,18 @@ public interface IPlayClerkArticleInfoService extends IService selectPlayClerkArticleInfoByPage(PlayClerkArticleQueryVo vo);
+ IPage selectByPage(PlayClerkArticleQueryVo vo);
+
+
+ /**
+ * 顾客查询动态列表
+ *
+ * @param customId 顾客ID
+ * @param customId 动态查询对象
+ * @return PlayClerkArticleCustomReturnVo
+ */
+ IPage customSelectByPage(PlayClerkArticleCustomQueryVo vo, String customId);
+
/**
* 新增店员动态信息
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkCommodityService.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkCommodityService.java
index 14471a3..4d44f75 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkCommodityService.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkCommodityService.java
@@ -27,17 +27,19 @@ public interface IPlayClerkCommodityService extends IService getClerkCommodityList(String userId);
+ List getClerkCommodityList(String userId,String enablingState);
/**
- * 根据用户ID，查询当前用户的服务项目类型
+ * 根据用户ID，查询当前店员所有服务项目
*
* @param userId 用户ID
+ * @param enablingState 服务启动状态[0:停用;1:启用]
* @return List
*/
- List selectCommodityTypeByUser(String userId);
+ List selectCommodityTypeByUser(String userId, String enablingState);
/**
* 根据用户ID，查询当前用户的服务项目
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkDataReviewInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkDataReviewInfoService.java
index 85149fd..c848f41 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkDataReviewInfoService.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkDataReviewInfoService.java
@@ -3,7 +3,9 @@ package com.starry.admin.modules.clerk.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.starry.admin.modules.clerk.module.entity.PlayClerkDataReviewInfoEntity;
-import com.starry.admin.modules.clerk.module.entity.PlayClerkDataReviewInfoQueryVo;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkDataReviewQueryVo;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkDataReviewReturnVo;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkDataReviewStateEditVo;
import java.util.List;
@@ -11,44 +13,49 @@ import java.util.List;
* 店员资料审核Service接口
*
* @author admin
- * @since 2024-04-11
+ * @since 2024-05-19
*/
public interface IPlayClerkDataReviewInfoService extends IService {
/**
* 查询店员资料审核
- *
* @param id 店员资料审核主键
* @return 店员资料审核
*/
PlayClerkDataReviewInfoEntity selectPlayClerkDataReviewInfoById(String id);
+ List queryByClerkId(String clerkId);
+
/**
- * 查询店员资料审核列表
- *
- * @param entity 店员资料审核
- * @return 店员资料审核集合
+ * 查询店员资料申请
+ * @param clerkId 店员ID
+ * @param dataType 资料类型[0:昵称;1:头像;2:相册;3:录音]
+ * @param reviewState 审核状态（0：未审核:1：审核通过，2：审核不通过）
+ * @return PlayClerkDataReviewInfoEntity
*/
- List queryList(PlayClerkDataReviewInfoEntity entity);
+ PlayClerkDataReviewInfoEntity queryByClerkId(String clerkId, String dataType, String reviewState);
/**
* 查询店员资料审核列表
- *
- * @param playClerkDataReviewInfo 店员资料审核
+ * @param vo 店员资料审核
* @return 店员资料审核集合
*/
- IPage selectPlayClerkDataReviewInfoByPage(PlayClerkDataReviewInfoQueryVo playClerkDataReviewInfo);
+ IPage selectByPage(PlayClerkDataReviewQueryVo vo);
/**
* 新增店员资料审核
- *
* @param playClerkDataReviewInfo 店员资料审核
* @return 结果
*/
boolean create(PlayClerkDataReviewInfoEntity playClerkDataReviewInfo);
/**
- * 修改店员资料审核
+ * 修改店员资料审核状态
*
+ * @param vo PlayClerkDataReviewStateEditVo
+ */
+ void updateDataReviewState(PlayClerkDataReviewStateEditVo vo);
+ /**
+ * 修改店员资料审核
* @param playClerkDataReviewInfo 店员资料审核
* @return 结果
*/
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkGroupInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkGroupInfoService.java
new file mode 100644
index 0000000..e5457ef
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkGroupInfoService.java
@@ -0,0 +1,61 @@
+package com.starry.admin.modules.clerk.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkGroupInfoEntity;
+
+/**
+ * 店员分组信息Service接口
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+public interface IPlayClerkGroupInfoService extends IService {
+ /**
+ * 查询店员分组信息
+ *
+ * @param id 店员分组信息主键
+ * @return 店员分组信息
+ */
+ PlayClerkGroupInfoEntity selectPlayClerkGroupInfoById(String id);
+
+ /**
+ * 查询店员分组信息列表
+ *
+ * @param playClerkGroupInfo 店员分组信息
+ * @return 店员分组信息集合
+ */
+ IPage selectPlayClerkGroupInfoByPage(PlayClerkGroupInfoEntity playClerkGroupInfo);
+
+ /**
+ * 新增店员分组信息
+ *
+ * @param playClerkGroupInfo 店员分组信息
+ * @return 结果
+ */
+ boolean create(PlayClerkGroupInfoEntity playClerkGroupInfo);
+
+ /**
+ * 修改店员分组信息
+ *
+ * @param playClerkGroupInfo 店员分组信息
+ * @return 结果
+ */
+ boolean update(PlayClerkGroupInfoEntity playClerkGroupInfo);
+
+ /**
+ * 批量删除店员分组信息
+ *
+ * @param ids 需要删除的店员分组信息主键集合
+ * @return 结果
+ */
+ int deletePlayClerkGroupInfoByIds(String[] ids);
+
+ /**
+ * 删除店员分组信息信息
+ *
+ * @param id 店员分组信息主键
+ * @return 结果
+ */
+ int deletePlayClerkGroupInfoById(String id);
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkGroupUserInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkGroupUserInfoService.java
new file mode 100644
index 0000000..24eaaaf
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkGroupUserInfoService.java
@@ -0,0 +1,61 @@
+package com.starry.admin.modules.clerk.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkGroupUserInfoEntity;
+
+/**
+ * 店员和分组关系Service接口
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+public interface IPlayClerkGroupUserInfoService extends IService {
+ /**
+ * 查询店员和分组关系
+ *
+ * @param id 店员和分组关系主键
+ * @return 店员和分组关系
+ */
+ PlayClerkGroupUserInfoEntity selectPlayClerkGroupUserInfoById(String id);
+
+ /**
+ * 查询店员和分组关系列表
+ *
+ * @param playClerkGroupUserInfo 店员和分组关系
+ * @return 店员和分组关系集合
+ */
+ IPage selectPlayClerkGroupUserInfoByPage(PlayClerkGroupUserInfoEntity playClerkGroupUserInfo);
+
+ /**
+ * 新增店员和分组关系
+ *
+ * @param playClerkGroupUserInfo 店员和分组关系
+ * @return 结果
+ */
+ boolean create(PlayClerkGroupUserInfoEntity playClerkGroupUserInfo);
+
+ /**
+ * 修改店员和分组关系
+ *
+ * @param playClerkGroupUserInfo 店员和分组关系
+ * @return 结果
+ */
+ boolean update(PlayClerkGroupUserInfoEntity playClerkGroupUserInfo);
+
+ /**
+ * 批量删除店员和分组关系
+ *
+ * @param ids 需要删除的店员和分组关系主键集合
+ * @return 结果
+ */
+ int deletePlayClerkGroupUserInfoByIds(String[] ids);
+
+ /**
+ * 删除店员和分组关系信息
+ *
+ * @param id 店员和分组关系主键
+ * @return 结果
+ */
+ int deletePlayClerkGroupUserInfoById(String id);
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkRankingInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkRankingInfoService.java
new file mode 100644
index 0000000..b818bfb
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkRankingInfoService.java
@@ -0,0 +1,109 @@
+package com.starry.admin.modules.clerk.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkRankingInfoEntity;
+import com.starry.admin.modules.weichat.entity.order.PlayOrderHistoryRankingReturnVo;
+import com.starry.admin.modules.weichat.entity.order.PlayOrderRankingReturnVo;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * 店员排行Service接口
+ *
+ * @author admin
+ * @since 2024-05-25
+ */
+public interface IPlayClerkRankingInfoService extends IService {
+ /**
+ * 查询店员排行
+ *
+ * @param id 店员排行主键
+ * @return 店员排行
+ */
+ PlayClerkRankingInfoEntity selectPlayClerkRankingInfoById(String id);
+
+ /**
+ * 查询店员排行列表
+ *
+ * @param playClerkRankingInfo 店员排行
+ * @return 店员排行集合
+ */
+ IPage selectPlayClerkRankingInfoByPage(PlayClerkRankingInfoEntity playClerkRankingInfo);
+
+ /**
+ * 获取当前期排名序号
+ *
+ * @return PlayClerkRankingInfoEntity
+ */
+ Integer selectSerialNumber();
+
+
+ /**
+ * 查询最后一次排行统计列表
+ *
+ * @return 排行信息列表
+ */
+ List selectMaxSerialNumber();
+
+ /**
+ * 根据时间查询店员排行
+ *
+ * @param clerkId 店员ID
+ * @param startTime 开始时间
+ * @param endTime 结束时间
+ * @return 店员排行集合
+ */
+ PlayClerkRankingInfoEntity selectByTime(String clerkId, LocalDate startTime, LocalDate endTime);
+
+
+ /**
+ * 店员分页查询本期排行信息
+ *
+ * @param clerkId 店员ID
+ * @return 店员排行集合
+ */
+ PlayOrderRankingReturnVo selectCurrentRanking(String clerkId);
+
+ /**
+ * 店员分页查询本期历史排行
+ *
+ * @param clerkId 店员ID
+ * @return 店员排行集合
+ */
+ List selectHistoryRanking(String clerkId);
+
+
+ /**
+ * 新增店员排行
+ *
+ * @param playClerkRankingInfo 店员排行
+ * @return 结果
+ */
+ boolean create(PlayClerkRankingInfoEntity playClerkRankingInfo);
+
+ /**
+ * 修改店员排行
+ *
+ * @param playClerkRankingInfo 店员排行
+ * @return 结果
+ */
+ boolean update(PlayClerkRankingInfoEntity playClerkRankingInfo);
+
+ /**
+ * 批量删除店员排行
+ *
+ * @param ids 需要删除的店员排行主键集合
+ * @return 结果
+ */
+ int deletePlayClerkRankingInfoByIds(String[] ids);
+
+ /**
+ * 删除店员排行信息
+ *
+ * @param id 店员排行主键
+ * @return 结果
+ */
+ int deletePlayClerkRankingInfoById(String id);
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkTypeInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkTypeInfoService.java
new file mode 100644
index 0000000..6c9b1da
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkTypeInfoService.java
@@ -0,0 +1,71 @@
+package com.starry.admin.modules.clerk.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkTypeInfoEntity;
+
+import java.util.List;
+
+/**
+ * 店员分类信息Service接口
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+public interface IPlayClerkTypeInfoService extends IService {
+ /**
+ * 查询店员分类信息
+ *
+ * @param id 店员分类信息主键
+ * @return 店员分类信息
+ */
+ PlayClerkTypeInfoEntity selectPlayClerkTypeInfoById(String id);
+
+ /**
+ * 查询店员分类信息列表
+ *
+ * @return 店员分类信息集合
+ */
+ List selectByAll();
+
+
+ /**
+ * 查询店员分类信息列表
+ *
+ * @param playClerkTypeInfo 店员分类信息
+ * @return 店员分类信息集合
+ */
+ IPage selectPlayClerkTypeInfoByPage(PlayClerkTypeInfoEntity playClerkTypeInfo);
+
+ /**
+ * 新增店员分类信息
+ *
+ * @param playClerkTypeInfo 店员分类信息
+ * @return 结果
+ */
+ boolean create(PlayClerkTypeInfoEntity playClerkTypeInfo);
+
+ /**
+ * 修改店员分类信息
+ *
+ * @param playClerkTypeInfo 店员分类信息
+ * @return 结果
+ */
+ boolean update(PlayClerkTypeInfoEntity playClerkTypeInfo);
+
+ /**
+ * 批量删除店员分类信息
+ *
+ * @param ids 需要删除的店员分类信息主键集合
+ * @return 结果
+ */
+ int deletePlayClerkTypeInfoByIds(String[] ids);
+
+ /**
+ * 删除店员分类信息信息
+ *
+ * @param id 店员分类信息主键
+ * @return 结果
+ */
+ int deletePlayClerkTypeInfoById(String id);
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkTypeUserInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkTypeUserInfoService.java
new file mode 100644
index 0000000..a581584
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkTypeUserInfoService.java
@@ -0,0 +1,61 @@
+package com.starry.admin.modules.clerk.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkTypeUserInfoEntity;
+
+/**
+ * 店员和分类关系Service接口
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+public interface IPlayClerkTypeUserInfoService extends IService {
+ /**
+ * 查询店员和分类关系
+ *
+ * @param id 店员和分类关系主键
+ * @return 店员和分类关系
+ */
+ PlayClerkTypeUserInfoEntity selectPlayClerkTypeUserInfoById(String id);
+
+ /**
+ * 查询店员和分类关系列表
+ *
+ * @param playClerkTypeUserInfo 店员和分类关系
+ * @return 店员和分类关系集合
+ */
+ IPage selectPlayClerkTypeUserInfoByPage(PlayClerkTypeUserInfoEntity playClerkTypeUserInfo);
+
+ /**
+ * 新增店员和分类关系
+ *
+ * @param playClerkTypeUserInfo 店员和分类关系
+ * @return 结果
+ */
+ boolean create(PlayClerkTypeUserInfoEntity playClerkTypeUserInfo);
+
+ /**
+ * 修改店员和分类关系
+ *
+ * @param playClerkTypeUserInfo 店员和分类关系
+ * @return 结果
+ */
+ boolean update(PlayClerkTypeUserInfoEntity playClerkTypeUserInfo);
+
+ /**
+ * 批量删除店员和分类关系
+ *
+ * @param ids 需要删除的店员和分类关系主键集合
+ * @return 结果
+ */
+ int deletePlayClerkTypeUserInfoByIds(String[] ids);
+
+ /**
+ * 删除店员和分类关系信息
+ *
+ * @param id 店员和分类关系主键
+ * @return 结果
+ */
+ int deletePlayClerkTypeUserInfoById(String id);
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkUserInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkUserInfoService.java
index 85b5dda..ace9b0f 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkUserInfoService.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkUserInfoService.java
@@ -2,12 +2,18 @@ package com.starry.admin.modules.clerk.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity;
import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
-import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoQueryVo;
-import com.starry.admin.modules.clerk.module.entity.PlayClerkUserListResultVo;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkUserQueryVo;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkUserReturnVo;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkUnsettledWagesInfoQueryVo;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkUnsettledWagesInfoReturnVo;
import com.starry.admin.modules.weichat.entity.PlayClerkUserLoginResponseVo;
+import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoQueryVo;
+import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoResultVo;
import java.math.BigDecimal;
+import java.util.List;
/**
@@ -18,6 +24,17 @@ import java.math.BigDecimal;
*/
public interface IPlayClerkUserInfoService extends IService {
+
+ /**
+ * 获取当前店员抽成信息
+ *
+ * @param clerkId 店员ID
+ * @return com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity
+ * @author 杭州世平信息科技有限公司-xuhq
+ * @since 2024/6/3 11:29
+ **/
+ PlayClerkLevelInfoEntity queryLevelCommission(String clerkId);
+
/**
* 根据账户ID查询店员
*
@@ -71,6 +88,43 @@ public interface IPlayClerkUserInfoService extends IService listAll();
+
+ /**
+ * 查询店员未结算订单
+ *
+ * @param vo 未结算订单查询对象
+ * @return 未结算订单
+ */
+ IPage listUnsettledWagesByPage(PlayClerkUnsettledWagesInfoQueryVo vo);
+
+ /**
+ * 管理端分页查询店员信息
+ *
+ * @param vo 店员查询实体
+ * @return 店员列表
+ */
+
+ IPage selectByPage(PlayClerkUserQueryVo vo);
/**
* 查询店员列表
@@ -79,7 +133,7 @@ public interface IPlayClerkUserInfoService extends IService selectByPage(PlayClerkUserInfoQueryVo vo, String customUserId);
+ IPage selectByPage(PlayClerkUserInfoQueryVo vo, String customUserId);
/**
* 查询店员列表
@@ -87,7 +141,7 @@ public interface IPlayClerkUserInfoService extends IService selectPlayClerkUserInfoByPage(PlayClerkUserInfoQueryVo vo);
+ IPage selectPlayClerkUserInfoByPage(PlayClerkUserInfoQueryVo vo);
/**
* 新增店员
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkUserReviewInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkUserReviewInfoService.java
new file mode 100644
index 0000000..4cf815b
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkUserReviewInfoService.java
@@ -0,0 +1,84 @@
+package com.starry.admin.modules.clerk.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkUserReviewInfoEntity;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkUserReviewQueryVo;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkUserReviewReturnVo;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkUserReviewStateEditVo;
+
+/**
+ * 店员资料审核Service接口
+ *
+ * @author admin
+ * @since 2024-05-19
+ */
+public interface IPlayClerkUserReviewInfoService extends IService {
+ /**
+ * 查询店员资料审核
+ *
+ * @param id 店员资料审核主键
+ * @return 店员资料审核
+ */
+ PlayClerkUserReviewInfoEntity selectPlayClerkUserReviewInfoById(String id);
+
+
+ /**
+ * 根据店员ID，查询未审核的申请
+ *
+ * @param clerkId 店员ID
+ * @param reviewState 审核状态（0：未审核:1：审核通过，2：审核不通过）
+ * @return 店员申请审核对象
+ */
+ PlayClerkUserReviewInfoEntity queryByClerkId(String clerkId, String reviewState);
+
+
+ /**
+ * 分页查询店员申请
+ *
+ * @param vo 店员申请对象
+ * @return 店员申请对象
+ */
+ IPage selectByPage(PlayClerkUserReviewQueryVo vo);
+
+ /**
+ * 查询店员资料审核列表
+ *
+ * @param playClerkUserReviewInfo 店员资料审核
+ * @return 店员资料审核集合
+ */
+ IPage selectPlayClerkUserReviewInfoByPage(PlayClerkUserReviewInfoEntity playClerkUserReviewInfo);
+
+ /**
+ * 新增店员资料审核
+ *
+ * @param playClerkUserReviewInfo 店员资料审核
+ * @return 结果
+ */
+ boolean create(PlayClerkUserReviewInfoEntity playClerkUserReviewInfo);
+
+ boolean update(PlayClerkUserReviewInfoEntity entity);
+
+ /**
+ * 修改店员资料审核
+ *
+ * @param vo 店员资料审核对象
+ */
+ void updateDataReviewState(PlayClerkUserReviewStateEditVo vo);
+
+ /**
+ * 批量删除店员资料审核
+ *
+ * @param ids 需要删除的店员资料审核主键集合
+ * @return 结果
+ */
+ int deletePlayClerkUserReviewInfoByIds(String[] ids);
+
+ /**
+ * 删除店员资料审核信息
+ *
+ * @param id 店员资料审核主键
+ * @return 结果
+ */
+ int deletePlayClerkUserReviewInfoById(String id);
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkWagesDetailsInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkWagesDetailsInfoService.java
new file mode 100644
index 0000000..5a3334e
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkWagesDetailsInfoService.java
@@ -0,0 +1,89 @@
+package com.starry.admin.modules.clerk.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesDetailsInfoEntity;
+
+import java.util.List;
+
+/**
+ * 店员工资明细信息Service接口
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+public interface IPlayClerkWagesDetailsInfoService extends IService {
+
+ /**
+ * 查询店员工资明细信息
+ *
+ * @param wagesId 店员工资统计ID
+ * @return 店员工资明细信息
+ */
+ List selectByWagesId(String wagesId);
+
+
+ /**
+ * 根据订单ID
+ *
+ * @param orderId 订单ID
+ * @return 工资详情
+ */
+ PlayClerkWagesDetailsInfoEntity selectByOrderId(String orderId);
+
+ /**
+ * 根据工资结算ID和店员ID查询工资详情
+ *
+ * @param wagesId 结算ID
+ * @param clerkId 店员ID
+ * @return 工资详情
+ */
+ PlayClerkWagesDetailsInfoEntity selectByClerkIdAndWagesId(String wagesId, String clerkId);
+ /**
+ * 查询店员工资明细信息
+ *
+ * @param id 店员工资明细信息主键
+ * @return 店员工资明细信息
+ */
+ PlayClerkWagesDetailsInfoEntity selectPlayClerkWagesDetailsInfoById(String id);
+
+ /**
+ * 查询店员工资明细信息列表
+ *
+ * @param playClerkWagesDetailsInfo 店员工资明细信息
+ * @return 店员工资明细信息集合
+ */
+ IPage selectPlayClerkWagesDetailsInfoByPage(PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo);
+
+ /**
+ * 新增店员工资明细信息
+ *
+ * @param playClerkWagesDetailsInfo 店员工资明细信息
+ * @return 结果
+ */
+ boolean create(PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo);
+
+ /**
+ * 修改店员工资明细信息
+ *
+ * @param playClerkWagesDetailsInfo 店员工资明细信息
+ * @return 结果
+ */
+ boolean update(PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo);
+
+ /**
+ * 批量删除店员工资明细信息
+ *
+ * @param ids 需要删除的店员工资明细信息主键集合
+ * @return 结果
+ */
+ int deletePlayClerkWagesDetailsInfoByIds(String[] ids);
+
+ /**
+ * 删除店员工资明细信息信息
+ *
+ * @param id 店员工资明细信息主键
+ * @return 结果
+ */
+ int deletePlayClerkWagesDetailsInfoById(String id);
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkWagesInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkWagesInfoService.java
new file mode 100644
index 0000000..b3c50b4
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkWagesInfoService.java
@@ -0,0 +1,111 @@
+package com.starry.admin.modules.clerk.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesInfoEntity;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkWagesInfoQueryVo;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkWagesInfoReturnVo;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * 店员工资结算信息Service接口
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+public interface IPlayClerkWagesInfoService extends IService {
+
+ /**
+ * 根据店员ID查询店员工资结算信息
+ *
+ * @param clerkId 店员ID
+ * @return 店员工资结算信息
+ */
+ PlayClerkWagesInfoEntity selectCurrentPeriodWagesByClerkId(String clerkId);
+
+ /**
+ * 根据店员ID查询店员往期工资
+ *
+ * @param clerkId 店员ID
+ * @return 店员工资结算信息
+ */
+ List selectHistoricalWagesByClerkId(String clerkId);
+
+
+ /**
+ * 获取最后一次统计
+ *
+ * @param clerkId 店员ID
+ * @return 上次结算时间
+ */
+ PlayClerkWagesInfoEntity getLastSettlement(String clerkId);
+
+ /**
+ * 获取最后一次统计
+ *
+ * @param clerkId 店员ID
+ * @return 上次结算时间
+ */
+ LocalDate getLastSettlementTime(String clerkId);
+
+
+ /**
+ * 查询店员工资结算信息
+ *
+ * @param id 店员工资结算信息主键
+ * @return 店员工资结算信息
+ */
+ PlayClerkWagesInfoEntity selectPlayClerkWagesInfoById(String id);
+
+ /**
+ * 分页查询工资统计信息
+ *
+ * @param vo 统计统计查询对象
+ * @return 查询工资统计信息
+ */
+ IPage selectHistoricalByPage(PlayClerkWagesInfoQueryVo vo);
+
+
+
+ /**
+ * 查询店员工资结算信息列表
+ *
+ * @param playClerkWagesInfo 店员工资结算信息
+ * @return 店员工资结算信息集合
+ */
+ IPage selectPlayClerkWagesInfoByPage(PlayClerkWagesInfoEntity playClerkWagesInfo);
+
+ /**
+ * 新增店员工资结算信息
+ *
+ * @param playClerkWagesInfo 店员工资结算信息
+ * @return 结果
+ */
+ boolean create(PlayClerkWagesInfoEntity playClerkWagesInfo);
+
+ /**
+ * 修改店员工资结算信息
+ *
+ * @param playClerkWagesInfo 店员工资结算信息
+ * @return 结果
+ */
+ boolean update(PlayClerkWagesInfoEntity playClerkWagesInfo);
+
+ /**
+ * 批量删除店员工资结算信息
+ *
+ * @param ids 需要删除的店员工资结算信息主键集合
+ * @return 结果
+ */
+ int deletePlayClerkWagesInfoByIds(String[] ids);
+
+ /**
+ * 删除店员工资结算信息信息
+ *
+ * @param id 店员工资结算信息主键
+ * @return 结果
+ */
+ int deletePlayClerkWagesInfoById(String id);
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/article/service/IPlayCustomArticleInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayCustomArticleInfoService.java
similarity index 79%
rename from play-admin/src/main/java/com/starry/admin/modules/article/service/IPlayCustomArticleInfoService.java
rename to play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayCustomArticleInfoService.java
index 662d3f1..3e33ea6 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/article/service/IPlayCustomArticleInfoService.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayCustomArticleInfoService.java
@@ -1,8 +1,8 @@
-package com.starry.admin.modules.article.service;
+package com.starry.admin.modules.clerk.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.starry.admin.modules.article.module.entity.PlayCustomArticleInfoEntity;
+import com.starry.admin.modules.clerk.module.entity.PlayCustomArticleInfoEntity;
/**
* 陪聊点赞动态信息Service接口
@@ -11,6 +11,17 @@ import com.starry.admin.modules.article.module.entity.PlayCustomArticleInfoEntit
* @since 2024-05-04
*/
public interface IPlayCustomArticleInfoService extends IService {
+
+
+ /**
+ * 查询顾客操作动态数据
+ * @param articleId 动态ID
+ * @param customId 客户ID
+ * @param endorseType 操作类型(1:点赞;0:收藏)
+ * @return PlayCustomArticleInfoEntity
+ */
+ PlayCustomArticleInfoEntity selectByArticleId(String articleId, String customId, String endorseType);
+
/**
* 查询陪聊点赞动态信息
*
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkArticleInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkArticleInfoServiceImpl.java
new file mode 100644
index 0000000..e039505
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkArticleInfoServiceImpl.java
@@ -0,0 +1,207 @@
+package com.starry.admin.modules.clerk.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.starry.admin.common.exception.CustomException;
+import com.starry.admin.modules.clerk.mapper.PlayClerkArticleInfoMapper;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkArticleInfoEntity;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
+import com.starry.admin.modules.clerk.module.entity.PlayCustomArticleInfoEntity;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkArticleQueryVo;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkArticleReturnVo;
+import com.starry.admin.modules.clerk.service.IPlayClerkArticleInfoService;
+import com.starry.admin.modules.weichat.entity.article.PlayClerkArticleCustomQueryVo;
+import com.starry.admin.modules.weichat.entity.article.PlayClerkArticleCustomReturnVo;
+import com.starry.common.utils.IdUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 店员动态信息Service业务层处理
+ *
+ * @author admin
+ * @since 2024-05-04
+ */
+@Service
+public class PlayClerkArticleInfoServiceImpl extends ServiceImpl implements IPlayClerkArticleInfoService {
+ @Resource
+ private PlayClerkArticleInfoMapper playClerkArticleInfoMapper;
+
+ /**
+ * 查询店员动态信息
+ *
+ * @param id 店员动态信息主键
+ * @return 店员动态信息
+ */
+ @Override
+ public PlayClerkArticleInfoEntity selectPlayClerkArticleInfoById(String id) {
+ PlayClerkArticleInfoEntity entity = this.baseMapper.selectById(id);
+ if (entity == null) {
+ throw new CustomException("动态不存在");
+ }
+ return this.baseMapper.selectById(id);
+ }
+
+ /**
+ * 查询店员动态信息列表
+ *
+ * @param vo 店员动态信息查询对象
+ * @return 店员动态信息
+ */
+ @Override
+ public IPage selectByPage(PlayClerkArticleQueryVo vo) {
+ MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>();
+ //查询主表全部字段
+ lambdaQueryWrapper.selectAll(PlayClerkArticleInfoEntity.class);
+ //陪聊用户表全部字段
+ lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname").selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar");
+ //陪聊动态表
+ lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkArticleInfoEntity::getClerkId);
+ //动态点赞表
+ lambdaQueryWrapper.selectCollection(PlayCustomArticleInfoEntity.class, PlayClerkArticleReturnVo::getArticleInfoEntities).leftJoin(PlayCustomArticleInfoEntity.class, PlayCustomArticleInfoEntity::getArticleId, PlayCustomArticleInfoEntity::getId);
+
+ if (StrUtil.isNotBlank(vo.getClerkId())) {
+ lambdaQueryWrapper.eq(PlayClerkArticleInfoEntity::getClerkId, vo.getClerkId());
+ }
+ if (StrUtil.isNotBlank(vo.getReviewState())) {
+ lambdaQueryWrapper.eq(PlayClerkArticleInfoEntity::getReviewState, vo.getReviewState());
+ }
+ if (vo.getReleaseTime() != null && vo.getReleaseTime().size() == 2) {
+ lambdaQueryWrapper.between(PlayClerkArticleInfoEntity::getReleaseTime, vo.getReleaseTime().get(0), vo.getReleaseTime().get(1));
+ }
+ IPage page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkArticleReturnVo.class, lambdaQueryWrapper);
+ for (PlayClerkArticleReturnVo record : page.getRecords()) {
+ int index = 0;
+ for (PlayCustomArticleInfoEntity articleInfoEntity : record.getArticleInfoEntities()) {
+ if (articleInfoEntity.getId() == null) {
+ continue;
+ }
+ index++;
+ }
+ record.setAgreedQuantity(index);
+ }
+ return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkArticleReturnVo.class, lambdaQueryWrapper);
+ }
+
+
+ @Override
+ public IPage customSelectByPage(PlayClerkArticleCustomQueryVo vo, String customId) {
+ MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>();
+ //查询主表全部字段
+ lambdaQueryWrapper.selectAll(PlayClerkArticleInfoEntity.class);
+ //陪聊用户表全部字段
+ lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname").selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getSex, "clerkSex");
+ //陪聊用户表全部字段
+ lambdaQueryWrapper.selectAs(PlayCustomArticleInfoEntity::getId, "id");
+ //陪聊动态表
+ lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkArticleInfoEntity::getClerkId);
+ if (StrUtil.isNotBlank(vo.getFollowState()) && "1".equals(vo.getFollowState())) {
+ //查询本人收藏的动态列表
+ lambdaQueryWrapper.innerJoin(PlayCustomArticleInfoEntity.class, PlayCustomArticleInfoEntity::getArticleId, PlayClerkArticleInfoEntity::getId);
+ lambdaQueryWrapper.eq(PlayCustomArticleInfoEntity::getCustomId, customId);
+ lambdaQueryWrapper.eq(PlayCustomArticleInfoEntity::getEndorseType, "0");
+ lambdaQueryWrapper.eq(PlayCustomArticleInfoEntity::getEndorseState, "1");
+ }
+ //查询指定店员动态
+ if (StrUtil.isNotBlank(vo.getClerkId())) {
+ lambdaQueryWrapper.eq(PlayClerkArticleInfoEntity::getClerkId, vo.getClerkId());
+ }
+ //动态点赞表
+ lambdaQueryWrapper.selectCollection(PlayCustomArticleInfoEntity.class, PlayClerkArticleReturnVo::getArticleInfoEntities).leftJoin(PlayCustomArticleInfoEntity.class, PlayCustomArticleInfoEntity::getArticleId, PlayCustomArticleInfoEntity::getId);
+ lambdaQueryWrapper.eq(PlayClerkArticleInfoEntity::getReviewState, "1");
+
+
+ IPage page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkArticleCustomReturnVo.class, lambdaQueryWrapper);
+ for (PlayClerkArticleCustomReturnVo record : page.getRecords()) {
+ int index = 0;
+ for (PlayCustomArticleInfoEntity articleInfoEntity : record.getArticleInfoEntities()) {
+ //动态操作信息为空
+ if (articleInfoEntity.getId() == null) {
+ continue;
+ }
+ //点赞或者动态处于激活状态
+ if ("1".equals(articleInfoEntity.getEndorseState())) {
+ if ("1".equals(articleInfoEntity.getEndorseType())) {
+ index++;
+ record.setGreedState("1");
+ } else {
+ record.setFollowState("1");
+ }
+ }
+ }
+ record.setAgreedQuantity(index);
+ }
+ return page;
+ }
+ /**
+ * 新增店员动态信息
+ *
+ * @param entity 店员动态信息
+ * @return 结果
+ */
+ @Override
+ public boolean create(PlayClerkArticleInfoEntity entity) {
+ if (!queryClerkUnauditedArticleInfo(entity.getClerkId()).isEmpty()) {
+ throw new CustomException("存在未审核动态,无法新增");
+ }
+
+ if (StrUtil.isBlankIfStr(entity.getId())) {
+ entity.setId(IdUtils.getUuid());
+ }
+ return save(entity);
+ }
+
+
+ /**
+ * 查询店员未审核的动态
+ *
+ * @param clerkId 店员ID
+ * @return 店员未审核的动态列表
+ */
+ public List queryClerkUnauditedArticleInfo(String clerkId) {
+ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(PlayClerkArticleInfoEntity::getClerkId, clerkId);
+ lambdaQueryWrapper.eq(PlayClerkArticleInfoEntity::getReviewState, "0");
+ return this.baseMapper.selectList(lambdaQueryWrapper);
+ }
+
+ /**
+ * 修改店员动态信息
+ *
+ * @param playClerkArticleInfo 店员动态信息
+ * @return 结果
+ */
+ @Override
+ public boolean update(PlayClerkArticleInfoEntity playClerkArticleInfo) {
+ return updateById(playClerkArticleInfo);
+ }
+
+ /**
+ * 批量删除店员动态信息
+ *
+ * @param ids 需要删除的店员动态信息主键
+ * @return 结果
+ */
+ @Override
+ public int deletePlayClerkArticleInfoByIds(String[] ids) {
+ return playClerkArticleInfoMapper.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ /**
+ * 删除店员动态信息信息
+ *
+ * @param id 店员动态信息主键
+ * @return 结果
+ */
+ @Override
+ public int deletePlayClerkArticleInfoById(String id) {
+ return playClerkArticleInfoMapper.deleteById(id);
+ }
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkClassificationInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkClassificationInfoServiceImpl.java
index bb1b993..14c7898 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkClassificationInfoServiceImpl.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkClassificationInfoServiceImpl.java
@@ -1,6 +1,6 @@
package com.starry.admin.modules.clerk.service.impl;
-import cn.hutool.core.util.IdUtil;
+import com.starry.common.utils.IdUtils;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -70,7 +70,7 @@ public class PlayClerkClassificationInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(PlayClerkCommodityEntity::getPlayUserId, userId);
+ lambdaQueryWrapper.eq(PlayClerkCommodityEntity::getClerkId, userId);
this.baseMapper.delete(lambdaQueryWrapper);
// 根据当前租户的服务项目，生成陪聊项目数据
- for (PlayCommodityInfoEntity commodityInfo : playCommodityInfoService.selectAll()) {
+ for (PlayCommodityInfoEntity commodityInfo : playCommodityInfoService.selectByType()) {
PlayClerkCommodityEntity entity = new PlayClerkCommodityEntity();
- entity.setPlayUserId(userId);
+ entity.setClerkId(userId);
entity.setCommodityId(commodityInfo.getId());
- entity.setCommodityType(commodityInfo.getItemType());
entity.setCommodityName(commodityInfo.getItemName());
- entity.setCommodityPrice(commodityInfo.getPrice());
- entity.setServiceDuration(commodityInfo.getServiceDuration());
entity.setEnablingState("1");
this.create(entity);
}
@@ -58,23 +55,25 @@ public class PlayClerkCommodityServiceImpl extends ServiceImpl getClerkCommodityList(String userId) {
- List list = this.selectCommodityTypeByUser(userId);
- return list.stream().map(PlayClerkCommodityEntity::getCommodityType).collect(Collectors.toList());
+ public List getClerkCommodityList(String userId, String enablingState) {
+ List list = this.selectCommodityTypeByUser(userId, enablingState);
+ return list.stream().map(PlayClerkCommodityEntity::getCommodityName).collect(Collectors.toList());
}
@Override
- public List selectCommodityTypeByUser(String userId) {
+ public List selectCommodityTypeByUser(String userId, String enablingState) {
LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.groupBy(PlayClerkCommodityEntity::getCommodityType);
- lambdaQueryWrapper.eq(PlayClerkCommodityEntity::getPlayUserId, userId);
+ lambdaQueryWrapper.eq(PlayClerkCommodityEntity::getClerkId, userId);
+ if (StrUtil.isNotBlank(enablingState)) {
+ lambdaQueryWrapper.eq(PlayClerkCommodityEntity::getEnablingState, enablingState);
+ }
return this.baseMapper.selectList(lambdaQueryWrapper);
}
@Override
public List selectByUser(String userId) {
LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(PlayClerkCommodityEntity::getPlayUserId, userId);
+ lambdaQueryWrapper.eq(PlayClerkCommodityEntity::getClerkId, userId);
return this.baseMapper.selectList(lambdaQueryWrapper);
}
@@ -85,12 +84,12 @@ public class PlayClerkCommodityServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(PlayClerkCommodityEntity::getPlayUserId, clerkUserId);
- lambdaQueryWrapper.eq(PlayClerkCommodityEntity::getCommodityType, type);
+ lambdaQueryWrapper.eq(PlayClerkCommodityEntity::getClerkId, clerkId);
+ lambdaQueryWrapper.eq(PlayClerkCommodityEntity::getCommodityName, commodityName);
this.baseMapper.update(entity, lambdaQueryWrapper);
}
@@ -130,7 +129,7 @@ public class PlayClerkCommodityServiceImpl extends ServiceImpl implements IPlayClerkDataReviewInfoService {
@Resource
private PlayClerkDataReviewInfoMapper playClerkDataReviewInfoMapper;
+ @Resource
+ private IPlayClerkUserInfoService playClerkUserInfoService;
+
+
/**
* 查询店员资料审核
- *
* @param id 店员资料审核主键
* @return 店员资料审核
*/
@Override
public PlayClerkDataReviewInfoEntity selectPlayClerkDataReviewInfoById(String id) {
- return this.baseMapper.selectById(id);
+ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(PlayClerkDataReviewInfoEntity::getId, id);
+ PlayClerkDataReviewInfoEntity entity = this.baseMapper.selectOne(queryWrapper);
+ if (entity == null) {
+ throw new CustomException("对象不存在");
+ }
+ return entity;
+ }
+
+ @Override
+ public List queryByClerkId(String clerkId) {
+ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(PlayClerkDataReviewInfoEntity::getClerkId, clerkId);
+ return this.baseMapper.selectList(queryWrapper);
}
- /**
- * 查询店员资料审核列表
- *
- * @param entity 店员资料审核
- * @return 店员资料审核
- */
@Override
- public List queryList(PlayClerkDataReviewInfoEntity entity) {
- LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
- if (StrUtil.isNotBlank(entity.getId())) {
- lambdaQueryWrapper.eq(PlayClerkDataReviewInfoEntity::getId, entity.getId());
- }
- if (StrUtil.isNotBlank(entity.getPlayUserId())) {
- lambdaQueryWrapper.eq(PlayClerkDataReviewInfoEntity::getPlayUserId, entity.getPlayUserId());
- }
- if (StrUtil.isNotBlank(entity.getState())) {
- lambdaQueryWrapper.eq(PlayClerkDataReviewInfoEntity::getState, entity.getState());
- }
- if (StrUtil.isNotBlank(entity.getDataType())) {
- lambdaQueryWrapper.eq(PlayClerkDataReviewInfoEntity::getDataType, entity.getDataType());
- }
- return this.baseMapper.selectList(lambdaQueryWrapper);
+ public PlayClerkDataReviewInfoEntity queryByClerkId(String clerkId, String dataType, String reviewState) {
+ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(PlayClerkDataReviewInfoEntity::getClerkId, clerkId);
+ queryWrapper.eq(PlayClerkDataReviewInfoEntity::getReviewState, reviewState);
+ queryWrapper.eq(PlayClerkDataReviewInfoEntity::getDataType, dataType);
+ return this.baseMapper.selectOne(queryWrapper);
}
/**
* 查询店员资料审核列表
- *
- * @param vo 店员资料审核分页对象
+ * @param vo 店员资料审核
* @return 店员资料审核
*/
@Override
- public IPage selectPlayClerkDataReviewInfoByPage(PlayClerkDataReviewInfoQueryVo vo) {
- LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
- if (StrUtil.isNotBlank(vo.getState())) {
- lambdaQueryWrapper.eq(PlayClerkDataReviewInfoEntity::getState, vo.getState());
+ public IPage selectByPage(PlayClerkDataReviewQueryVo vo) {
+ MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>();
+ lambdaQueryWrapper.selectAll(PlayClerkDataReviewInfoEntity.class);
+ //店员表
+ lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname");
+ lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkUserReviewInfoEntity::getClerkId);
+ if (StrUtil.isNotBlank(vo.getClerkId())) {
+ lambdaQueryWrapper.eq(PlayClerkDataReviewInfoEntity::getClerkId, vo.getClerkId());
}
- Page page = new Page<>(vo.getPageNum(), vo.getPageSize());
- return this.baseMapper.selectPage(page, lambdaQueryWrapper);
+ if (StrUtil.isNotBlank(vo.getDataType())) {
+ lambdaQueryWrapper.eq(PlayClerkDataReviewInfoEntity::getDataType, vo.getDataType());
+ }
+ if (StrUtil.isNotBlank(vo.getReviewState())) {
+ lambdaQueryWrapper.like(PlayClerkDataReviewInfoEntity::getReviewState, vo.getReviewState());
+ }
+ if (vo.getAddTime() != null && vo.getAddTime().size() == 2) {
+ lambdaQueryWrapper.between(PlayClerkDataReviewInfoEntity::getAddTime, vo.getAddTime().get(0), vo.getAddTime().get(1));
+ }
+ return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkDataReviewReturnVo.class, lambdaQueryWrapper);
}
/**
* 新增店员资料审核
- *
* @param playClerkDataReviewInfo 店员资料审核
* @return 结果
*/
@Override
public boolean create(PlayClerkDataReviewInfoEntity playClerkDataReviewInfo) {
if (StrUtil.isBlankIfStr(playClerkDataReviewInfo.getId())) {
- playClerkDataReviewInfo.setId(IdUtil.fastSimpleUUID());
+ playClerkDataReviewInfo.setId(IdUtils.getUuid());
+ }
+ if (StrUtil.isBlankIfStr(playClerkDataReviewInfo.getAddTime())) {
+ playClerkDataReviewInfo.setAddTime(LocalDateTime.now());
}
return save(playClerkDataReviewInfo);
}
+ @Override
+ public void updateDataReviewState(PlayClerkDataReviewStateEditVo vo) {
+ PlayClerkDataReviewInfoEntity entity = this.selectPlayClerkDataReviewInfoById(vo.getId());
+ BeanUtils.copyProperties(vo, entity);
+ this.update(entity);
+ if ("1".equals(vo.getReviewState())) {
+ PlayClerkUserInfoEntity userInfo = new PlayClerkUserInfoEntity();
+ userInfo.setId(entity.getId());
+ if ("1".equals(entity.getDataType())) {
+ userInfo.setAvatar(entity.getDataContent().get(0));
+ }
+ if ("2".equals(entity.getDataType())) {
+ userInfo.setAlbum(entity.getDataContent());
+ }
+ if ("3".equals(entity.getDataType())) {
+ userInfo.setAudio(entity.getDataContent().get(0));
+ }
+ playClerkUserInfoService.update(userInfo);
+ }
+ }
+
/**
* 修改店员资料审核
- *
* @param playClerkDataReviewInfo 店员资料审核
* @return 结果
*/
@@ -106,7 +149,6 @@ public class PlayClerkDataReviewInfoServiceImpl extends ServiceImpl implements IPlayClerkGroupInfoService {
+ @Resource
+ private PlayClerkGroupInfoMapper playClerkGroupInfoMapper;
+
+ /**
+ * 查询店员分组信息
+ *
+ * @param id 店员分组信息主键
+ * @return 店员分组信息
+ */
+ @Override
+ public PlayClerkGroupInfoEntity selectPlayClerkGroupInfoById(String id) {
+ return this.baseMapper.selectById(id);
+ }
+
+ /**
+ * 查询店员分组信息列表
+ *
+ * @param playClerkGroupInfo 店员分组信息
+ * @return 店员分组信息
+ */
+ @Override
+ public IPage selectPlayClerkGroupInfoByPage(PlayClerkGroupInfoEntity playClerkGroupInfo) {
+ Page page = new Page<>(1, 10);
+ return this.baseMapper.selectPage(page, new LambdaQueryWrapper());
+ }
+
+ /**
+ * 新增店员分组信息
+ *
+ * @param playClerkGroupInfo 店员分组信息
+ * @return 结果
+ */
+ @Override
+ public boolean create(PlayClerkGroupInfoEntity playClerkGroupInfo) {
+ if (StrUtil.isBlankIfStr(playClerkGroupInfo.getId())) {
+ playClerkGroupInfo.setId(IdUtils.getUuid());
+ }
+ return save(playClerkGroupInfo);
+ }
+
+ /**
+ * 修改店员分组信息
+ *
+ * @param playClerkGroupInfo 店员分组信息
+ * @return 结果
+ */
+ @Override
+ public boolean update(PlayClerkGroupInfoEntity playClerkGroupInfo) {
+ return updateById(playClerkGroupInfo);
+ }
+
+ /**
+ * 批量删除店员分组信息
+ *
+ * @param ids 需要删除的店员分组信息主键
+ * @return 结果
+ */
+ @Override
+ public int deletePlayClerkGroupInfoByIds(String[] ids) {
+ return playClerkGroupInfoMapper.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ /**
+ * 删除店员分组信息信息
+ *
+ * @param id 店员分组信息主键
+ * @return 结果
+ */
+ @Override
+ public int deletePlayClerkGroupInfoById(String id) {
+ return playClerkGroupInfoMapper.deleteById(id);
+ }
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkGroupUserInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkGroupUserInfoServiceImpl.java
new file mode 100644
index 0000000..3cc3f0d
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkGroupUserInfoServiceImpl.java
@@ -0,0 +1,97 @@
+package com.starry.admin.modules.clerk.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.starry.admin.modules.clerk.mapper.PlayClerkGroupUserInfoMapper;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkGroupUserInfoEntity;
+import com.starry.admin.modules.clerk.service.IPlayClerkGroupUserInfoService;
+import com.starry.common.utils.IdUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+
+/**
+ * 店员和分组关系Service业务层处理
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+@Service
+public class PlayClerkGroupUserInfoServiceImpl extends ServiceImpl implements IPlayClerkGroupUserInfoService {
+ @Resource
+ private PlayClerkGroupUserInfoMapper playClerkGroupUserInfoMapper;
+
+ /**
+ * 查询店员和分组关系
+ *
+ * @param id 店员和分组关系主键
+ * @return 店员和分组关系
+ */
+ @Override
+ public PlayClerkGroupUserInfoEntity selectPlayClerkGroupUserInfoById(String id) {
+ return this.baseMapper.selectById(id);
+ }
+
+ /**
+ * 查询店员和分组关系列表
+ *
+ * @param playClerkGroupUserInfo 店员和分组关系
+ * @return 店员和分组关系
+ */
+ @Override
+ public IPage selectPlayClerkGroupUserInfoByPage(PlayClerkGroupUserInfoEntity playClerkGroupUserInfo) {
+ Page page = new Page<>(1, 10);
+ return this.baseMapper.selectPage(page, new LambdaQueryWrapper());
+ }
+
+ /**
+ * 新增店员和分组关系
+ *
+ * @param playClerkGroupUserInfo 店员和分组关系
+ * @return 结果
+ */
+ @Override
+ public boolean create(PlayClerkGroupUserInfoEntity playClerkGroupUserInfo) {
+ if (StrUtil.isBlankIfStr(playClerkGroupUserInfo.getId())) {
+ playClerkGroupUserInfo.setId(IdUtils.getUuid());
+ }
+ return save(playClerkGroupUserInfo);
+ }
+
+ /**
+ * 修改店员和分组关系
+ *
+ * @param playClerkGroupUserInfo 店员和分组关系
+ * @return 结果
+ */
+ @Override
+ public boolean update(PlayClerkGroupUserInfoEntity playClerkGroupUserInfo) {
+ return updateById(playClerkGroupUserInfo);
+ }
+
+ /**
+ * 批量删除店员和分组关系
+ *
+ * @param ids 需要删除的店员和分组关系主键
+ * @return 结果
+ */
+ @Override
+ public int deletePlayClerkGroupUserInfoByIds(String[] ids) {
+ return playClerkGroupUserInfoMapper.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ /**
+ * 删除店员和分组关系信息
+ *
+ * @param id 店员和分组关系主键
+ * @return 结果
+ */
+ @Override
+ public int deletePlayClerkGroupUserInfoById(String id) {
+ return playClerkGroupUserInfoMapper.deleteById(id);
+ }
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkLevelInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkLevelInfoServiceImpl.java
index dc07271..a45e4b5 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkLevelInfoServiceImpl.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkLevelInfoServiceImpl.java
@@ -1,6 +1,5 @@
package com.starry.admin.modules.clerk.service.impl;
-import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,10 +10,12 @@ import com.starry.admin.common.exception.CustomException;
import com.starry.admin.modules.clerk.mapper.PlayClerkLevelInfoMapper;
import com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity;
import com.starry.admin.modules.clerk.service.IPlayClerkLevelInfoService;
+import com.starry.common.utils.IdUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
/**
@@ -77,8 +78,9 @@ public class PlayClerkLevelInfoServiceImpl extends ServiceImpl implements IPlayClerkRankingInfoService {
+ @Resource
+ private PlayClerkRankingInfoMapper playClerkRankingInfoMapper;
+
+ /**
+ * 查询店员排行
+ *
+ * @param id 店员排行主键
+ * @return 店员排行
+ */
+ @Override
+ public PlayClerkRankingInfoEntity selectPlayClerkRankingInfoById(String id) {
+ return this.baseMapper.selectById(id);
+ }
+
+
+ @Override
+ public List selectHistoryRanking(String clerkId) {
+ long serialNumber = selectSerialNumber();
+ MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>();
+ // 根据排行序号和用户ID查询
+ lambdaQueryWrapper.ne(PlayClerkRankingInfoEntity::getSerialNumber, serialNumber);
+ lambdaQueryWrapper.eq(PlayClerkRankingInfoEntity::getClerkId, clerkId);
+ return this.baseMapper.selectJoinList(PlayOrderHistoryRankingReturnVo.class, lambdaQueryWrapper);
+ }
+
+ @Override
+ public PlayOrderRankingReturnVo selectCurrentRanking(String clerkId) {
+ long serialNumber = selectSerialNumber();
+ MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>();
+ lambdaQueryWrapper.selectAll(PlayClerkRankingInfoEntity.class);
+ //店员信息
+ lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname").selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getSex, "clerkSex");
+ lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkRankingInfoEntity::getClerkId);
+ //店员等级
+ lambdaQueryWrapper.selectAs(PlayClerkLevelInfoEntity::getId, "levelId").selectAs(PlayClerkLevelInfoEntity::getName, "levelName");
+ lambdaQueryWrapper.leftJoin(PlayClerkLevelInfoEntity.class, PlayClerkLevelInfoEntity::getId, PlayClerkUserInfoEntity::getLevelId);
+ // 根据排行序号和用户ID查询
+ lambdaQueryWrapper.eq(PlayClerkRankingInfoEntity::getSerialNumber, serialNumber);
+ lambdaQueryWrapper.eq(PlayClerkRankingInfoEntity::getClerkId, clerkId);
+ PlayOrderRankingReturnVo returnVo = this.baseMapper.selectJoinOne(PlayOrderRankingReturnVo.class, lambdaQueryWrapper);
+ if (returnVo == null) {
+ returnVo = new PlayOrderRankingReturnVo();
+ }
+ returnVo.setRankings(this.selectBySerialNumber(serialNumber));
+ return returnVo;
+ }
+
+
+ @Override
+ public List selectMaxSerialNumber() {
+ MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>();
+ lambdaQueryWrapper.eq(PlayClerkRankingInfoEntity::getSerialNumber, this.selectSerialNumber());
+ return this.baseMapper.selectList(lambdaQueryWrapper);
+ }
+
+ /**
+ * 获取当前期排名序号
+ *
+ * @return PlayClerkRankingInfoEntity
+ */
+ @Override
+ public Integer selectSerialNumber() {
+ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.orderByDesc(PlayClerkRankingInfoEntity::getSerialNumber).last("limit 1");
+ PlayClerkRankingInfoEntity entity = this.baseMapper.selectOne(lambdaQueryWrapper);
+ if (entity == null || entity.getSerialNumber() == null) {
+ return 0;
+ }
+ return entity.getSerialNumber();
+ }
+
+
+ List selectBySerialNumber(long serialNumber) {
+ MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>();
+ lambdaQueryWrapper.eq(PlayClerkRankingInfoEntity::getSerialNumber, serialNumber);
+ lambdaQueryWrapper.orderByDesc(PlayClerkRankingInfoEntity::getRankingIndex);
+ lambdaQueryWrapper.selectAll(PlayClerkRankingInfoEntity.class);
+ //店员信息
+ lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname").selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getSex, "clerkSex");
+ lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkRankingInfoEntity::getClerkId);
+ //店员等级
+ lambdaQueryWrapper.selectAs(PlayClerkLevelInfoEntity::getId, "levelId").selectAs(PlayClerkLevelInfoEntity::getName, "levelName");
+ lambdaQueryWrapper.leftJoin(PlayClerkLevelInfoEntity.class, PlayClerkLevelInfoEntity::getId, PlayClerkUserInfoEntity::getLevelId);
+ return this.baseMapper.selectJoinList(PlayOrderRankingListVo.class, lambdaQueryWrapper);
+ }
+
+ @Override
+ public PlayClerkRankingInfoEntity selectByTime(String clerkId, LocalDate startTime, LocalDate endTime) {
+ MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>();
+ lambdaQueryWrapper.eq(PlayClerkRankingInfoEntity::getStartCountDate, startTime);
+ lambdaQueryWrapper.eq(PlayClerkRankingInfoEntity::getEndCountDate, endTime);
+ lambdaQueryWrapper.eq(PlayClerkRankingInfoEntity::getClerkId, clerkId);
+ return this.baseMapper.selectOne(lambdaQueryWrapper);
+ }
+
+ /**
+ * 查询店员排行列表
+ *
+ * @param playClerkRankingInfo 店员排行
+ * @return 店员排行
+ */
+ @Override
+ public IPage selectPlayClerkRankingInfoByPage(PlayClerkRankingInfoEntity playClerkRankingInfo) {
+ Page page = new Page<>(1, 10);
+ return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>());
+ }
+
+ /**
+ * 新增店员排行
+ *
+ * @param playClerkRankingInfo 店员排行
+ * @return 结果
+ */
+ @Override
+ public boolean create(PlayClerkRankingInfoEntity playClerkRankingInfo) {
+ if (StrUtil.isBlankIfStr(playClerkRankingInfo.getId())) {
+ playClerkRankingInfo.setId(IdUtils.getUuid());
+ }
+ return save(playClerkRankingInfo);
+ }
+
+ /**
+ * 修改店员排行
+ *
+ * @param playClerkRankingInfo 店员排行
+ * @return 结果
+ */
+ @Override
+ public boolean update(PlayClerkRankingInfoEntity playClerkRankingInfo) {
+ return updateById(playClerkRankingInfo);
+ }
+
+ /**
+ * 批量删除店员排行
+ *
+ * @param ids 需要删除的店员排行主键
+ * @return 结果
+ */
+ @Override
+ public int deletePlayClerkRankingInfoByIds(String[] ids) {
+ return playClerkRankingInfoMapper.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ /**
+ * 删除店员排行信息
+ *
+ * @param id 店员排行主键
+ * @return 结果
+ */
+ @Override
+ public int deletePlayClerkRankingInfoById(String id) {
+ return playClerkRankingInfoMapper.deleteById(id);
+ }
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkTypeInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkTypeInfoServiceImpl.java
new file mode 100644
index 0000000..f3a802e
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkTypeInfoServiceImpl.java
@@ -0,0 +1,104 @@
+package com.starry.admin.modules.clerk.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.starry.admin.modules.clerk.mapper.PlayClerkTypeInfoMapper;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkTypeInfoEntity;
+import com.starry.admin.modules.clerk.service.IPlayClerkTypeInfoService;
+import com.starry.common.utils.IdUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 店员分类信息Service业务层处理
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+@Service
+public class PlayClerkTypeInfoServiceImpl extends ServiceImpl implements IPlayClerkTypeInfoService {
+ @Resource
+ private PlayClerkTypeInfoMapper playClerkTypeInfoMapper;
+
+ /**
+ * 查询店员分类信息
+ *
+ * @param id 店员分类信息主键
+ * @return 店员分类信息
+ */
+ @Override
+ public PlayClerkTypeInfoEntity selectPlayClerkTypeInfoById(String id) {
+ return this.baseMapper.selectById(id);
+ }
+
+
+ @Override
+ public List selectByAll() {
+ return this.baseMapper.selectList(new LambdaQueryWrapper<>());
+ }
+
+ /**
+ * 查询店员分类信息列表
+ *
+ * @param playClerkTypeInfo 店员分类信息
+ * @return 店员分类信息
+ */
+ @Override
+ public IPage selectPlayClerkTypeInfoByPage(PlayClerkTypeInfoEntity playClerkTypeInfo) {
+ Page page = new Page<>(1, 10);
+ return this.baseMapper.selectPage(page, new LambdaQueryWrapper());
+ }
+
+ /**
+ * 新增店员分类信息
+ *
+ * @param playClerkTypeInfo 店员分类信息
+ * @return 结果
+ */
+ @Override
+ public boolean create(PlayClerkTypeInfoEntity playClerkTypeInfo) {
+ if (StrUtil.isBlankIfStr(playClerkTypeInfo.getId())) {
+ playClerkTypeInfo.setId(IdUtils.getUuid());
+ }
+ return save(playClerkTypeInfo);
+ }
+
+ /**
+ * 修改店员分类信息
+ *
+ * @param playClerkTypeInfo 店员分类信息
+ * @return 结果
+ */
+ @Override
+ public boolean update(PlayClerkTypeInfoEntity playClerkTypeInfo) {
+ return updateById(playClerkTypeInfo);
+ }
+
+ /**
+ * 批量删除店员分类信息
+ *
+ * @param ids 需要删除的店员分类信息主键
+ * @return 结果
+ */
+ @Override
+ public int deletePlayClerkTypeInfoByIds(String[] ids) {
+ return playClerkTypeInfoMapper.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ /**
+ * 删除店员分类信息信息
+ *
+ * @param id 店员分类信息主键
+ * @return 结果
+ */
+ @Override
+ public int deletePlayClerkTypeInfoById(String id) {
+ return playClerkTypeInfoMapper.deleteById(id);
+ }
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkTypeUserInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkTypeUserInfoServiceImpl.java
new file mode 100644
index 0000000..6d85819
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkTypeUserInfoServiceImpl.java
@@ -0,0 +1,97 @@
+package com.starry.admin.modules.clerk.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.starry.admin.modules.clerk.mapper.PlayClerkTypeUserInfoMapper;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkTypeUserInfoEntity;
+import com.starry.admin.modules.clerk.service.IPlayClerkTypeUserInfoService;
+import com.starry.common.utils.IdUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+
+/**
+ * 店员和分类关系Service业务层处理
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+@Service
+public class PlayClerkTypeUserInfoServiceImpl extends ServiceImpl implements IPlayClerkTypeUserInfoService {
+ @Resource
+ private PlayClerkTypeUserInfoMapper playClerkTypeUserInfoMapper;
+
+ /**
+ * 查询店员和分类关系
+ *
+ * @param id 店员和分类关系主键
+ * @return 店员和分类关系
+ */
+ @Override
+ public PlayClerkTypeUserInfoEntity selectPlayClerkTypeUserInfoById(String id) {
+ return this.baseMapper.selectById(id);
+ }
+
+ /**
+ * 查询店员和分类关系列表
+ *
+ * @param playClerkTypeUserInfo 店员和分类关系
+ * @return 店员和分类关系
+ */
+ @Override
+ public IPage selectPlayClerkTypeUserInfoByPage(PlayClerkTypeUserInfoEntity playClerkTypeUserInfo) {
+ Page page = new Page<>(1, 10);
+ return this.baseMapper.selectPage(page, new LambdaQueryWrapper());
+ }
+
+ /**
+ * 新增店员和分类关系
+ *
+ * @param playClerkTypeUserInfo 店员和分类关系
+ * @return 结果
+ */
+ @Override
+ public boolean create(PlayClerkTypeUserInfoEntity playClerkTypeUserInfo) {
+ if (StrUtil.isBlankIfStr(playClerkTypeUserInfo.getId())) {
+ playClerkTypeUserInfo.setId(IdUtils.getUuid());
+ }
+ return save(playClerkTypeUserInfo);
+ }
+
+ /**
+ * 修改店员和分类关系
+ *
+ * @param playClerkTypeUserInfo 店员和分类关系
+ * @return 结果
+ */
+ @Override
+ public boolean update(PlayClerkTypeUserInfoEntity playClerkTypeUserInfo) {
+ return updateById(playClerkTypeUserInfo);
+ }
+
+ /**
+ * 批量删除店员和分类关系
+ *
+ * @param ids 需要删除的店员和分类关系主键
+ * @return 结果
+ */
+ @Override
+ public int deletePlayClerkTypeUserInfoByIds(String[] ids) {
+ return playClerkTypeUserInfoMapper.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ /**
+ * 删除店员和分类关系信息
+ *
+ * @param id 店员和分类关系主键
+ * @return 结果
+ */
+ @Override
+ public int deletePlayClerkTypeUserInfoById(String id) {
+ return playClerkTypeUserInfoMapper.deleteById(id);
+ }
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java
index d04f17b..5b03706 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java
@@ -1,6 +1,5 @@
package com.starry.admin.modules.clerk.service.impl;
-import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,22 +7,29 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.starry.admin.common.exception.CustomException;
+import com.starry.admin.modules.balance.service.IPlayBalanceDetailsInfoService;
import com.starry.admin.modules.clerk.mapper.PlayClerkUserInfoMapper;
import com.starry.admin.modules.clerk.module.entity.*;
import com.starry.admin.modules.clerk.module.vo.PlayClerkCommodityQueryVo;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkUnsettledWagesInfoQueryVo;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkUnsettledWagesInfoReturnVo;
import com.starry.admin.modules.clerk.service.IPlayClerkCommodityService;
import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
+import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity;
+import com.starry.admin.modules.custom.module.vo.PlayCustomRankingReturnVo;
import com.starry.admin.modules.follow.module.entity.PlayCustomFollowInfoEntity;
import com.starry.admin.modules.follow.service.IPlayCustomFollowInfoService;
+import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
import com.starry.admin.modules.weichat.entity.PlayClerkUserLoginResponseVo;
+import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoQueryVo;
+import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoResultVo;
import com.starry.common.utils.ConvertUtil;
+import com.starry.common.utils.IdUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
@@ -39,8 +45,10 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl lambdaWrapper = new MPJLambdaWrapper<>();
+ lambdaWrapper.selectAll(PlayClerkLevelInfoEntity.class);
+ lambdaWrapper.selectAs(PlayClerkUserInfoEntity::getLevelId,"levelId");
+ lambdaWrapper.leftJoin(PlayClerkLevelInfoEntity.class,PlayClerkLevelInfoEntity::getId,PlayClerkUserInfoEntity::getLevelId);
+ lambdaWrapper.eq(PlayClerkUserInfoEntity::getId,clerkId);
+ return this.baseMapper.selectJoinOne(PlayClerkLevelInfoEntity.class,lambdaWrapper);
+
+ }
@Override
public PlayClerkUserInfoEntity queryByUserId(String id) {
@@ -81,13 +103,9 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl list = playClerkDataReviewInfoService.queryByClerkId(userInfo.getId());
// 判断头像、音频、相册是否可以编辑，如果存在未审核的数据，则不允许编辑
- PlayClerkDataReviewInfoEntity dataReviewInfo = new PlayClerkDataReviewInfoEntity();
- dataReviewInfo.setPlayUserId(userInfo.getId());
- dataReviewInfo.setState("0");
- List list = dataReviewInfoService.queryList(dataReviewInfo);
- Map map = list.stream().collect(Collectors.toMap(PlayClerkDataReviewInfoEntity::getDataType, account -> account));
+ Map map = list.stream().collect(Collectors.toMap(PlayClerkDataReviewInfoEntity::getDataType, account -> account, (entity1, entity2) -> entity1));
if (map.containsKey("1")) {
result.setAvatarAllowEdit(false);
}
@@ -97,10 +115,19 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl clerkCommodityEntities = playClerkCommodityService.selectCommodityTypeByUser(userInfo.getId(), "");
+ List playClerkCommodityQueryVos = new ArrayList<>();
+ for (PlayClerkCommodityEntity clerkCommodityEntity : clerkCommodityEntities) {
+ playClerkCommodityQueryVos.add(new PlayClerkCommodityQueryVo(clerkCommodityEntity.getCommodityName(), clerkCommodityEntity.getEnablingState()));
+ }
+ result.setCommodity(playClerkCommodityQueryVos);
result.setArea(userInfo.getProvince() + "-" + userInfo.getCity());
return result;
}
@@ -117,12 +144,17 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl selectPlayClerkUserInfoByPage(PlayClerkUserInfoQueryVo vo) {
- Page page = new Page<>(vo.getPageNum(), vo.getPageSize());
-
- MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper()
- // 查询主表全部字段
- .selectAll(PlayClerkUserInfoEntity.class).selectAs(PlayClerkUserInfoEntity::getCity, "address")
- // 等级表
- .selectAs(PlayClerkLevelInfoEntity::getName, "levelName").leftJoin(PlayClerkLevelInfoEntity.class, PlayClerkLevelInfoEntity::getId, PlayClerkUserInfoEntity::getLevelId);
+ public IPage selectPlayClerkUserInfoByPage(PlayClerkUserInfoQueryVo vo) {
+ Page page = new Page<>(vo.getPageNum(), vo.getPageSize());
+ MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>();
+ // 查询主表全部字段
+ lambdaQueryWrapper.selectAll(PlayClerkUserInfoEntity.class).selectAs(PlayClerkUserInfoEntity::getCity, "address");
+ // 等级表
+ lambdaQueryWrapper.selectAs(PlayClerkLevelInfoEntity::getName, "levelName");
+ lambdaQueryWrapper.leftJoin(PlayClerkLevelInfoEntity.class, PlayClerkLevelInfoEntity::getId, PlayClerkUserInfoEntity::getLevelId);
// 服务项目表
if (StrUtil.isNotBlank(vo.getNickname())) {
@@ -163,28 +195,141 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl listAll() {
+ return this.baseMapper.selectList(new LambdaQueryWrapper<>());
+
}
@Override
- public IPage selectByPage(PlayClerkUserInfoQueryVo vo, String customUserId) {
- IPage voPage = this.selectPlayClerkUserInfoByPage(vo);
- // 如果当前顾客已登录，查询是否关注
- if (StrUtil.isNotBlank(customUserId)) {
- LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(PlayCustomFollowInfoEntity::getCustomUserId, customUserId);
- List customFollowInfoEntities = customFollowInfoService.list(lambdaQueryWrapper);
- Map customFollows = customFollowInfoEntities.stream().collect(Collectors.toMap(PlayCustomFollowInfoEntity::getClerkUserId, PlayCustomFollowInfoEntity::getFollowState));
- for (PlayClerkUserListResultVo record : voPage.getRecords()) {
- if (customFollows.containsKey(record.getId())) {
- record.setFollowState(customFollows.get(record.getId()));
- record.setCommodity(playClerkCommodityService.getClerkCommodityList(record.getId()));
- record.setAddress(record.getCity());
- }
- }
+ public IPage listUnsettledWagesByPage(PlayClerkUnsettledWagesInfoQueryVo vo) {
+ MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>();
+ //查询所有店员
+ lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname").selectAs(PlayClerkUserInfoEntity::getId, "clerkId");
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getClerkState, "1");
+ if (StrUtil.isNotBlank(vo.getClerkId())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getId, vo.getClerkId());
+ }
+ if (StrUtil.isNotBlank(vo.getListingState())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getListingState, vo.getListingState());
+ }
+ //查询店员订单信息
+ lambdaQueryWrapper.selectCollection(PlayOrderInfoEntity.class, PlayClerkUnsettledWagesInfoReturnVo::getOrderInfoEntities);
+ lambdaQueryWrapper.leftJoin(PlayOrderInfoEntity.class, PlayOrderInfoEntity::getAcceptBy, PlayClerkUserInfoEntity::getId);
+ lambdaQueryWrapper.eq(PlayOrderInfoEntity::getOrderSettlementState, "0");
+ return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkUnsettledWagesInfoReturnVo.class, lambdaQueryWrapper);
+ }
+ @Override
+ public IPage selectByPage(PlayClerkUserQueryVo vo) {
+ MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>();
+ //主表（店员表全部字段）
+ lambdaQueryWrapper.selectAll(PlayClerkUserInfoEntity.class);
+ //订单表
+ lambdaQueryWrapper.selectCollection(PlayOrderInfoEntity.class, PlayCustomRankingReturnVo::getOrderInfos);
+ lambdaQueryWrapper.leftJoin(PlayOrderInfoEntity.class, PlayOrderInfoEntity::getAcceptBy, PlayCustomUserInfoEntity::getId);
+ if(StrUtil.isNotBlank(vo.getId())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getId, vo.getId());
+ }
+ if(StrUtil.isNotBlank(vo.getNickname())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getNickname, vo.getNickname());
+ }
+ if(StrUtil.isNotBlank(vo.getNickname())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getNickname, vo.getNickname());
+ }
+ if (StrUtil.isNotBlank(vo.getPhone())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getPhone, vo.getPhone());
+ }
+ if (StrUtil.isNotBlank(vo.getGroupId())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getGroupId, vo.getGroupId());
+ }
+ if (StrUtil.isNotBlank(vo.getSex())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getSex, vo.getSex());
+ }
+ if (StrUtil.isNotBlank(vo.getFixingLevel())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getFixingLevel, vo.getFixingLevel());
+ }
+ if (StrUtil.isNotBlank(vo.getLevelId())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getLevelId, vo.getLevelId());
+ }
+ if (StrUtil.isNotBlank(vo.getProvince())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getProvince, vo.getProvince());
+ }
+ if (StrUtil.isNotBlank(vo.getCity())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getCity, vo.getCity());
+ }
+ if (StrUtil.isNotBlank(vo.getOnboardingState())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getOnboardingState, vo.getOnboardingState());
+ }
+ if (StrUtil.isNotBlank(vo.getRecommendationState())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getRecommendationState, vo.getRecommendationState());
+ }
+ if (StrUtil.isNotBlank(vo.getPinToTopState())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getPinToTopState, vo.getPinToTopState());
+ }
+ if (StrUtil.isNotBlank(vo.getOnlineState())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getOnlineState, vo.getOnlineState());
+ }
+ if (StrUtil.isNotBlank(vo.getDisplayState())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getDisplayState, vo.getDisplayState());
+ }
+ if (StrUtil.isNotBlank(vo.getRealState())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getRealState, vo.getRealState());
+ }
+ if (StrUtil.isNotBlank(vo.getMandatoryRealState())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getMandatoryRealState, vo.getMandatoryRealState());
+ }
+ if (StrUtil.isNotBlank(vo.getClerkState())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getClerkState, vo.getClerkState());
+ }
+ if (StrUtil.isNotBlank(vo.getCode())) {
+ lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getCode, vo.getCode());
}
+ IPage page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkUserReturnVo.class, lambdaQueryWrapper);
+
+ for (PlayClerkUserReturnVo record : page.getRecords()) {
+ BigDecimal orderTotalAmount = new BigDecimal("0");
+ int orderContinueNumber = 0;
+ int orderNumber = 0;
+ for (PlayOrderInfoEntity orderInfo : record.getOrderInfos()) {
+ if (orderInfo.getId() == null) {
+ continue;
+ }
+ if ("0".equals(orderInfo.getFirstOrder())) {
+ orderContinueNumber++;
+ }
+ orderNumber++;
+ if (!"4".equals(orderInfo.getOrderStatus())) {
+ orderTotalAmount = orderTotalAmount.add(orderInfo.getFinalAmount());
+ }
+ }
+ record.setOrderTotalAmount(orderTotalAmount);
+ record.setOrderNumber(String.valueOf(orderNumber));
+ record.setOrderContinueNumber(String.valueOf(orderContinueNumber));
+ }
+
+ return page;
+ }
+
+ @Override
+ public IPage selectByPage(PlayClerkUserInfoQueryVo vo, String customUserId) {
+ IPage voPage = this.selectPlayClerkUserInfoByPage(vo);
+ Map customFollows = new HashMap<>(16);
+ // 如果当前顾客已登录，查询用户关注状态
+ if (StrUtil.isNotBlank(customUserId)) {
+ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(PlayCustomFollowInfoEntity::getCustomId, customUserId);
+ List customFollowInfoEntities = customFollowInfoService.list(lambdaQueryWrapper);
+ customFollows = customFollowInfoEntities.stream().collect(Collectors.toMap(PlayCustomFollowInfoEntity::getClerkId, PlayCustomFollowInfoEntity::getFollowState));
+ }
+ for (PlayClerkUserInfoResultVo record : voPage.getRecords()) {
+ record.setFollowState(customFollows.containsKey(record.getId()) ? "1" : "0");
+ record.setCommodity(playClerkCommodityService.getClerkCommodityList(record.getId(), "1"));
+ }
return voPage;
}
@@ -197,7 +342,7 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl implements IPlayClerkUserReviewInfoService {
+ @Resource
+ private PlayClerkUserReviewInfoMapper playClerkUserReviewInfoMapper;
+
+ @Resource
+ private IPlayClerkUserInfoService playClerkUserInfoService;
+
+ @Resource
+ private IPlayClerkCommodityService clerkCommodityService;
+
+
+ @Override
+ public PlayClerkUserReviewInfoEntity queryByClerkId(String clerkId,String reviewState) {
+ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(PlayClerkUserReviewInfoEntity::getClerkId, clerkId);
+ queryWrapper.eq(PlayClerkUserReviewInfoEntity::getReviewState,reviewState);
+ return this.baseMapper.selectOne(queryWrapper);
+ }
+
+ /**
+ * 查询店员资料审核
+ *
+ * @param id 店员资料审核主键
+ * @return 店员资料审核
+ */
+ @Override
+ public PlayClerkUserReviewInfoEntity selectPlayClerkUserReviewInfoById(String id) {
+ PlayClerkUserReviewInfoEntity entity = this.baseMapper.selectById(id);
+ if (entity == null) {
+ throw new CustomException("对象不存在");
+ }
+ return entity;
+ }
+
+
+ @Override
+ public IPage selectByPage(PlayClerkUserReviewQueryVo vo) {
+ MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>();
+ lambdaQueryWrapper.selectAll(PlayClerkUserReviewInfoEntity.class);
+ //店员表
+ lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getSignature, "signature");
+ lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkUserReviewInfoEntity::getClerkId);
+ if (StrUtil.isNotBlank(vo.getClerkId())) {
+ lambdaQueryWrapper.eq(PlayClerkUserReviewInfoEntity::getClerkId, vo.getClerkId());
+ }
+ if (StrUtil.isNotBlank(vo.getSex())) {
+ lambdaQueryWrapper.eq(PlayClerkUserReviewInfoEntity::getSex, vo.getSex());
+ }
+ if (StrUtil.isNotBlank(vo.getNickname())) {
+ lambdaQueryWrapper.like(PlayClerkUserReviewInfoEntity::getNickname, vo.getNickname());
+ }
+ if (StrUtil.isNotBlank(vo.getPhone())) {
+ lambdaQueryWrapper.like(PlayClerkUserReviewInfoEntity::getPhone, vo.getPhone());
+ }
+ if (StrUtil.isNotBlank(vo.getReviewState())) {
+ lambdaQueryWrapper.like(PlayClerkUserReviewInfoEntity::getReviewState, vo.getReviewState());
+ }
+ if (StrUtil.isNotBlank(vo.getWeiChatCode())) {
+ lambdaQueryWrapper.like(PlayClerkUserReviewInfoEntity::getWeiChatCode, vo.getWeiChatCode());
+ }
+ lambdaQueryWrapper.orderByDesc(PlayClerkUserReviewInfoEntity::getAddTime);
+ lambdaQueryWrapper.orderByDesc(PlayClerkUserReviewInfoEntity::getClerkId);
+ return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkUserReviewReturnVo.class, lambdaQueryWrapper);
+ }
+
+ /**
+ * 查询店员资料审核列表
+ *
+ * @param playClerkUserReviewInfo 店员资料审核
+ * @return 店员资料审核
+ */
+ @Override
+ public IPage selectPlayClerkUserReviewInfoByPage(PlayClerkUserReviewInfoEntity playClerkUserReviewInfo) {
+ Page page = new Page<>(1, 10);
+ return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>());
+ }
+
+ /**
+ * 新增店员资料审核
+ *
+ * @param playClerkUserReviewInfo 店员资料审核
+ * @return 结果
+ */
+ @Override
+ public boolean create(PlayClerkUserReviewInfoEntity playClerkUserReviewInfo) {
+ if (StrUtil.isBlankIfStr(playClerkUserReviewInfo.getId())) {
+ playClerkUserReviewInfo.setId(IdUtils.getUuid());
+ }
+ return save(playClerkUserReviewInfo);
+ }
+
+ /**
+ * 修改店员资料审核
+ *
+ * @param entity 店员资料审核
+ * @return 结果
+ */
+ @Override
+ public boolean update(PlayClerkUserReviewInfoEntity entity) {
+ return updateById(entity);
+ }
+
+ /**
+ * 修改店员资料审核
+ *
+ * @param vo 店员资料审核对象
+ */
+ @Override
+ public void updateDataReviewState(PlayClerkUserReviewStateEditVo vo) {
+ PlayClerkUserReviewInfoEntity entity = this.selectPlayClerkUserReviewInfoById(vo.getId());
+ if ("1".equals(vo.getReviewState())) {
+ PlayClerkUserInfoEntity userInfo = playClerkUserInfoService.queryByUserId(entity.getClerkId());
+ BeanUtils.copyProperties(entity, userInfo);
+ userInfo.setClerkState("1");
+ userInfo.setId(entity.getClerkId());
+ userInfo.setAlbum(entity.getAlbum());
+ playClerkUserInfoService.update(userInfo);
+ clerkCommodityService.initClerkCommodity(userInfo.getId());
+ }
+ BeanUtils.copyProperties(vo, entity);
+ this.update(entity);
+ }
+
+ /**
+ * 批量删除店员资料审核
+ *
+ * @param ids 需要删除的店员资料审核主键
+ * @return 结果
+ */
+ @Override
+ public int deletePlayClerkUserReviewInfoByIds(String[] ids) {
+ return playClerkUserReviewInfoMapper.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ /**
+ * 删除店员资料审核信息
+ *
+ * @param id 店员资料审核主键
+ * @return 结果
+ */
+ @Override
+ public int deletePlayClerkUserReviewInfoById(String id) {
+ return playClerkUserReviewInfoMapper.deleteById(id);
+ }
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkWagesDetailsInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkWagesDetailsInfoServiceImpl.java
new file mode 100644
index 0000000..244794a
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkWagesDetailsInfoServiceImpl.java
@@ -0,0 +1,123 @@
+package com.starry.admin.modules.clerk.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.starry.admin.modules.clerk.mapper.PlayClerkWagesDetailsInfoMapper;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesDetailsInfoEntity;
+import com.starry.admin.modules.clerk.service.IPlayClerkWagesDetailsInfoService;
+import com.starry.common.utils.IdUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * 店员工资明细信息Service业务层处理
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+@Service
+public class PlayClerkWagesDetailsInfoServiceImpl extends ServiceImpl implements IPlayClerkWagesDetailsInfoService {
+ @Resource
+ private PlayClerkWagesDetailsInfoMapper playClerkWagesDetailsInfoMapper;
+
+
+ @Override
+ public PlayClerkWagesDetailsInfoEntity selectByClerkIdAndWagesId(String wagesId, String clerkId) {
+ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(PlayClerkWagesDetailsInfoEntity::getWagesId, wagesId);
+ lambdaQueryWrapper.eq(PlayClerkWagesDetailsInfoEntity::getClerkId, clerkId);
+ return this.baseMapper.selectOne(lambdaQueryWrapper);
+ }
+
+
+ @Override
+ public PlayClerkWagesDetailsInfoEntity selectByOrderId(String orderId) {
+ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(PlayClerkWagesDetailsInfoEntity::getOrderId, orderId);
+ return this.baseMapper.selectOne(lambdaQueryWrapper);
+ }
+
+ /**
+ * 查询店员工资明细信息
+ *
+ * @param id 店员工资明细信息主键
+ * @return 店员工资明细信息
+ */
+ @Override
+ public PlayClerkWagesDetailsInfoEntity selectPlayClerkWagesDetailsInfoById(String id) {
+ return this.baseMapper.selectById(id);
+ }
+
+ @Override
+ public List selectByWagesId(String wagesId) {
+ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(PlayClerkWagesDetailsInfoEntity::getWagesId, wagesId);
+ return this.baseMapper.selectList(lambdaQueryWrapper);
+ }
+
+ /**
+ * 查询店员工资明细信息列表
+ *
+ * @param playClerkWagesDetailsInfo 店员工资明细信息
+ * @return 店员工资明细信息
+ */
+ @Override
+ public IPage selectPlayClerkWagesDetailsInfoByPage(PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo) {
+ Page page = new Page<>(1, 10);
+ return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>());
+ }
+
+ /**
+ * 新增店员工资明细信息
+ *
+ * @param playClerkWagesDetailsInfo 店员工资明细信息
+ * @return 结果
+ */
+ @Override
+ public boolean create(PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo) {
+ if (StrUtil.isBlankIfStr(playClerkWagesDetailsInfo.getId())) {
+ playClerkWagesDetailsInfo.setId(IdUtils.getUuid());
+ }
+ return save(playClerkWagesDetailsInfo);
+ }
+
+ /**
+ * 修改店员工资明细信息
+ *
+ * @param playClerkWagesDetailsInfo 店员工资明细信息
+ * @return 结果
+ */
+ @Override
+ public boolean update(PlayClerkWagesDetailsInfoEntity playClerkWagesDetailsInfo) {
+ return updateById(playClerkWagesDetailsInfo);
+ }
+
+ /**
+ * 批量删除店员工资明细信息
+ *
+ * @param ids 需要删除的店员工资明细信息主键
+ * @return 结果
+ */
+ @Override
+ public int deletePlayClerkWagesDetailsInfoByIds(String[] ids) {
+ return playClerkWagesDetailsInfoMapper.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ /**
+ * 删除店员工资明细信息信息
+ *
+ * @param id 店员工资明细信息主键
+ * @return 结果
+ */
+ @Override
+ public int deletePlayClerkWagesDetailsInfoById(String id) {
+ return playClerkWagesDetailsInfoMapper.deleteById(id);
+ }
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkWagesInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkWagesInfoServiceImpl.java
new file mode 100644
index 0000000..28ec5e5
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkWagesInfoServiceImpl.java
@@ -0,0 +1,173 @@
+package com.starry.admin.modules.clerk.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.starry.admin.modules.clerk.mapper.PlayClerkWagesInfoMapper;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkWagesInfoEntity;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkWagesInfoQueryVo;
+import com.starry.admin.modules.clerk.module.vo.PlayClerkWagesInfoReturnVo;
+import com.starry.admin.modules.clerk.service.IPlayClerkWagesInfoService;
+import com.starry.common.utils.IdUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * 店员工资结算信息Service业务层处理
+ *
+ * @author admin
+ * @since 2024-05-31
+ */
+@Service
+public class PlayClerkWagesInfoServiceImpl extends ServiceImpl implements IPlayClerkWagesInfoService {
+ @Resource
+ private PlayClerkWagesInfoMapper playClerkWagesInfoMapper;
+
+
+ @Override
+ public PlayClerkWagesInfoEntity selectCurrentPeriodWagesByClerkId(String clerkId) {
+ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(PlayClerkWagesInfoEntity::getClerkId, clerkId);
+ lambdaQueryWrapper.eq(PlayClerkWagesInfoEntity::getHistoricalStatistics, "0");
+ return this.baseMapper.selectOne(lambdaQueryWrapper);
+ }
+
+ @Override
+ public List selectHistoricalWagesByClerkId(String clerkId) {
+ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(PlayClerkWagesInfoEntity::getClerkId, clerkId);
+ lambdaQueryWrapper.eq(PlayClerkWagesInfoEntity::getHistoricalStatistics, "1");
+ return this.baseMapper.selectList(lambdaQueryWrapper);
+ }
+
+ @Override
+ public PlayClerkWagesInfoEntity getLastSettlement(String clerkId) {
+ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(PlayClerkWagesInfoEntity::getClerkId, clerkId);
+ lambdaQueryWrapper.eq(PlayClerkWagesInfoEntity::getHistoricalStatistics, "0");
+ lambdaQueryWrapper.orderByDesc(PlayClerkWagesInfoEntity::getEndCountDate);
+ return this.baseMapper.selectOne(lambdaQueryWrapper);
+ }
+
+
+ @Override
+ public LocalDate getLastSettlementTime(String clerkId) {
+ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(PlayClerkWagesInfoEntity::getClerkId, clerkId);
+ lambdaQueryWrapper.eq(PlayClerkWagesInfoEntity::getHistoricalStatistics, "1");
+ lambdaQueryWrapper.orderByDesc(PlayClerkWagesInfoEntity::getEndCountDate);
+ PlayClerkWagesInfoEntity entity = this.baseMapper.selectOne(lambdaQueryWrapper);
+ if (entity == null) {
+ return LocalDate.of(2000, 1, 1);
+ }
+ return entity.getEndCountDate();
+ }
+
+
+ @Override
+ public IPage selectHistoricalByPage(PlayClerkWagesInfoQueryVo vo) {
+ MPJLambdaWrapper lambdaWrapper = new MPJLambdaWrapper<>();
+ lambdaWrapper.selectAll(PlayClerkWagesInfoEntity.class);
+ //凭借店员表
+ lambdaWrapper.selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname");
+ lambdaWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkWagesInfoEntity::getClerkId);
+ if (StrUtil.isNotBlank(vo.getGroupId())) {
+ lambdaWrapper.eq(PlayClerkUserInfoEntity::getGroupId, vo.getGroupId());
+ }
+ if (StrUtil.isNotBlank(vo.getListingState())) {
+ lambdaWrapper.eq(PlayClerkUserInfoEntity::getListingState, vo.getListingState());
+ }
+ if (StrUtil.isNotBlank(vo.getClerkId())) {
+ lambdaWrapper.eq(PlayClerkUserInfoEntity::getId, vo.getClerkId());
+ }
+ if (StrUtil.isNotEmpty(vo.getSettlementDate())) {
+ if (vo.getSettlementDate().contains("T")) {
+ vo.setSettlementDate(vo.getSettlementDate().substring(0, vo.getSettlementDate().indexOf("T")));
+ }
+ lambdaWrapper.eq(PlayClerkWagesInfoEntity::getSettlementDate, LocalDate.parse(vo.getSettlementDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ }
+ lambdaWrapper.eq(PlayClerkWagesInfoEntity::getHistoricalStatistics, "1");
+ return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkWagesInfoReturnVo.class, lambdaWrapper);
+ }
+
+ /**
+ * 查询店员工资结算信息
+ *
+ * @param id 店员工资结算信息主键
+ * @return 店员工资结算信息
+ */
+ @Override
+ public PlayClerkWagesInfoEntity selectPlayClerkWagesInfoById(String id) {
+ return this.baseMapper.selectById(id);
+ }
+
+ /**
+ * 查询店员工资结算信息列表
+ *
+ * @param playClerkWagesInfo 店员工资结算信息
+ * @return 店员工资结算信息
+ */
+ @Override
+ public IPage selectPlayClerkWagesInfoByPage(PlayClerkWagesInfoEntity playClerkWagesInfo) {
+ Page page = new Page<>(1, 10);
+ return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>());
+ }
+
+
+ /**
+ * 新增店员工资结算信息
+ *
+ * @param playClerkWagesInfo 店员工资结算信息
+ * @return 结果
+ */
+ @Override
+ public boolean create(PlayClerkWagesInfoEntity playClerkWagesInfo) {
+ if (StrUtil.isBlankIfStr(playClerkWagesInfo.getId())) {
+ playClerkWagesInfo.setId(IdUtils.getUuid());
+ }
+ return save(playClerkWagesInfo);
+ }
+
+ /**
+ * 修改店员工资结算信息
+ *
+ * @param playClerkWagesInfo 店员工资结算信息
+ * @return 结果
+ */
+ @Override
+ public boolean update(PlayClerkWagesInfoEntity playClerkWagesInfo) {
+ return updateById(playClerkWagesInfo);
+ }
+
+ /**
+ * 批量删除店员工资结算信息
+ *
+ * @param ids 需要删除的店员工资结算信息主键
+ * @return 结果
+ */
+ @Override
+ public int deletePlayClerkWagesInfoByIds(String[] ids) {
+ return playClerkWagesInfoMapper.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ /**
+ * 删除店员工资结算信息信息
+ *
+ * @param id 店员工资结算信息主键
+ * @return 结果
+ */
+ @Override
+ public int deletePlayClerkWagesInfoById(String id) {
+ return playClerkWagesInfoMapper.deleteById(id);
+ }
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/article/service/impl/PlayCustomArticleInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayCustomArticleInfoServiceImpl.java
similarity index 76%
rename from play-admin/src/main/java/com/starry/admin/modules/article/service/impl/PlayCustomArticleInfoServiceImpl.java
rename to play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayCustomArticleInfoServiceImpl.java
index c1fdb95..ba97148 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/article/service/impl/PlayCustomArticleInfoServiceImpl.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayCustomArticleInfoServiceImpl.java
@@ -1,14 +1,14 @@
-package com.starry.admin.modules.article.service.impl;
+package com.starry.admin.modules.clerk.service.impl;
-import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.starry.admin.modules.article.mapper.PlayCustomArticleInfoMapper;
-import com.starry.admin.modules.article.module.entity.PlayCustomArticleInfoEntity;
-import com.starry.admin.modules.article.service.IPlayCustomArticleInfoService;
+import com.starry.admin.modules.clerk.mapper.PlayCustomArticleInfoMapper;
+import com.starry.admin.modules.clerk.module.entity.PlayCustomArticleInfoEntity;
+import com.starry.admin.modules.clerk.service.IPlayCustomArticleInfoService;
+import com.starry.common.utils.IdUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -26,6 +26,17 @@ public class PlayCustomArticleInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(PlayCustomArticleInfoEntity::getArticleId, articleId);
+ lambdaQueryWrapper.eq(PlayCustomArticleInfoEntity::getCustomId, customId);
+ lambdaQueryWrapper.eq(PlayCustomArticleInfoEntity::getEndorseType, endorseType);
+ return this.baseMapper.selectOne(lambdaQueryWrapper);
+ }
+
+
/**
* 查询陪聊点赞动态信息
*
@@ -58,7 +69,7 @@ public class PlayCustomArticleInfoServiceImpl extends ServiceImpl list = playCustomLeaveMsgService.selectByPage(vo);
return R.ok(list);
}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomLevelInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomLevelInfoController.java
index 9f9d1c4..749b0a3 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomLevelInfoController.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomLevelInfoController.java
@@ -4,6 +4,7 @@ import com.starry.admin.common.exception.CustomException;
import com.starry.admin.modules.custom.module.entity.PlayCustomLevelInfoEntity;
import com.starry.admin.modules.custom.module.vo.PlayCustomLevelAddVo;
import com.starry.admin.modules.custom.module.vo.PlayCustomLevelEditVo;
+import com.starry.admin.modules.custom.module.vo.PlayCustomLevelReturnVo;
import com.starry.admin.modules.custom.service.IPlayCustomLevelInfoService;
import com.starry.common.annotation.Log;
import com.starry.common.enums.BusinessType;
@@ -32,7 +33,7 @@ public class PlayCustomLevelInfoController {
@PostMapping("/listAll")
public R listAll() {
List list = playCustomLevelInfoService.selectPlayCustomLevelInfoByPage();
- return R.ok(list);
+ return R.ok(ConvertUtil.entityToVoList(list, PlayCustomLevelReturnVo.class));
}
/**
diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomRankingController.java b/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomRankingController.java
new file mode 100644
index 0000000..f1bdd2f
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomRankingController.java
@@ -0,0 +1,37 @@
+package com.starry.admin.modules.custom.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.starry.admin.modules.custom.module.vo.PlayCustomRankingQueryVo;
+import com.starry.admin.modules.custom.module.vo.PlayCustomRankingReturnVo;
+import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService;
+import com.starry.common.result.R;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 顾客Controller
+ *
+ * @author admin
+ * @since 2024-04-08
+ */
+@RestController
+@RequestMapping("/custom/ranking")
+public class PlayCustomRankingController {
+ @Resource
+ private IPlayCustomUserInfoService playCustomUserInfoService;
+
+ /**
+ * 查询顾客排名列表
+ */
+ @PostMapping("/listByPage")
+ public R list(@Validated @RequestBody PlayCustomRankingQueryVo vo) {
+ IPage list = playCustomUserInfoService.selectRankingByPage(vo);
+ return R.ok(list);
+ }
+
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomUserInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomUserInfoController.java
index 1f44038..d84d1e5 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomUserInfoController.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomUserInfoController.java
@@ -2,6 +2,8 @@ package com.starry.admin.modules.custom.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity;
+import com.starry.admin.modules.custom.module.vo.PlayCustomUserQueryVo;
+import com.starry.admin.modules.custom.module.vo.PlayCustomUserReturnVo;
import com.starry.admin.modules.custom.module.vo.PlayCustomUserStateEditVo;
import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService;
import com.starry.common.annotation.Log;
@@ -28,9 +30,9 @@ public class PlayCustomUserInfoController {
/**
* 查询顾客列表
*/
- @GetMapping("/list")
- public R list(PlayCustomUserInfoEntity playCustomUserInfo) {
- IPage list = playCustomUserInfoService.selectPlayCustomUserInfoByPage(playCustomUserInfo);
+ @PostMapping("/listByPage")
+ public R list(@Validated @RequestBody PlayCustomUserQueryVo vo) {
+ IPage list = playCustomUserInfoService.selectByPage(vo);
return R.ok(list);
}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomUserInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomUserInfoMapper.java
index e7063e3..9c53132 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomUserInfoMapper.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomUserInfoMapper.java
@@ -1,7 +1,7 @@
package com.starry.admin.modules.custom.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity;
/**
@@ -10,7 +10,7 @@ import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity;
* @author admin
* @since 2024-04-08
*/
-public interface PlayCustomUserInfoMapper extends BaseMapper {
+public interface PlayCustomUserInfoMapper extends MPJBaseMapper