From 096e5744f180147636bb03c4224946761555eb95 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Fri, 23 May 2025 10:43:47 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=8E=BB=E6=8E=89=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=B8=8D=E7=94=A8=E6=8E=A5=E5=8F=A3=E5=8F=8A=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ICuMemberSettlePeriodServiceApi.java | 12 +- .../com/hzs/system/base/IAreaServiceApi.java | 12 +- .../hzs/system/base/ICurrencyServiceApi.java | 10 - .../hzs/system/config/IAwardsServiceApi.java | 39 +- .../hzs/system/config/IGradeServiceApi.java | 40 +- .../hzs/system/config/IVertexServiceApi.java | 7 - .../manage/BdWaresBonusController.java | 122 --- .../bonus/mapper/BdWaresBonusItemsMapper.java | 16 - .../bonus/mapper/BdWaresBonusMapper.java | 17 +- .../service/IBdWaresBonusItemsService.java | 42 - .../bonus/service/IBdWaresBonusService.java | 41 +- .../impl/BdWaresBonusItemsServiceImpl.java | 53 -- .../service/impl/BdWaresBonusServiceImpl.java | 86 -- .../member/bonus/BdWaresBonusItemsMapper.xml | 19 - .../member/bonus/BdWaresBonusMapper.xml | 38 +- .../account/mapper/CuMemberTradeMapper.java | 27 - .../service/ICuMemberTradeService.java | 41 +- .../impl/CuMemberTradeServiceImpl.java | 117 +-- .../CuMemberSettlePeriodServiceProvider.java | 13 +- .../manage/CuMemberAchieveLogController.java | 59 -- .../controller/manage/CuMemberController.java | 130 +-- .../manage/ZeroElementRevokeController.java | 343 ------- .../base/mapper/CuMemberAchieveLogMapper.java | 2 - .../member/base/mapper/CuMemberMapper.java | 9 - .../member/base/service/ICuMemberService.java | 9 - .../impl/CuMemberAchieveLogServiceImpl.java | 1 - .../service/impl/CuMemberServiceImpl.java | 5 - .../mapper/CuMemberServiceLogMapper.java | 20 +- .../service/ICuMemberServiceLogService.java | 19 +- .../impl/CuMemberServiceLogServiceImpl.java | 6 + .../member/account/CuMemberTradeMapper.xml | 36 - .../mapper/member/base/CuMemberMapper.xml | 64 -- .../detail/CuMemberServiceLogMapper.xml | 12 + .../manage/CuMemberAwardsStatController.java | 850 +++--------------- .../manage/CuUmbrellaBelowPushController.java | 61 +- .../mapper/CuMemberAwardsStatMapper.java | 15 - .../service/ICuMemberAwardsStatService.java | 15 - .../impl/CuMemberAwardsStatServiceImpl.java | 15 - .../hzs/report/member/vo/HomeDataStatVO.java | 13 +- .../hzs/report/member/vo/MallPVStatVO.java | 162 ---- .../hzs/report/member/vo/MemberTradeVo.java | 16 +- .../report/member/vo/MemberTreeStatVO.java | 32 - .../report/member/vo/MonthlyJobLevelVo.java | 160 ---- .../hzs/report/member/vo/NoticeMemberVO.java | 15 +- .../hzs/report/member/vo/OrderCurrencyVo.java | 16 +- .../com/hzs/report/member/vo/OrderVo.java | 73 -- .../hzs/report/member/vo/ReportSummaryVo.java | 16 +- .../report/member/vo/RepurchasePVStatVO.java | 160 ---- .../report/member/vo/ResettleBloodExcel.java | 9 +- .../member/vo/SmallAreaNewAddAchieveVO.java | 9 - .../hzs/report/member/vo/StatProductVO.java | 16 +- .../member/vo/UmbrellaBelowProductVO.java | 14 +- .../report/member/vo/UmbrellaBelowPushVO.java | 9 +- .../member/vo/UmbrellaBelowRepeatVO.java | 19 +- .../com/hzs/report/member/vo/WaresInfoVO.java | 18 +- .../member/CuMemberAwardsStatMapper.xml | 186 ---- .../manage/BdProductStorehouseController.java | 176 ---- .../hzs/system/base/mapper/BdAreaMapper.java | 3 - .../mapper/BdProductStorehouseAreaMapper.java | 21 - .../mapper/BdProductStorehouseMapper.java | 24 +- .../base/provider/AreaServiceProvider.java | 10 +- .../provider/CurrencyServiceProvider.java | 10 - .../system/base/service/IBdAreaService.java | 3 - .../IBdProductStorehouseAreaService.java | 21 - .../service/IBdProductStorehouseService.java | 41 +- .../base/service/impl/BdAreaServiceImpl.java | 3 - .../BdProductStorehouseAreaServiceImpl.java | 27 - .../impl/BdProductStorehouseServiceImpl.java | 119 +-- .../system/base/vo/BdNoticeAdminShowVO.java | 6 - .../com/hzs/system/base/vo/BdNoticeVO.java | 6 +- .../base/vo/BdPlatformMessageDetailVO.java | 8 - .../system/base/vo/BdPlatformMessageVO.java | 7 +- .../base/vo/BdProductStorehouseAreaVO.java | 73 -- .../system/base/vo/BdProductStorehouseVO.java | 136 --- .../base/vo/BdStorehouseAreaMiddleVO.java | 11 +- .../hzs/system/base/vo/BdStorehouseVO.java | 15 +- .../manage/BdPurposeController.java | 197 ---- .../system/config/mapper/BdAwardsMapper.java | 15 +- .../system/config/mapper/BdGradeMapper.java | 3 - .../config/mapper/BdGradeScopeMapper.java | 9 +- .../system/config/mapper/BdPurposeMapper.java | 17 - .../config/mapper/BdRangeAwardsMapper.java | 5 - .../system/config/mapper/BdVertexMapper.java | 21 +- .../provider/AwardsServiceProvider.java | 40 - .../config/provider/GradeServiceProvider.java | 48 +- .../provider/IVertexServiceProvider.java | 23 +- .../config/service/IBdAwardsService.java | 57 +- .../config/service/IBdGradeScopeService.java | 9 +- .../config/service/IBdGradeService.java | 49 +- .../config/service/IBdPurposeService.java | 17 - .../config/service/IBdRangeAwardsService.java | 12 - .../service/IBdServiceChargeService.java | 8 +- .../config/service/IBdVertexService.java | 14 +- .../service/impl/BdAwardsServiceImpl.java | 102 --- .../impl/BdBonusExpandServiceImpl.java | 5 +- .../service/impl/BdGradeScopeServiceImpl.java | 10 - .../service/impl/BdGradeServiceImpl.java | 53 -- .../service/impl/BdPurposeServiceImpl.java | 20 - .../impl/BdRangeAwardsServiceImpl.java | 14 +- .../service/impl/BdVertexServiceImpl.java | 16 - .../manage/SupplierUserController.java | 197 ---- .../manage/SysApprovalController.java | 288 ------ .../sys/mapper/SysApprovalItemMapper.java | 32 - .../system/sys/mapper/SysApprovalMapper.java | 23 - .../sys/mapper/SysApprovalSendMapper.java | 11 - .../hzs/system/sys/mapper/SysUserMapper.java | 8 - .../hzs/system/sys/param/ApprovalParam.java | 20 - .../system/sys/param/ApprovalSaveParam.java | 45 - .../sys/service/ISupplierUserService.java | 41 - .../sys/service/ISysApprovalItemService.java | 22 - .../sys/service/ISysApprovalSendService.java | 11 - .../sys/service/ISysApprovalService.java | 40 - .../system/sys/service/ISysUserService.java | 10 - .../service/impl/SupplierUserServiceImpl.java | 59 -- .../impl/SysApprovalItemServiceImpl.java | 15 - .../impl/SysApprovalSendServiceImpl.java | 8 - .../service/impl/SysApprovalServiceImpl.java | 85 -- .../sys/service/impl/SysUserServiceImpl.java | 7 - .../com/hzs/system/sys/vo/ApprovalVO.java | 58 -- .../base/BdProductStorehouseAreaMapper.xml | 43 - .../system/base/BdProductStorehouseMapper.xml | 99 +- .../mapper/system/config/BdPurposeMapper.xml | 28 - .../system/sys/SysApprovalItemMapper.xml | 39 - .../mapper/system/sys/SysApprovalMapper.xml | 50 -- .../system/sys/SysApprovalSendMapper.xml | 10 - .../mapper/system/sys/SysUserMapper.xml | 13 - .../domain/member/account/CuMemberTrade.java | 5 - .../hzs/common/domain/system/base/BdArea.java | 8 +- .../system/base/BdProductStorehouseArea.java | 5 - .../common/domain/system/config/BdAwards.java | 25 +- .../common/domain/system/config/BdGrade.java | 3 - .../domain/system/config/BdGradeScope.java | 5 - .../domain/system/config/BdPurpose.java | 41 - .../domain/system/config/BdRangeAwards.java | 6 +- .../domain/system/config/ext/BdAwardsExt.java | 8 +- .../common/domain/system/sys/SysApproval.java | 3 - .../system/sys/SysApprovalBusiness.java | 3 - .../system/sys/SysApprovalBusinessData.java | 3 - .../system/sys/SysApprovalBusinessDetail.java | 3 - .../system/sys/SysApprovalBusinessFile.java | 7 +- .../system/sys/SysApprovalBusinessMember.java | 5 +- .../sys/SysApprovalBusinessReceive.java | 3 - .../system/sys/SysApprovalBusinessSend.java | 3 - .../domain/system/sys/SysApprovalItem.java | 3 - .../domain/system/sys/SysApprovalSend.java | 3 - .../domain/system/sys/SysBusinessLog.java | 3 - .../hzs/common/domain/vertex/BdVertex.java | 5 - .../pay/service/impl/RefundServiceImpl.java | 13 +- 148 files changed, 374 insertions(+), 5901 deletions(-) delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/BdWaresBonusController.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusItemsMapper.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusItemsService.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusItemsServiceImpl.java delete mode 100644 bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/BdWaresBonusItemsMapper.xml delete mode 100644 bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/ZeroElementRevokeController.java delete mode 100644 bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MallPVStatVO.java delete mode 100644 bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MemberTreeStatVO.java delete mode 100644 bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MonthlyJobLevelVo.java delete mode 100644 bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/OrderVo.java delete mode 100644 bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/RepurchasePVStatVO.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/manage/BdProductStorehouseController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdProductStorehouseAreaMapper.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdProductStorehouseAreaService.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdProductStorehouseAreaServiceImpl.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdProductStorehouseAreaVO.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdProductStorehouseVO.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdPurposeController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdPurposeMapper.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdPurposeService.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdPurposeServiceImpl.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SupplierUserController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SysApprovalController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/sys/param/ApprovalParam.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/sys/param/ApprovalSaveParam.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISupplierUserService.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SupplierUserServiceImpl.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/sys/vo/ApprovalVO.java delete mode 100644 bd-business/bd-business-system/src/main/resources/mapper/system/base/BdProductStorehouseAreaMapper.xml delete mode 100644 bd-business/bd-business-system/src/main/resources/mapper/system/config/BdPurposeMapper.xml delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdPurpose.java diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/ICuMemberSettlePeriodServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/ICuMemberSettlePeriodServiceApi.java index 1d784de9..4c628543 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/ICuMemberSettlePeriodServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/ICuMemberSettlePeriodServiceApi.java @@ -4,20 +4,12 @@ import com.hzs.common.core.domain.R; import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; /** - * @Description: 会员结算期间api接口 - * @Author: zhangjing - * @Time: 2022/10/26 15:12 - * @Classname: IMemberAchieveServiceAPI - * @PackageName: com.hzs.member.achieve + * 会员结算期间api接口 */ public interface ICuMemberSettlePeriodServiceApi { /** - * @description: 根据日期获得日期对应的期间 - * @author: zhang jing - * @date: 2023/8/26 10:25 - * @param: [date] - * @return: com.hzs.common.core.domain.R + * 根据日期获得日期对应的期间 **/ R getCuMemberSettlePeriodByDate(String date); diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/base/IAreaServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/IAreaServiceApi.java index 97d6c7dd..6a09ccfc 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/base/IAreaServiceApi.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/IAreaServiceApi.java @@ -9,11 +9,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 行政区划接口 - * @Author: jiang chao - * @Time: 2022/10/21 11:30 - * @Classname: IAreaServiceApi - * @PackageName: com.hzs.system.base + * 行政区划接口 */ public interface IAreaServiceApi { @@ -49,8 +45,8 @@ public interface IAreaServiceApi { */ R updateArea(List provinceDTOList); - /* - * @description: 查询省绑定的产品仓库 - **/ + /** + * 查询省绑定的产品仓库 + */ R> queryBdProductStorehouseByCondition(List productId, Integer province); } diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICurrencyServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICurrencyServiceApi.java index aa5879be..5f140f57 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICurrencyServiceApi.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICurrencyServiceApi.java @@ -10,11 +10,6 @@ import java.util.Collection; import java.util.List; import java.util.Set; -/** - * @Description: - * @Classname: ICurrencyServiceApi - * @PackageName: com.hzs.system.base - */ public interface ICurrencyServiceApi { /** @@ -50,11 +45,6 @@ public interface ICurrencyServiceApi { **/ R queryBdStorehouseByProvince(Integer province, Integer... type); - /* - * @description: 根据省查询对应的发货仓库 - **/ - R queryBdStorehouseById(Integer pkId); - /** * 根据省查询对应的发货仓库 * diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IAwardsServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IAwardsServiceApi.java index 6e0ca7d7..74a08dc8 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IAwardsServiceApi.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IAwardsServiceApi.java @@ -3,65 +3,32 @@ package com.hzs.system.config; import com.hzs.common.core.domain.R; import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.domain.system.config.BdRangeAwards; -import com.hzs.common.domain.system.config.ext.BdAwardsExt; import java.util.List; import java.util.Map; /** - * @description: 根据国家查询奖衔配置列表api - * @author: zhang jing - * @date: 2022/9/29 15:31 - * @param: - * @return: + * 根据国家查询奖衔配置列表api **/ public interface IAwardsServiceApi { /** - * @description: 根据国家查询奖衔配置列表 - * @author: zhang jing - * @date: 2022/9/29 15:31 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> + * 根据国家查询奖衔配置列表 **/ R> queryAwards(Integer pkCountry); - /* - * @description: - * @author: sui q - * @date: 2024/10/15 16:45 - * @param: null null - **/ R> queryRangeAwards(); /** - * @description: 根据PKID查询奖衔信息 - * @author: zhang jing - * @date: 2022/10/10 11:49 - * @param: [pkId] - * @return: com.hzs.common.core.domain.R + * 根据PKID查询奖衔信息 **/ R getAwardsOne(Integer pkId); /** * 根据国家获取该国家的奖衔 - * - * @throws - * @return: R> - * @Author: sui q - * @Date: 2022/11/4 16:38 */ R> getAwards(); - /** - * @description: 根据国家查询辅导分红 - * @author: zhang jing - * @date: 2022/11/11 14:14 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ - R> coachBonusList(Integer pkCountry); - /** * 根据所属国家查询奖衔 * diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IGradeServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IGradeServiceApi.java index 9eacbf4f..0c3a3430 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IGradeServiceApi.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IGradeServiceApi.java @@ -1,7 +1,6 @@ package com.hzs.system.config; import com.hzs.common.core.domain.R; -import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.domain.system.config.BdGrade; import com.hzs.system.config.dto.GradeDTO; @@ -11,11 +10,7 @@ import java.util.Map; import java.util.Set; /** - * @Description: 等级公共的api - * @Author: sui q - * @Time: 2022/9/9 14:07 - * @Classname: IGradeServiceApi - * @PackageName: com.hzs.system.config + * 等级公共的api */ public interface IGradeServiceApi { @@ -23,45 +18,30 @@ public interface IGradeServiceApi { * 获取等级 * * @param pkId 主键 - * @return: R - * @Author: sui q - * @Date: 2022/9/24 17:57 */ R getGrade(Integer pkId); - /* - * @description: 根据等级值获得等级 - * @author: sui q - * @date: 2023/4/23 19:21 - * @param: null null - **/ + /** + * 根据等级值获得等级 + */ R getGradeByGradeValue(Integer gradeValue, Integer pkCountry); /** * 根据国家查询等级配置列表 * * @param pkCountry 国家 - * @return: R> - * @Author: sui q - * @Date: 2022/9/6 10:37 */ R> queryGradeConfigByCondition(Integer pkCountry); - /* - * @description: 查询不同国家的等级参数 - * @author: sui q - * @date: 2023/5/9 17:31 - * @param: null null - **/ + /** + * 查询不同国家的等级参数 + */ R>> queryCountryGradeConfigByCondition(Set pkCountrySet); /** * 根据国家查询全部等级配置 * * @param pkCountry 国家 - * @return: R> - * @Author: sui q - * @Date: 2022/9/6 10:37 */ R> queryGradeList(Integer pkCountry); @@ -70,9 +50,6 @@ public interface IGradeServiceApi { * * @param pkCountry 国家 * @param pkGrade 等级 - * @return: R - * @Author: sui q - * @Date: 2022/10/25 14:12 */ R queryGradeConfigByCondition(Integer pkCountry, Integer pkGrade); @@ -88,9 +65,6 @@ public interface IGradeServiceApi { * 根据国家查询等级配置列表 * * @param pkCountry 国家 - * @return: R> - * @Author: sui q - * @Date: 2022/9/6 10:37 */ R> queryGrowUpFootmarkGrade(Integer pkCountry); diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IVertexServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IVertexServiceApi.java index 51ce9234..ad0cfb80 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IVertexServiceApi.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IVertexServiceApi.java @@ -5,13 +5,6 @@ import com.hzs.system.config.dto.VertexDTO; import java.util.List; -/** - * @Description: - * @Author: yuhui - * @Time: 2022/11/16 15:55 - * @Classname: IVertexServiceApi - * @PackageName: com.hzs.sale.vertex - */ public interface IVertexServiceApi { /** diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/BdWaresBonusController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/BdWaresBonusController.java deleted file mode 100644 index 3eb9c061..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/BdWaresBonusController.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.hzs.bonus.bonus.controller.manage; - -import com.hzs.bonus.bonus.param.BdWaresBonusItemsParam; -import com.hzs.bonus.bonus.param.BdWaresBonusParam; -import com.hzs.bonus.bonus.service.IBdWaresBonusService; -import com.hzs.common.core.annotation.AccessPermissions; -import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.member.bonus.BdWaresBonus; -import com.hzs.common.security.utils.SecurityUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.math.BigDecimal; - -/** - * 特殊商品分配奖金 前端控制器 - * - * @author hzs - * @since 2024-10-30 - */ -@RestController -@RequestMapping("/wares-bonus/special") -public class BdWaresBonusController extends BaseController { - - @Autowired - private IBdWaresBonusService bdWaresBonusService; - - /** - * 在管理页面修改保存4-n参数 - * - * @return AjaxResult - */ - @PostMapping("/insert") - public AjaxResult insertBdWaresBonus(@RequestBody BdWaresBonusParam waresBonusParam) { - if (waresBonusParam.getPkId() != null) { - return AjaxResult.error(MemberMsgConstants.REQUIRED_NOT_EMPTY); - } - String msg = validateParam(waresBonusParam); - if (msg != null) { - return AjaxResult.error(msg); - } - waresBonusParam.setPkCountry(SecurityUtils.getPkCountry()); - bdWaresBonusService.insertOrUpdateBdWaresBonusByParam(waresBonusParam, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - private String validateParam(BdWaresBonusParam waresBonusParam) { - if (waresBonusParam.getPkWares() == null || - waresBonusParam.getTotalAlgebra() == null || waresBonusParam.getOrderAssAchieve() == null || - waresBonusParam.getWaresBonusItemsParamList() == null || waresBonusParam.getWaresBonusItemsParamList().size() == 0) { - return MemberMsgConstants.REQUIRED_NOT_EMPTY; - } - BigDecimal totalAssAchieve = BigDecimal.ZERO; - for (BdWaresBonusItemsParam bdWaresBonusItemsParam : waresBonusParam.getWaresBonusItemsParamList()) { - if (bdWaresBonusItemsParam.getAlgebra() == null || bdWaresBonusItemsParam.getAssAchieve() == null) { - return MemberMsgConstants.REQUIRED_NOT_EMPTY; - } - totalAssAchieve = ComputeUtil.computeAdd(totalAssAchieve, bdWaresBonusItemsParam.getAssAchieve()); - } - if (!ComputeUtil.compareEqual(totalAssAchieve, waresBonusParam.getOrderAssAchieve())) { - return "分配总ev跟各子ev合计不相等！"; - } - BdWaresBonus bdWaresBonus = bdWaresBonusService.queryWaresBonusById(waresBonusParam); - if (bdWaresBonus != null && bdWaresBonus.getPkId() != null) { - return "该商品已经配置过，不能再次配置！"; - } - return null; - } - - /** - * 在管理页面修改保存4-n参数 - * - * @return AjaxResult - */ - @PostMapping("/update") - public AjaxResult updateBdWaresBonus(@RequestBody BdWaresBonusParam waresBonusParam) { - if (waresBonusParam.getPkId() == null) { - return AjaxResult.error(MemberMsgConstants.REQUIRED_NOT_EMPTY); - } - String msg = validateParam(waresBonusParam); - if (msg != null) { - return AjaxResult.error(msg); - } - waresBonusParam.setPkCountry(SecurityUtils.getPkCountry()); - bdWaresBonusService.insertOrUpdateBdWaresBonusByParam(waresBonusParam, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /** - * 在管理页面修改保存4-n参数 - * - * @return AjaxResult - */ - @DeleteMapping("/delete/{pkId}") - public AjaxResult deleteBdWaresBonus(@PathVariable Long pkId) { - bdWaresBonusService.deleteSpecialWaresBonus(pkId, SecurityUtils.getUserId()); - return AjaxResult.success(); - } - - /** - * 分页查询会员某个时间段内的奖金汇总 - */ - @AccessPermissions("WaresBonus") - @PostMapping("/query") - public TableDataInfo listWaresBonusParam(@RequestBody BdWaresBonusParam waresBonusParam) { - waresBonusParam.setPkCountry(SecurityUtils.getPkCountry()); - startPage(); - return getDataTable(bdWaresBonusService.querySpecialWaresBonus(waresBonusParam)); - } - - /** - * 极差团队特殊商品配置ev的分配规则 - */ - @GetMapping("/ev-query") - public TableDataInfo querySpecialWaresBonus() { - return getDataTable(bdWaresBonusService.querySpecialWaresBonus()); - } -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusItemsMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusItemsMapper.java deleted file mode 100644 index 21327fe0..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusItemsMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hzs.bonus.bonus.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.member.bonus.BdWaresBonusItems; - -/** - *

- * 特殊商品分配ev奖金明细 Mapper 接口 - *

- * - * @author hzs - * @since 2024-10-30 - */ -public interface BdWaresBonusItemsMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusMapper.java index dce37735..ef55d2a6 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusMapper.java @@ -8,28 +8,13 @@ import com.hzs.common.domain.member.ext.BdWaresBonusExt; import java.util.List; /** - *

* 特殊商品分配奖金 Mapper 接口 - *

- * - * @author hzs - * @since 2024-10-30 */ public interface BdWaresBonusMapper extends BaseMapper { /* - * @description: 查询特殊品奖金配置 - * @author: sui q - * @date: 2024/10/30 10:55 - * @param: null null + * 查询特殊品奖金配置 **/ List querySpecialWaresBonus(BdWaresBonusParam waresBonusParam); - /* - * @description: 查询能设置奖金的特殊品 - * @author: sui q - * @date: 2024/11/8 10:19 - * @param: null null - **/ - List queryAllSpecialWaresBonus(); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusItemsService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusItemsService.java deleted file mode 100644 index ec7c8444..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusItemsService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.hzs.bonus.bonus.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.bonus.BdWaresBonusItems; - -import java.util.List; - -/** - *

- * 特殊商品分配ev奖金明细 服务类 - *

- * - * @author hzs - * @since 2024-10-30 - */ -public interface IBdWaresBonusItemsService extends IService { - - /* - * @description: 插入奖金特殊项奖金 - * @author: sui q - * @date: 2024/11/7 15:04 - * @param: null null - **/ - void insetWaresBonusItems(List waresBonusItemsList); - - /* - * @description: 插入奖金特殊项奖金 - * @author: sui q - * @date: 2024/11/7 15:04 - * @param: null null - **/ - void updateWaresBonusItems(List waresBonusItemsList); - - /* - * @description: 插入奖金特殊项奖金 - * @author: sui q - * @date: 2024/11/7 15:04 - * @param: null null - **/ - void deleteWaresBonusItems(List waresBonusItemsList, Long pkWaresBonus, Long userId); - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusService.java index 85363daa..5f107f95 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusService.java @@ -8,52 +8,13 @@ import com.hzs.common.domain.member.ext.BdWaresBonusExt; import java.util.List; /** - *

* 特殊商品分配奖金 服务类 - *

- * - * @author hzs - * @since 2024-10-30 */ public interface IBdWaresBonusService extends IService { /* - * @description: 查询特殊品奖金配置 - * @author: sui q - * @date: 2024/10/30 10:55 - * @param: null null + * 查询特殊品奖金配置 **/ List querySpecialWaresBonus(BdWaresBonusParam waresBonusParam); - /* - * @description: 根据主键删除特殊商品奖金配置 - * @author: sui q - * @date: 2024/11/8 9:58 - * @param: null null - **/ - void deleteSpecialWaresBonus(Long pkId, Long userId); - - /* - * @description: 根据商品id查询是否已经存在数据 - * @author: sui q - * @date: 2024/11/7 15:51 - * @param: null null - **/ - BdWaresBonus queryWaresBonusById(BdWaresBonusParam waresBonusParam); - - /* - * @description: 插入商品奖金根据参数 - * @author: sui q - * @date: 2024/11/7 13:47 - * @param: null null - **/ - void insertOrUpdateBdWaresBonusByParam(BdWaresBonusParam bdWaresBonusParam, Long userId); - - /* - * @description: 查询能设置奖金的特殊品 - * @author: sui q - * @date: 2024/11/8 10:19 - * @param: null null - **/ - List querySpecialWaresBonus(); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusItemsServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusItemsServiceImpl.java deleted file mode 100644 index 51c419b0..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusItemsServiceImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.hzs.bonus.bonus.service.impl; - -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.bonus.bonus.mapper.BdWaresBonusItemsMapper; -import com.hzs.bonus.bonus.service.IBdWaresBonusItemsService; -import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.member.bonus.BdWaresBonusItems; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -/** - * 特殊商品分配ev奖金明细 服务实现类 - * - * @author hzs - * @since 2024-10-30 - */ -@Service -public class BdWaresBonusItemsServiceImpl extends ServiceImpl implements IBdWaresBonusItemsService { - - @Override - @Transactional(rollbackFor = Exception.class) - public void insetWaresBonusItems(List waresBonusItemsList) { - saveBatch(waresBonusItemsList); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateWaresBonusItems(List waresBonusItemsList) { - updateBatchById(waresBonusItemsList); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteWaresBonusItems(List waresBonusItemsList, Long pkWaresBonus, Long userId) { - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - if (waresBonusItemsList != null && waresBonusItemsList.size() > 0) { - Set itemIdList = waresBonusItemsList.stream().map(BdWaresBonusItems::getPkId).collect(Collectors.toSet()); - updateWrapper.notIn(BdWaresBonusItems::getPkId, itemIdList); - } - updateWrapper.eq(BdWaresBonusItems::getPkWaresBonus, pkWaresBonus); - updateWrapper.set(BdWaresBonusItems::getDelFlag, EDelFlag.DELETE.getValue()); - updateWrapper.set(BdWaresBonusItems::getPkModified, userId); - updateWrapper.set(BdWaresBonusItems::getModifiedTime, DateUtils.currentDateTime()); - update(updateWrapper); - } - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusServiceImpl.java index 235ca4bf..0c03cb53 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusServiceImpl.java @@ -1,110 +1,24 @@ package com.hzs.bonus.bonus.service.impl; -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.bonus.bonus.mapper.BdWaresBonusMapper; import com.hzs.bonus.bonus.param.BdWaresBonusParam; -import com.hzs.bonus.bonus.service.IBdWaresBonusItemsService; import com.hzs.bonus.bonus.service.IBdWaresBonusService; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; import com.hzs.common.domain.member.bonus.BdWaresBonus; -import com.hzs.common.domain.member.bonus.BdWaresBonusItems; import com.hzs.common.domain.member.ext.BdWaresBonusExt; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Date; import java.util.List; /** * 特殊商品分配奖金 服务实现类 - * - * @author hzs - * @since 2024-10-30 */ @Service public class BdWaresBonusServiceImpl extends ServiceImpl implements IBdWaresBonusService { - @Autowired - private IBdWaresBonusItemsService waresBonusItemsService; - @Override public List querySpecialWaresBonus(BdWaresBonusParam waresBonusParam) { return baseMapper.querySpecialWaresBonus(waresBonusParam); } - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteSpecialWaresBonus(Long pkId, Long userId) { - // 删除明细表 - waresBonusItemsService.deleteWaresBonusItems(null, pkId, userId); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, userId); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue()); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime()); - updateWrapper.eq(SystemFieldConstants.PK_ID, pkId); - update(updateWrapper); - } - - @Override - public BdWaresBonus queryWaresBonusById(BdWaresBonusParam waresBonusParam) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(SystemFieldConstants.PK_WARES, waresBonusParam.getPkWares()); - if (waresBonusParam.getPkId() != null) { - queryWrapper.ne(SystemFieldConstants.PK_ID, waresBonusParam.getPkId()); - } - return baseMapper.selectOne(queryWrapper); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void insertOrUpdateBdWaresBonusByParam(BdWaresBonusParam bdWaresBonusParam, Long userId) { - // 主表 - BdWaresBonus bdWaresBonus = BeanUtil.copyProperties(bdWaresBonusParam, BdWaresBonus.class); - if (bdWaresBonus.getPkId() == null) { - bdWaresBonus.setPkCreator(userId); - baseMapper.insert(bdWaresBonus); - } else { - bdWaresBonus.setPkModified(userId); - baseMapper.updateById(bdWaresBonus); - } - // 明细 - List bdWaresBonusItems = BeanUtil.copyToList(bdWaresBonusParam.getWaresBonusItemsParamList(), BdWaresBonusItems.class); - // 分类分为有id和没有id的 - List insertWaresBonusItems = new ArrayList<>(); - List updateWaresBonusItems = new ArrayList<>(); - Date currentDate = DateUtils.currentDateTime(); - for (BdWaresBonusItems bdWaresBonusItem : bdWaresBonusItems) { - bdWaresBonusItem.setPkWaresBonus(bdWaresBonus.getPkId()); - bdWaresBonusItem.setPkCountry(bdWaresBonus.getPkCountry()); - if (bdWaresBonusItem.getPkId() == null) { - bdWaresBonusItem.setPkCreator(userId); - insertWaresBonusItems.add(bdWaresBonusItem); - } else { - bdWaresBonusItem.setPkModified(userId); - bdWaresBonusItem.setModifiedTime(currentDate); - updateWaresBonusItems.add(bdWaresBonusItem); - } - } - if (updateWaresBonusItems.size() > 0) { - // 删除 - waresBonusItemsService.deleteWaresBonusItems(updateWaresBonusItems, updateWaresBonusItems.get(0).getPkWaresBonus(), userId); - waresBonusItemsService.updateWaresBonusItems(updateWaresBonusItems); - } - // 新增 - if (insertWaresBonusItems.size() > 0) { - waresBonusItemsService.insetWaresBonusItems(insertWaresBonusItems); - } - } - - @Override - public List querySpecialWaresBonus() { - return baseMapper.queryAllSpecialWaresBonus(); - } } diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/BdWaresBonusItemsMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/BdWaresBonusItemsMapper.xml deleted file mode 100644 index d5c6eb60..00000000 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/BdWaresBonusItemsMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/BdWaresBonusMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/BdWaresBonusMapper.xml index be3096c0..1c62f6ce 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/BdWaresBonusMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/BdWaresBonusMapper.xml @@ -4,22 +4,23 @@ - - - - - - - - - - + + + + + + + + + + - - - + + + + - diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTradeMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTradeMapper.java index d85d98d6..d8f68f9c 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTradeMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTradeMapper.java @@ -1,6 +1,5 @@ package com.hzs.member.account.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.account.CuMemberTrade; import com.hzs.common.domain.member.account.CuMemberTradeExt; @@ -10,12 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 会员交易明细 Mapper 接口 - *

- * - * @author hzs - * @since 2022-09-06 */ public interface CuMemberTradeMapper extends BaseMapper { @@ -92,27 +86,6 @@ public interface CuMemberTradeMapper extends BaseMapper { @Param("sourceCode") String sourceCode, @Param("tradeClassify") Integer tradeClassify); - - /** - * 批量获取cuMemberBonus主键 - * - * @param rowNum 数量 - * @return: List - * @Author: sui q - * @Date: 2022/12/13 13:47 - */ - List batchQueryCuMemberTradeSeq(Integer rowNum); - - /** - * 批量插入会员交易流水，用于奖金发放插入流水 - * - * @param cuMemberTradeList 交易流水 - * @return: void - * @Author: sui q - * @Date: 2023/3/21 11:45 - */ - void batchInsertCuMemberTrade(@Param("cuMemberTradeList") List cuMemberTradeList); - /** * 根据来源单号查询会员奖金币种的流水信息 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTradeService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTradeService.java index 56b202b8..3e67fd20 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTradeService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTradeService.java @@ -22,13 +22,9 @@ public interface ICuMemberTradeService extends IService { * * @param pkMember 会员主键 * @param sourceCode 订单编号 - * @return: List - * @Author: sui q - * @Date: 2022/10/22 21:26 */ List queryCuMemberTrade(Long pkMember, String sourceCode); - /** * 查询列表信息 * @@ -37,7 +33,6 @@ public interface ICuMemberTradeService extends IService { */ Object[] selectMemberTradeList(CuMemberTradeVO cuMemberTradeVO); - /** * 批量插入流水信息 * @@ -46,7 +41,6 @@ public interface ICuMemberTradeService extends IService { */ Integer batchSaveTradeByMemberCode(@Param("cuMemberTrades") List cuMemberTrades); - /** * 查询钱包明细详情信息 * @@ -88,24 +82,15 @@ public interface ICuMemberTradeService extends IService { List selectBalanceNotEnoughMember(BusinessCommissionDTO businessCommissionDTO); /** - * @description: 办理业务专用查询会员余额 - * @author: zhang jing - * @date: 2023/11/10 15:19 - * @param: [mbbList] - * @return: java.util.List + * 办理业务专用查询会员余额 **/ List selectBusinessBalanceNotEnoughMember(List mbbList, Integer pkCountry); /** - * @description: 特殊业务业务办理专用查询会员余额 - * @author: zhang jing - * @date: 2023/11/14 11:10 - * @param: [mbbList, pkCountry] - * @return: java.util.List + * 特殊业务业务办理专用查询会员余额 **/ List selectSpecialBusinessBalanceNotEnoughMember(List mbbList, Integer pkCountry); - /** * 查询钱包明细（前端） * @@ -114,7 +99,6 @@ public interface ICuMemberTradeService extends IService { */ List selectWattleDetail(CuMemberTradeVO cuMemberTradeVO); - /** * 根据 来源编号更新交易编号 * @@ -141,27 +125,6 @@ public interface ICuMemberTradeService extends IService { */ Integer saveMemberTradeAndAccountByRechargeCode(String rechargeCode); - - /** - * 批量获取cuMemberBonus主键 - * - * @param rowNum 数量 - * @return: List - * @Author: sui q - * @Date: 2022/12/13 13:47 - */ - List batchQueryCuMemberTradeSeq(Integer rowNum); - - /** - * 批量插入会员交易流水，用于奖金发放插入流水 - * - * @param cuMemberTradeList 交易流水 - * @return: void - * @Author: sui q - * @Date: 2023/3/21 11:45 - */ - void batchInsertCuMemberTrade(@Param("cuMemberTradeList") List cuMemberTradeList); - /** * 根据来源单号查询会员奖金币种的流水信息 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java index 7111b03a..0fadc63a 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java @@ -41,30 +41,18 @@ import java.util.stream.Collectors; /** * 会员交易明细 服务实现类 - * - * @author hzs - * @since 2022-09-06 */ @Service public class CuMemberTradeServiceImpl extends ServiceImpl implements ICuMemberTradeService { @Autowired - ICuMemberBaseService cuMemberBaseService; + private ICuMemberBaseService iCuMemberBaseService; @Autowired - ICuMemberAccountService cuMemberAccountService; - + private ICuMemberAccountService iCuMemberAccountService; @Autowired - ICuMemberRechargeService cuMemberRechargeService; - + private ICuMemberRechargeService iCuMemberRechargeService; @Autowired - ITransactionCommonService iTransactionCommonService; - - private CuMemberBonusSettle cuMemberBonusSettle; - - @Autowired - public void setCuMemberBonusSettle(CuMemberBonusSettle cuMemberBonusSettle) { - this.cuMemberBonusSettle = cuMemberBonusSettle; - } + private ITransactionCommonService iTransactionCommonService; @Override public List queryCuMemberTrade(Long pkMember, String sourceCode) { @@ -98,10 +86,10 @@ public class CuMemberTradeServiceImpl extends ServiceImpl allAccounts = cuMemberBaseService.getAccountByCountryId(pkCountry); + List allAccounts = iCuMemberBaseService.getAccountByCountryId(pkCountry); Map map = allAccounts.stream().collect(Collectors.toMap(BdAccount::getPkId, o -> o)); Map transactionMap = iTransactionCommonService.exportEnumTransaction(ETradeType.values()); //根据国家查询汇率 - CurrencyDTO currency = cuMemberBaseService.getCurrency(pkCountry); + CurrencyDTO currency = iCuMemberBaseService.getCurrency(pkCountry); //汇率 BigDecimal exchangeRate = currency.getInExchangeRate(); for (CuMemberTradeExt cuMemberTradeExt : cuMemberTradeExtList) { @@ -196,14 +184,14 @@ public class CuMemberTradeServiceImpl extends ServiceImpl) objects[1], accountValue, isWithdraw); } else { - return cuMemberAccountService.batchUpdateMemberAccountByPkMemberCountry( + return iCuMemberAccountService.batchUpdateMemberAccountByPkMemberCountry( (List) objects[1], null); } } @@ -228,14 +216,14 @@ public class CuMemberTradeServiceImpl extends ServiceImpl pkMembers = cuMemberTrades.stream().map(CuMemberTrade::getPkMember).collect(Collectors.toList()); //查询账户余额 - List cuMemberAccounts = cuMemberAccountService.selectMemberAccountByPkMember(pkMembers); + List cuMemberAccounts = iCuMemberAccountService.selectMemberAccountByPkMember(pkMembers); Map memberAccountMap = cuMemberAccounts.stream().collect(Collectors.toMap(CuMemberAccount::getPkMember, o -> o)); Integer pkAccountValue = null; Map memberAmountMap = new HashMap<>(); for (CuMemberTrade cuMemberTrade : cuMemberTrades) { Long pkMember = cuMemberTrade.getPkMember(); Integer pkAccount = cuMemberTrade.getPkAccount(); - pkAccountValue = cuMemberBaseService.getAccountValueById(pkAccount); + pkAccountValue = iCuMemberBaseService.getAccountValueById(pkAccount); rejectTrade = new CuMemberTrade(); BeanUtils.copyProperties(cuMemberTrade, rejectTrade); BigDecimal tradeAmount = cuMemberTrade.getTradeAmount().negate(); @@ -268,9 +256,9 @@ public class CuMemberTradeServiceImpl extends ServiceImpl memberAmountDTOList = memberAmountMap.entrySet().stream().map(a -> a.getValue()).collect(Collectors.toList()); + List memberAmountDTOList = memberAmountMap.entrySet().stream().map(Map.Entry::getValue).collect(Collectors.toList()); //更新余额 - return cuMemberAccountService.batchUpdateMemberAccountByPkMemberCountry(memberAmountDTOList, isWithdraw); + return iCuMemberAccountService.batchUpdateMemberAccountByPkMemberCountry(memberAmountDTOList, isWithdraw); } return true; } @@ -283,7 +271,7 @@ public class CuMemberTradeServiceImpl extends ServiceImpl memberAmountDTOList = businessCommissionDTO.getMemberAmountDTOList(); Map memberAccountExtMap = memberAmountDTOList.stream().collect(Collectors.toMap(MemberAmountDTO::getPkMember, o -> o)); - List cuMemberAccountExts = cuMemberAccountService.queryMemberAccountByPkMember(memberAmountDTOList); + List cuMemberAccountExts = iCuMemberAccountService.queryMemberAccountByPkMember(memberAmountDTOList); for (CuMemberAccountExt memberAccountExt : cuMemberAccountExts) { BigDecimal availableBalance = getAvailableBalance(memberAccountExt, pkAccount); if (availableBalance.compareTo(memberAccountExtMap.get(memberAccountExt.getPkMember()).getTradeAmount()) < 0) { @@ -294,27 +282,19 @@ public class CuMemberTradeServiceImpl extends ServiceImpl - **/ @Override public List selectBusinessBalanceNotEnoughMember(List mbbList, Integer pkCountry) { // 根据国家查询固定币种 - List accList = cuMemberBaseService.getAccountByCountryId(pkCountry); + List accList = iCuMemberBaseService.getAccountByCountryId(pkCountry); Map accountMap = accList.stream() .collect(Collectors.toMap(BdAccount::getFieldValue, Function.identity())); List memberAmountDTOList = mbbList.stream() .map(item -> BeanUtil.copyProperties(item, MemberAmountDTO.class)) .collect(Collectors.toList()); - List cuMemberAccountExts = cuMemberAccountService.queryMemberAccountByPkMember(memberAmountDTOList); + List cuMemberAccountExts = iCuMemberAccountService.queryMemberAccountByPkMember(memberAmountDTOList); Map cuMemberAccountExtsMap = cuMemberAccountExts.stream() .collect(Collectors.toMap(CuMemberAccountExt::getPkMember, Function.identity())); Map> memberAmountMap = memberAmountDTOList.stream() @@ -434,25 +414,15 @@ public class CuMemberTradeServiceImpl extends ServiceImpl - **/ @Override public List selectSpecialBusinessBalanceNotEnoughMember(List mbbList, Integer pkCountry) { // 根据国家查询固定币种 - List accList = cuMemberBaseService.getAccountByCountryId(pkCountry); + List accList = iCuMemberBaseService.getAccountByCountryId(pkCountry); Map accountMap = accList.stream().collect(Collectors.toMap(BdAccount::getFieldValue, Function.identity())); List memberAmountDTOList = mbbList.stream() @@ -462,7 +432,7 @@ public class CuMemberTradeServiceImpl extends ServiceImpl memberAccountExtMap = memberAmountDTOList.stream() .collect(Collectors.toMap(MemberAmountDTO::getPkMember, Function.identity())); - List cuMemberAccountExts = cuMemberAccountService.queryMemberAccountByPkMember(memberAmountDTOList); + List cuMemberAccountExts = iCuMemberAccountService.queryMemberAccountByPkMember(memberAmountDTOList); for (CuMemberAccountExt memberAccountExt : cuMemberAccountExts) { processAccountBalance(accountMap, memberAccountExt, memberAccountExtMap, mbbList); @@ -535,7 +505,7 @@ public class CuMemberTradeServiceImpl extends ServiceImpl memberAmountDTOList = businessCommissionDTO.getMemberAmountDTOList(); if (CollUtil.isNotEmpty(memberAmountDTOList)) { //查询账户余额 - List cuMemberAccountExts = cuMemberAccountService.queryMemberAccountByPkMember(memberAmountDTOList); + List cuMemberAccountExts = iCuMemberAccountService.queryMemberAccountByPkMember(memberAmountDTOList); Map memberAccountExtMap = cuMemberAccountExts.stream().collect(Collectors.toMap(CuMemberAccountExt::getPkMember, o -> o)); Integer tradeType = ETradeType.getValueByApprovalValue(businessCommissionDTO.getTradeType()); tradeType = tradeType == 0 ? businessCommissionDTO.getTradeType() : tradeType; @@ -609,14 +579,14 @@ public class CuMemberTradeServiceImpl extends ServiceImpl a.getValue()).collect(Collectors.toList()); + memberAmountList = memberAmountMap.entrySet().stream().map(Map.Entry::getValue).collect(Collectors.toList()); } } return new Object[]{cuMemberTradeLsit, memberAmountList}; @@ -699,7 +669,6 @@ public class CuMemberTradeServiceImpl extends ServiceImpl */ private Map getTranslateAccountValue(Integer pkCountry) { - List accountList = cuMemberBaseService.getAccountByCountry(null, pkCountry); + List accountList = iCuMemberBaseService.getAccountByCountry(null, pkCountry); return accountList.stream().collect(Collectors.toMap(BdAccount::getPkId, BdAccount::getAccountName)); } - @Override public Integer updateSourceCodeByTradeCode(CuMemberTradeVO cuMemberTradeVO) { return baseMapper.updateSourceCodeByTradeCode(cuMemberTradeVO); @@ -770,17 +735,16 @@ public class CuMemberTradeServiceImpl extends ServiceImpl batchQueryCuMemberTradeSeq(Integer rowNum) { - return baseMapper.batchQueryCuMemberTradeSeq(rowNum); - } - - @Override - public void batchInsertCuMemberTrade(List cuMemberTradeList) { - List> cutList = cuMemberBonusSettle.handleCutList(cuMemberTradeList); - cutList.forEach(memberTradeList -> - baseMapper.batchInsertCuMemberTrade(memberTradeList)); - } - - @Override public List selectMemberTradeBySourceCode(String sourceCode) { return baseMapper.selectMemberTradeBySourceCode(sourceCode); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/provider/CuMemberSettlePeriodServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/provider/CuMemberSettlePeriodServiceProvider.java index 8848789f..4a990076 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/provider/CuMemberSettlePeriodServiceProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/provider/CuMemberSettlePeriodServiceProvider.java @@ -8,11 +8,7 @@ import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; /** - * @Description: 会员结算期间 - * @Author: zhangjing - * @Time: 2022/10/26 15:14 - * @Classname: MemberAchieveServiceProvider - * @PackageName: com.hzs.member.achieve.provider + * 会员结算期间 */ @DubboService public class CuMemberSettlePeriodServiceProvider implements ICuMemberSettlePeriodServiceApi { @@ -20,13 +16,6 @@ public class CuMemberSettlePeriodServiceProvider implements ICuMemberSettlePerio @Autowired private ICuMemberSettlePeriodService iCuMemberSettlePeriodService; - /** - * @description: 根据日期获得日期对应的期间 - * @author: zhang jing - * @date: 2023/8/26 10:25 - * @param: [date] - * @return: com.hzs.common.core.domain.R - **/ @Override public R getCuMemberSettlePeriodByDate(String date) { return R.ok(iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date)); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberAchieveLogController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberAchieveLogController.java index 67f11408..dee65932 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberAchieveLogController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberAchieveLogController.java @@ -269,65 +269,6 @@ public class CuMemberAchieveLogController extends BaseController { return AjaxResult.success(listNew); } - /** - * 根据选中的会员查询会员的历史业绩 - **/ - @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.SELECT) - @PostMapping("/infusingWaterBelow") - public AjaxResult infusingWaterBelow(@RequestBody CuMemberAchieveLogVO cuMemberAchieveLogVO) { - if (CollectionUtil.isEmpty(cuMemberAchieveLogVO.getPkMemberList())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); - } - if (CollectionUtil.isEmpty(cuMemberAchieveLogVO.getAchieveList())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.ACHIEVE_NOT_NULL)); - } - - Integer pkCountry = SecurityUtils.getPkCountry(); - List listNew = new ArrayList<>(); - for (Long pkid : cuMemberAchieveLogVO.getPkMemberList()) { - CuMemberAchieveLogVO cma = new CuMemberAchieveLogVO(); - cma.setPkMember(pkid); - CuMemberAchieveLogVO cmal = iCuMemberAchieveLogService.searchOne(cma, pkCountry); - if (StringUtils.isNotNull(cmal)) { - CuMemberAchieveLogVO cmalnew = new CuMemberAchieveLogVO(); - cmalnew.setPkMember(cma.getPkMember()); - for (int i = 0; i < cuMemberAchieveLogVO.getAchieveList().size(); i++) { - if (cuMemberAchieveLogVO.getAchieveList().get(i) == EMemberAchieve.ASUMREALMODIFY_PV.getValue()) { - cmalnew.setAsumRealPv(cma.getAsumRealPv()); - } - if (cuMemberAchieveLogVO.getAchieveList().get(i) == EMemberAchieve.BSUMREALMODIFY_PV.getValue()) { - cmalnew.setBsumRealPv(cma.getBsumRealPv()); - } - if (cuMemberAchieveLogVO.getAchieveList().get(i) == EMemberAchieve.AFIRSTMODIFY_PV.getValue()) { - cmalnew.setAfirstModifyPv(cma.getAfirstModifyPv()); - } - if (cuMemberAchieveLogVO.getAchieveList().get(i) == EMemberAchieve.BFIRSTMODIFY_PV.getValue()) { - cmalnew.setBfirstModifyPv(cma.getBfirstModifyPv()); - } - if (cuMemberAchieveLogVO.getAchieveList().get(i) == EMemberAchieve.REPAFIRSTMODIFY_BALANCE.getValue()) { - cmalnew.setRepAFirstModifyBalance(cma.getRepAFirstModifyBalance()); - } - if (cuMemberAchieveLogVO.getAchieveList().get(i) == EMemberAchieve.REPBFIRSTMODIFY_BALANCE.getValue()) { - cmalnew.setRepBFirstModifyBalance(cma.getRepBFirstModifyBalance()); - } - } - Integer maxSecond = iCuMemberAchieveLogService.selectByMaxApproveNumber(cmal.getPkMember(), EApproveStatus.FINISH.getValue()); - //查询扣费金额，账户信息 - ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); - serviceChargeDTO.setType(EApprovalBusiness.MEMBER_ACHIEVE.getValue()); - serviceChargeDTO.setQuantity(maxSecond + 1); - serviceChargeDTO.setPkCountry(pkCountry); - R serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); - //接口查询金额是否足够 - cmalnew.setCost(serviceChargeDTOR.getData().getCost()); - cmalnew.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); - cmalnew.setPkAccountKey(iCuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount())); - listNew.add(cmalnew); - } - } - return AjaxResult.success(listNew); - } - /** * 注水业绩 确认 **/ diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java index cbb61cb2..8c784ac2 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java @@ -62,17 +62,17 @@ import java.util.stream.Collectors; public class CuMemberController extends BaseController { @Autowired - private ICuMemberWithdrawService memberWithdrawService; + private ICuMemberWithdrawService iCuMemberWithdrawService; @Autowired - private ICuMemberSettlePeriodService memberSettlePeriodService; + private ICuMemberSettlePeriodService iCuMemberSettlePeriodService; @Autowired - private ICuMemberTransferService memberTransferService; + private ICuMemberTransferService iCuMemberTransferService; @Autowired - private ICuMemberService cuMemberService; + private ICuMemberService iCuMemberService; @Autowired - private ICuMemberTeamService memberTeamService; + private ICuMemberTeamService iCuMemberTeamService; @Autowired - private ICuMemberTreeService memberTreeService; + private ICuMemberTreeService iCuMemberTreeService; @Autowired private ITransactionCommonService iTransactionCommonService; @Autowired @@ -93,11 +93,6 @@ public class CuMemberController extends BaseController { @DubboReference IMenuColumnServiceApi iMenuColumnServiceApi; - @Autowired - public void setCuMemberService(ICuMemberService cuMemberService) { - this.cuMemberService = cuMemberService; - } - /** * 会员 */ @@ -145,12 +140,12 @@ public class CuMemberController extends BaseController { memberParam.setTeamList(userAuthorityDTO.getUserTeamList()); startPage(); - List queryCuMemberVoList = cuMemberService.queryCuMemberByCondition(memberParam); + List queryCuMemberVoList = iCuMemberService.queryCuMemberByCondition(memberParam); List cuMemberVOList = new ArrayList<>(); if (CollectionUtil.isNotEmpty(queryCuMemberVoList)) { - cuMemberVOList = cuMemberService.queryCuMemberByMemberList(queryCuMemberVoList, memberParam); + cuMemberVOList = iCuMemberService.queryCuMemberByMemberList(queryCuMemberVoList, memberParam); if (CollectionUtil.isNotEmpty(cuMemberVOList)) { // 获取需要翻译的枚举翻译 Map transactionMap = iTransactionCommonService.exportEnumTransaction(EMemberAccount.values()); @@ -307,7 +302,7 @@ public class CuMemberController extends BaseController { UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData(); memberParam.setVertexList(userAuthorityDTO.getUserVertexList()); memberParam.setTeamList(userAuthorityDTO.getUserTeamList()); - List cuMemberVOList = cuMemberService.queryCuMemberByMemberListExcel(memberParam); + List cuMemberVOList = iCuMemberService.queryCuMemberByMemberListExcel(memberParam); if (CollectionUtil.isNotEmpty(cuMemberVOList)) { // 获取需要翻译的枚举翻译 @@ -395,7 +390,7 @@ public class CuMemberController extends BaseController { @PostMapping("/real-member") public TableDataInfo realMember(@RequestBody CuMemberVO memberParam) { memberParam.setPkCountry(SecurityUtils.getPkCountry()); - List cuMemberVOS = cuMemberService.realCuMemberByCondition(memberParam); + List cuMemberVOS = iCuMemberService.realCuMemberByCondition(memberParam); if (CollectionUtil.isNotEmpty(cuMemberVOS)) { for (CuMemberVO cvo : cuMemberVOS) { @@ -431,7 +426,7 @@ public class CuMemberController extends BaseController { **/ @GetMapping("/getOne/{memberCode}") public AjaxResult getOne(@PathVariable String memberCode) { - CuMember cuMember = cuMemberService.getMember(memberCode); + CuMember cuMember = iCuMemberService.getMember(memberCode); return AjaxResult.success(cuMember); } @@ -494,7 +489,7 @@ public class CuMemberController extends BaseController { * @param param */ private void handleMemberSelect(List resultList, MemberSelectParam param) { - List cuMemberExtList = cuMemberService.queryMemberSelect(param, SecurityUtils.getPkCountry()); + List cuMemberExtList = iCuMemberService.queryMemberSelect(param, SecurityUtils.getPkCountry()); if (CollectionUtil.isNotEmpty(cuMemberExtList)) { for (CuMemberExt cuMemberExt : cuMemberExtList) { @@ -529,7 +524,7 @@ public class CuMemberController extends BaseController { memberRealInfoParam.setBirthDate(memberRealInfoParam.getBirthDate().replace("-", "")); } startPage(); - List resultList = cuMemberService.selectByMemberRealInfo(memberRealInfoParam); + List resultList = iCuMemberService.selectByMemberRealInfo(memberRealInfoParam); if (CollectionUtil.isNotEmpty(resultList)) { //数据库内容翻译 @@ -604,7 +599,7 @@ public class CuMemberController extends BaseController { * @return */ @AccessPermissions("TeamInfo") - @GetMapping("member-team-info") + @GetMapping("/member-team-info") public TableDataInfo memberTeamInfo(MemberTeamInfoParam memberTeamInfoParam) { String time; String settleTableName; @@ -615,13 +610,13 @@ public class CuMemberController extends BaseController { // 昨日 time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtil.offsetDay(new Date(), -1)); - csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); + csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); settleTableName = TableNameConstants.CU_MEMBER_SETTLE + csPeriod.getPkId(); } else { String queryDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, memberTeamInfoParam.getQueryDate()); String currentDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.currentDate()); time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, memberTeamInfoParam.getQueryDate()); - csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); + csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); if (queryDate.equals(currentDate)) { settleTableName = TableNameConstants.CU_MEMBER_SETTLE + csPeriod.getPkId(); } else { @@ -630,7 +625,7 @@ public class CuMemberController extends BaseController { } } // 如果表格不存在则返回空数据 - Integer tableNumber = memberTreeService.queryExistOracleTable(settleTableName); + Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); if (tableNumber == null || tableNumber == 0) { return getDataTable(new ArrayList<>()); } @@ -640,10 +635,10 @@ public class CuMemberController extends BaseController { if (StringUtils.isNotBlank(memberTeamInfoParam.getMemberCode())) { if (memberTeamInfoParam.getRelaType() != null && memberTeamInfoParam.getRelaType().equals(ERealType.XY.getIntValue())) { // 血缘 - memberTeamList = memberTeamService.queryMemberTeamInfoList(memberTeamInfoParam); + memberTeamList = iCuMemberTeamService.queryMemberTeamInfoList(memberTeamInfoParam); } else { // 安置 - memberTeamList = memberTeamService.queryMemberTeamInfoPlaceParentList(memberTeamInfoParam); + memberTeamList = iCuMemberTeamService.queryMemberTeamInfoPlaceParentList(memberTeamInfoParam); } } for (MemberTeamVo memberTeamVo : memberTeamList) { @@ -660,7 +655,7 @@ public class CuMemberController extends BaseController { } } if (memberTeamVo.getPkPlaceParent() != null) { - CuMember member = cuMemberService.getMember(memberTeamVo.getPkPlaceParent()); + CuMember member = iCuMemberService.getMember(memberTeamVo.getPkPlaceParent()); if (member != null) { memberTeamVo.setPlaceParentCode(member.getMemberCode()); } @@ -671,18 +666,18 @@ public class CuMemberController extends BaseController { //TODO 奖金大盘占比 memberTeamVo.setBonusLargeMarketProportion(BigDecimal.ZERO); // 直推人数 - Long directPushPeopleNumber = memberTreeService.queryCuMemberTreeParentTableCount(settleTableName, memberTeamVo.getMemberId()); + Long directPushPeopleNumber = iCuMemberTreeService.queryCuMemberTreeParentTableCount(settleTableName, memberTeamVo.getMemberId()); memberTeamVo.setDirectPushPeopleNumber(directPushPeopleNumber); // 转账次数 QueryWrapper qew = new QueryWrapper<>(); qew.eq("PK_MEMBER", memberTeamVo.getMemberId()); - int memberTransferCount = memberTransferService.count(qew); + int memberTransferCount = iCuMemberTransferService.count(qew); memberTeamVo.setMemberTransferCount(memberTransferCount); // 提现次数 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("PK_MEMBER", memberTeamVo.getMemberId()); - int memberWithdrawCount = memberWithdrawService.count(queryWrapper); + int memberWithdrawCount = iCuMemberWithdrawService.count(queryWrapper); memberTeamVo.setWithdrawalNumber(memberWithdrawCount); // 最后一次登录时间 if (memberTeamVo.getLastLoginTime() != null) { @@ -696,7 +691,7 @@ public class CuMemberController extends BaseController { /** * 会员团队信息导出 */ - @PostMapping("member-team-info-export") + @PostMapping("/member-team-info-export") public void memberTeamInfoExport(MemberTeamInfoParam memberTeamInfoParam, HttpServletResponse response) { String time; String settleTableName; @@ -707,13 +702,13 @@ public class CuMemberController extends BaseController { // 昨日 time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtil.offsetDay(new Date(), -1)); - csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); + csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); settleTableName = TableNameConstants.CU_MEMBER_SETTLE + csPeriod.getPkId(); } else { String queryDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, memberTeamInfoParam.getQueryDate()); String currentDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.currentDate()); time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, memberTeamInfoParam.getQueryDate()); - csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); + csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); if (queryDate.equals(currentDate)) { settleTableName = TableNameConstants.CU_MEMBER_SETTLE + csPeriod.getPkId(); } else { @@ -722,7 +717,7 @@ public class CuMemberController extends BaseController { } } // 如果表格不存在则返回空数据 - Integer tableNumber = memberTreeService.queryExistOracleTable(settleTableName); + Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); if (tableNumber == null || tableNumber == 0) { ExcelUtil util = new ExcelUtil<>(MemberTeamVo.class); util.exportExcel(response, memberTeamList, "会员团队信息"); @@ -733,10 +728,10 @@ public class CuMemberController extends BaseController { if (StringUtils.isNotBlank(memberTeamInfoParam.getMemberCode())) { if (memberTeamInfoParam.getRelaType() != null && memberTeamInfoParam.getRelaType().equals(ERealType.XY.getIntValue())) { // 血缘 - memberTeamList = memberTeamService.queryMemberTeamInfoList(memberTeamInfoParam); + memberTeamList = iCuMemberTeamService.queryMemberTeamInfoList(memberTeamInfoParam); } else { // 安置 - memberTeamList = memberTeamService.queryMemberTeamInfoPlaceParentList(memberTeamInfoParam); + memberTeamList = iCuMemberTeamService.queryMemberTeamInfoPlaceParentList(memberTeamInfoParam); } } for (MemberTeamVo memberTeamVo : memberTeamList) { @@ -754,7 +749,7 @@ public class CuMemberController extends BaseController { } } if (memberTeamVo.getPkPlaceParent() != null) { - CuMember member = cuMemberService.getMember(memberTeamVo.getPkPlaceParent()); + CuMember member = iCuMemberService.getMember(memberTeamVo.getPkPlaceParent()); if (member != null) { memberTeamVo.setPlaceParentCode(member.getMemberCode()); } @@ -767,18 +762,18 @@ public class CuMemberController extends BaseController { //奖金大盘占比 memberTeamVo.setBonusLargeMarketProportion(BigDecimal.ZERO); // 直推人数 - Long directPushPeopleNumber = memberTreeService.queryCuMemberTreeParentTableCount(settleTableName, memberTeamVo.getMemberId()); + Long directPushPeopleNumber = iCuMemberTreeService.queryCuMemberTreeParentTableCount(settleTableName, memberTeamVo.getMemberId()); memberTeamVo.setDirectPushPeopleNumber(directPushPeopleNumber); // 转账次数 QueryWrapper qew = new QueryWrapper<>(); qew.eq("PK_MEMBER", memberTeamVo.getMemberId()); - int memberTransferCount = memberTransferService.count(qew); + int memberTransferCount = iCuMemberTransferService.count(qew); memberTeamVo.setMemberTransferCount(memberTransferCount); // 提现次数 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("PK_MEMBER", memberTeamVo.getMemberId()); - int memberWithdrawCount = memberWithdrawService.count(queryWrapper); + int memberWithdrawCount = iCuMemberWithdrawService.count(queryWrapper); memberTeamVo.setWithdrawalNumber(memberWithdrawCount); // 最后一次登录时间 if (memberTeamVo.getLastLoginTime() != null) { @@ -813,7 +808,7 @@ public class CuMemberController extends BaseController { UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData(); memberRealInfoParam.setVertexList(userAuthorityDTO.getUserVertexList()); memberRealInfoParam.setTeamList(userAuthorityDTO.getUserTeamList()); - List resultList = cuMemberService.selectByMemberRealInfo(memberRealInfoParam); + List resultList = iCuMemberService.selectByMemberRealInfo(memberRealInfoParam); if (CollectionUtil.isNotEmpty(resultList)) { // 获取需要翻译的枚举翻译 @@ -896,7 +891,7 @@ public class CuMemberController extends BaseController { @GetMapping("/query-top-member") public AjaxResult queryTopMember() { List resultList = new ArrayList<>(); - List list = cuMemberService.queryPlaceMemberList(MemberConstants.GJ30720200CODE, SecurityUtils.getPkCountry()); + List list = iCuMemberService.queryPlaceMemberList(MemberConstants.GJ30720200CODE, SecurityUtils.getPkCountry()); if (CollectionUtil.isNotEmpty(list)) { resultList = BeanUtil.copyToList(list, TopMemberVO.class); } @@ -924,7 +919,7 @@ public class CuMemberController extends BaseController { BigDecimal chinaInExchangeRate = chinaCurrency.getData().getInExchangeRate(); startPage(); memberConsumptionStatParam.setPkCountry(SecurityUtils.getPkCountry()); - List memberConsumptionStatVoList = cuMemberService.getMemberConsumptionStat(memberConsumptionStatParam); + List memberConsumptionStatVoList = iCuMemberService.getMemberConsumptionStat(memberConsumptionStatParam); for (MemberConsumptionStatVo memberConsumptionStatVo : memberConsumptionStatVoList) { memberConsumptionStatVo.setOrderAchieve(memberConsumptionStatVo.getOrderAchieve().multiply(chinaInExchangeRate).setScale(2, BigDecimal.ROUND_HALF_UP)); } @@ -952,7 +947,7 @@ public class CuMemberController extends BaseController { R chinaCurrency = iCurrencyServiceApi.getCurrency(CountryConstants.CHINA_COUNTRY); BigDecimal chinaInExchangeRate = chinaCurrency.getData().getInExchangeRate(); memberConsumptionStatParam.setPkCountry(SecurityUtils.getPkCountry()); - List memberConsumptionStatVoList = cuMemberService.getMemberConsumptionStat(memberConsumptionStatParam); + List memberConsumptionStatVoList = iCuMemberService.getMemberConsumptionStat(memberConsumptionStatParam); for (MemberConsumptionStatVo memberConsumptionStatVo : memberConsumptionStatVoList) { memberConsumptionStatVo.setOrderAchieve(memberConsumptionStatVo.getOrderAchieve().multiply(chinaInExchangeRate).setScale(2, BigDecimal.ROUND_HALF_UP)); } @@ -960,55 +955,4 @@ public class CuMemberController extends BaseController { util.exportExcel(response, memberConsumptionStatVoList, "用户消费统计"); } - /** - * 会员奖衔查询 - */ - @AccessPermissions("memberFind") - @GetMapping("/member_awards_query") - public TableDataInfo memberAwardsQuery(MemberAwardsQueryParam param) { - startPage(); - List memberAwardsList = cuMemberService.listMemberAwards(param, SecurityUtils.getPkCountry()); - if (CollectionUtil.isNotEmpty(memberAwardsList)) { - // 中国汇率 - CurrencyDTO currency = iCurrencyServiceApi.getCurrency(CountryConstants.CHINA_COUNTRY).getData(); - - for (MemberAwardsQueryVO vo : memberAwardsList) { - if (vo.getPkAwards() > vo.getPkMaxAwards()) { - // 当月奖衔 大于 最高奖衔，最高奖衔就为当月奖衔 - vo.setPkMaxAwards(vo.getPkAwards()); - vo.setMaxAwardsName(vo.getAwardsName()); - } - if (null != vo.getNewPv()) { - vo.setNewPv(vo.getNewPv().multiply(currency.getInExchangeRate())); - } - } - } - return getDataTable(memberAwardsList); - } - - /** - * 会员奖衔导出 - */ - @PostMapping("/member_awards_query_export") - public void memberAwardsQueryExport(MemberAwardsQueryParam param, HttpServletResponse response) { - List memberAwardsList = cuMemberService.listMemberAwards(param, SecurityUtils.getPkCountry()); - if (CollectionUtil.isNotEmpty(memberAwardsList)) { - // 中国汇率 - CurrencyDTO currency = iCurrencyServiceApi.getCurrency(CountryConstants.CHINA_COUNTRY).getData(); - - for (MemberAwardsQueryVO vo : memberAwardsList) { - if (vo.getPkAwards() > vo.getPkMaxAwards()) { - // 当月奖衔 大于 最高奖衔，最高奖衔就为当月奖衔 - vo.setPkMaxAwards(vo.getPkAwards()); - vo.setMaxAwardsName(vo.getAwardsName()); - } - if (null != vo.getNewPv()) { - vo.setNewPv(vo.getNewPv().multiply(currency.getInExchangeRate())); - } - } - } - ExcelUtil util = new ExcelUtil<>(MemberAwardsQueryVO.class); - util.exportExcel(response, memberAwardsList, "会员奖衔查询"); - } - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/ZeroElementRevokeController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/ZeroElementRevokeController.java deleted file mode 100644 index 28a9fd63..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/ZeroElementRevokeController.java +++ /dev/null @@ -1,343 +0,0 @@ -package com.hzs.member.base.controller.manage; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.hzs.common.core.annotation.AccessPermissions; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.service.ITransactionCommonService; -import com.hzs.common.util.TransactionUtils; -import com.hzs.member.account.dto.BusinessCommissionDTO; -import com.hzs.member.account.dto.MemberAmountDTO; -import com.hzs.member.account.dto.MemberBalanceDTO; -import com.hzs.member.account.service.ICuMemberBaseService; -import com.hzs.member.account.service.ICuMemberTradeService; -import com.hzs.member.base.service.ICuMemberService; -import com.hzs.member.base.vo.ZeroElementRevokeVO; -import com.hzs.member.detail.service.ICuMemberServiceLogService; -import com.hzs.system.config.IServiceChargeServiceApi; -import com.hzs.system.config.dto.ServiceChargeDTO; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @description: 特殊业务-零元撤单 - * @author: zhang jing - * @date: 2022/12/29 11:39 - * @param: - * @return: - **/ -@RequestMapping("/manager/zeroRevoke") -@RestController -public class ZeroElementRevokeController extends BaseController { - - @Autowired - private ICuMemberService cuMemberService; - - @Autowired - public void setCuMemberService(ICuMemberService cuMemberService) { - this.cuMemberService = cuMemberService; - } - - @Autowired - private ICuMemberServiceLogService memberServiceLogService; - @Autowired - private ICuMemberTradeService cuMemberTradeService; - @Autowired - private ICuMemberBaseService cuMemberBaseService; - @Autowired - private ITransactionCommonService iTransactionCommonService; - - @DubboReference - IServiceChargeServiceApi serviceChargeServiceApi; - - - /** - * @description: 特殊业务-零元撤单列表 - * @author: zhang jing - * @date: 2022/11/17 15:39 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @AccessPermissions("ZeroBuy") - @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.ZERO_REVOKE, method = EOperationMethod.SELECT) - @GetMapping("/list") - public TableDataInfo puCodeList(ZeroElementRevokeVO zeroElementRevokeVO) { - startPage(); - Integer pkCountry = SecurityUtils.getPkCountry(); - zeroElementRevokeVO.setPkCountry(pkCountry); - List list = cuMemberService.zeroList(zeroElementRevokeVO); - return getDataTable(list); - } - - - /** - * 导出 - * - * @param response - * @param zeroElementRevokeVO - */ - @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.ZERO_REVOKE, method = EOperationMethod.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, ZeroElementRevokeVO zeroElementRevokeVO) { - Integer pkCountry = SecurityUtils.getPkCountry(); - zeroElementRevokeVO.setPkCountry(pkCountry); - List list = cuMemberService.zeroList(zeroElementRevokeVO); - if (CollectionUtil.isNotEmpty(list)) { - Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, - EnumsPrefixConstants.KEY_AWARD); - list.forEach(itm -> { - //注册等级key - itm.setPkSettleGradeVal(transactionMap1.get(itm.getPkSettleGrade())); - itm.setPkAwardsVal(transactionMap1.get(itm.getPkAwards())); - }); - } - ExcelUtil util = new ExcelUtil<>(ZeroElementRevokeVO.class); - util.exportExcel(response, list, "导出零元撤单"); - } - - - /** - * @description: 查询选择零元注册的会员 - * @author: zhang jing - * @date: 2023/3/27 17:52 - * @param: [updateCodeVO] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.ZERO_REVOKE, method = EOperationMethod.SELECT) - @GetMapping("/selected") - public AjaxResult selected(ZeroElementRevokeVO zeroElementRevokeVO) { - if (StringUtils.isEmpty(zeroElementRevokeVO.getPkIdListStr())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); - } - List errorlist = new ArrayList<>(); - List pkIdList = Arrays.stream(zeroElementRevokeVO.getPkIdListStr().split(",")) - .map(Long::parseLong) - .collect(Collectors.toList()); - zeroElementRevokeVO.setPkIdList(pkIdList); - List list = zeroElementRevokeVO.getPkIdList(); - List newlist = new ArrayList<>(); - Integer pkCountry = SecurityUtils.getPkCountry(); - for (Long lo : list) { - CuMember cm = cuMemberService.getMemberById(lo); - ZeroElementRevokeVO zrvo = BeanUtil.copyProperties(cm, ZeroElementRevokeVO.class); - if (zrvo != null) { - newlist.add(zrvo); - } - } - if (CollectionUtil.isNotEmpty(newlist)) { - for (ZeroElementRevokeVO zer : newlist) { - //查询会员是否存在三方订单 - Integer count = cuMemberService.checkThreeOrder(zer.getPkId()); - if (count > 0) { - ZeroElementRevokeVO err = new ZeroElementRevokeVO(); - err.setErrorMsg(zer.getMemberCode() + " : " + TransactionUtils.getContent(ConfigMsgConstants.CHECK_THREE_ORDER)); - errorlist.add(err); - } - //当前最大次数 - Integer approveNumber = memberServiceLogService.selectByMaxApproveNumber(zer.getPkId(), - EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue(), EApproveStatus.FINISH.getValue()); - zer.setChangeNumber(approveNumber + 1); - //查询扣费金额，账户信息 - ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); - serviceChargeDTO.setType(EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue()); - serviceChargeDTO.setQuantity(approveNumber + 1); - serviceChargeDTO.setPkCountry(pkCountry); - R serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); - if (null == serviceChargeDTOR.getData() || - null == serviceChargeDTOR.getData().getPkAccount()) { - return AjaxResult.error(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL); - } - zer.setCost(serviceChargeDTOR.getData().getCost()); - zer.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); - zer.setPkAccountKey(cuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount())); - } - } - zeroElementRevokeVO.setZeroVOList(newlist); - zeroElementRevokeVO.setErroList(errorlist); - return AjaxResult.success(zeroElementRevokeVO); - } - - - /** - * @description: 零元撤单 - * @author: zhang jing - * @date: 2022/12/30 10:22 - * @param: [postageParams] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.ZERO_REVOKE, method = EOperationMethod.SUBMIT) - @PostMapping("/confirm") - public AjaxResult confirm(@RequestBody ZeroElementRevokeVO zeroElementRevokeVO) { - if (CollectionUtil.isEmpty(zeroElementRevokeVO.getZeroVOList())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); - } - List errorlist = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(zeroElementRevokeVO.getZeroVOList())) { - List memberAmountDTOList = new ArrayList<>(); - if (StringUtils.isNull(zeroElementRevokeVO.getProcessType())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PROCESS_TYPE_NOT_NULL)); - } - Date date = new Date(); - Integer pkCountry = SecurityUtils.getPkCountry(); - zeroElementRevokeVO.setPkCountry(pkCountry); - zeroElementRevokeVO.setPkCreator(SecurityUtils.getUserId()); - zeroElementRevokeVO.setCreationTime(date); - BusinessCommissionDTO businessCommissionDTO = new BusinessCommissionDTO(); - for (ZeroElementRevokeVO zrvo : zeroElementRevokeVO.getZeroVOList()) { - Integer count = cuMemberService.checkmsLogCount(zrvo.getPkId(), EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue()); - if (count > 0) { - zrvo.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT)); - errorlist.add(zrvo); - continue; - } - //当前最大次数 - Integer approveNumber = memberServiceLogService.selectByMaxApproveNumber(zrvo.getPkId(), - EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue(), EApproveStatus.FINISH.getValue()); - zrvo.setChangeNumber(approveNumber + 1); - if (zeroElementRevokeVO.getProcessType() == EProcessType.AVOIDSIGNING.getValue() || - zeroElementRevokeVO.getProcessType() == EProcessType.DOUBLEPAY.getValue()) { - //查询扣费金额，账户信息 - ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); - serviceChargeDTO.setType(EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue()); - serviceChargeDTO.setPkCountry(pkCountry); - serviceChargeDTO.setQuantity(approveNumber + 1); - R serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); - if (null == serviceChargeDTOR.getData() || - null == serviceChargeDTOR.getData().getPkAccount()) { - return AjaxResult.error(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL); - } - //接口查询金额是否足够 - businessCommissionDTO.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); - businessCommissionDTO.setPkCountry(pkCountry); - MemberAmountDTO memberAmountDTO = new MemberAmountDTO(); - memberAmountDTO.setPkMember(zrvo.getPkId()); - memberAmountDTO.setTradeAmount(serviceChargeDTOR.getData().getCost()); - zrvo.setCost(serviceChargeDTOR.getData().getCost()); - zrvo.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); - memberAmountDTOList.add(memberAmountDTO); - zeroElementRevokeVO.setMemberAmountDTOList(memberAmountDTOList); - } - } - if (CollectionUtil.isNotEmpty(errorlist)) { - return AjaxResult.error(504, ConfigMsgConstants.MEMBER_DATA_ERROR, errorlist); - } - businessCommissionDTO.setMemberAmountDTOList(memberAmountDTOList); - if (CollectionUtil.isNotEmpty(memberAmountDTOList)) { - //接口查询金额是否足够 - List memberBalanceList = cuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO); - if (CollectionUtil.isNotEmpty(memberBalanceList)) { - return AjaxResult.error(504, TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT), memberBalanceList); - } - } - - zeroElementRevokeVO = cuMemberService.zeroRevokeBusiness(zeroElementRevokeVO); - } else { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_NOT_NULL)); - } - return AjaxResult.success(zeroElementRevokeVO); - } - - /** - * @description: 发起签呈 免付，需要签呈需要付费 - * @author: zhang jing - * @date: 2023/3/4 11:06 - * @param: [updateCodeVO] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.ZERO_REVOKE, method = EOperationMethod.SUBMIT) - @PostMapping("/petition") - public AjaxResult petition(@RequestBody ZeroElementRevokeVO zeroElementRevokeVO) { - List errorlist = new ArrayList<>(); - if (StringUtils.isEmpty(zeroElementRevokeVO.getZeroVOList())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_NOT_NULL)); - } - if (StringUtils.isNull(zeroElementRevokeVO.getProcessType())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PROCESS_TYPE_NOT_NULL)); - } - if (StringUtils.isNull(zeroElementRevokeVO.getSignType())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.SIGN_TYPE_NOT_NULL)); - } - if (CollectionUtil.isEmpty(zeroElementRevokeVO.getUserIdList())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.EXAMINE_AND_APPROVE_NOT_NULL)); - } - Integer pkCountry = SecurityUtils.getPkCountry(); - Date date = new Date(); - zeroElementRevokeVO.setPkCountry(pkCountry); - zeroElementRevokeVO.setPkCreator(SecurityUtils.getUserId()); - zeroElementRevokeVO.setCreationTime(date); - Set pkMemberIds = new HashSet<>(); - BusinessCommissionDTO businessCommissionDTO = new BusinessCommissionDTO(); - List memberAmountDTOList = new ArrayList<>(); - for (ZeroElementRevokeVO zero : zeroElementRevokeVO.getZeroVOList()) { - if (StringUtils.isEmpty(zero.getMemberCode())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_CODE_NOT_NULL)); - } - if (StringUtils.isNull(zero.getPkId())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PKID_NOT_NULL)); - } - Integer count = cuMemberService.checkmsLogCount(zero.getPkId(), EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue()); - if (count > 0) { - zero.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT)); - errorlist.add(zero); - continue; - } - pkMemberIds.add(zero.getPkId()); - - //当前最大次数 - Integer approveNumber = memberServiceLogService.selectByMaxApproveNumber(zero.getPkId(), - EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue(), EApproveStatus.FINISH.getValue()); - zero.setChangeNumber(approveNumber + 1); - if (zeroElementRevokeVO.getProcessType() == EProcessType.DOUBLEPAY.getValue()) { - //查询扣费金额，账户信息 - ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); - serviceChargeDTO.setType(EApprovalBusiness.ZERO_ELEMENT_REVOKE.getValue()); - serviceChargeDTO.setQuantity(approveNumber + 1); - serviceChargeDTO.setPkCountry(pkCountry); - R serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); - //接口查询金额是否足够 - businessCommissionDTO.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); - businessCommissionDTO.setPkCountry(pkCountry); - MemberAmountDTO memberAmountDTO = new MemberAmountDTO(); - memberAmountDTO.setPkMember(zero.getPkId()); - memberAmountDTO.setTradeAmount(serviceChargeDTOR.getData().getCost()); - zero.setCost(serviceChargeDTOR.getData().getCost()); - zero.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); - memberAmountDTOList.add(memberAmountDTO); - } - } - if (CollectionUtil.isNotEmpty(errorlist)) { - return AjaxResult.error(504, ConfigMsgConstants.MEMBER_DATA_ERROR, errorlist); - } - zeroElementRevokeVO.setPkMemberList(pkMemberIds); - zeroElementRevokeVO.setMemberAmountDTOList(memberAmountDTOList); - businessCommissionDTO.setMemberAmountDTOList(memberAmountDTOList); - if (CollectionUtil.isNotEmpty(memberAmountDTOList)) { - //接口查询金额是否足够 - if (zeroElementRevokeVO.getProcessType() == EProcessType.DOUBLEPAY.getValue()) { - List memberBalanceList = cuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO); - if (CollectionUtil.isNotEmpty(memberBalanceList)) { - return AjaxResult.error(504, TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT), memberBalanceList); - } - } - } - cuMemberService.zeroPetition(zeroElementRevokeVO); - return AjaxResult.success(true); - } - -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberAchieveLogMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberAchieveLogMapper.java index 85e73b91..46ed4774 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberAchieveLogMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberAchieveLogMapper.java @@ -5,10 +5,8 @@ import com.hzs.common.domain.member.detail.CuMemberAchieveLog; import com.hzs.member.base.vo.CuMemberAchieveLogVO; import org.apache.ibatis.annotations.Param; -import java.math.BigDecimal; import java.util.Date; import java.util.List; -import java.util.Set; /** * 注水业绩记录表 Mapper 接口 diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java index 4121b355..869dd86f 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java @@ -791,15 +791,6 @@ public interface CuMemberMapper extends BaseMapper { */ CuMember getParentMember(@Param("memberCode") String memberCode); - /** - * 查询会员奖衔列表 - * - * @param param 查询参数 - * @param pkCountry 所属国家 - * @return - */ - List listMemberAwards(@Param("param") MemberAwardsQueryParam param, @Param("pkCountry") Integer pkCountry); - /** * 查询同姓名同手机号指定等级会员数量 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java index 668be825..4c2ae584 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java @@ -1008,15 +1008,6 @@ public interface ICuMemberService extends IService { */ CuMember getParentMember(String memberCode); - /** - * 会员奖衔查询列表 - * - * @param param 查询参数 - * @param pkCountry 所属国家 - * @return - */ - List listMemberAwards(MemberAwardsQueryParam param, Integer pkCountry); - /** * 查询同姓名同手机号指定等级会员数量 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberAchieveLogServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberAchieveLogServiceImpl.java index b55d66e6..8e2c4779 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberAchieveLogServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberAchieveLogServiceImpl.java @@ -13,7 +13,6 @@ import com.hzs.common.core.exception.ServiceException; import com.hzs.common.core.utils.CommonUtil; import com.hzs.common.core.utils.DateUtils; import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; import com.hzs.common.domain.member.detail.CuMemberAchieveLog; import com.hzs.common.security.service.UserTokenService; import com.hzs.common.security.utils.SecurityUtils; diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java index 2c7e503c..031314f2 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java @@ -3491,11 +3491,6 @@ public class CuMemberServiceImpl extends ServiceImpl i return baseMapper.getParentMember(memberCode); } - @Override - public List listMemberAwards(MemberAwardsQueryParam param, Integer pkCountry) { - return baseMapper.listMemberAwards(param, pkCountry); - } - @Override public int countGradeMemberPoint(String memberName, String phone, Integer pkGrade, Integer pkCountry) { return baseMapper.countGradeMemberPoint(memberName, phone, pkGrade, pkCountry); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberServiceLogMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberServiceLogMapper.java index b134f4d3..27a28dee 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberServiceLogMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberServiceLogMapper.java @@ -17,18 +17,14 @@ public interface CuMemberServiceLogMapper extends BaseMapper Integer selectByMaxApproveNumber(@Param("pkMember") Long pkMember, @Param("editType") Integer editType, @Param("approveStatus") Integer approveStatus); /** - * @description: 查询会员办理业务日志最新数据 - * @param: [pkMember, editType, approveStatus] - * @return: com.hzs.member.detail.vo.CuMemberServiceLogVO + * 查询会员办理业务日志最新数据 **/ CuMemberServiceLog selectTopData(@Param("pkMember") Long pkMember, @Param("editType") int editType, @Param("approveStatus") int approveStatus); /** - * @description: 查询用户是否已经存在未审核业务 - * @param: [cuMemberServiceLogVO] - * @return: java.util.List + * 查询用户是否已经存在未审核业务 **/ List selectServiceLogList(CuMemberServiceLogVO cuMemberServiceLogVO); @@ -41,9 +37,7 @@ public interface CuMemberServiceLogMapper extends BaseMapper List selectByServiceLogList(CuMemberServiceLog cuMemberServiceLog); /** - * @description: 查询会员原值 - * @param: [cuMemberOldValueVO] - * @return: java.util.List + * 查询会员原值 **/ List selectOldValue(BusinessMemberVO businessMemberVO); @@ -91,4 +85,12 @@ public interface CuMemberServiceLogMapper extends BaseMapper */ List selectByList(CuMemberServiceLogExt memberServiceLogExt); + /** + * 查询指定会员政策币信息 + * + * @param pkMember 会员ID + * @return + */ + CuMemberServiceLogExt queryPolicy(@Param("pkMember") Long pkMember); + } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberServiceLogService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberServiceLogService.java index dc71eba5..6d41ba16 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberServiceLogService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberServiceLogService.java @@ -47,7 +47,11 @@ public interface ICuMemberServiceLogService extends IService List selectOldValue(BusinessMemberVO businessMemberVO); /** - * 再次发起签呈 + * @description: 再次发起签呈 + * @author: zhang jing + * @date: 2023/2/2 11:15 + * @param: [cmslList, cuMemberServiceLogVO] + * @return: com.hzs.member.detail.vo.CuMemberServiceLogVO **/ CuMemberServiceLogVO againBusiness(List cmslList, CuMemberServiceLogVO cuMemberServiceLogVO); @@ -103,6 +107,11 @@ public interface ICuMemberServiceLogService extends IService */ List queryList(Integer editType, String memberCode, String memberName, Integer pkCountry, Integer approveStatus); + /** + * 根据业务单号查询业务日志 + **/ + R> selectCuMemberServiceLog(String businessNo); + /** * 查询展示列表 * @@ -110,4 +119,12 @@ public interface ICuMemberServiceLogService extends IService */ List selectByList(CuMemberServiceLogExt memberServiceLogExt); + /** + * 查询指定会员政策币信息 + * + * @param pkMember 会员ID + * @return + */ + CuMemberServiceLogExt queryPolicy(Long pkMember); + } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberServiceLogServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberServiceLogServiceImpl.java index c1888c9a..a441cef2 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberServiceLogServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberServiceLogServiceImpl.java @@ -124,4 +124,10 @@ public class CuMemberServiceLogServiceImpl extends ServiceImpl - - merge into cu_member_trade a - using ( - select m.pk_id, m.pk_member, m.trade_code, m.pk_account, m.trade_type,m.trade_classify, m.pk_rate, m.trade_amount, - (case when ba.field_value=4 then ca.account4 + m.trade_amount when ba.field_value=5 then ca.account5 + m.trade_amount - when ba.field_value=8 then ca.account8 + m.trade_amount when ba.field_value=9 then ca.account9 + m.trade_amount - else ca.account10 + m.trade_amount end) trade_balance, - (case when ba.field_value=4 then ca.account4 when ba.field_value=5 then ca.account5 when ba.field_value=8 then ca.account8 - when ba.field_value=9 then ca.account9 else ca.account10 end) trade_before_balance, - m.source_code, m.trade_statue, m.remarks, m.pk_country, m.creation_time, m.pk_creator from( - - select #{item.pkId} pk_id,#{item.tradeCode} trade_code, #{item.tradeClassify} trade_classify, - #{item.pkMember} pk_member,#{item.pkAccount} pk_account,#{item.pkRate} pk_rate,#{item.tradeAmount} trade_amount, - #{item.sourceCode} source_code,#{item.tradeStatue} trade_statue,#{item.remarks} remarks, - #{item.tradeType} trade_type,#{item.pkCountry} pk_country,#{item.pkCreator} pk_creator, - #{item.creationTime} creation_time from dual - ) m - inner join cu_member_account ca - on m.pk_member = ca.pk_member - inner join bd_account ba - on ba.pk_id = m.pk_account - ) b - on (a.pk_id = b.pk_id) - when not matched then - insert (pk_id, pk_member, trade_code, pk_account, trade_type, - trade_classify, pk_rate, trade_amount, trade_balance,trade_before_balance, - source_code, trade_statue, remarks, pk_country, creation_time, pk_creator) - values(b.pk_id,b.pk_member,b.trade_code,b.pk_account,b.trade_type, - b.trade_classify,b.pk_rate,b.trade_amount,b.trade_balance,b.trade_before_balance, - b.source_code,b.trade_statue,b.remarks,b.pk_country,b.creation_time,b.pk_creator) - - - - - - + + + diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuMemberAwardsStatController.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuMemberAwardsStatController.java index d8eb7250..3b898d92 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuMemberAwardsStatController.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuMemberAwardsStatController.java @@ -51,9 +51,6 @@ import java.util.stream.Collectors; /** * 会员奖衔升级记录表 前端控制器 - * - * @author zhangjing - * @since 2022-10-20 */ @RestController @RequestMapping("/manager/member-awards") @@ -69,7 +66,7 @@ public class CuMemberAwardsStatController extends BaseController { @DubboReference IMemberServiceApi iMemberServiceApi; @DubboReference - ICurrencyServiceApi currencyServiceApi; + ICurrencyServiceApi iCurrencyServiceApi; @DubboReference IAreaServiceApi iAreaServiceApi; @DubboReference @@ -77,14 +74,10 @@ public class CuMemberAwardsStatController extends BaseController { @DubboReference IVertexServiceApi iVertexServiceApi; @DubboReference - ICuMemberSettlePeriodServiceApi cuMemberSettlePeriodService; + ICuMemberSettlePeriodServiceApi iCuMemberSettlePeriodServiceApi; /** - * @description: 真实业绩新增奖衔查询列表 - * @author: zhang jing - * @date: 2022/10/20 10:36 - * @param: [memberAuthorityParam] - * @return: com.hzs.common.core.web.page.TableDataInfoCLmy0718D + * 真实业绩新增奖衔查询列表 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.REAL_PERFORMANCE_ADDED_AWARDS, method = EOperationMethod.SELECT) @GetMapping("/list") @@ -92,11 +85,11 @@ public class CuMemberAwardsStatController extends BaseController { Date date = DateUtils.currentDate(); cuMemberAwardsStatVO.setPkCountry(SecurityUtils.getPkCountry()); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); //当前日期前一天 String dateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date)); //查询最新期数 - int endperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int endperiod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(dateStr)).getData().getPkId(); cuMemberAwardsStatVO.setPeriod(endperiod); String achieveTableName = TableNameConstants.CU_MEMBER_SETTLE + endperiod; @@ -117,18 +110,14 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出 真实业绩新增奖衔查询列表 - * @author: zhang jing - * @date: 2023/8/25 17:30 - * @param: [response, cuMemberAwardsStatVO] - * @return: void + * 导出 真实业绩新增奖衔查询列表 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.REAL_PERFORMANCE_ADDED_AWARDS, method = EOperationMethod.EXPORT) @PostMapping("/export") public void exportUmbrella(HttpServletResponse response, CuMemberAwardsStatVO cuMemberAwardsStatVO) { cuMemberAwardsStatVO.setPkCountry(SecurityUtils.getPkCountry()); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB( EnumsPrefixConstants.KEY_AWARD); @@ -136,7 +125,7 @@ public class CuMemberAwardsStatController extends BaseController { //当前日期前一天 String dateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date)); //查询最新期数 - int endperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int endperiod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(dateStr)).getData().getPkId(); cuMemberAwardsStatVO.setPeriod(endperiod); String achieveTableName = TableNameConstants.CU_MEMBER_SETTLE + endperiod; @@ -159,11 +148,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 奖衔晋升查询 - * @author: zhang jing - * @date: 2024/1/2 10:38 - * @param: [awardPromotionVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 奖衔晋升查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AWARD_PROMOTION, method = EOperationMethod.SELECT) @GetMapping("/promotion-list") @@ -183,11 +168,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出奖衔晋升查询 - * @author: zhang jing - * @date: 2024/1/2 10:42 - * @param: [response, awardPromotionVO] - * @return: void + * 导出奖衔晋升查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AWARD_PROMOTION, method = EOperationMethod.EXPORT) @PostMapping("/promotion-export") @@ -217,11 +198,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 会员业绩数据查询 - * @author: zhang jing - * @date: 2024/1/4 12:00 - * @param: [memberAchieveVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 会员业绩数据查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MEMBER_ACHIEVE, method = EOperationMethod.SELECT) @GetMapping("/member-achieve-list") @@ -237,7 +214,7 @@ public class CuMemberAwardsStatController extends BaseController { startPage(); List list = iCuMemberAwardsStatService.memberAchieveList(memberAchieveVO); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); //业绩转为当前国家的汇率 if (CollectionUtil.isNotEmpty(list)) { list.forEach(itm -> { @@ -256,11 +233,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description:导出会员业绩数据查询 - * @author: zhang jing - * @date: 2024/1/4 14:34 - * @param: [response, memberAchieveVO] - * @return: void + * 导出会员业绩数据查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MEMBER_ACHIEVE, method = EOperationMethod.EXPORT) @PostMapping("/member-achieve-export") @@ -273,7 +246,7 @@ public class CuMemberAwardsStatController extends BaseController { memberAchieveVO.setPkCountry(SecurityUtils.getPkCountry()); List list = iCuMemberAwardsStatService.memberAchieveList(memberAchieveVO); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); //业绩转为当前国家的汇率 if (CollectionUtil.isNotEmpty(list)) { list.forEach(itm -> { @@ -294,11 +267,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 真实奖衔分析 - * @author: zhang jing - * @date: 2023/8/26 15:57 - * @param: [cuMemberAwardsStatVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 真实奖衔分析 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AWARD_ANALYSIS, method = EOperationMethod.SELECT) @GetMapping("/analysis-list") @@ -306,12 +275,12 @@ public class CuMemberAwardsStatController extends BaseController { Date date = DateUtils.currentDate(); cuMemberAwardsAnalysisVO.setPkCountry(SecurityUtils.getPkCountry()); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); //当前日期前一天 String dateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date)); //查询最新期数 - int endperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int endperiod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(dateStr)).getData().getPkId(); cuMemberAwardsAnalysisVO.setPeriod(endperiod); startPage(); @@ -345,24 +314,20 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 真实奖衔分析-详情（穿透页面接口） - * @author: zhang jing - * @date: 2023/9/26 11:52 - * @param: [cuMemberAwardsAnalysisVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 真实奖衔分析-详情（穿透页面接口） **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.ANALYSIS_DETAILS, method = EOperationMethod.SELECT) @GetMapping("/analysis-details-list") public TableDataInfo analysisDetailsList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO) { Date date = DateUtils.currentDate(); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); //当前日期前一天 String dateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date)); //查询最新期数 if (cuMemberAwardsAnalysisVO.getPeriod() == null) { - int endperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int endperiod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(dateStr)).getData().getPkId(); cuMemberAwardsAnalysisVO.setPeriod(endperiod); } @@ -384,11 +349,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出真实奖衔分析-详情（穿透页面接口） - * @author: zhang jing - * @date: 2023/9/27 14:43 - * @param: [response, cuMemberAwardsAnalysisVO] - * @return: void + * 导出真实奖衔分析-详情（穿透页面接口） **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AWARD_ANALYSIS, method = EOperationMethod.EXPORT) @PostMapping("/export-analysis-details") @@ -397,11 +358,11 @@ public class CuMemberAwardsStatController extends BaseController { Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, EnumsPrefixConstants.KEY_AWARD); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); //当前日期前一天 String dateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date)); //查询最新期数 - int endperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int endperiod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(dateStr)).getData().getPkId(); cuMemberAwardsAnalysisVO.setPeriod(endperiod); String achieveTableName = TableNameConstants.CU_MEMBER_SETTLE + endperiod; @@ -424,17 +385,13 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 收入明细 - * @author: zhang jing - * @date: 2023/9/26 9:39 - * @param: [cuMemberAwardsAnalysisVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 收入明细 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.REVENUE_DETAI_LIST, method = EOperationMethod.SELECT) @GetMapping("/revenue-detai-list") public TableDataInfo revenueDetailsList(RevenueDetailsVO revenueDetailsVO) { //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); revenueDetailsVO.setPkCountry(SecurityUtils.getPkCountry()); startPage(); List list = iCuMemberAwardsStatService.selectRevenueDetailsList(revenueDetailsVO); @@ -452,18 +409,14 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出收入明细 - * @author: zhang jing - * @date: 2023/8/26 16:41 - * @param: [response, cuMemberAwardsAnalysisVO] - * @return: void + * 导出收入明细 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.REVENUE_DETAI_LIST, method = EOperationMethod.EXPORT) @PostMapping("/export-revenue-detai") public void exportRevenueDetai(HttpServletResponse response, RevenueDetailsVO revenueDetailsVO) { revenueDetailsVO.setPkCountry(SecurityUtils.getPkCountry()); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, EnumsPrefixConstants.KEY_AWARD); List list = iCuMemberAwardsStatService.selectRevenueDetailsList(revenueDetailsVO); @@ -484,11 +437,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出真实奖衔分析 - * @author: zhang jing - * @date: 2023/8/26 16:41 - * @param: [response, cuMemberAwardsAnalysisVO] - * @return: void + * 导出真实奖衔分析 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AWARD_ANALYSIS, method = EOperationMethod.EXPORT) @PostMapping("/export-analysis") @@ -498,13 +447,13 @@ public class CuMemberAwardsStatController extends BaseController { Map transactionMap = iTransactionCommonService.exportEnumTransaction(EUpgradeType.values()); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); Date date = DateUtils.currentDate(); cuMemberAwardsAnalysisVO.setPkCountry(SecurityUtils.getPkCountry()); //当前日期前一天 String dateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date)); //查询最新期数 - int endperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int endperiod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(dateStr)).getData().getPkId(); cuMemberAwardsAnalysisVO.setPeriod(endperiod); String achieveTableName = TableNameConstants.CU_MEMBER_SETTLE + endperiod; @@ -538,264 +487,8 @@ public class CuMemberAwardsStatController extends BaseController { util.exportExcel(response, list, "真实奖衔分析"); } - /** - * @description: 复购pv统计 - * @author: zhang jing - * @date: 2023/8/29 15:33 - * @param: [repurchasePVStatVO] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.REPURCHASE_PV_STAT, method = EOperationMethod.SELECT) - @GetMapping("/repurchasepv-list") - public TableDataInfo repurchasePVStat(RepurchasePVStatVO repurchasePVStatVO) { - Date date = DateUtils.currentDate(); - //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - repurchasePVStatVO.setPkCountry(SecurityUtils.getPkCountry()); - if (StringUtils.isNull(repurchasePVStatVO.getStartDate()) || - StringUtils.isNull(repurchasePVStatVO.getEndDate())) { - if (DateUtils.compareDateBefore(date, DateUtils.currentMonthFirstDate()) || - DateUtils.compareDateEqual(date, DateUtils.currentMonthFirstDate())) { - //之前月的第一天 - repurchasePVStatVO.setStartDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeMonthFirstDate())); - repurchasePVStatVO.setEndDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeMonthLastDate())); - } else { - //当前月第一天 - repurchasePVStatVO.setStartDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.currentMonthFirstDate())); - repurchasePVStatVO.setEndDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date))); - } - } - - if (DateUtils.compareDateBefore(date, DateUtils.parseStringToDate(repurchasePVStatVO.getStartDate())) || - DateUtils.compareDateEqual(date, DateUtils.parseStringToDate(repurchasePVStatVO.getStartDate()))) { - //当前月第一天 - repurchasePVStatVO.setStartDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.currentMonthFirstDate())); - } - if (DateUtils.compareDateBefore(date, DateUtils.parseStringToDate(repurchasePVStatVO.getEndDate())) || - DateUtils.compareDateEqual(date, DateUtils.parseStringToDate(repurchasePVStatVO.getEndDate()))) { - //当前日期的前一天 - repurchasePVStatVO.setEndDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date))); - } - //查询最新期数 - int staperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( - DateUtils.parseDateToStr(repurchasePVStatVO.getStartDate())).getData().getPkId(); - repurchasePVStatVO.setPeriod(staperiod); - String achieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(repurchasePVStatVO.getStartDate()); - repurchasePVStatVO.setAchieveTableName(achieveTableName); - Date currentDate = DateUtils.afterDate(1, ChronoUnit.DAYS, DateUtils.parseStringToDate(repurchasePVStatVO.getStartDate())); - // 考核表 - String tableName = TableNameConstants.CU_MEMBER_ASSESS + DateUtils.currentYear(currentDate); - repurchasePVStatVO.setAssessTableName(tableName); - startPage(); - List list = iCuMemberAwardsStatService.selectRepurchasePVStatList(repurchasePVStatVO); - //业绩转为当前国家的汇率 - if (CollectionUtil.isNotEmpty(list)) { - list.forEach(itm -> { - if (null != currency.getData().getInExchangeRate()) { - itm.setRepurchaseNewPv(itm.getRepurchaseNewPv().multiply(currency.getData().getInExchangeRate())); - itm.setHistoryPv(itm.getHistoryPv().multiply(currency.getData().getInExchangeRate())); - itm.setMonthSurplus(itm.getMonthSurplus().multiply(currency.getData().getInExchangeRate())); - } - }); - } - return getDataTable(list); - } - - - /** - * @description: 导出复购pv统计 - * @author: zhang jing - * @date: 2023/8/30 10:14 - * @param: [response, repurchasePVStatVO] - * @return: void - **/ - @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.REPURCHASE_PV_STAT, method = EOperationMethod.EXPORT) - @PostMapping("/export-repurchasepv") - public void exportRepurchasePVStat(HttpServletResponse response, RepurchasePVStatVO repurchasePVStatVO) { - Date date = DateUtils.currentDate(); - // 获取需要翻译的枚举翻译 - Map transactionMap = iTransactionCommonService.exportEnumTransaction(EAssessStatus.values(), EDealerYesNo.values()); - Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB( - EnumsPrefixConstants.KEY_AWARD); - //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - repurchasePVStatVO.setPkCountry(SecurityUtils.getPkCountry()); - if (StringUtils.isNull(repurchasePVStatVO.getStartDate()) || - StringUtils.isNull(repurchasePVStatVO.getEndDate())) { - if (DateUtils.compareDateBefore(date, DateUtils.currentMonthFirstDate()) || - DateUtils.compareDateEqual(date, DateUtils.currentMonthFirstDate())) { - //之前月的第一天 - repurchasePVStatVO.setStartDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeMonthFirstDate())); - repurchasePVStatVO.setEndDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeMonthLastDate())); - } else { - //当前月第一天 - repurchasePVStatVO.setStartDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.currentMonthFirstDate())); - repurchasePVStatVO.setEndDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date))); - } - } - - if (DateUtils.compareDateBefore(date, DateUtils.parseStringToDate(repurchasePVStatVO.getStartDate())) || - DateUtils.compareDateEqual(date, DateUtils.parseStringToDate(repurchasePVStatVO.getStartDate()))) { - //当前月第一天 - repurchasePVStatVO.setStartDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.currentMonthFirstDate())); - } - if (DateUtils.compareDateBefore(date, DateUtils.parseStringToDate(repurchasePVStatVO.getEndDate())) || - DateUtils.compareDateEqual(date, DateUtils.parseStringToDate(repurchasePVStatVO.getEndDate()))) { - //当前日期的前一天 - repurchasePVStatVO.setEndDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date))); - } - //查询最新期数 - int staperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( - DateUtils.parseDateToStr(repurchasePVStatVO.getStartDate())).getData().getPkId(); - repurchasePVStatVO.setPeriod(staperiod); - String achieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(repurchasePVStatVO.getStartDate()); - repurchasePVStatVO.setAchieveTableName(achieveTableName); - Date currentDate = DateUtils.afterDate(1, ChronoUnit.DAYS, DateUtils.parseStringToDate(repurchasePVStatVO.getStartDate())); - // 考核表 - String tableName = TableNameConstants.CU_MEMBER_ASSESS + DateUtils.currentYear(currentDate); - repurchasePVStatVO.setAssessTableName(tableName); - startPage(); - List list = iCuMemberAwardsStatService.selectRepurchasePVStatList(repurchasePVStatVO); - //业绩转为当前国家的汇率 - if (CollectionUtil.isNotEmpty(list)) { - list.forEach(itm -> { - itm.setAssessStatusVal(transactionMap.get(EnumsPrefixConstants.ASSESS_STATUS + itm.getAssessStatus().toString())); - itm.setIsExamineVal(transactionMap.get(EnumsPrefixConstants.DEALER_YES_NO + itm.getIsExamine().toString())); - itm.setPkAwardsVal(transactionMap1.get(itm.getPkAwards())); - if (null != currency.getData().getInExchangeRate()) { - itm.setRepurchaseNewPv(itm.getRepurchaseNewPv().multiply(currency.getData().getInExchangeRate())); - itm.setHistoryPv(itm.getHistoryPv().multiply(currency.getData().getInExchangeRate())); - itm.setMonthSurplus(itm.getMonthSurplus().multiply(currency.getData().getInExchangeRate())); - } - }); - } - - ExcelUtil util = new ExcelUtil<>(RepurchasePVStatVO.class); - util.exportExcel(response, list, "复购PV统计"); - } - - - /** - * @description: 商城BV统计 - * @author: zhang jing - * @date: 2023/8/30 10:44 - * @param: [mallPVStatVO] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MALL_BV_STAT, method = EOperationMethod.SELECT) - @GetMapping("/mallPv-list") - public TableDataInfo mallPvList(MallPVStatVO mallPVStatVO) { - Date date = DateUtils.currentDate(); - mallPVStatVO.setPkCountry(SecurityUtils.getPkCountry()); - if (StringUtils.isNull(mallPVStatVO.getStartDate()) || - StringUtils.isNull(mallPVStatVO.getEndDate())) { - if (DateUtils.compareDateBefore(date, DateUtils.currentMonthFirstDate()) || - DateUtils.compareDateEqual(date, DateUtils.currentMonthFirstDate())) { - //之前月的第一天 - mallPVStatVO.setStartDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeMonthFirstDate())); - mallPVStatVO.setEndDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeMonthLastDate())); - } else { - //当前月第一天 - mallPVStatVO.setStartDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.currentMonthFirstDate())); - mallPVStatVO.setEndDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date))); - } - } - - if (DateUtils.compareDateBefore(date, DateUtils.parseStringToDate(mallPVStatVO.getStartDate())) || - DateUtils.compareDateEqual(date, DateUtils.parseStringToDate(mallPVStatVO.getStartDate()))) { - //当前月第一天 - mallPVStatVO.setStartDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.currentMonthFirstDate())); - } - if (DateUtils.compareDateBefore(date, DateUtils.parseStringToDate(mallPVStatVO.getEndDate())) || - DateUtils.compareDateEqual(date, DateUtils.parseStringToDate(mallPVStatVO.getEndDate()))) { - //当前日期的前一天 - mallPVStatVO.setEndDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date))); - } - //查询最新期数 - int staperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( - DateUtils.parseDateToStr(mallPVStatVO.getStartDate())).getData().getPkId(); - mallPVStatVO.setPeriod(staperiod); - String achieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(mallPVStatVO.getStartDate()); - mallPVStatVO.setAchieveTableName(achieveTableName); - Date currentDate = DateUtils.afterDate(1, ChronoUnit.DAYS, DateUtils.parseStringToDate(mallPVStatVO.getStartDate())); - // 考核表 - String tableName = TableNameConstants.CU_MEMBER_ASSESS + DateUtils.currentYear(currentDate); - mallPVStatVO.setAssessTableName(tableName); - startPage(); - List list = iCuMemberAwardsStatService.selectMallPVStatList(mallPVStatVO); - return getDataTable(list); - } - - /** - * @description:导出-商城BV统计 - * @author: zhang jing - * @date: 2023/8/30 11:21 - * @param: [response, mallPVStatVO] - * @return: void - **/ - @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MALL_BV_STAT, method = EOperationMethod.EXPORT) - @PostMapping("/export-mallPv") - public void exportMallPv(HttpServletResponse response, MallPVStatVO mallPVStatVO) { - Date date = DateUtils.currentDate(); - Map transactionMap = iTransactionCommonService.exportEnumTransaction(EAssessStatus.values(), EDealerYesNo.values()); - Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB( - EnumsPrefixConstants.KEY_AWARD); - mallPVStatVO.setPkCountry(SecurityUtils.getPkCountry()); - if (StringUtils.isNull(mallPVStatVO.getStartDate()) || - StringUtils.isNull(mallPVStatVO.getEndDate())) { - if (DateUtils.compareDateBefore(date, DateUtils.currentMonthFirstDate()) || - DateUtils.compareDateEqual(date, DateUtils.currentMonthFirstDate())) { - //之前月的第一天 - mallPVStatVO.setStartDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeMonthFirstDate())); - mallPVStatVO.setEndDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeMonthLastDate())); - } else { - //当前月第一天 - mallPVStatVO.setStartDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.currentMonthFirstDate())); - mallPVStatVO.setEndDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date))); - } - } - - if (DateUtils.compareDateBefore(date, DateUtils.parseStringToDate(mallPVStatVO.getStartDate())) || - DateUtils.compareDateEqual(date, DateUtils.parseStringToDate(mallPVStatVO.getStartDate()))) { - //当前月第一天 - mallPVStatVO.setStartDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.currentMonthFirstDate())); - } - if (DateUtils.compareDateBefore(date, DateUtils.parseStringToDate(mallPVStatVO.getEndDate())) || - DateUtils.compareDateEqual(date, DateUtils.parseStringToDate(mallPVStatVO.getEndDate()))) { - //当前日期的前一天 - mallPVStatVO.setEndDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date))); - } - //查询最新期数 - int staperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( - DateUtils.parseDateToStr(mallPVStatVO.getStartDate())).getData().getPkId(); - mallPVStatVO.setPeriod(staperiod); - String achieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(mallPVStatVO.getStartDate()); - mallPVStatVO.setAchieveTableName(achieveTableName); - Date currentDate = DateUtils.afterDate(1, ChronoUnit.DAYS, DateUtils.parseStringToDate(mallPVStatVO.getStartDate())); - // 考核表 - String tableName = TableNameConstants.CU_MEMBER_ASSESS + DateUtils.currentYear(currentDate); - mallPVStatVO.setAssessTableName(tableName); - startPage(); - List list = iCuMemberAwardsStatService.selectMallPVStatList(mallPVStatVO); - if (CollectionUtil.isNotEmpty(list)) { - list.forEach(itm -> { - itm.setPkAwardsVal(transactionMap1.get(itm.getPkAwards())); - itm.setAssessStatusVal(transactionMap.get(EnumsPrefixConstants.ASSESS_STATUS + itm.getAssessStatus().toString())); - itm.setIsExamineVal(transactionMap.get(EnumsPrefixConstants.DEALER_YES_NO + itm.getIsExamine().toString())); - }); - } - ExcelUtil util = new ExcelUtil<>(MallPVStatVO.class); - util.exportExcel(response, list, "商城BV统计"); - } - - - /** - * @description: 个人统计 - * @author: zhang jing - * @date: 2023/9/1 11:32 - * @param: [personStatVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 个人统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PERSON_STAT, method = EOperationMethod.SELECT) @GetMapping("/personStatList") @@ -842,7 +535,7 @@ public class CuMemberAwardsStatController extends BaseController { if (CollectionUtil.isNotEmpty(firstDaysOfMonth)) { for (String dateStr : firstDaysOfMonth) { //查询最新期数 - int staperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int staperiod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(dateStr)).getData().getPkId(); PersonStatVO per = new PersonStatVO(); per.setPeriod(staperiod); @@ -867,11 +560,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出 个人统计 - * @author: zhang jing - * @date: 2023/9/1 14:26 - * @param: [personStatVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 导出 个人统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PERSON_STAT, method = EOperationMethod.EXPORT) @PostMapping("/export-personStat") @@ -918,7 +607,7 @@ public class CuMemberAwardsStatController extends BaseController { if (CollectionUtil.isNotEmpty(firstDaysOfMonth)) { for (String dateStr : firstDaysOfMonth) { //查询最新期数 - int staperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int staperiod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(dateStr)).getData().getPkId(); PersonStatVO per = new PersonStatVO(); per.setPeriod(staperiod); @@ -945,17 +634,13 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 直推统计 - * @author: zhang jing - * @date: 2023/9/1 16:13 - * @param: [personStatVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 直推统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_STAT, method = EOperationMethod.SELECT) @GetMapping("/directPushStatList") public TableDataInfo directPushStatList(DirectPushVO directPushVO) { Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { directPushVO.setRate(exchangeRate); @@ -975,11 +660,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出直推统计 - * @author: zhang jing - * @date: 2023/9/4 15:27 - * @param: [directPushVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 导出直推统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_STAT, method = EOperationMethod.EXPORT) @PostMapping("/export-directPush") @@ -990,7 +671,7 @@ public class CuMemberAwardsStatController extends BaseController { Map transactionMap = iTransactionCommonService.exportEnumTransaction(EOrderBusiness.values()); Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, EnumsPrefixConstants.KEY_AWARD); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { directPushVO.setRate(exchangeRate); @@ -1020,11 +701,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 个人复购统计 - * @author: zhang jing - * @date: 2024/1/25 11:09 - * @param: [prVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 个人复购统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PERSON_REPURCHASE, method = EOperationMethod.SELECT) @GetMapping("/personRepurchaseList") @@ -1033,7 +710,7 @@ public class CuMemberAwardsStatController extends BaseController { return getDataTable(new ArrayList<>()); } Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); prVO.setPkCountry(pkCountry); startPage(); @@ -1049,11 +726,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出个人复购统计 - * @author: zhang jing - * @date: 2024/1/25 14:19 - * @param: [response, prVO] - * @return: void + * 导出个人复购统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PERSON_REPURCHASE, method = EOperationMethod.EXPORT) @PostMapping("/export-personRepurchase") @@ -1061,7 +734,7 @@ public class CuMemberAwardsStatController extends BaseController { if (StringUtils.isNotEmpty(prVO.getStartDate()) && StringUtils.isNotEmpty(prVO.getEndDate())) { Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); prVO.setPkCountry(pkCountry); List list = iCuMemberAwardsStatService.personRepurchaseList(prVO); @@ -1082,11 +755,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出安置业绩统计 - * @author: zhang jing - * @date: 2024/2/25 14:53 - * @param: [response, psVO] - * @return: void + * 导出安置业绩统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.POSIT_STAT, method = EOperationMethod.EXPORT) @PostMapping("/export-positStat") @@ -1098,7 +767,7 @@ public class CuMemberAwardsStatController extends BaseController { if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { return; } - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.isSuccess() ? (currency.getData().getInExchangeRate() != null ? currency.getData().getInExchangeRate() : BigDecimal.ONE) : BigDecimal.ONE; psVO.setPkCountry(pkCountry); @@ -1140,11 +809,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 直推数据列表 - * @author: zhang jing - * @date: 2023/12/18 16:40 - * @param: [dpdVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 直推数据列表 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_DATA, method = EOperationMethod.SELECT) @GetMapping("/directPushDataList") @@ -1169,7 +834,7 @@ public class CuMemberAwardsStatController extends BaseController { Date date = DateUtils.currentDate(); Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { dpdVO.setRate(exchangeRate); @@ -1235,11 +900,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 导出直推数据 - * @author: zhang jing - * @date: 2023/12/20 11:54 - * @param: [response, dpdVO] - * @return: void + * 导出直推数据 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_DATA, method = EOperationMethod.EXPORT) @PostMapping("/export-directPushData") @@ -1260,7 +921,7 @@ public class CuMemberAwardsStatController extends BaseController { } Date date = DateUtils.currentDate(); Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { dpdVO.setRate(exchangeRate); @@ -1327,11 +988,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 直推数据详情 - * @author: zhang jing - * @date: 2023/12/20 14:10 - * @param: [dpdVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 直推数据详情 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_DATA, method = EOperationMethod.SELECT) @GetMapping("/directPushDataDetails") @@ -1340,7 +997,7 @@ public class CuMemberAwardsStatController extends BaseController { return getDataTable(new ArrayList<>()); } Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); dpdVO.setRate(exchangeRate); dpdVO.setPkCountry(pkCountry); @@ -1350,11 +1007,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 直推数据-发送站内信展示 - * @author: zhang jing - * @date: 2023/12/20 17:36 - * @param: [dpdVO] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 直推数据-发送站内信展示 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_DATA, method = EOperationMethod.CONFIRM) @GetMapping("/sendingMessages") @@ -1386,7 +1039,7 @@ public class CuMemberAwardsStatController extends BaseController { //查询会员 Date date = DateUtils.currentDate(); Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { dpdVO.setRate(exchangeRate); @@ -1462,11 +1115,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 直推数据-发送站内信-发起签呈 - * @author: zhang jing - * @date: 2023/12/21 11:38 - * @param: [nmvo] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 直推数据-发送站内信-发起签呈 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_DATA, method = EOperationMethod.SUBMIT) @PostMapping("/petition") @@ -1497,18 +1146,14 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 会员订单分布统计 - * @author: zhang jing - * @date: 2023/9/20 14:14 - * @param: [directPushVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 会员订单分布统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.ORDER_SCATTER, method = EOperationMethod.SELECT) @GetMapping("/memberOrderScatter") public TableDataInfo memberOrderScatter(OrderScatterVO orderScatterVO) { Date date = DateUtils.currentDate(); Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); orderScatterVO.setRate(exchangeRate); orderScatterVO.setPkCountry(pkCountry); @@ -1527,18 +1172,14 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出会员订单分布统计 - * @author: zhang jing - * @date: 2023/9/20 15:39 - * @param: [response, orderScatterVO] - * @return: void + * 导出会员订单分布统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.ORDER_SCATTER, method = EOperationMethod.EXPORT) @PostMapping("/export-OrderScatter") public void exportOrderScatter(HttpServletResponse response, OrderScatterVO orderScatterVO) { Date date = DateUtils.currentDate(); Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); orderScatterVO.setRate(exchangeRate); orderScatterVO.setPkCountry(pkCountry); @@ -1557,11 +1198,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 地区业绩统计 - * @author: zhang jing - * @date: 2024/5/6 15:37 - * @param: [orderScatterVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 地区业绩统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AREA_ACHIEVE_STAT, method = EOperationMethod.SELECT) @GetMapping("/areaAchieveStat") @@ -1570,7 +1207,7 @@ public class CuMemberAwardsStatController extends BaseController { Integer pkCountry = SecurityUtils.getPkCountry(); // 获取货币数据和汇率 - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); // 在输入对象中设置汇率和国家 @@ -1771,18 +1408,14 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出地区业绩统计 - * @author: zhang jing - * @date: 2024/5/8 9:40 - * @param: [areaAchieveStatVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 导出地区业绩统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AREA_ACHIEVE_STAT, method = EOperationMethod.EXPORT) @PostMapping("/export-areaAchieveStat") public void exportAreaAchieveStat(HttpServletResponse response, AreaAchieveStatVO areaAchieveStatVO) throws IOException { Date date = DateUtils.currentDate(); Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); areaAchieveStatVO.setRate(exchangeRate); areaAchieveStatVO.setPkCountry(pkCountry); @@ -1967,11 +1600,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 查询跨月时间 - * @author: zhang jing - * @date: 2023/8/28 14:10 - * @param: [startDate, endDate] - * @return: java.util.List + * 查询跨月时间 **/ public List getStrideMonth(String startDate, String endDate) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); @@ -1988,18 +1617,14 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 伞下血缘去重 - * @author: zhang jing - * @date: 2023/10/11 11:16 - * @param: [bloodRemoveSameVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 伞下血缘去重 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AWARD_ANALYSIS, method = EOperationMethod.SELECT) @GetMapping("/blood-remove-same") public TableDataInfo bloodRemoveSameList(BloodRemoveSameVO bloodRemoveSameVO) { List list = new ArrayList<>(); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); bloodRemoveSameVO.setPkCountry(SecurityUtils.getPkCountry()); List orderTypeList = EOrderBusiness.getOrderTypeList(bloodRemoveSameVO.getOrderType()); bloodRemoveSameVO.setOrderTypeList(orderTypeList); @@ -2042,18 +1667,14 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 伞下血缘去重历史数据 - * @author: zhang jing - * @date: 2024/5/14 14:39 - * @param: [bloodRemoveSameVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 伞下血缘去重历史数据 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AWARD_ANALYSIS, method = EOperationMethod.SELECT) @GetMapping("/blood-remove-same-history") public TableDataInfo bloodRemoveSameListHistory(BloodRemoveSameVO bloodRemoveSameVO) { List list = new ArrayList<>(); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); bloodRemoveSameVO.setPkCountry(SecurityUtils.getPkCountry()); List orderTypeList = EOrderBusiness.getOrderTypeList(bloodRemoveSameVO.getOrderType()); bloodRemoveSameVO.setOrderTypeList(orderTypeList); @@ -2061,23 +1682,6 @@ public class CuMemberAwardsStatController extends BaseController { bloodRemoveSameVO.setOrderType(EOrderBusiness.WHOLE.getValue()); } List pkAwardsList = new ArrayList<>(); -// if (bloodRemoveSameVO.getPkAwardsLevel() != null) { -// if (bloodRemoveSameVO.getPkAwardsLevel() == EAwardsLevel.MANAGER_LEVEL.getValue()) { -// pkAwardsList.add(EAwards.MANAGER.getValue()); -// pkAwardsList.add(EAwards.HIGH_MANAGER.getValue()); -// pkAwardsList.add(EAwards.SENIOR_MANAGER.getValue()); -// } else if (bloodRemoveSameVO.getPkAwardsLevel() == EAwardsLevel.CHIEF_LEVEL.getValue()) { -// pkAwardsList.add(EAwards.CHIEF.getValue()); -// pkAwardsList.add(EAwards.HIGH_CHIEF.getValue()); -// pkAwardsList.add(EAwards.SENIOR_CHIEF.getValue()); -// pkAwardsList.add(EAwards.CHAIRMAN.getValue()); -// } else if (bloodRemoveSameVO.getPkAwardsLevel() == EAwardsLevel.CHAIRMAN_LEVEL.getValue()) { -// pkAwardsList.add(EAwards.CHAIRMAN.getValue()); -// pkAwardsList.add(EAwards.HONOR_CHAIRMAN.getValue()); -// pkAwardsList.add(EAwards.GLOBAL_CHAIRMAN.getValue()); -// } -// pkAwardsList = iCuMemberAwardsStatService.awardsLevellist(pkAwardsList, SecurityUtils.getPkCountry()); -// } if (bloodRemoveSameVO.getPkAwards() != null) { pkAwardsList.add(bloodRemoveSameVO.getPkAwards()); } @@ -2092,9 +1696,9 @@ public class CuMemberAwardsStatController extends BaseController { //查询最新期数 //开始时间减一天 bloodRemoveSameVO.setStartDate(DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, bloodRemoveSameVO.getStartDate())); - bloodRemoveSameVO.setPeriodSta(cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + bloodRemoveSameVO.setPeriodSta(iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(bloodRemoveSameVO.getStartDate())).getData().getPkId()); - bloodRemoveSameVO.setPeriodEnd(cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + bloodRemoveSameVO.setPeriodEnd(iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(bloodRemoveSameVO.getEndDate())).getData().getPkId()); bloodRemoveSameVO.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(bloodRemoveSameVO.getStartDate())); bloodRemoveSameVO.setAchieveTableNameEnd(TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(bloodRemoveSameVO.getEndDate())); @@ -2112,18 +1716,14 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 导出伞下血缘去重 - * @author: zhang jing - * @date: 2023/10/19 16:08 - * @param: [response, lcVO] - * @return: void + * 导出伞下血缘去重 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AWARD_ANALYSIS, method = EOperationMethod.EXPORT) @PostMapping("/export-blood-remove-same") public void exportBloodRemoveSame(HttpServletResponse response, BloodRemoveSameVO bloodRemoveSameVO) { List list = new ArrayList<>(); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB( EnumsPrefixConstants.KEY_AWARD); bloodRemoveSameVO.setPkCountry(SecurityUtils.getPkCountry()); @@ -2170,18 +1770,14 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出伞下血缘去重历史数据 - * @author: zhang jing - * @date: 2024/5/14 14:41 - * @param: [response, bloodRemoveSameVO] - * @return: void + * 导出伞下血缘去重历史数据 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AWARD_ANALYSIS, method = EOperationMethod.EXPORT) @PostMapping("/export-blood-remove-same-history") public void exportBloodRemoveSameHistory(HttpServletResponse response, BloodRemoveSameVO bloodRemoveSameVO) { List list = new ArrayList<>(); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB( EnumsPrefixConstants.KEY_AWARD); bloodRemoveSameVO.setPkCountry(SecurityUtils.getPkCountry()); @@ -2191,23 +1787,6 @@ public class CuMemberAwardsStatController extends BaseController { if (StringUtils.isNull(bloodRemoveSameVO.getOrderType())) { bloodRemoveSameVO.setOrderType(EOrderBusiness.WHOLE.getValue()); } -// if (bloodRemoveSameVO.getPkAwardsLevel() != null) { -// if (bloodRemoveSameVO.getPkAwardsLevel() == EAwardsLevel.MANAGER_LEVEL.getValue()) { -// pkAwardsList.add(EAwards.MANAGER.getValue()); -// pkAwardsList.add(EAwards.HIGH_MANAGER.getValue()); -// pkAwardsList.add(EAwards.SENIOR_MANAGER.getValue()); -// } else if (bloodRemoveSameVO.getPkAwardsLevel() == EAwardsLevel.CHIEF_LEVEL.getValue()) { -// pkAwardsList.add(EAwards.CHIEF.getValue()); -// pkAwardsList.add(EAwards.HIGH_CHIEF.getValue()); -// pkAwardsList.add(EAwards.SENIOR_CHIEF.getValue()); -// pkAwardsList.add(EAwards.CHAIRMAN.getValue()); -// } else if (bloodRemoveSameVO.getPkAwardsLevel() == EAwardsLevel.CHAIRMAN_LEVEL.getValue()) { -// pkAwardsList.add(EAwards.CHAIRMAN.getValue()); -// pkAwardsList.add(EAwards.HONOR_CHAIRMAN.getValue()); -// pkAwardsList.add(EAwards.GLOBAL_CHAIRMAN.getValue()); -// } -// pkAwardsList = iCuMemberAwardsStatService.awardsLevellist(pkAwardsList, SecurityUtils.getPkCountry()); -// } if (bloodRemoveSameVO.getPkAwards() != null) { pkAwardsList.add(bloodRemoveSameVO.getPkAwards()); } @@ -2222,9 +1801,9 @@ public class CuMemberAwardsStatController extends BaseController { } else { //查询最新期数 bloodRemoveSameVO.setStartDate(DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, bloodRemoveSameVO.getStartDate())); - bloodRemoveSameVO.setPeriodSta(cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + bloodRemoveSameVO.setPeriodSta(iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(bloodRemoveSameVO.getStartDate())).getData().getPkId()); - bloodRemoveSameVO.setPeriodEnd(cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + bloodRemoveSameVO.setPeriodEnd(iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(bloodRemoveSameVO.getEndDate())).getData().getPkId()); bloodRemoveSameVO.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(bloodRemoveSameVO.getStartDate())); bloodRemoveSameVO.setAchieveTableNameEnd(TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(bloodRemoveSameVO.getEndDate())); @@ -2241,13 +1820,8 @@ public class CuMemberAwardsStatController extends BaseController { } } - /** - * @description: 安置血缘查询 - * @author: zhang jing - * @date: 2023/12/6 15:38 - * @param: [resettleBloodVOVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 安置血缘查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.RESETTLE_BLOOD, method = EOperationMethod.SELECT) @GetMapping("/resettle-blood-list") @@ -2267,11 +1841,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出安置血缘查询 - * @author: zhang jing - * @date: 2023/12/7 15:01 - * @param: [response, resettleBloodVO] - * @return: void + * 导出安置血缘查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.RESETTLE_BLOOD, method = EOperationMethod.EXPORT) @PostMapping("/resettle-blood-excel") @@ -2293,11 +1863,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 安置血缘查询-左右区人数详情列表 - * @author: zhang jing - * @date: 2023/12/7 10:47 - * @param: [resettleBloodVOVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 安置血缘查询-左右区人数详情列表 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.RESETTLE_DETAILS, method = EOperationMethod.SELECT) @GetMapping("/resettle-details-list") @@ -2309,11 +1875,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 安置血缘查询-左右区血缘人数详情列表 - * @author: zhang jing - * @date: 2023/12/7 11:21 - * @param: [resettleBloodVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 安置血缘查询-左右区血缘人数详情列表 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.RESETTLE_BLOOD_DETAILS, method = EOperationMethod.SELECT) @GetMapping("/resettle-blood-details-list") @@ -2326,11 +1888,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 导出左右区血缘人数详情列表 - * @author: zhang jing - * @date: 2023/12/7 15:04 - * @param: [response, resettleBloodVO] - * @return: void + * 导出左右区血缘人数详情列表 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.RESETTLE_BLOOD_DETAILS, method = EOperationMethod.EXPORT) @PostMapping("/resettle-details-excel") @@ -2350,11 +1908,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出左右区人数详情列表 - * @author: zhang jing - * @date: 2023/12/7 15:04 - * @param: [response, resettleBloodVO] - * @return: void + * 导出左右区人数详情列表 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.RESETTLE_DETAILS, method = EOperationMethod.EXPORT) @PostMapping("/resettle-blood-details-excel") @@ -2375,11 +1929,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 伞下直推产品查询 - * @author: zhang jing - * @date: 2024/2/23 16:00 - * @param: [ubpVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 伞下直推产品查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.UMBRELLA_BELOW_PRODUCT, method = EOperationMethod.SELECT) @GetMapping("/umbrella-below-product") @@ -2396,7 +1946,7 @@ public class CuMemberAwardsStatController extends BaseController { R member = iMemberServiceApi.getMemberByCode(ubpVO.getMemberCode()); ubpVO.setPkMember(member.getData().getPkId()); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); startPage(); List list = iCuMemberAwardsStatService.umbrellaBelowProductList(ubpVO); if (CollectionUtil.isNotEmpty(list)) { @@ -2413,11 +1963,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出伞下直推产品查询 - * @author: zhang jing - * @date: 2024/2/26 10:09 - * @param: [response, ubpVO] - * @return: void + * 导出伞下直推产品查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.UMBRELLA_BELOW_PRODUCT, method = EOperationMethod.EXPORT) @PostMapping("/umbrella-below-product-excel") @@ -2432,7 +1978,7 @@ public class CuMemberAwardsStatController extends BaseController { R member = iMemberServiceApi.getMemberByCode(ubpVO.getMemberCode()); ubpVO.setPkMember(member.getData().getPkId()); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); startPage(); List list = iCuMemberAwardsStatService.umbrellaBelowProductList(ubpVO); if (CollectionUtil.isNotEmpty(list)) { @@ -2457,11 +2003,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 伞下直推产品去重 - * @author: zhang jing - * @date: 2024/2/24 14:23 - * @param: [ubpVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 伞下直推产品去重 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.UMBRELLA_BELOW_REPEAT, method = EOperationMethod.SELECT) @GetMapping("/umbrella-below-repeat") @@ -2484,7 +2026,7 @@ public class CuMemberAwardsStatController extends BaseController { } ubrVO.setPkMemberList(pkMemberList); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); startPage(); List list = iCuMemberAwardsStatService.umbrellaBelowRepeatList(ubrVO); if (CollectionUtil.isNotEmpty(list)) { @@ -2501,11 +2043,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出伞下直推产品去重 - * @author: zhang jing - * @date: 2024/2/26 10:11 - * @param: [response, ubrVO] - * @return: void + * 导出伞下直推产品去重 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.UMBRELLA_BELOW_REPEAT, method = EOperationMethod.EXPORT) @PostMapping("/umbrella-below-repeat-excel") @@ -2526,7 +2064,7 @@ public class CuMemberAwardsStatController extends BaseController { } ubrVO.setPkMemberList(pkMemberList); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); List list = iCuMemberAwardsStatService.umbrellaBelowRepeatList(ubrVO); if (CollectionUtil.isNotEmpty(list)) { Map transactionMap = iTransactionCommonService.exportEnumTransaction(EOrderType.values()); @@ -2546,11 +2084,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 伞下直推产品统计 - * @author: zhang jing - * @date: 2024/2/25 11:39 - * @param: [sptVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 伞下直推产品统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.STAT_PRODUCT, method = EOperationMethod.SELECT) @GetMapping("/stat-product") @@ -2573,7 +2107,7 @@ public class CuMemberAwardsStatController extends BaseController { } sptVO.setPkMemberList(pkMemberList); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); startPage(); List list = iCuMemberAwardsStatService.statProductList(sptVO); if (CollectionUtil.isNotEmpty(list)) { @@ -2590,11 +2124,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出伞下直推产品统计 - * @author: zhang jing - * @date: 2024/2/26 10:12 - * @param: [response, sptVO] - * @return: void + * 导出伞下直推产品统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.STAT_PRODUCT, method = EOperationMethod.EXPORT) @PostMapping("/stat-product-excel") @@ -2615,7 +2145,7 @@ public class CuMemberAwardsStatController extends BaseController { } sptVO.setPkMemberList(pkMemberList); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); List list = iCuMemberAwardsStatService.statProductList(sptVO); if (CollectionUtil.isNotEmpty(list)) { list.forEach(itm -> { @@ -2634,11 +2164,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 会员户籍数据查询 - * @author: zhang jing - * @date: 2024/3/6 14:29 - * @param: [ddVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 会员户籍数据查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DOMICILE_DATA_LIST, method = EOperationMethod.SELECT) @GetMapping("/domicileDataList") @@ -2650,11 +2176,11 @@ public class CuMemberAwardsStatController extends BaseController { String endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date); endDateStr = DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, endDateStr); //查询最新期数 - int endPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int endPeriod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(endDateStr)).getData().getPkId(); String endAchieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(endDateStr); Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.isSuccess() ? (currency.getData().getInExchangeRate() != null ? currency.getData().getInExchangeRate() : BigDecimal.ONE) : BigDecimal.ONE; ddVO.setEndPeriod(endPeriod); ddVO.setEndAchieveTableName(endAchieveTableName); @@ -2677,11 +2203,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 导出会员户籍数据查询 - * @author: zhang jing - * @date: 2024/3/6 14:29 - * @param: [response, psVO] - * @return: void + * 导出会员户籍数据查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DOMICILE_DATA_LIST, method = EOperationMethod.EXPORT) @PostMapping("/export-domicileDataList") @@ -2693,11 +2215,11 @@ public class CuMemberAwardsStatController extends BaseController { String endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date); endDateStr = DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, endDateStr); //查询最新期数 - int endPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int endPeriod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(endDateStr)).getData().getPkId(); String endAchieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(endDateStr); Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.isSuccess() ? (currency.getData().getInExchangeRate() != null ? currency.getData().getInExchangeRate() : BigDecimal.ONE) : BigDecimal.ONE; ddVO.setEndPeriod(endPeriod); ddVO.setEndAchieveTableName(endAchieveTableName); @@ -2723,11 +2245,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 系统业绩统计 - * @author: zhang jing - * @date: 2024/5/6 15:37 - * @param: [orderScatterVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 系统业绩统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AREA_ACHIEVE_STAT, method = EOperationMethod.SELECT) @GetMapping("/vertexAchieveStat") @@ -2736,7 +2254,7 @@ public class CuMemberAwardsStatController extends BaseController { Integer pkCountry = SecurityUtils.getPkCountry(); // 获取货币数据和汇率 - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); // 在输入对象中设置汇率和国家 @@ -2906,7 +2424,6 @@ public class CuMemberAwardsStatController extends BaseController { break; } } - } else { aasAll.setVertexName(value.getVertexName()); } @@ -2917,11 +2434,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出系统业绩统计 - * @author: zhang jing - * @date: 2024/5/8 9:40 - * @param: [areaAchieveStatVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 导出系统业绩统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AREA_ACHIEVE_STAT, method = EOperationMethod.EXPORT) @PostMapping("/export-vertexAchieveStat") @@ -2930,7 +2443,7 @@ public class CuMemberAwardsStatController extends BaseController { Integer pkCountry = SecurityUtils.getPkCountry(); // 获取货币数据和汇率 - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); // 在输入对象中设置汇率和国家 @@ -3110,163 +2623,4 @@ public class CuMemberAwardsStatController extends BaseController { iCuMemberAwardsStatService.exportExcelVertexWithMergedCells(response, fileName, allList); } - - /** - * @description: 月度职级名单查询 - * @author: zhang jing - * @date: 2024/6/21 9:31 - * @param: [monthlyJobLevelVo] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MONTHLY_JOB_LEVEL, method = EOperationMethod.SELECT) - @GetMapping("/monthly-job-level") - public TableDataInfo monthlyJobLevel(MonthlyJobLevelVo mjlVO) { - Integer pkCountry = SecurityUtils.getPkCountry(); - Date date = DateUtils.currentDate(); - if (StringUtils.isNotBlank(mjlVO.getMemberCode())) { - R member = iMemberServiceApi.getMemberByCode(mjlVO.getMemberCode()); - if (null != member.getData()) { - mjlVO.setPkMember(member.getData().getPkId()); - mjlVO.setMemberCode(member.getData().getMemberCode()); - mjlVO.setMemberName(member.getData().getMemberName()); - } else { - return getDataTable(new ArrayList<>()); - } - } else { - return getDataTable(new ArrayList<>()); - } - if (StringUtils.isNull(mjlVO.getStatDate())) { - return getDataTable(new ArrayList<>()); - } else { - //汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - mjlVO.setRate(currency.getData().getInExchangeRate()); - mjlVO.setPkCountry(pkCountry); - //判断是否为当前月 - String currentDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM, date); - String statDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM, mjlVO.getStatDate()); - if (currentDate.equals(statDate)) { - //查询当前月当前日期减一天 - mjlVO.setEndDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date))); - } else if (DateUtils.compareDateBefore(date, mjlVO.getStatDate())) { - return getDataTable(new ArrayList<>()); - } else { - //查询当前月最后一天 - mjlVO.setEndDate(DateUtils.currentMonthLastDateStr(mjlVO.getStatDate())); - } - //当前月期数,当前月表 - mjlVO.setPeriodEnd(cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( - mjlVO.getEndDate()).getData().getPkId()); - mjlVO.setAchieveTableName(TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(mjlVO.getEndDate())); - mjlVO.setSettleTableName(TableNameConstants.CU_MEMBER_TREE + DateUtils.getMonth(mjlVO.getEndDate())); - - //查询上一个月 - mjlVO.setLastMonthEndDate(DateUtils.beforeMonthLastDateStr(DateUtils.parseStringToDate(mjlVO.getEndDate()))); - mjlVO.setLastMonthPeriodEnd(cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( - mjlVO.getLastMonthEndDate()).getData().getPkId()); - mjlVO.setLastMonthAchieveTableName(TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(mjlVO.getLastMonthEndDate())); - mjlVO.setLastMonthSettleTableName(TableNameConstants.CU_MEMBER_TREE + DateUtils.getMonth(mjlVO.getLastMonthEndDate())); - List mjlList = iCuMemberAwardsStatService.monthlyJobLevelList(mjlVO); - if (CollectionUtil.isNotEmpty(mjlList)) { - mjlList.forEach(itm -> { - itm.setMemberCode(mjlVO.getMemberCode()); - itm.setMemberName(mjlVO.getMemberName()); - if (itm.getAsumPv() != null && itm.getLastMonthASumPv() != null) { - itm.setNewASumPv(itm.getAsumPv().subtract(itm.getLastMonthASumPv())); - itm.setNewBSumPv(itm.getBsumPv().subtract(itm.getLastMonthBSumPv())); - } else if (itm.getAsumPv() != null) { - itm.setNewASumPv(itm.getAsumPv()); - itm.setNewBSumPv(itm.getBsumPv()); - } - if (itm.getDyTotal() != null && itm.getSyTotal() != null) { - itm.setDyNewTotal(itm.getDyTotal() - itm.getSyTotal()); - } else if (itm.getDyTotal() != null) { - itm.setDyNewTotal(itm.getDyTotal()); - } - }); - return getDataTable(mjlList); - } - } - return getDataTable(new ArrayList<>()); - } - - - /** - * @description: 导出月度职级名单查询 - * @author: zhang jing - * @date: 2024/6/25 12:02 - * @param: [response, mjlVO] - * @return: void - **/ - @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MONTHLY_JOB_LEVEL, method = EOperationMethod.SELECT) - @PostMapping("/export-monthly-job-level") - public void exportMonthlyJobLevel(HttpServletResponse response, MonthlyJobLevelVo mjlVO) { - Integer pkCountry = SecurityUtils.getPkCountry(); - Date date = DateUtils.currentDate(); - if (StringUtils.isNotBlank(mjlVO.getMemberCode())) { - R member = iMemberServiceApi.getMemberByCode(mjlVO.getMemberCode()); - if (null != member.getData()) { - mjlVO.setPkMember(member.getData().getPkId()); - mjlVO.setMemberCode(member.getData().getMemberCode()); - mjlVO.setMemberName(member.getData().getMemberName()); - } else { - return; - } - } else { - return; - } - if (StringUtils.isNotNull(mjlVO.getStatDate())) { - //汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - mjlVO.setRate(currency.getData().getInExchangeRate()); - mjlVO.setPkCountry(pkCountry); - //判断是否为当前月 - String currentDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM, date); - String statDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM, mjlVO.getStatDate()); - if (currentDate.equals(statDate)) { - //查询当前月当前日期减一天 - mjlVO.setEndDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date))); - } else if (DateUtils.compareDateBefore(date, mjlVO.getStatDate())) { - return; - } else { - //查询当前月最后一天 - mjlVO.setEndDate(DateUtils.currentMonthLastDateStr(mjlVO.getStatDate())); - } - //当前月期数,当前月表 - mjlVO.setPeriodEnd(cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( - mjlVO.getEndDate()).getData().getPkId()); - mjlVO.setAchieveTableName(TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(mjlVO.getEndDate())); - mjlVO.setSettleTableName(TableNameConstants.CU_MEMBER_TREE + DateUtils.getMonth(mjlVO.getEndDate())); - - //查询上一个月 - mjlVO.setLastMonthEndDate(DateUtils.beforeMonthLastDateStr(DateUtils.parseStringToDate(mjlVO.getEndDate()))); - mjlVO.setLastMonthPeriodEnd(cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( - mjlVO.getLastMonthEndDate()).getData().getPkId()); - mjlVO.setLastMonthAchieveTableName(TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(mjlVO.getLastMonthEndDate())); - mjlVO.setLastMonthSettleTableName(TableNameConstants.CU_MEMBER_TREE + DateUtils.getMonth(mjlVO.getLastMonthEndDate())); - List mjlList = iCuMemberAwardsStatService.monthlyJobLevelList(mjlVO); - if (CollectionUtil.isNotEmpty(mjlList)) { - mjlList.forEach(itm -> { - itm.setMemberCode(mjlVO.getMemberCode()); - itm.setMemberName(mjlVO.getMemberName()); - if (itm.getAsumPv() != null && itm.getLastMonthASumPv() != null) { - itm.setNewASumPv(itm.getAsumPv().subtract(itm.getLastMonthASumPv())); - itm.setNewBSumPv(itm.getBsumPv().subtract(itm.getLastMonthBSumPv())); - } else if (itm.getAsumPv() != null) { - itm.setNewASumPv(itm.getAsumPv()); - itm.setNewBSumPv(itm.getBsumPv()); - } - if (itm.getDyTotal() != null && itm.getSyTotal() != null) { - itm.setDyNewTotal(itm.getDyTotal() - itm.getSyTotal()); - } else if (itm.getDyTotal() != null) { - itm.setDyNewTotal(itm.getDyTotal()); - } - }); - ExcelUtil util = new ExcelUtil<>(MonthlyJobLevelVo.class); - util.exportExcel(response, mjlList, "月度职级名单查询"); - } - } - } - - } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuUmbrellaBelowPushController.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuUmbrellaBelowPushController.java index 3ffddaf8..9ea38046 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuUmbrellaBelowPushController.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuUmbrellaBelowPushController.java @@ -1,6 +1,5 @@ package com.hzs.report.member.controller.manage; - import cn.hutool.core.collection.CollectionUtil; import com.hzs.common.core.annotation.Log; import com.hzs.common.core.constant.EnumsPrefixConstants; @@ -13,14 +12,10 @@ import com.hzs.common.core.utils.poi.ExcelUtil; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.service.ITransactionCommonService; import com.hzs.member.base.IMemberServiceApi; import com.hzs.report.member.service.IMemberService; -import com.hzs.report.member.vo.MallPVStatVO; import com.hzs.report.member.vo.UmbrellaBelowPushVO; -import com.hzs.sale.order.ISaOrderServiceApi; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -36,32 +31,22 @@ import java.util.List; import java.util.Map; /** - *

* 伞下直推 - *

- * - * @author zhangjing - * @since 2023-05-17 */ @RestController @RequestMapping("/manage/umbrella-below-push") public class CuUmbrellaBelowPushController extends BaseController { - @DubboReference - private IMemberServiceApi memberServiceApi; @Autowired private IMemberService memberService; - @DubboReference - private ISaOrderServiceApi orderServiceApi; @Autowired private ITransactionCommonService iTransactionCommonService; + @DubboReference + IMemberServiceApi memberServiceApi; + /** - * @description: 伞下直推 - * @author: zhang jing - * @date: 2023/5/18 9:57 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 伞下直推 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.UMBRELLA_DIRECT_PUSH, method = EOperationMethod.SELECT) @GetMapping("/list") @@ -88,18 +73,12 @@ public class CuUmbrellaBelowPushController extends BaseController { Map orderMap = new HashMap<>(); if (CollectionUtil.isNotEmpty(ordeList)) { ordeList.forEach(itms -> { - if (null != orderMap.get(itms.getPkMember())) { - orderMap.put(itms.getPkMember(), itms.getOrderAchieve().add(orderMap.get(itms.getPkMember()))); - } else { - orderMap.put(itms.getPkMember(), itms.getOrderAchieve()); - } - }); - } - if (orderMap != null) { - uvoExtList.forEach(itm -> { - itm.setOrderAchieve(orderMap.get(itm.getPkMember())); + orderMap.merge(itms.getPkMember(), itms.getOrderAchieve(), (a, b) -> b.add(a)); }); } + uvoExtList.forEach(itm -> { + itm.setOrderAchieve(orderMap.get(itm.getPkMember())); + }); } } TableDataInfo tableDataInfo = getDataTable(uvoExtList); @@ -108,11 +87,7 @@ public class CuUmbrellaBelowPushController extends BaseController { } /** - * @description: 导出 伞下直推 - * @author: zhang jing - * @date: 2023/8/31 9:15 - * @param: [response, uvo] - * @return: void + * 导出 伞下直推 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.UMBRELLA_DIRECT_PUSH, method = EOperationMethod.EXPORT) @PostMapping("/export") @@ -142,20 +117,14 @@ public class CuUmbrellaBelowPushController extends BaseController { Map orderMap = new HashMap<>(); if (CollectionUtil.isNotEmpty(ordeList)) { ordeList.forEach(itms -> { - if (null != orderMap.get(itms.getPkMember())) { - orderMap.put(itms.getPkMember(), itms.getOrderAchieve().add(orderMap.get(itms.getPkMember()))); - } else { - orderMap.put(itms.getPkMember(), itms.getOrderAchieve()); - } - }); - } - if (orderMap != null) { - list.forEach(itm -> { - itm.setOrderAchieve(orderMap.get(itm.getPkMember())); - itm.setPkAwardsVal(transactionMap1.get(itm.getPkAwards())); - itm.setPkRegisterGradeVal(transactionMap1.get(itm.getPkRegisterGrade())); + orderMap.merge(itms.getPkMember(), itms.getOrderAchieve(), (a, b) -> b.add(a)); }); } + list.forEach(itm -> { + itm.setOrderAchieve(orderMap.get(itm.getPkMember())); + itm.setPkAwardsVal(transactionMap1.get(itm.getPkAwards())); + itm.setPkRegisterGradeVal(transactionMap1.get(itm.getPkRegisterGrade())); + }); } } ExcelUtil util = new ExcelUtil<>(UmbrellaBelowPushVO.class); diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberAwardsStatMapper.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberAwardsStatMapper.java index 2f7142a4..389bd00e 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberAwardsStatMapper.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberAwardsStatMapper.java @@ -94,16 +94,6 @@ public interface CuMemberAwardsStatMapper extends BaseMapper { List selectRevenueDetailsList(RevenueDetailsVO revenueDetailsVO); - /** - * 复购bv统计-业绩，考核记录 - **/ - List selectRepurchasePVStatList(RepurchasePVStatVO repurchasePVStatVO); - - /** - * 商城BV统计 - **/ - List selectMallPVStatList(MallPVStatVO mallPVStatVO); - /** * 个人统计业绩查询 **/ @@ -199,9 +189,4 @@ public interface CuMemberAwardsStatMapper extends BaseMapper { **/ List vertexAchieveStat(VertexAchieveStatVO vertexAchieveStatVO); - /** - * 月度职级名单查询 - **/ - List monthlyJobLevelList(MonthlyJobLevelVo mjlvo); - } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/ICuMemberAwardsStatService.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/ICuMemberAwardsStatService.java index 69b7aa86..7dd90c64 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/ICuMemberAwardsStatService.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/ICuMemberAwardsStatService.java @@ -96,16 +96,6 @@ public interface ICuMemberAwardsStatService { **/ List selectRevenueDetailsList(RevenueDetailsVO revenueDetailsVO); - /** - * 复购bv统计 - **/ - List selectRepurchasePVStatList(RepurchasePVStatVO repurchasePVStatVO); - - /** - * 商城BV统计 - **/ - List selectMallPVStatList(MallPVStatVO mallPVStatVO); - /** * 个人统计业绩查询 **/ @@ -223,9 +213,4 @@ public interface ICuMemberAwardsStatService { void exportExcelVertexWithMergedCells(HttpServletResponse response, String fileName, List dataList) throws IOException; - /** - * 月度职级名单查询 - **/ - List monthlyJobLevelList(MonthlyJobLevelVo mjlvo); - } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberAwardsStatServiceImpl.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberAwardsStatServiceImpl.java index 9b1f9602..78b1db35 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberAwardsStatServiceImpl.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberAwardsStatServiceImpl.java @@ -132,16 +132,6 @@ public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService return cuMemberAwardsStatMapper.selectRevenueDetailsList(revenueDetailsVO); } - @Override - public List selectRepurchasePVStatList(RepurchasePVStatVO repurchasePVStatVO) { - return cuMemberAwardsStatMapper.selectRepurchasePVStatList(repurchasePVStatVO); - } - - @Override - public List selectMallPVStatList(MallPVStatVO mallPVStatVO) { - return cuMemberAwardsStatMapper.selectMallPVStatList(mallPVStatVO); - } - @Override public List selectPersonPvList(List perList) { return cuMemberAwardsStatMapper.selectPersonPvList(perList); @@ -529,11 +519,6 @@ public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService workbook.close(); } - @Override - public List monthlyJobLevelList(MonthlyJobLevelVo mjlvo) { - return cuMemberAwardsStatMapper.monthlyJobLevelList(mjlvo); - } - // 获取对象属性值的通用方法 private long getPropertyValue(AreaAchieveStatVO data, String methodName) { long value = 0; diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/HomeDataStatVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/HomeDataStatVO.java index e0aa0431..b5dc3a5b 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/HomeDataStatVO.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/HomeDataStatVO.java @@ -10,12 +10,7 @@ import java.util.Date; import java.util.List; /** - *

* 国内报表统计VO - *

- * - * @author zhangjing - * @since 2023-10-19 */ @Data public class HomeDataStatVO { @@ -74,7 +69,6 @@ public class HomeDataStatVO { private BigDecimal repurchasePv; - /** * 首购累计金额(￥) */ @@ -89,7 +83,7 @@ public class HomeDataStatVO { * 复购专区累计金额(￥) */ @Excel(name = "复购专区累计金额(￥)") - private BigDecimal repurchaseOrderSumMo; + private BigDecimal repurchaseOrderSumMo; /** * 复购专区累计业绩(PV) */ @@ -99,7 +93,7 @@ public class HomeDataStatVO { * 复购累计金额(￥) */ @Excel(name = "复购累计金额(￥)") - private BigDecimal repurchaseSumMo; + private BigDecimal repurchaseSumMo; /** * 复购累计业绩(PV) */ @@ -135,7 +129,7 @@ public class HomeDataStatVO { /** * 订单日期 */ - @Excel(name = "订单日期",dateFormat = "yyyy-MM-dd") + @Excel(name = "订单日期", dateFormat = "yyyy-MM-dd") private String payTime; /** @@ -170,5 +164,4 @@ public class HomeDataStatVO { private String endDate; - } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MallPVStatVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MallPVStatVO.java deleted file mode 100644 index 6c5778dd..00000000 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MallPVStatVO.java +++ /dev/null @@ -1,162 +0,0 @@ -package com.hzs.report.member.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 复购PV统计 - * @author: zhang jing - * @date: 2023/8/29 14:59 - * @param: - * @return: - **/ -@Data -public class MallPVStatVO implements Serializable { - - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Long pkId; - - /** - * 会员编号 - */ - private Long pkMember; - /** - * 日期 - */ - @Excel(name = "日期",dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date creationTime; - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 会员姓名 - */ - @Excel(name = "会员姓名") - private String memberName; - /** - * 手机号码 - */ - @Excel(name = "联系方式") - private String phone; - /** - * 奖衔 - */ - @Excel(name = "真实奖衔") - private String pkAwardsVal; - - /** - * 隶属体系 - */ - @Excel(name = "隶属体系") - private String vertexName; - /** - * 团队名称 - */ - @Excel(name = "隶属团队") - private String teamName; - /** - * 单月累计业绩(商城新增业绩) - */ - @Excel(name = "单月累计业绩(PV)") - private BigDecimal mallNewPv=BigDecimal.ZERO; - /** - * 历史业绩 商城累计业绩 - * - */ - @Excel(name = "历史累计业绩(PV)") - private BigDecimal historyPv=BigDecimal.ZERO; - - /** - * 考核金额 - */ - @Excel(name = "考核金额(￥)") - private BigDecimal assessTarget=BigDecimal.ZERO; - /** - * 右区首购累计业绩 - */ - @Excel(name = "剩余业绩(PV)") - private BigDecimal monthSurplus=BigDecimal.ZERO; - - - /** - * 考核状态 EAssessStatus - */ - @Transaction(transactionKey =EnumsPrefixConstants.ASSESS_STATUS) - private Integer assessStatus; - /** - * 考核状态 - */ - @Excel(name = "考核状态") - private String assessStatusVal; - /** - * 是否免考 - */ - @Transaction(transactionKey =EnumsPrefixConstants.DEALER_YES_NO) - private Integer isExamine; - /** - * 是否免考 - */ - @Excel(name = "是否免考") - private String isExamineVal; - /** - * 结算期间 - */ - private Integer period; - - - /** - * 创建时间开始时间 - */ - private String startDate; - - /** - * 创建时间结束时间 - */ - private String endDate; - - /** - * 业绩表名 - */ - private String achieveTableName; - /** - * 考核记录表名 - */ - private String assessTableName; - /** - * 奖衔 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer pkAwards; - - - - /** - * 隶属体系 - */ - private Integer pkVertex; - /** - * 隶属团队 - */ - private Integer pkTeamCode; - /** - * 国家 - */ - private Integer pkCountry; - -} diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MemberTradeVo.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MemberTradeVo.java index e1cc3ba6..3a6e74ab 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MemberTradeVo.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MemberTradeVo.java @@ -1,23 +1,9 @@ -package com.hzs.report.member.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/8/31 14:18 - * @Classname: MemberTradeVo - * @PackageName: com.hzs.report.member.vo - */ +package com.hzs.report.member.vo; import lombok.Data; import java.math.BigDecimal; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.report.member.vo - *@Author: yh - *@CreateTime: 2023-08-31 14:18 - *@Description: TODO - *@Version: 1.0 - */ @Data public class MemberTradeVo { diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MemberTreeStatVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MemberTreeStatVO.java deleted file mode 100644 index 220a74ce..00000000 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MemberTreeStatVO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hzs.report.member.vo; - -import lombok.Data; - - - -/** - *

- * 统计历史网体VO - *

- * - * @author zhangjing - * @since 2023-05-31 - */ -@Data -public class MemberTreeStatVO { - - private static final long serialVersionUID = 1L; - - /** - *期数 - */ - private Integer period; - - /** - * 会员结算日表表名 - */ - private String memberTreeTableName; - - - -} diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MonthlyJobLevelVo.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MonthlyJobLevelVo.java deleted file mode 100644 index 117fba0d..00000000 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MonthlyJobLevelVo.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.hzs.report.member.vo; - - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.BigDecimalFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 月度职级名单查询VO - * @author: zhang jing - * @date: 2024/6/20 16:43 - * @param: - * @return: - **/ -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Data -public class MonthlyJobLevelVo { - - /** - * 用户编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 用户姓名 - */ - @Excel(name = "会员姓名") - private String memberName; - /** - * 统计日期 - */ - @Excel(name = "统计日期", dateFormat = "yyyy-MM") - @JsonFormat(pattern = "yyyy-MM") - private Date statDate; - - /** - * 上月累计首购业绩(左区) - */ - @Excel(name = "上月累计首购业绩(左区)") - @BigDecimalFormat() - private BigDecimal lastMonthASumPv; - /** - * 上月累计首购业绩(右区) - */ - @Excel(name = "上月累计首购业绩(右区)") - @BigDecimalFormat() - private BigDecimal lastMonthBSumPv; - - /** - * 本月新增首购业绩(左区) - */ - @Excel(name = "本月新增首购业绩(左区)") - @BigDecimalFormat() - private BigDecimal newASumPv=new BigDecimal(0); - /** - * 本月新增首购业绩(右区) - */ - @Excel(name = "本月新增首购业绩(右区)") - @BigDecimalFormat() - private BigDecimal newBSumPv=new BigDecimal(0); - - /** - * 累计首购业绩(左区) - */ - @Excel(name = "累计首购业绩(左区)") - @BigDecimalFormat() - private BigDecimal asumPv; - /** - * 累计首购业绩(右区) - */ - @Excel(name = "累计首购业绩(右区)") - @BigDecimalFormat() - private BigDecimal bsumPv; - /** - * 本月推荐人数 - */ - @Excel(name = "本月推荐人数") - private Integer dyNewTotal=0; - /** - * 累计推荐人数 - */ - @Excel(name = "累计推荐人数") - private Integer dyTotal; - /** - * 上月累计推荐人数 - */ - private Integer syTotal; - - - - private Long pkMember; - - /** - * 当前月结束期数 - */ - private Integer periodEnd; - - /** - * 上个月结束期数 - */ - private Integer lastMonthPeriodEnd; - - /** - * 当月业绩表 - */ - private String achieveTableName; - /** - * 本月会员网体表 - */ - private String settleTableName; - - /** - * 上个月业绩表 - */ - private String lastMonthAchieveTableName; - - /** - * 上个会员网体表 - */ - private String lastMonthSettleTableName; - - - /** - * 当前月开始日期 - */ - private String startDate; - /** - * 当前月结束日期 - */ - private String endDate; - - /** - * 上个月结束日期 - */ - private String lastMonthEndDate; - /** - * 汇率 - */ - private BigDecimal rate; - - private Integer pkCountry; - - - - - - -} diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/NoticeMemberVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/NoticeMemberVO.java index 60822137..1afd47fb 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/NoticeMemberVO.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/NoticeMemberVO.java @@ -1,26 +1,19 @@ package com.hzs.report.member.vo; import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; import com.hzs.common.core.web.domain.BaseApprovalEntity; import com.hzs.system.sys.dto.LoginUser; import lombok.Data; +import lombok.EqualsAndHashCode; import java.math.BigDecimal; import java.util.Date; import java.util.List; - /** - *

* 直推数据-发送站内信VO - *

- * - * @author zhangjing - * @since 2023-05-31 */ +@EqualsAndHashCode(callSuper = true) @Data public class NoticeMemberVO extends BaseApprovalEntity { @@ -76,8 +69,4 @@ public class NoticeMemberVO extends BaseApprovalEntity { private Date creationTime; - - - - } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/OrderCurrencyVo.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/OrderCurrencyVo.java index 530156bd..b2bce367 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/OrderCurrencyVo.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/OrderCurrencyVo.java @@ -1,23 +1,9 @@ -package com.hzs.report.member.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/8/31 10:49 - * @Classname: OrderCurrencyVo - * @PackageName: com.hzs.report.member.vo - */ +package com.hzs.report.member.vo; import lombok.Data; import java.math.BigDecimal; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.report.member.vo - *@Author: yh - *@CreateTime: 2023-08-31 10:49 - *@Description: TODO - *@Version: 1.0 - */ @Data public class OrderCurrencyVo { diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/OrderVo.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/OrderVo.java deleted file mode 100644 index 312ad133..00000000 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/OrderVo.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.hzs.report.member.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/8/31 10:07 - * @Classname: OrderVo - * @PackageName: com.hzs.report.member.vo - */ - -import lombok.Data; - -import java.math.BigDecimal; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.report.member.vo - *@Author: yh - *@CreateTime: 2023-08-31 10:07 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class OrderVo { - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员姓名 - */ - private String memberName; - - /** - * 订单编号 - */ - private String orderCode; - - /** - * 订单类型 - */ - private Integer orderType; - - /** - * 订单金额（¥） - */ - private BigDecimal orderAmount; - - - /** - * 产品邮费（¥） - */ - private BigDecimal postage; - - /** - * 现金账户（¥） - */ - private BigDecimal cashAccount; - - /** - * 奖金账户（¥） - */ - private BigDecimal bonusAccount; - - /** - * 消费账户（¥） - */ - private BigDecimal expendAccount; - /** - * 政策账户（¥） - */ - private BigDecimal policyAccount; -} diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/ReportSummaryVo.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/ReportSummaryVo.java index ce6b09b6..b233eda5 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/ReportSummaryVo.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/ReportSummaryVo.java @@ -1,10 +1,4 @@ -package com.hzs.report.member.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/9/20 9:11 - * @Classname: ReportSummaryVo - * @PackageName: com.hzs.report.member.vo - */ +package com.hzs.report.member.vo; import com.hzs.common.core.annotation.BigDecimalFormat; import com.hzs.common.core.annotation.Excel; @@ -13,14 +7,6 @@ import lombok.Data; import java.math.BigDecimal; import java.util.Date; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.report.member.vo - *@Author: yh - *@CreateTime: 2023-09-20 09:11 - *@Description: TODO - *@Version: 1.0 - */ @Data public class ReportSummaryVo { diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/RepurchasePVStatVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/RepurchasePVStatVO.java deleted file mode 100644 index 04eb4322..00000000 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/RepurchasePVStatVO.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.hzs.report.member.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 复购PV统计 - * @author: zhang jing - * @date: 2023/8/29 14:59 - * @param: - * @return: - **/ -@Data -public class RepurchasePVStatVO implements Serializable { - - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Long pkId; - - /** - * 会员编号 - */ - private Long pkMember; - /** - * 日期 - */ - @Excel(name = "日期",dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date creationTime; - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 会员姓名 - */ - @Excel(name = "会员姓名") - private String memberName; - /** - * 手机号码 - */ - @Excel(name = "联系方式") - private String phone; - - /** - * 隶属体系 - */ - @Excel(name = "隶属体系") - private String vertexName; - /** - * 团队名称 - */ - @Excel(name = "隶属团队") - private String teamName; - /** - * 单月业绩(复购新增) - */ - @Excel(name = "单月业绩(PV)") - private BigDecimal repurchaseNewPv=BigDecimal.ZERO; - /** - * 历史业绩 REP_A_SUM_PV 复购A区累计业绩 - * REP_B_SUM_PV 复购B区累计业绩 - */ - @Excel(name = "历史业绩(PV)") - private BigDecimal historyPv=BigDecimal.ZERO; - - /** - * 考核金额 - */ - @Excel(name = "考核金额(￥)") - private BigDecimal assessTarget=BigDecimal.ZERO; - /** - * 右区首购累计业绩 - */ - @Excel(name = "剩余业绩(PV)") - private BigDecimal monthSurplus=BigDecimal.ZERO; - - - /** - * 考核状态 - */ - @Transaction(transactionKey =EnumsPrefixConstants.ASSESS_STATUS) - private Integer assessStatus; - /** - * 考核状态 - */ - @Excel(name = "考核状态") - private String assessStatusVal; - /** - * 是否免考 - */ - @Transaction(transactionKey =EnumsPrefixConstants.DEALER_YES_NO) - private Integer isExamine; - /** - * 是否免考 - */ - @Excel(name = "是否免考") - private String isExamineVal; - /** - * 结算期间 - */ - private Integer period; - - - /** - * 创建时间开始时间 - */ - private String startDate; - - /** - * 创建时间结束时间 - */ - private String endDate; - - /** - * 业绩表名 - */ - private String achieveTableName; - /** - * 考核记录表名 - */ - private String assessTableName; - /** - * 奖衔 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer pkAwards; - - /** - * 奖衔 - */ - private String pkAwardsVal; - - /** - * 隶属体系 - */ - private Integer pkVertex; - /** - * 隶属团队 - */ - private Integer pkTeamCode; - /** - * 国家 - */ - private Integer pkCountry; - -} diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/ResettleBloodExcel.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/ResettleBloodExcel.java index e8e6d63d..c2f30251 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/ResettleBloodExcel.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/ResettleBloodExcel.java @@ -9,12 +9,7 @@ import lombok.Data; import java.util.Date; /** - *

* 安置血缘查询VO - *

- * - * @author hzs - * @since 2022-08-31 */ @Data public class ResettleBloodExcel { @@ -58,7 +53,7 @@ public class ResettleBloodExcel { /** * 创建时间 */ - @Excel(name = "日期",dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "日期", dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date creationTime; @@ -66,6 +61,4 @@ public class ResettleBloodExcel { private Integer memberCount; - - } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/SmallAreaNewAddAchieveVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/SmallAreaNewAddAchieveVO.java index e2c50478..040aea03 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/SmallAreaNewAddAchieveVO.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/SmallAreaNewAddAchieveVO.java @@ -13,14 +13,7 @@ import java.util.List; /** * 小区新增业绩 - * - * @Description: - * @Author: ljc - * @Time: 2024/3/1 15:00 - * @Classname: SmallAreaNewAddAchieveParam - * @Package_name: com.hzs.report.member.param */ - @AllArgsConstructor @NoArgsConstructor @Data @@ -86,8 +79,6 @@ public class SmallAreaNewAddAchieveVO implements Serializable { private BigDecimal rightSumPv; - - /** * 国家ID */ diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/StatProductVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/StatProductVO.java index 46925d2b..28c0c2ca 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/StatProductVO.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/StatProductVO.java @@ -2,20 +2,13 @@ package com.hzs.report.member.vo; import com.hzs.common.core.annotation.BigDecimalFormat; import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.Data; import java.math.BigDecimal; import java.util.List; /** - *

* 伞下直推统计产品VO - *

- * - * @author hzs - * @since 2022-08-31 */ @Data public class StatProductVO { @@ -60,7 +53,7 @@ public class StatProductVO { * 产品单价(￥) */ @BigDecimalFormat - @Excel(name = "产品单价(￥)",scale = 2) + @Excel(name = "产品单价(￥)", scale = 2) private BigDecimal price; /** * 产品数量 @@ -71,13 +64,13 @@ public class StatProductVO { * 产品总价 */ @BigDecimalFormat - @Excel(name = "产品总价(￥)",scale = 2) + @Excel(name = "产品总价(￥)", scale = 2) private BigDecimal totalPrice; /** * 产品业绩 */ @BigDecimalFormat - @Excel(name = "产品业绩(￥)",scale = 2) + @Excel(name = "产品业绩(￥)", scale = 2) private BigDecimal achievement; /** @@ -102,7 +95,4 @@ public class StatProductVO { private Integer pkCountry; - - - } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/UmbrellaBelowProductVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/UmbrellaBelowProductVO.java index d74a47d7..99fcc990 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/UmbrellaBelowProductVO.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/UmbrellaBelowProductVO.java @@ -12,12 +12,7 @@ import java.util.Date; import java.util.List; /** - *

* 伞下直推产品查询VO - *

- * - * @author hzs - * @since 2022-08-31 */ @Data public class UmbrellaBelowProductVO { @@ -82,14 +77,14 @@ public class UmbrellaBelowProductVO { * 累计金额 */ @BigDecimalFormat - @Excel(name = "累计金额(￥)",scale = 2) - private BigDecimal orderAmount=BigDecimal.ZERO; + @Excel(name = "累计金额(￥)", scale = 2) + private BigDecimal orderAmount = BigDecimal.ZERO; /** * 累计业绩 */ @BigDecimalFormat - @Excel(name = "累计业绩(￥)",scale = 2) - private BigDecimal orderAchieve=BigDecimal.ZERO; + @Excel(name = "累计业绩(￥)", scale = 2) + private BigDecimal orderAchieve = BigDecimal.ZERO; /** * 订单类型集合 */ @@ -141,5 +136,4 @@ public class UmbrellaBelowProductVO { private Integer pkGrade; - } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/UmbrellaBelowPushVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/UmbrellaBelowPushVO.java index 09c03f0f..0b1e6a9e 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/UmbrellaBelowPushVO.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/UmbrellaBelowPushVO.java @@ -12,12 +12,7 @@ import java.util.List; /** - *

* 伞下直推VO - *

- * - * @author zhangjing - * @since 2023-05-31 */ @Data public class UmbrellaBelowPushVO { @@ -103,7 +98,7 @@ public class UmbrellaBelowPushVO { /** * 注册日期 */ - @Excel(name = "注册日期",dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "注册日期", dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date creationTime; /** @@ -129,6 +124,4 @@ public class UmbrellaBelowPushVO { List pkMemberList; - - } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/UmbrellaBelowRepeatVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/UmbrellaBelowRepeatVO.java index 80b80457..6c0f8147 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/UmbrellaBelowRepeatVO.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/UmbrellaBelowRepeatVO.java @@ -12,12 +12,7 @@ import java.util.Date; import java.util.List; /** - *

* 伞下直推产品去重VO - *

- * - * @author hzs - * @since 2022-08-31 */ @Data public class UmbrellaBelowRepeatVO { @@ -62,13 +57,13 @@ public class UmbrellaBelowRepeatVO { * 产品单价(￥) */ @BigDecimalFormat - @Excel(name = "产品单价(￥)",scale = 2) + @Excel(name = "产品单价(￥)", scale = 2) private BigDecimal price; /** * 产品业绩 */ @BigDecimalFormat - @Excel(name = "产品业绩(￥)",scale = 2) + @Excel(name = "产品业绩(￥)", scale = 2) private BigDecimal achievement; /** * 产品数量 @@ -80,14 +75,14 @@ public class UmbrellaBelowRepeatVO { * 产品总价 */ @BigDecimalFormat - @Excel(name = "产品总价(￥)",scale = 2) + @Excel(name = "产品总价(￥)", scale = 2) private BigDecimal totalPrice; /** * 产品业绩 */ @BigDecimalFormat - @Excel(name = "产品总业绩(￥)",scale = 2) + @Excel(name = "产品总业绩(￥)", scale = 2) private BigDecimal totalAchievement; /** * 订单编号 @@ -153,13 +148,13 @@ public class UmbrellaBelowRepeatVO { /** * 创建时间 */ - @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date creationTime; /** * 支付时间 */ - @Excel(name = "支付时间",dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "支付时间", dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date payTime; /** @@ -184,6 +179,4 @@ public class UmbrellaBelowRepeatVO { private Integer pkCountry; - - } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/WaresInfoVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/WaresInfoVO.java index 3bba7974..72411e30 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/WaresInfoVO.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/WaresInfoVO.java @@ -1,21 +1,7 @@ -package com.hzs.report.member.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2024/7/17 15:15 - * @Classname: WaresInfoVo - * @PackageName: com.hzs.report.member.vo - */ +package com.hzs.report.member.vo; import lombok.Data; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.report.member.vo - *@Author: yh - *@CreateTime: 2024-07-17 15:15 - *@Description: TODO - *@Version: 1.0 - */ @Data public class WaresInfoVO { @@ -49,7 +35,7 @@ public class WaresInfoVO { /** * 规格数量 */ - private Integer specsQuantity ; + private Integer specsQuantity; /** * 产品主键 diff --git a/bd-business/bd-business-report/src/main/resources/mapper/report/member/CuMemberAwardsStatMapper.xml b/bd-business/bd-business-report/src/main/resources/mapper/report/member/CuMemberAwardsStatMapper.xml index 4f5591f6..325f955e 100644 --- a/bd-business/bd-business-report/src/main/resources/mapper/report/member/CuMemberAwardsStatMapper.xml +++ b/bd-business/bd-business-report/src/main/resources/mapper/report/member/CuMemberAwardsStatMapper.xml @@ -508,146 +508,6 @@ ORDER BY realIncomeTotal DESC - - - - - - - - - - diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/manage/BdProductStorehouseController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/manage/BdProductStorehouseController.java deleted file mode 100644 index 68d31557..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/manage/BdProductStorehouseController.java +++ /dev/null @@ -1,176 +0,0 @@ -package com.hzs.system.base.controller.manage; - - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; -import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.core.enums.EOperationBusiness; -import com.hzs.common.core.enums.EOperationMethod; -import com.hzs.common.core.enums.EOperationModule; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.base.BdProductStorehouse; -import com.hzs.common.domain.system.base.BdProductStorehouseArea; -import com.hzs.common.domain.system.base.BdStorehouseAreaMiddle; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.system.base.service.IBdProductStorehouseAreaService; -import com.hzs.system.base.service.IBdProductStorehouseService; -import com.hzs.system.base.vo.BdProductStorehouseAreaVO; -import com.hzs.system.base.vo.BdProductStorehouseVO; -import com.hzs.system.base.vo.BdStorehouseAreaMiddleVO; -import com.hzs.system.base.vo.BdStorehouseVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - *

- * 产品绑定仓库表 前端控制器 - *

- * - * @author zhangjing - * @since 2024-04-12 - */ -@RestController -@RequestMapping("/manage/bd-product-storehouse") -public class BdProductStorehouseController extends BaseController { - - @Autowired - private IBdProductStorehouseService iBdProductStorehouseService; - @Autowired - private IBdProductStorehouseAreaService iBdProductStorehouseAreaService; - /** - * 获取地区仓库列表 - */ - @Log(module = EOperationModule.PRODUCT_STOREHOUSE, business = EOperationBusiness.PRODUCT_STOREHOUSE, method = EOperationMethod.SELECT) - @GetMapping("/list") - public TableDataInfo list(BdProductStorehouseVO productStorehouseVO) { - startPage(); - productStorehouseVO.setPkCountry(SecurityUtils.getPkCountry()); - List list = iBdProductStorehouseService.getProductStorehouseList(productStorehouseVO); - list.forEach(itm -> { - BdProductStorehouseArea psa = new BdProductStorehouseArea(); - psa.setPkProductStorehouse(itm.getPkId()); - psa.setPkCountry(SecurityUtils.getPkCountry()); - List samList = iBdProductStorehouseAreaService.getStorehouseAreaList(psa); - itm.setSamList(samList); - }); - return getDataTable(list); - } - - /** - * @description: 获取单条 - * @author: zhang jing - * @date: 2023/5/5 20:14 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.PRODUCT_STOREHOUSE, business = EOperationBusiness.PRODUCT_STOREHOUSE, method = EOperationMethod.SELECT) - @GetMapping("/geOne/{pkId}") - public AjaxResult getBdStorehouse(@PathVariable Long pkId) { - BdProductStorehouse productStorehouse = iBdProductStorehouseService.getById(pkId); - BdProductStorehouseVO ps = BeanUtil.copyProperties(productStorehouse, BdProductStorehouseVO.class); - BdProductStorehouseArea psa = new BdProductStorehouseArea(); - psa.setPkProductStorehouse(ps.getPkId()); - psa.setPkCountry(SecurityUtils.getPkCountry()); - List provinceList = new ArrayList<>(); - List samList = iBdProductStorehouseAreaService.getStorehouseAreaList(psa); - if (CollectionUtil.isNotEmpty(samList)) { - samList.forEach(itm -> provinceList.add(itm.getProvince())); - } - ps.setProvinceList(provinceList); - return AjaxResult.success(ps); - } - - /** - * @description: 导出产品绑定仓库 - * @author: zhang jing - * @date: 2023/5/5 20:16 - * @param: [response, productStorehouseVO] - * @return: void - **/ - @Log(module = EOperationModule.PRODUCT_STOREHOUSE, business = EOperationBusiness.PRODUCT_STOREHOUSE, method = EOperationMethod.SELECT) - @PostMapping("/export") - public void export(HttpServletResponse response, BdProductStorehouseVO productStorehouseVO) { - productStorehouseVO.setPkCountry(SecurityUtils.getPkCountry()); - List list = iBdProductStorehouseService.getProductStorehouseList(productStorehouseVO); - ExcelUtil util = new ExcelUtil<>(BdProductStorehouseVO.class); - util.exportExcel(response, list, "产品绑定仓库"); - } - - /** - * @description: 新增地区产品绑定仓库 - * @author: zhang jing - * @date: 2024/4/12 10:25 - * @param: [productStorehouseVO] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.PRODUCT_STOREHOUSE, business = EOperationBusiness.PRODUCT_STOREHOUSE, method = EOperationMethod.INSERT) - @PostMapping("/save") - public AjaxResult save(@RequestBody BdProductStorehouseVO productStorehouseVO) { - if (StringUtils.isNull(productStorehouseVO.getPkStorehouse())) { - return AjaxResult.error(ConfigMsgConstants.STOREHOUSE_NOT_NULL); - } - if (StringUtils.isNull(productStorehouseVO.getPkProduct())) { - return AjaxResult.error(ConfigMsgConstants.PK_PRODUCT_NOT_NULL); - } - - if (CollectionUtil.isEmpty(productStorehouseVO.getProvinceList())) { - return AjaxResult.error(ConfigMsgConstants.HO_REGION_NOT_NULL); - } - Long userId= SecurityUtils.getUserId(); - Integer pkCountry=SecurityUtils.getPkCountry(); - Date date= new Date(); - productStorehouseVO.setCreationTime(date); - productStorehouseVO.setPkCreator(userId); - productStorehouseVO.setPkCountry(pkCountry); - return toAjax(iBdProductStorehouseService.insertProductStorehouse(productStorehouseVO)); - } - - - /** - * @description: 修改保存地区产品绑定仓库 - * @author: zhang jing - * @date: 2024/4/12 10:25 - * @param: [productStorehouseVO] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.PRODUCT_STOREHOUSE, business = EOperationBusiness.PRODUCT_STOREHOUSE, method = EOperationMethod.UPDATE) - @PostMapping("/update") - public AjaxResult update(@RequestBody BdProductStorehouseVO productStorehouseVO) { - if (StringUtils.isNull(productStorehouseVO.getPkStorehouse())) { - return AjaxResult.error(ConfigMsgConstants.STOREHOUSE_NOT_NULL); - } - if (CollectionUtil.isEmpty(productStorehouseVO.getProvinceList())) { - return AjaxResult.error(ConfigMsgConstants.HO_REGION_NOT_NULL); - } - Long userId= SecurityUtils.getUserId(); - Date date= new Date(); - productStorehouseVO.setCreationTime(date); - productStorehouseVO.setPkModified(userId); - return toAjax(iBdProductStorehouseService.upProductStorehouseVO(productStorehouseVO)); - } - - /** - * @description: 删除地区产品绑定仓库 - * @author: zhang jing - * @date: 2024/4/12 10:25 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.PRODUCT_STOREHOUSE, business = EOperationBusiness.PRODUCT_STOREHOUSE, method = EOperationMethod.DELETE) - @PostMapping("/del/{pkId}") - public AjaxResult delBdStorehouse(@PathVariable Long pkId) { - return toAjax(iBdProductStorehouseService.delBdStorehouse(pkId)); - } -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdAreaMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdAreaMapper.java index 081d044c..e145360a 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdAreaMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdAreaMapper.java @@ -8,9 +8,6 @@ import java.util.List; /** * 行政区划 Mapper 接口 - * - * @author hzs - * @since 2022-08-04 */ public interface BdAreaMapper extends BaseMapper { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdProductStorehouseAreaMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdProductStorehouseAreaMapper.java deleted file mode 100644 index 7dd2deaa..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdProductStorehouseAreaMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hzs.system.base.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.system.base.BdProductStorehouseArea; -import com.hzs.system.base.vo.BdProductStorehouseAreaVO; - -import java.util.List; - -/** - *

- * 产品仓库绑定地区表 Mapper 接口 - *

- * - * @author zhangjing - * @since 2024-04-12 - */ -public interface BdProductStorehouseAreaMapper extends BaseMapper { - - List getStorehouseAreaList(BdProductStorehouseArea psa); -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdProductStorehouseMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdProductStorehouseMapper.java index bc28efc6..df6c47ad 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdProductStorehouseMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdProductStorehouseMapper.java @@ -1,38 +1,20 @@ package com.hzs.system.base.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.system.base.BdProductStorehouse; import com.hzs.common.domain.system.base.ext.BdProductStorehouseExt; -import com.hzs.system.base.vo.BdProductStorehouseVO; import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 产品绑定仓库表 Mapper 接口 - *

- * - * @author zhangjing - * @since 2024-04-12 */ public interface BdProductStorehouseMapper extends BaseMapper { /** - * @description: 产品绑定仓库列表 - * @author: zhang jing - * @date: 2024/4/12 11:30 - * @param: [productStorehouseVO] - * @return: java.util.List - **/ - List getProductStorehouseList(BdProductStorehouseVO productStorehouseVO); - - /* - * @description: 查询省绑定的产品仓库 - * @author: sui q - * @date: 2024/4/26 11:35 - * @param: null null - **/ + * 查询省绑定的产品仓库 + */ List queryBdProductStorehouseByCondition(@Param("productId") List productId, @Param("province") Integer province); + } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/AreaServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/AreaServiceProvider.java index 9d51b533..5ee43a9f 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/AreaServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/AreaServiceProvider.java @@ -17,11 +17,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 行政区划dubbo服务 - * @Author: jiang chao - * @Time: 2022/10/21 11:32 - * @Classname: AreaServiceProvider - * @PackageName: com.hzs.system.base.provider + * 行政区划dubbo服务 */ @Slf4j @DubboService @@ -31,7 +27,7 @@ public class AreaServiceProvider implements IAreaServiceApi { private IBdAreaService iBdAreaService; @Autowired - private IBdProductStorehouseService bdProductStorehouseService; + private IBdProductStorehouseService iBdProductStorehouseService; @Override public R> getAreaMap(Integer pkCountry) { @@ -74,7 +70,7 @@ public class AreaServiceProvider implements IAreaServiceApi { @Override public R> queryBdProductStorehouseByCondition(List productId, Integer province) { - return R.ok(bdProductStorehouseService.queryBdProductStorehouseByCondition(productId, province)); + return R.ok(iBdProductStorehouseService.queryBdProductStorehouseByCondition(productId, province)); } } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/CurrencyServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/CurrencyServiceProvider.java index f2a7f007..322a66f8 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/CurrencyServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/CurrencyServiceProvider.java @@ -21,11 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.*; import java.util.stream.Collectors; -/** - * @Description: - * @Classname: ICurrencyServiceProvider - * @PackageName: com.hzs.system.base.provider - */ @DubboService public class CurrencyServiceProvider implements ICurrencyServiceApi { @@ -81,11 +76,6 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi { return R.ok(iBdStorehouseAreaMiddleService.queryBdStorehouseByProvince(province, storeType)); } - @Override - public R queryBdStorehouseById(Integer pkId) { - return R.ok(iBdStorehouseService.getById(pkId)); - } - @Override public R> queryBdStorehouseMapByProvince(Collection provinceList) { return R.ok(iBdStorehouseAreaMiddleService.queryStorehouseListByProvince(provinceList)); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdAreaService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdAreaService.java index 9dfe620b..ecc7fca2 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdAreaService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdAreaService.java @@ -9,9 +9,6 @@ import java.util.List; /** * 行政区划 服务类 - * - * @author hzs - * @since 2022-08-04 */ public interface IBdAreaService extends IService { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdProductStorehouseAreaService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdProductStorehouseAreaService.java deleted file mode 100644 index 350c2ab6..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdProductStorehouseAreaService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hzs.system.base.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.system.base.BdProductStorehouseArea; -import com.hzs.system.base.vo.BdProductStorehouseAreaVO; - -import java.util.List; - -/** - *

- * 产品仓库绑定地区表 服务类 - *

- * - * @author zhangjing - * @since 2024-04-12 - */ -public interface IBdProductStorehouseAreaService extends IService { - - List getStorehouseAreaList(BdProductStorehouseArea psa); -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdProductStorehouseService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdProductStorehouseService.java index 2bea2545..da51060e 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdProductStorehouseService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdProductStorehouseService.java @@ -1,57 +1,18 @@ package com.hzs.system.base.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.system.base.BdProductStorehouse; import com.hzs.common.domain.system.base.ext.BdProductStorehouseExt; -import com.hzs.system.base.vo.BdProductStorehouseVO; import java.util.List; /** - *

* 产品绑定仓库表 服务类 - *

- * - * @author zhangjing - * @since 2024-04-12 */ public interface IBdProductStorehouseService extends IService { - /** - * @description: 产品绑定仓库列表 - * @author: zhang jing - * @date: 2024/4/12 11:31 - * @param: [productStorehouseVO] - * @return: java.util.List - **/ - List getProductStorehouseList(BdProductStorehouseVO productStorehouseVO); - - /** - * @description: 新增产品绑定仓库列表 - * @author: zhang jing - * @date: 2024/4/12 14:04 - * @param: [productStorehouseVO] - * @return: boolean - **/ - boolean insertProductStorehouse(BdProductStorehouseVO productStorehouseVO); - - /** - * @description: 修改产品绑定仓库列表 - * @author: zhang jing - * @date: 2024/4/12 14:04 - * @param: [productStorehouseVO] - * @return: boolean - **/ - boolean upProductStorehouseVO(BdProductStorehouseVO productStorehouseVO); - - boolean delBdStorehouse(Long pkId); - /* - * @description: 查询省绑定的产品仓库 - * @author: sui q - * @date: 2024/4/26 11:35 - * @param: null null + * 查询省绑定的产品仓库 **/ List queryBdProductStorehouseByCondition(List productId, Integer province); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdAreaServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdAreaServiceImpl.java index 5382eccd..d5d9c429 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdAreaServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdAreaServiceImpl.java @@ -25,9 +25,6 @@ import java.util.stream.Collectors; /** * 行政区划 服务实现类 - * - * @author hzs - * @since 2022-08-04 */ @Service public class BdAreaServiceImpl extends ServiceImpl implements IBdAreaService { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdProductStorehouseAreaServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdProductStorehouseAreaServiceImpl.java deleted file mode 100644 index 438055d1..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdProductStorehouseAreaServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzs.system.base.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.system.base.BdProductStorehouseArea; -import com.hzs.system.base.mapper.BdProductStorehouseAreaMapper; -import com.hzs.system.base.service.IBdProductStorehouseAreaService; -import com.hzs.system.base.vo.BdProductStorehouseAreaVO; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 产品仓库绑定地区表 服务实现类 - *

- * - * @author zhangjing - * @since 2024-04-12 - */ -@Service -public class BdProductStorehouseAreaServiceImpl extends ServiceImpl implements IBdProductStorehouseAreaService { - - @Override - public List getStorehouseAreaList(BdProductStorehouseArea psa) { - return baseMapper.getStorehouseAreaList(psa); - } -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdProductStorehouseServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdProductStorehouseServiceImpl.java index 141c374c..f05053c6 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdProductStorehouseServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdProductStorehouseServiceImpl.java @@ -1,140 +1,23 @@ package com.hzs.system.base.service.impl; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.enums.EDelFlag; import com.hzs.common.domain.system.base.BdProductStorehouse; -import com.hzs.common.domain.system.base.BdProductStorehouseArea; import com.hzs.common.domain.system.base.ext.BdProductStorehouseExt; -import com.hzs.common.security.utils.SecurityUtils; import com.hzs.system.base.mapper.BdProductStorehouseMapper; -import com.hzs.system.base.service.IBdProductStorehouseAreaService; import com.hzs.system.base.service.IBdProductStorehouseService; -import com.hzs.system.base.vo.BdProductStorehouseVO; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; /** - *

* 产品绑定仓库表 服务实现类 - *

- * - * @author zhangjing - * @since 2024-04-12 */ @Service public class BdProductStorehouseServiceImpl extends ServiceImpl implements IBdProductStorehouseService { - @Autowired - private IBdProductStorehouseAreaService ipsAreaService; - /** - * @description: 产品绑定仓库列表 - * @author: zhang jing - * @date: 2024/4/12 11:31 - * @param: [productStorehouseVO] - * @return: java.util.List - **/ - @Override - public List getProductStorehouseList(BdProductStorehouseVO productStorehouseVO) { - return baseMapper.getProductStorehouseList(productStorehouseVO); - } - - /** - * @description: 新增产品绑定仓库列表 - * @author: zhang jing - * @date: 2024/4/12 14:15 - * @param: [productStorehouseVO] - * @return: boolean - **/ - @Transactional(rollbackFor = Exception.class) - @Override - public boolean insertProductStorehouse(BdProductStorehouseVO productStorehouseVO) { - BdProductStorehouse bps= BeanUtil.copyProperties(productStorehouseVO, BdProductStorehouse.class); - baseMapper.insert(bps); - if(CollectionUtil.isNotEmpty(productStorehouseVO.getProvinceList())){ - //新增产品仓库绑定地区 - for(Integer i:productStorehouseVO.getProvinceList()){ - BdProductStorehouseArea bpsa=new BdProductStorehouseArea(); - bpsa.setPkProductStorehouse(bps.getPkId()); - bpsa.setProvince(i); - bpsa.setCreationTime(productStorehouseVO.getCreationTime()); - bpsa.setPkCountry(productStorehouseVO.getPkCountry()); - bpsa.setPkCreator(productStorehouseVO.getPkCreator()); - ipsAreaService.save(bpsa); - } - } - return true; - } - - /** - * @description: 新增产品绑定仓库列表 - * @author: zhang jing - * @date: 2024/4/12 14:15 - * @param: [productStorehouseVO] - * @return: boolean - **/ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean upProductStorehouseVO(BdProductStorehouseVO productStorehouseVO) { - BdProductStorehouse bps= BeanUtil.copyProperties(productStorehouseVO, BdProductStorehouse.class); - baseMapper.updateById(bps); - if(CollectionUtil.isNotEmpty(productStorehouseVO.getProvinceList())){ - //删除之前绑定的地区 - UpdateWrapper updateWrapper=new UpdateWrapper(); - updateWrapper.set("DEL_FLAG",EDelFlag.DELETE.getValue()); - updateWrapper.set("PK_MODIFIED",productStorehouseVO.getPkCreator()); - updateWrapper.set("MODIFIED_TIME",productStorehouseVO.getCreationTime()); - updateWrapper.eq("PK_PRODUCT_STOREHOUSE",bps.getPkId()); - ipsAreaService.update(updateWrapper); - //新增产品仓库绑定地区 - for(Integer i:productStorehouseVO.getProvinceList()){ - BdProductStorehouseArea bpsa=new BdProductStorehouseArea(); - bpsa.setPkProductStorehouse(bps.getPkId()); - bpsa.setProvince(i); - bpsa.setPkCreator(productStorehouseVO.getPkCreator()); - bpsa.setCreationTime(productStorehouseVO.getCreationTime()); - bpsa.setPkCountry(bps.getPkCountry()); - ipsAreaService.save(bpsa); - } - } - return true; - } - - /** - * @description: 新增产品绑定仓库列表 - * @author: zhang jing - * @date: 2024/4/12 14:15 - * @param: [pkId] - * @return: boolean - **/ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean delBdStorehouse(Long pkId) { - Date date=new Date(); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_ID", pkId); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId()); - updateWrapper.set("MODIFIED_TIME", date); - baseMapper.update(null,updateWrapper); - //删除绑定的地区 - UpdateWrapper updateWrapper1=new UpdateWrapper(); - updateWrapper1.set("DEL_FLAG",EDelFlag.DELETE.getValue()); - updateWrapper1.set("PK_MODIFIED",SecurityUtils.getUserId()); - updateWrapper1.set("MODIFIED_TIME",date); - updateWrapper1.eq("PK_PRODUCT_STOREHOUSE",pkId); - ipsAreaService.update(updateWrapper1); - return true; - } - @Override public List queryBdProductStorehouseByCondition(List productId, Integer province) { return baseMapper.queryBdProductStorehouseByCondition(productId, province); } + } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdNoticeAdminShowVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdNoticeAdminShowVO.java index 5263f0f7..65e69e5f 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdNoticeAdminShowVO.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdNoticeAdminShowVO.java @@ -9,12 +9,6 @@ import java.util.List; /** * 后台公告显示 - * - * @Description: - * @Author: ljc - * @Time: 2023/4/25 16:11 - * @Classname: BdNoticeAdminShowVO - * @Package_name: com.hzs.system.base.vo */ @Data @AllArgsConstructor diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdNoticeVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdNoticeVO.java index 77021325..c895327b 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdNoticeVO.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdNoticeVO.java @@ -15,11 +15,7 @@ import java.util.Date; import java.util.List; /** - * @Description: 公告VO - * @Author: ljc - * @Time: 2023/2/3 11:24 - * @Classname: BdNoticeVO - * @Package_name: com.hzs.system.base.vo + * 公告VO */ @Data @Builder diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdPlatformMessageDetailVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdPlatformMessageDetailVO.java index 4a15ade7..f4762e36 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdPlatformMessageDetailVO.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdPlatformMessageDetailVO.java @@ -1,6 +1,5 @@ package com.hzs.system.base.vo; - import com.hzs.common.core.enums.EApprovalBusiness; import com.hzs.common.core.enums.EApproveRechargeStatus; import com.hzs.common.core.enums.ENoticeBusinessType; @@ -13,13 +12,6 @@ import java.io.Serializable; import java.util.Date; import java.util.List; -/** - * @Description: - * @Author: ljc - * @Time: 2023/4/4 16:30 - * @Classname: BdPlatformMessageDetailVO - * @Package_name: com.hzs.system.base.vo - */ @Data @Builder @AllArgsConstructor diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdPlatformMessageVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdPlatformMessageVO.java index ce3b6272..43e8d3c5 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdPlatformMessageVO.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdPlatformMessageVO.java @@ -14,18 +14,13 @@ import java.util.Date; /** * 后台站内信 VO - * - * @Description: - * @Author: ljc - * @Time: 2023/4/4 16:20 - * @Classname: BdPlatformMessageVO - * @Package_name: com.hzs.system.base.vo */ @Data @Builder @AllArgsConstructor @NoArgsConstructor public class BdPlatformMessageVO implements Serializable { + private static final long serialVersionUID = -636094618562659818L; /** diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdProductStorehouseAreaVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdProductStorehouseAreaVO.java deleted file mode 100644 index 24924bdc..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdProductStorehouseAreaVO.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.hzs.system.base.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - *

- * 仓库地区中间表VO - *

- * - * @author hzs - * @since 2023-05-05 - */ -@Data -public class BdProductStorehouseAreaVO { - - private static final long serialVersionUID = 1L; - - private Long pkId; - - /** - * 产品绑定仓库表主键 - */ - private Long pkProductStorehouse; - - /** - * 省 - */ - private Integer province; - /** - * 省 - */ - private List provinceList; - /** - * 仓库名称 - */ - private String name; - /** - * 省 - */ - private String provinceVal; - /** - * 创建时间 - */ - @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - private Integer delFlag; - private Integer pkCountry; - /** - * 创建人ID - */ - private Long pkCreator; - /** - * 修改人ID - */ - private Long pkModified; - - /** - * 修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date modifiedTime; - - - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdProductStorehouseVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdProductStorehouseVO.java deleted file mode 100644 index 4d30d623..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdProductStorehouseVO.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.hzs.system.base.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - *

- * 产品绑定仓库表VO - *

- * - * @author hzs - * @since 2023-05-05 - */ -@Data -public class BdProductStorehouseVO { - - private static final long serialVersionUID = 1L; - - private Long pkId; - - /** - * 仓库表主键 - */ - private Integer pkStorehouse; - /** - * 仓库名称 - */ - @Excel(name = "仓库名称") - private String name; - /** - * 产品主键 - */ - private Integer pkProduct; - /** - * 产品编号 - */ - @Excel(name = "产品编号") - private String productCode; - /** - * 产品名称 - */ - @Excel(name = "产品名称") - private String productName; - /** - * 仓库编号 - */ - private String code; - /** - * 仓库地址 - */ - private String wareAddress; - /** - * 市 - */ - private Integer city; - /** - * 区县 - */ - private Integer county; - /** - * 联系方式 - */ - private String mobilePhone; - /** - * 联系人 - */ - private String contacts; - /** - * 省 - */ - private String provinceval; - /** - * 市 - */ - private String cityval; - /** - * 区县 - */ - private String countyval; - - /** - * 省 - */ - private Integer province; - /** - * 省 - */ - private List provinceList; - /** - * 创建时间 - */ - @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - private Integer delFlag; - private Integer pkCountry; - /** - * 创建人ID - */ - private Long pkCreator; - /** - * 修改人ID - */ - private Long pkModified; - - /** - * 修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date modifiedTime; - /** - * 开始时间 - */ - private String startDate; - /** - * 结束时间 - */ - private String endDate; - /** - * 绑定地区集合 - */ - List samList; - - - - - - - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdStorehouseAreaMiddleVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdStorehouseAreaMiddleVO.java index 2681a6cc..f147316e 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdStorehouseAreaMiddleVO.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdStorehouseAreaMiddleVO.java @@ -1,21 +1,14 @@ package com.hzs.system.base.vo; -import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.web.domain.BaseEntity; import lombok.Data; import java.util.Date; import java.util.List; /** - *

* 仓库地区中间表VO - *

- * - * @author hzs - * @since 2023-05-05 */ @Data public class BdStorehouseAreaMiddleVO { @@ -48,7 +41,7 @@ public class BdStorehouseAreaMiddleVO { /** * 创建时间 */ - @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date creationTime; @@ -70,6 +63,4 @@ public class BdStorehouseAreaMiddleVO { private Date modifiedTime; - - } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdStorehouseVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdStorehouseVO.java index 6eada9cd..3ddcd9c9 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdStorehouseVO.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdStorehouseVO.java @@ -9,15 +9,10 @@ import java.util.Date; import java.util.List; /** - *

- *仓库信息实体类VO - *

- * - * @author hzs - * @since 2022-08-02 + * 仓库信息实体类VO */ @Data -public class BdStorehouseVO { +public class BdStorehouseVO { private static final long serialVersionUID = 1L; @@ -43,7 +38,7 @@ public class BdStorehouseVO { * 绑定地区集合 */ @Excel(name = "绑定地区") - private String areaStr; + private String areaStr; @Excel(name = "省") private String provinceVal; @@ -89,7 +84,7 @@ public class BdStorehouseVO { /** * 创建时间 */ - @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date creationTime; @@ -105,7 +100,6 @@ public class BdStorehouseVO { private Date modifiedTime; - /** * 国家 */ @@ -132,7 +126,6 @@ public class BdStorehouseVO { private Date endDate; - private Integer pkCorp; /** * 库存类型 1 正常 2 不良品 EStorehouseType diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdPurposeController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdPurposeController.java deleted file mode 100644 index 9f47a536..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdPurposeController.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.hzs.system.config.controller.manage; - - -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.config.BdPurpose; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.system.config.service.IBdPurposeService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.Date; -import java.util.List; - -/** - *

- * 领用用途表 前端控制器 - *

- * - * @author zhangjing - * @since 2024-04-22 - */ -@RestController -@RequestMapping("/manage/bd-purpose") -public class BdPurposeController extends BaseController { - - @Autowired - private IBdPurposeService iBdPurposeService; - - /** - * @description: 领用用途配置列表 - * @author: zhang jing - * @date: 2024/4/22 10:51 - * @param: [purpose] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @Log(module = EOperationModule.BDPURPOSE_CONFIG,business = EOperationBusiness.BDPURPOSE_CONFIG, method = EOperationMethod.SELECT) - @GetMapping("/list") - public TableDataInfo list(BdPurpose purpose) { - startPage(); - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("PK_COUNTRY", SecurityUtils.getPkCountry()); - if (StringUtils.isNotNull(purpose.getPurpose())) { - queryWrapper.like("PURPOSE", purpose.getPurpose()); - } - queryWrapper.orderByDesc("CREATION_TIME"); - List list = iBdPurposeService.list(queryWrapper); - return getDataTable(list); - } - - /** - * @description: 用途下拉选列表 - * @author: zhang jing - * @date: 2024/4/23 14:25 - * @param: [purpose] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @Log(module = EOperationModule.BDPURPOSE_CONFIG,business = EOperationBusiness.BDPURPOSE_CONFIG, method = EOperationMethod.SELECT) - @GetMapping("/allList") - public TableDataInfo allList(BdPurpose purpose) { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("PK_COUNTRY", SecurityUtils.getPkCountry()); - if (StringUtils.isNotNull(purpose.getPurpose())) { - queryWrapper.like("PURPOSE", purpose.getPurpose()); - } - queryWrapper.orderByDesc("CREATION_TIME"); - List list = iBdPurposeService.list(queryWrapper); - return getDataTable(list); - } - - /** - * @description: 导出领用用途配置 - * @author: zhang jing - * @date: 2023/3/9 16:08 - * @param: [response, purpose] - * @return: void - **/ - @Log(module = EOperationModule.BDPURPOSE_CONFIG,business = EOperationBusiness.BDPURPOSE_CONFIG, method = EOperationMethod.SELECT) - @PostMapping("/export") - public void export(HttpServletResponse response, BdPurpose purpose) { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("PK_COUNTRY", SecurityUtils.getPkCountry()); - if (StringUtils.isNotNull(purpose.getPurpose())) { - queryWrapper.like("PURPOSE", purpose.getPurpose()); - } - queryWrapper.orderByDesc("CREATION_TIME"); - List list = iBdPurposeService.list(queryWrapper); - ExcelUtil util = new ExcelUtil<>(BdPurpose.class); - util.exportExcel(response, list, "领用用途配置"); - } - - /** - * @description: 新增领用用途配置 - * @author: zhang jing - * @date: 2024/4/22 10:51 - * @param: [purpose] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.BDPURPOSE_CONFIG,business = EOperationBusiness.BDPURPOSE_CONFIG, method = EOperationMethod.INSERT) - @PostMapping("/save") - public AjaxResult save(@RequestBody BdPurpose purpose) { - Integer pkCountry = SecurityUtils.getPkCountry(); - if (StringUtils.isEmpty(purpose.getPurpose())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.BD_PURPOSE_NOT_NULL)); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("PK_COUNTRY", pkCountry); - if (StringUtils.isNotNull(purpose.getPurpose())) { - queryWrapper.eq("PURPOSE", purpose.getPurpose()); - } - List list = iBdPurposeService.list(queryWrapper); - if (CollectionUtil.isNotEmpty(list)) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.BD_PURPOSE_REPEAT)); - } - purpose.setCreationTime(new Date()); - purpose.setPkCreator(SecurityUtils.getUserId()); - purpose.setPkCountry(pkCountry); - return AjaxResult.success(iBdPurposeService.save(purpose)); - } - - - - /** - * @description:修改领用用途配置 - * @author: zhang jing - * @date: 2024/4/22 10:51 - * @param: [purpose] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.BDPURPOSE_CONFIG,business = EOperationBusiness.BDPURPOSE_CONFIG, method = EOperationMethod.UPDATE) - @PostMapping("/update") - public AjaxResult update(@RequestBody BdPurpose purpose) { - Integer pkCountry = SecurityUtils.getPkCountry(); - if (StringUtils.isEmpty(purpose.getPurpose())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.BD_PURPOSE_NOT_NULL)); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("PK_COUNTRY", pkCountry); - if (StringUtils.isNotNull(purpose.getPurpose())) { - queryWrapper.eq("PURPOSE", purpose.getPurpose()); - queryWrapper.ne("PK_ID",purpose.getPkId()); - } - List list = iBdPurposeService.list(queryWrapper); - if (CollectionUtil.isNotEmpty(list)) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.BD_PURPOSE_REPEAT)); - } - purpose.setCreationTime(new Date()); - purpose.setPkCreator(SecurityUtils.getUserId()); - purpose.setPkCountry(pkCountry); - return toAjax(iBdPurposeService.updateById(purpose)); - } - - /** - * @description: 修改领用用途配置 - * @author: zhang jing - * @date: 2024/4/22 10:51 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.BDPURPOSE_CONFIG,business = EOperationBusiness.BDPURPOSE_CONFIG, method = EOperationMethod.SELECT) - @GetMapping("/getOne/{pkId}") - public AjaxResult getOne(@PathVariable Long pkId) { - BdPurpose purpose = iBdPurposeService.getById(pkId); - return AjaxResult.success(purpose); - } - - - /** - * @description: 删除领用用途配置 - * @author: zhang jing - * @date: 2024/4/22 10:52 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.BDPURPOSE_CONFIG,business = EOperationBusiness.BDPURPOSE_CONFIG, method = EOperationMethod.DELETE) - @DeleteMapping("/{pkId}") - public AjaxResult delete(@PathVariable Long pkId) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_ID", pkId); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId()); - updateWrapper.set("MODIFIED_TIME", new Date()); - return toAjax(iBdPurposeService.update(updateWrapper)); - } - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdAwardsMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdAwardsMapper.java index 8de5a12f..ff8d5b91 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdAwardsMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdAwardsMapper.java @@ -1,26 +1,13 @@ package com.hzs.system.config.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.system.config.BdAwards; import org.apache.ibatis.annotations.Param; -/** - *

- * Mapper 接口 - *

- * - * @author zhangjing - * @since 2022-09-08 - */ public interface BdAwardsMapper extends BaseMapper { /** - * @description: 查询等级或奖衔是否被使用 - * @author: zhang jing - * @date: 2023/3/2 17:37 - * @param: [pkRegisterGrade, pkSettleGrade, pkAwards] - * @return: java.lang.Integer + * 查询等级或奖衔是否被使用 **/ Integer checkGradeAwards(@Param("pkRegisterGrade") Long pkRegisterGrade, @Param("pkSettleGrade") Long pkSettleGrade, diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdGradeMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdGradeMapper.java index 10afe0d6..7a90d2bd 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdGradeMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdGradeMapper.java @@ -8,9 +8,6 @@ import java.math.BigDecimal; /** * 等级配置表 Mapper 接口 - * - * @author zhangjing - * @since 2022-09-08 */ public interface BdGradeMapper extends BaseMapper { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdGradeScopeMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdGradeScopeMapper.java index 528964b0..f20ecd72 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdGradeScopeMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdGradeScopeMapper.java @@ -8,18 +8,11 @@ import java.util.List; /** * 等级范围 Mapper 接口 - * - * @author zhangjing - * @since 2022-10-24 */ public interface BdGradeScopeMapper extends BaseMapper { /** - * @description: 查询等级范围配置列表 - * @author: zhang jing - * @date: 2022/10/25 10:34 - * @param: [gradeScopeParam] - * @return: java.util.List + * 查询等级范围配置列表 **/ List selectGradeScopeList(BdGradeScopeExt gradeScopeExt); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdPurposeMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdPurposeMapper.java deleted file mode 100644 index 67a1116c..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdPurposeMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.config.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.system.config.BdPurpose; - -/** - *

- * 领用用途表 Mapper 接口 - *

- * - * @author zhangjing - * @since 2024-04-22 - */ -public interface BdPurposeMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdRangeAwardsMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdRangeAwardsMapper.java index 66e7531e..9540cca4 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdRangeAwardsMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdRangeAwardsMapper.java @@ -4,12 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.system.config.BdRangeAwards; /** - *

* 极差奖衔配置表 Mapper 接口 - *

- * - * @author hzs - * @since 2024-10-15 */ public interface BdRangeAwardsMapper extends BaseMapper { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdVertexMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdVertexMapper.java index e48a9fc1..dd0896a2 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdVertexMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdVertexMapper.java @@ -11,9 +11,6 @@ import java.util.List; /** * 体系配置 Mapper 接口 - * - * @author hzs - * @since 2022-10-31 */ public interface BdVertexMapper extends BaseMapper { @@ -33,12 +30,9 @@ public interface BdVertexMapper extends BaseMapper { */ List queryListByUserId(@Param("userId") Long userId); - /* - * @description: 更新所属体系 - * @author: sui q - * @date: 2023/4/25 10:52 - * @param: null null - **/ + /** + * 更新所属体系 + */ void updateBdVertexById(@Param("pkMember") Long pkMember, @Param("pkVertex") Integer pkVertex); /** @@ -52,12 +46,9 @@ public interface BdVertexMapper extends BaseMapper { @Param("pkVertex") Integer pkVertex, @Param("pkCountry") Integer pkCountry); - /* - * @description: 更新所属体系 - * @author: sui q - * @date: 2023/4/25 10:52 - * @param: null null - **/ + /** + * 更新所属体系 + */ void updateBdVertexNullById(@Param("pkVertex") Integer pkVertex); /** diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/AwardsServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/AwardsServiceProvider.java index c4a20245..7e975e9e 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/AwardsServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/AwardsServiceProvider.java @@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil; import com.hzs.common.core.domain.R; import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.domain.system.config.BdRangeAwards; -import com.hzs.common.domain.system.config.ext.BdAwardsExt; import com.hzs.system.config.IAwardsServiceApi; import com.hzs.system.config.service.IBdAwardsService; import com.hzs.system.config.service.IBdRangeAwardsService; @@ -23,13 +22,6 @@ public class AwardsServiceProvider implements IAwardsServiceApi { @Autowired private IBdRangeAwardsService iBdRangeAwardsService; - /** - * @description: 根据国家查询奖衔配置列表 - * @author: zhang jing - * @date: 2022/9/29 15:17 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ @Override public R> queryAwards(Integer pkCountry) { return R.ok(iBdAwardsService.queryAwards(pkCountry)); @@ -40,25 +32,11 @@ public class AwardsServiceProvider implements IAwardsServiceApi { return R.ok(iBdRangeAwardsService.queryRangeAwards()); } - /** - * @description: 根据pkID查询奖衔信息 - * @author: zhang jing - * @date: 2022/10/10 11:52 - * @param: [pkId] - * @return: com.hzs.common.core.domain.R - **/ @Override public R getAwardsOne(Integer pkId) { return R.ok(BeanUtil.copyProperties(iBdAwardsService.getBdAwardsOne(pkId), BdAwards.class)); } - /** - * @description: 根据国家查询奖衔配置列表 - * @author: zhang jing - * @date: 2022/11/11 14:17 - * @param: [pkCountrySet] - * @return: com.hzs.common.core.domain.R>> - **/ @Override public R> getAwards() { List awardsList = iBdAwardsService.queryAwards(); @@ -70,24 +48,6 @@ public class AwardsServiceProvider implements IAwardsServiceApi { return R.ok(countryAwardsMap); } - /** - * @description: 根据国家查询辅导分红列表 - * @author: zhang jing - * @date: 2022/11/11 14:16 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ - @Override - public R> coachBonusList(Integer pkCountry) { - return R.ok(iBdAwardsService.coachBonusList(pkCountry)); - } - - /** - * 根据所属国家查询奖衔 - * - * @param pkCountry - * @return - */ @Override public R> queryByPkCountryAwards(Integer pkCountry) { return R.ok(iBdAwardsService.queryByPkCountryAwards(pkCountry)); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/GradeServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/GradeServiceProvider.java index 6299ebd8..231c1fb5 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/GradeServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/GradeServiceProvider.java @@ -3,7 +3,6 @@ package com.hzs.system.config.provider; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import com.hzs.common.core.domain.R; -import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.domain.system.config.BdGrade; import com.hzs.common.domain.system.ext.BdGradeScopeExt; import com.hzs.system.config.IGradeServiceApi; @@ -17,11 +16,7 @@ import java.math.BigDecimal; import java.util.*; /** - * @Description: 等级的dubbo服务类 - * @Author: sui q - * @Time: 2022/9/9 14:11 - * @Classname: GradeServiceProvider - * @PackageName: com.hzs.system.config.provider + * 等级的dubbo服务类 */ @DubboService public class GradeServiceProvider implements IGradeServiceApi { @@ -31,13 +26,6 @@ public class GradeServiceProvider implements IGradeServiceApi { @Autowired private IBdGradeScopeService iBdGradeScopeService; - /** - * @description: 查询等级配置 - * @author: zhang jing - * @date: 2022/9/28 15:18 - * @param: [pkId] - * @return: com.hzs.common.core.domain.R - **/ @Override public R getGrade(Integer pkId) { return R.ok(BeanUtil.copyProperties(iBdGradeService.getBdGrade(pkId), GradeDTO.class)); @@ -48,13 +36,6 @@ public class GradeServiceProvider implements IGradeServiceApi { return R.ok(BeanUtil.copyProperties(iBdGradeService.getGradeByGradeValue(gradeValue, pkCountry), GradeDTO.class)); } - /** - * @description: 根据国家查询等级配置列表 - * @author: zhang jing - * @date: 2022/9/28 15:18 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ @Override public R> queryGradeConfigByCondition(Integer pkCountry) { List gradeList = iBdGradeService.queryGradeConfigByCondition(pkCountry); @@ -99,14 +80,6 @@ public class GradeServiceProvider implements IGradeServiceApi { return R.ok(gradeDtoMap); } - /** - * 根据国家查询全部等级配置 - * - * @param pkCountry 国家 - * @return: R> - * @Author: sui q - * @Date: 2022/9/6 10:37 - */ @Override public R> queryGradeList(Integer pkCountry) { List gradeList = iBdGradeService.queryGradeConfigByCondition(pkCountry); @@ -126,12 +99,6 @@ public class GradeServiceProvider implements IGradeServiceApi { return R.ok(gradeDTO); } - /** - * 查询全部等级列表数据 - * - * @param pkCountry - * @return - */ @Override public R> selectGradeAll(Integer pkCountry) { List gradeList = iBdGradeService.selectGradeAll(pkCountry); @@ -140,24 +107,11 @@ public class GradeServiceProvider implements IGradeServiceApi { return R.ok(gradeDTOList); } - /** - * 根据国家查询等级配置列表 - * - * @param pkCountry 国家 - * @return: R> - * @Author: sui q - * @Date: 2022/9/6 10:37 - */ @Override public R> queryGrowUpFootmarkGrade(Integer pkCountry) { return R.ok(iBdGradeService.queryGrowUpFootmarkGrade(pkCountry)); } - /** - * 查询全部的等级 - * - * @return - */ @Override public R> findAll() { List gradeList = iBdGradeService.list(); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/IVertexServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/IVertexServiceProvider.java index c1dd55de..83ea5b30 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/IVertexServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/IVertexServiceProvider.java @@ -1,7 +1,7 @@ package com.hzs.system.config.provider; import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.hzs.common.core.domain.R; import com.hzs.common.domain.vertex.BdVertex; @@ -15,24 +15,12 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList; import java.util.List; -/** - * @Description: - * @Author: yuhui - * @Time: 2022/11/16 15:58 - * @Classname: IVertexServiceProvider - * @PackageName: com.hzs.sale.vertex.provider - */ @DubboService public class IVertexServiceProvider implements IVertexServiceApi { @Autowired private IBdVertexService vertexService; - /** - * 查询所有体系配置 - * - * @return - */ @Override public R> findAll() { List list = vertexService.list(); @@ -44,15 +32,10 @@ public class IVertexServiceProvider implements IVertexServiceApi { return R.ok(resultList); } - /** - * 查询所有体系配置(根据国家) - * - * @return - */ @Override public R> findAllByPkCountry(Integer pkCountry) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_COUNTRY", pkCountry); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(BdVertex::getPkCountry, pkCountry); List list = vertexService.list(queryWrapper); List resultList = new ArrayList<>(); for (BdVertex bdVertex : list) { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAwardsService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAwardsService.java index f74c3160..ea391b66 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAwardsService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAwardsService.java @@ -8,28 +8,16 @@ import java.util.List; /** * 服务类 - * - * @author zhangjing - * @since 2022-09-08 */ public interface IBdAwardsService extends IService { /** - * @description: 根据国家查询奖衔配置列表 - * @author: zhang jing - * @date: 2022/9/29 15:15 - * @param: [pkCountry] - * @return: java.util.List + * 根据国家查询奖衔配置列表 **/ List queryAwards(Integer pkCountry); /** * 根据pkID查询奖衔信息 - * - * @author: zhang jing - * @date: 2022/10/10 11:52 - * @param: [pkId] 奖衔主键 - * @return: com.hzs.common.domain.system.config.BdAwards **/ BdAwards getBdAwardsOne(Integer pkId); @@ -43,65 +31,32 @@ public interface IBdAwardsService extends IService { List getBdAwards(Integer pkCountry, Integer enableState); /** - * @description: 生成奖衔 - * @author: zhang jing - * @date: 2022/10/22 9:55 - * @param: [awards] - * @return: boolean + * 生成奖衔 **/ boolean generate(BdAwards awards); /** - * @description: 修改辅导分红配置 - * @author: zhang jing - * @date: 2022/11/1 10:50 - * @param: [awardsExt] - * @return: boolean + * 修改辅导分红配置 **/ boolean updateAwards(BdAwardsExt awardsExt); /** - * @description: 修改环球积分 - * @author: zhang jing - * @date: 2022/11/2 9:46 - * @param: [awardsExt] - * @return: boolean + * 修改环球积分 **/ boolean updateLobalIntegral(BdAwardsExt awardsExt); /** - * @description: 修改车奖积分 - * @author: zhang jing - * @date: 2022/11/2 9:46 - * @param: [awardsExt] - * @return: boolean + * 修改车奖积分 **/ boolean updateGlobalIntegral(BdAwardsExt awardsExt); - /** - * @description: 根据国家查询辅导分红列表 - * @author: zhang jing - * @date: 2022/11/11 9:45 - * @param: [pkCountry] - * @return: java.util.List - **/ - List coachBonusList(Integer pkCountry); - /** * 查询所有奖衔 - * - * @return: List - * @Author: sui q - * @Date: 2023/2/21 15:46 */ List queryAwards(); /** - * @description: 查询等级或奖衔是否被使用 - * @author: zhang jing - * @date: 2023/3/2 17:36 - * @param: [pkRegisterGrade, pkSettleGrade, pkAwards] - * @return: java.lang.Integer + * 查询等级或奖衔是否被使用 **/ Integer checkGradeAwards(Long pkRegisterGrade, Long pkSettleGrade, diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdGradeScopeService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdGradeScopeService.java index 797d63a6..86db15c9 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdGradeScopeService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdGradeScopeService.java @@ -8,18 +8,11 @@ import java.util.List; /** * 等级范围 服务类 - * - * @author zhangjing - * @since 2022-10-24 */ public interface IBdGradeScopeService extends IService { /** - * @description: 查询等级范围配置列表 - * @author: zhang jing - * @date: 2022/10/25 10:42 - * @param: [gradeScopeParam] - * @return: java.util.List + * 查询等级范围配置列表 **/ List selectGradeScopeList(BdGradeScopeExt gradeScopeExt); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdGradeService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdGradeService.java index f82472a1..a215d2c5 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdGradeService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdGradeService.java @@ -9,9 +9,6 @@ import java.util.List; /** * 等级配置表 服务类 - * - * @author zhangjing - * @since 2022-09-08 */ public interface IBdGradeService extends IService { @@ -19,72 +16,43 @@ public interface IBdGradeService extends IService { * 获取等级 * * @param pkId 主键 - * @return: R - * @Author: sui q - * @Date: 2022/9/24 17:57 */ BdGrade getBdGrade(Integer pkId); - /* - * @description: 根据等级值获得等级 - * @author: sui q - * @date: 2023/4/23 19:21 - * @param: null null - **/ + /** + * 根据等级值获得等级 + */ BdGrade getGradeByGradeValue(Integer gradeValue, Integer pkCountry); /** * 根据国家查询等级配置列表 * * @param pkCountry 国家 - * @return: R> - * @Author: sui q - * @Date: 2022/9/6 10:37 */ List queryGradeConfigByCondition(Integer pkCountry); /** - * @description: 生成等级配置 - * @author: zhang jing - * @date: 2022/10/18 16:42 - * @param: [grade] - * @return: boolean + * 生成等级配置 **/ boolean generate(BdGrade grade); /** - * @description: 新增等级配置 - * @author: zhang jing - * @date: 2022/10/26 11:57 - * @param: [grade] - * @return: boolean + * 新增等级配置 **/ boolean saveBdGrade(BdGradeExt gradeExt); /** - * @description: 修改等级配置+新增等级范围 - * @author: zhang jing - * @date: 2022/10/26 14:28 - * @param: [gradeExt] - * @return: boolean + * 修改等级配置+新增等级范围 **/ boolean updateBdGrade(BdGradeExt gradeExt); /** - * @description: 修改拓展信息 - * @author: zhang jing - * @date: 2022/10/31 16:47 - * @param: [gradeExt] - * @return: boolean + * 修改拓展信息 **/ boolean updateExpand(BdGradeExt gradeExt); /** * 查询所有国家的等级配置 - * - * @return: List - * @Author: sui q - * @Date: 2023/2/21 15:32 */ List queryBdGrade(); @@ -109,9 +77,6 @@ public interface IBdGradeService extends IService { * 根据国家查询等级配置列表 * * @param pkCountry 国家 - * @return: R> - * @Author: sui q - * @Date: 2022/9/6 10:37 */ List queryGrowUpFootmarkGrade(Integer pkCountry); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdPurposeService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdPurposeService.java deleted file mode 100644 index 3a5664ca..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdPurposeService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.config.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.system.config.BdPurpose; - -/** - *

- * 领用用途表 服务类 - *

- * - * @author zhangjing - * @since 2024-04-22 - */ -public interface IBdPurposeService extends IService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdRangeAwardsService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdRangeAwardsService.java index 8472241a..5a1d2ef2 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdRangeAwardsService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdRangeAwardsService.java @@ -1,26 +1,14 @@ package com.hzs.system.config.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.core.domain.R; import com.hzs.common.domain.system.config.BdRangeAwards; import java.util.List; /** - *

* 极差奖衔配置表 服务类 - *

- * - * @author hzs - * @since 2024-10-15 */ public interface IBdRangeAwardsService extends IService { - /* - * @description: - * @author: sui q - * @date: 2024/10/15 16:45 - * @param: null null - **/ List queryRangeAwards(); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdServiceChargeService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdServiceChargeService.java index 10666dd4..e944d325 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdServiceChargeService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdServiceChargeService.java @@ -9,9 +9,6 @@ import java.util.List; /** * 办理业务手续费配置主表 服务类 - * - * @author hzs - * @since 2023-01-03 */ public interface IBdServiceChargeService extends IService { @@ -46,10 +43,7 @@ public interface IBdServiceChargeService extends IService { /** * 根据业务类型查询扣款 - * - * @param serviceChargeDTO - * @return - */ + **/ ServiceChargeDTO getServiceChargeByType(ServiceChargeDTO serviceChargeDTO); /** diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdVertexService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdVertexService.java index cf2eafcb..d9d23afa 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdVertexService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdVertexService.java @@ -11,9 +11,6 @@ import java.util.Map; /** * 体系配置 服务类 - * - * @author hzs - * @since 2022-10-31 */ public interface IBdVertexService extends IService { @@ -48,12 +45,9 @@ public interface IBdVertexService extends IService { */ List queryListByUserId(Long userId); - /* - * @description: 根据主键更新所属体系 - * @author: sui q - * @date: 2023/4/25 10:47 - * @param: null null - **/ + /** + * 根据主键更新所属体系 + */ void updateBdVertexById(Integer pkVertex); /** @@ -75,7 +69,7 @@ public interface IBdVertexService extends IService { /** * 查询刷新体系数据 * - * @param pkCountry 所属国家 + * @param pkCountry 所属国家 * @return */ void flushAllVertex(Integer pkCountry); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAwardsServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAwardsServiceImpl.java index f6b025e2..f85147af 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAwardsServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAwardsServiceImpl.java @@ -20,15 +20,11 @@ import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.Date; import java.util.List; /** * 奖衔配置服务实现类 - * - * @author zhangjing - * @since 2022-09-08 */ @Service public class BdAwardsServiceImpl extends ServiceImpl implements IBdAwardsService { @@ -40,26 +36,10 @@ public class BdAwardsServiceImpl extends ServiceImpl i ITransactionServiceApi iTransactionServiceApi; - /** - * @description: 根据国家查询奖衔配置列表 - * @author: zhang jing - * @date: 2022/9/29 15:10 - * @param: [pkCountry] - * @return: java.util.List - **/ - @Override public List queryAwards(Integer pkCountry) { return getBdAwards(pkCountry, EnableStatus.ENABLE.getValue()); } - - /** - * @description: 根据pkID查询奖衔信息 - * @author: zhang jing - * @date: 2022/10/10 11:51 - * @param: [pkId] - * @return: com.hzs.common.domain.system.config.BdAwards - **/ @Override public BdAwards getBdAwardsOne(Integer pkId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -67,13 +47,6 @@ public class BdAwardsServiceImpl extends ServiceImpl i return baseMapper.selectOne(queryWrapper); } - /** - * @description: 根据国家查询奖衔配置 - * @author: zhang jing - * @date: 2022/11/10 16:59 - * @param: [pkCountry, enableState] - * @return: java.util.List - **/ @Override public List getBdAwards(Integer pkCountry, Integer enableState) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -87,13 +60,6 @@ public class BdAwardsServiceImpl extends ServiceImpl i return baseMapper.selectList(queryWrapper); } - /** - * @description: 生成奖衔 - * @author: zhang jing - * @date: 2022/10/22 9:58 - * @param: [awards] - * @return: boolean - **/ @Override public boolean generate(BdAwards awards) { Integer pkCountry = SecurityUtils.getPkCountry(); @@ -118,13 +84,6 @@ public class BdAwardsServiceImpl extends ServiceImpl i return true; } - /** - * @description: 修改辅导分红配置 - * @author: zhang jing - * @date: 2022/11/1 10:49 - * @param: [awardsExt] - * @return: boolean - **/ @Override public boolean updateAwards(BdAwardsExt awardsExt) { for (BdAwards awards : awardsExt.getAwardsList()) { @@ -133,13 +92,6 @@ public class BdAwardsServiceImpl extends ServiceImpl i return true; } - /** - * @description: 修改环球积分 - * @author: zhang jing - * @date: 2022/11/2 9:48 - * @param: [awardsExt] - * @return: boolean - **/ @Override public boolean updateLobalIntegral(BdAwardsExt awardsExt) { for (BdAwards awards : awardsExt.getLobalIntegralList()) { @@ -148,13 +100,6 @@ public class BdAwardsServiceImpl extends ServiceImpl i return true; } - /** - * @description: 修改车奖积分 - * @author: zhang jing - * @date: 2022/11/2 9:48 - * @param: [awardsExt] - * @return: boolean - **/ @Override public boolean updateGlobalIntegral(BdAwardsExt awardsExt) { for (BdAwards awards : awardsExt.getCarAwardPointsList()) { @@ -163,64 +108,17 @@ public class BdAwardsServiceImpl extends ServiceImpl i return true; } - /** - * @description: 根据国家查询辅导分红列表 - * @author: zhang jing - * @date: 2022/11/11 9:47 - * @param: [pkCountry] - * @return: java.util.List - **/ - @Override - public List coachBonusList(Integer pkCountry) { - List listExt = redisService.getCacheList(CacheConstants.BD_AWARDS_COACH + pkCountry); - List listExtNew = new ArrayList<>(); - if (CollectionUtil.isEmpty(listExt)) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(BdAwards::getPkCountry, SecurityUtils.getPkCountry()); - queryWrapper.orderByAsc(BdAwards::getAwardsValue); - List list = baseMapper.selectList(queryWrapper); - if (CollectionUtil.isNotEmpty(list)) { - for (BdAwards ba : list) { - BdAwardsExt baExt = new BdAwardsExt(); - baExt.setPkId(ba.getPkId()); - baExt.setAwardsName(ba.getAwardsName()); - baExt.setCoachAlgebra(ba.getCoachAlgebra()); - baExt.setCoachRatio(ba.getCoachRatio()); - baExt.setAbonusRatio(ba.getAbonusRatio()); - listExtNew.add(baExt); - } - redisService.setCacheList(CacheConstants.BD_AWARDS_COACH + pkCountry, listExtNew); - } - return listExtNew; - } else { - return listExt; - } - } - @Override public List queryAwards() { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); return baseMapper.selectList(queryWrapper); } - /** - * @description: 查询等级或奖衔是否被使用 - * @author: zhang jing - * @date: 2023/3/2 17:37 - * @param: [pkRegisterGrade, pkSettleGrade, pkAwards] - * @return: java.lang.Integer - **/ @Override public Integer checkGradeAwards(Long pkRegisterGrade, Long pkSettleGrade, Long pkAwards) { return baseMapper.checkGradeAwards(pkRegisterGrade, pkSettleGrade, pkAwards); } - /** - * 根据所属国家查询奖衔 - * - * @param pkCountry - * @return - */ @Override public List queryByPkCountryAwards(Integer pkCountry) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusExpandServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusExpandServiceImpl.java index a589977d..4517b2b8 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusExpandServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusExpandServiceImpl.java @@ -10,10 +10,7 @@ import org.springframework.stereotype.Service; import java.util.List; /** - * 奖金4—N配置 服务实现类 - * - * @author hzs - * @since 2022-10-31 + * 奖金4—N配置服务实现类 */ @Service public class BdBonusExpandServiceImpl extends ServiceImpl implements IBdBonusExpandService { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdGradeScopeServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdGradeScopeServiceImpl.java index e62a2467..88b86d91 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdGradeScopeServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdGradeScopeServiceImpl.java @@ -11,20 +11,10 @@ import java.util.List; /** * 等级范围 服务实现类 - * - * @author zhangjing - * @since 2022-10-24 */ @Service public class BdGradeScopeServiceImpl extends ServiceImpl implements IBdGradeScopeService { - /** - * @description: 查询等级范围配置列表 - * @author: zhang jing - * @date: 2022/10/25 10:34 - * @param: [gradeScopeParam] - * @return: java.util.List - **/ @Override public List selectGradeScopeList(BdGradeScopeExt gradeScopeExt) { return baseMapper.selectGradeScopeList(gradeScopeExt); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdGradeServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdGradeServiceImpl.java index d7f55c91..9786c661 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdGradeServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdGradeServiceImpl.java @@ -31,9 +31,6 @@ import java.util.List; /** * 等级配置表 服务实现类 - * - * @author zhangjing - * @since 2022-09-08 */ @Service public class BdGradeServiceImpl extends ServiceImpl implements IBdGradeService { @@ -81,13 +78,6 @@ public class BdGradeServiceImpl extends ServiceImpl impl return baseMapper.selectList(queryWrapper); } - /** - * @description: 生成等级配置 - * @author: zhang jing - * @date: 2022/10/18 16:43 - * @param: [grade] - * @return: boolean - **/ @Override @Transactional(rollbackFor = Exception.class) public boolean generate(BdGrade grade) { @@ -113,13 +103,6 @@ public class BdGradeServiceImpl extends ServiceImpl impl return true; } - /** - * @description: 新增等级配置+增加等级（推荐）范围 - * @author: zhang jing - * @date: 2022/10/26 11:58 - * @param: [gradeExt] - * @return: boolean - **/ @Override public boolean saveBdGrade(BdGradeExt gradeExt) { Integer pkCountry = SecurityUtils.getPkCountry(); @@ -149,13 +132,6 @@ public class BdGradeServiceImpl extends ServiceImpl impl return true; } - /** - * @description: 修改等级配置+增加等级（推荐）范围 - * @author: zhang jing - * @date: 2022/10/26 14:00 - * @param: [gradeExt] - * @return: boolean - **/ @Override @Transactional(rollbackFor = Exception.class) public boolean updateBdGrade(BdGradeExt gradeExt) { @@ -190,13 +166,6 @@ public class BdGradeServiceImpl extends ServiceImpl impl return true; } - /** - * @description: 修改拓展信息 - * @author: zhang jing - * @date: 2022/10/31 16:46 - * @param: [gradeExt] - * @return: boolean - **/ @Override @Transactional(rollbackFor = Exception.class) public boolean updateExpand(BdGradeExt gradeExt) { @@ -230,14 +199,6 @@ public class BdGradeServiceImpl extends ServiceImpl impl return baseMapper.selectList(queryWrapper); } - - /** - * @description: 删除等级配置 - * @author: zhang jing - * @date: 2023/4/22 14:30 - * @param: [pkId] - * @return: boolean - **/ @Transactional(rollbackFor = Exception.class) @Override public boolean updateGrade(Long pkId, Long userId) { @@ -257,12 +218,6 @@ public class BdGradeServiceImpl extends ServiceImpl impl return true; } - /** - * 查询全部等级列表数据 - * - * @param pkCountry - * @return - */ @Override public List selectGradeAll(Integer pkCountry) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -274,14 +229,6 @@ public class BdGradeServiceImpl extends ServiceImpl impl return baseMapper.selectList(queryWrapper); } - /** - * 根据国家查询等级配置列表 - * - * @param pkCountry 国家 - * @return: R> - * @Author: sui q - * @Date: 2022/9/6 10:37 - */ @Override public List queryGrowUpFootmarkGrade(Integer pkCountry) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdPurposeServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdPurposeServiceImpl.java deleted file mode 100644 index ae375808..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdPurposeServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hzs.system.config.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.system.config.BdPurpose; -import com.hzs.system.config.mapper.BdPurposeMapper; -import com.hzs.system.config.service.IBdPurposeService; -import org.springframework.stereotype.Service; - -/** - *

- * 领用用途表 服务实现类 - *

- * - * @author zhangjing - * @since 2024-04-22 - */ -@Service -public class BdPurposeServiceImpl extends ServiceImpl implements IBdPurposeService { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdRangeAwardsServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdRangeAwardsServiceImpl.java index 0ffacf2e..e279aa72 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdRangeAwardsServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdRangeAwardsServiceImpl.java @@ -1,8 +1,7 @@ package com.hzs.system.config.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.SystemFieldConstants; import com.hzs.common.core.enums.ERangeAwards; import com.hzs.common.domain.system.config.BdRangeAwards; import com.hzs.system.config.mapper.BdRangeAwardsMapper; @@ -12,21 +11,16 @@ import org.springframework.stereotype.Service; import java.util.List; /** - *

* 极差奖衔配置表 服务实现类 - *

- * - * @author hzs - * @since 2024-10-15 */ @Service public class BdRangeAwardsServiceImpl extends ServiceImpl implements IBdRangeAwardsService { @Override public List queryRangeAwards() { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.gt("AWARDS_VALUE", ERangeAwards.S0.getValue()); - queryWrapper.orderByAsc("AWARDS_VALUE"); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.gt(BdRangeAwards::getAwardsValue, ERangeAwards.S0.getValue()); + queryWrapper.orderByAsc(BdRangeAwards::getAwardsValue); return baseMapper.selectList(queryWrapper); } } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdVertexServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdVertexServiceImpl.java index 1ea732e2..af7e242d 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdVertexServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdVertexServiceImpl.java @@ -17,25 +17,15 @@ import java.util.Map; /** * 体系配置 服务实现类 - * - * @author hzs - * @since 2022-10-31 */ @Service public class BdVertexServiceImpl extends ServiceImpl implements IBdVertexService { - /** - * 根据id查询体系配置 - * - * @param pkId - * @return - */ @Override public BdVertex getVertex(Integer pkId) { return baseMapper.selectById(pkId); } - @Override public Map getAllVertexMap() { Map resultMap = new HashMap<>(); @@ -48,12 +38,6 @@ public class BdVertexServiceImpl extends ServiceImpl i return resultMap; } - /** - * 查询体系配置 - * - * @param vertexParam - * @return - */ @Override public List selectByList(VertexParam vertexParam) { return baseMapper.selectByList(vertexParam); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SupplierUserController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SupplierUserController.java deleted file mode 100644 index a62bca4c..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SupplierUserController.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.hzs.system.sys.controller.manage; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.UserConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.sys.SysUser; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.system.sys.param.SysUserParam; -import com.hzs.system.sys.param.SysUserQueryParam; -import com.hzs.system.sys.service.ISupplierUserService; -import com.hzs.system.sys.service.ISysUserService; -import com.hzs.system.sys.vo.SupplierUserDetailVO; -import com.hzs.system.sys.vo.SupplierUserQueryVO; -import com.hzs.system.sys.vo.SysUserQueryVO; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ArrayUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.List; - -/** - * @Description: 供应商管理控制器 - * @Author: jiang chao - * @Time: 2024/3/23 11:02 - * @Classname: SysSupplierController - * @PackageName: com.hzs.system.sys.controller.manage - */ -@Slf4j -@RestController -@RequestMapping("/manage/supplier") -public class SupplierUserController extends BaseController { - - @Autowired - private ISysUserService iSysUserService; - @Autowired - private ISupplierUserService iSupplierUserService; - - /** - * 供应商用户列表 - * - * @param param - * @return - */ - @Log(module = EOperationModule.SUPPLIER_USER, business = EOperationBusiness.SUPPLIER_USER, method = EOperationMethod.SELECT) - @GetMapping("/list") - public TableDataInfo list(SysUserQueryParam param) { - DateUtils.handTimeStartAndEnd(param.getCreationTime()); - param.setUserType(ELoginType.SUPPLIER.getValueInt()); - startPage(); - List list = iSysUserService.selectUserList(param); - - // 实际显示列表 - List resultList = new ArrayList<>(list.size()); - - if (CollectionUtil.isNotEmpty(list)) { - for (SysUserQueryVO sysUserQueryVO : list) { - sysUserQueryVO.setStatusVal(EnableStatus.getLabelByIntValue(sysUserQueryVO.getStatus())); - - resultList.add(BeanUtil.copyProperties(sysUserQueryVO, SupplierUserQueryVO.class)); - } - } - - TableDataInfo tableDataInfo = getDataTable(list); - tableDataInfo.setRows(resultList); - return tableDataInfo; - } - - /** - * 供应商用户导出 - * - * @param response - * @param param - */ - @Log(module = EOperationModule.SUPPLIER_USER, business = EOperationBusiness.SUPPLIER_USER, method = EOperationMethod.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, SysUserQueryParam param) { - DateUtils.handTimeStartAndEnd(param.getCreationTime()); - param.setUserType(ELoginType.SUPPLIER.getValueInt()); - List list = iSysUserService.selectUserList(param); - - // 实际导出列表 - List resultList = new ArrayList<>(list.size()); - - if (CollectionUtil.isNotEmpty(list)) { - for (SysUserQueryVO sysUserQueryVO : list) { - sysUserQueryVO.setStatusVal(EnableStatus.getLabelByIntValue(sysUserQueryVO.getStatus())); - - resultList.add(BeanUtil.copyProperties(sysUserQueryVO, SupplierUserQueryVO.class)); - } - } - - ExcelUtil util = new ExcelUtil<>(SupplierUserQueryVO.class); - util.exportExcel(response, resultList, "供应商导出"); - } - - /** - * 供应商信息 - */ - @GetMapping(value = {"/{userId}"}) - public AjaxResult getInfo(@PathVariable(value = "userId") Long userId) { - SupplierUserDetailVO supplierUserDetailVO = new SupplierUserDetailVO(); - - SysUser sysUser = iSysUserService.selectUserById(userId); - if (null != sysUser) { - BeanUtil.copyProperties(sysUser, supplierUserDetailVO); - } - - return AjaxResult.success(supplierUserDetailVO); - } - - /** - * 新增供应商 - * - * @param param - * @return - */ - @Log(module = EOperationModule.SUPPLIER_USER, business = EOperationBusiness.SUPPLIER_USER, method = EOperationMethod.INSERT) - @PostMapping - public AjaxResult add(@RequestBody SysUserParam param) { - if (UserConstants.NOT_UNIQUE.equals(iSysUserService.checkUserNameUnique(param.getUserName()))) { - return AjaxResult.error("新増失败 " + param.getUserName() + " 已存在"); - } - - param.setPwd(param.getPassword()); - param.setPassword(SecurityUtils.encryptPassword(param.getPassword())); - param.setUserType(ELoginType.SUPPLIER.getValueInt()); - - return toAjax(iSupplierUserService.insertSupplierUser(param, SecurityUtils.getUserId())); - } - - /** - * 修改供应商 - * - * @param param - * @return - */ - @Log(module = EOperationModule.SUPPLIER_USER, business = EOperationBusiness.SUPPLIER_USER, method = EOperationMethod.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SysUserParam param) { - if (null == param.getUserId()) { - return AjaxResult.error("缺少参数"); - } - if (StringUtils.isNotEmpty(param.getPassword())) { - param.setPwd(param.getPassword()); - param.setPassword(SecurityUtils.encryptPassword(param.getPassword())); - } - param.setUserType(ELoginType.SUPPLIER.getValueInt()); - - return toAjax(iSupplierUserService.updateSupplierUser(param, SecurityUtils.getUserId())); - } - - /** - * 删除供应商 - */ - @Log(module = EOperationModule.SUPPLIER_USER, business = EOperationBusiness.SUPPLIER_USER, method = EOperationMethod.DELETE) - @DeleteMapping("/{userIds}") - public AjaxResult remove(@PathVariable Long[] userIds) { - if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) { - return AjaxResult.error("当前供应商不能删除"); - } - for (Long userId : userIds) { - iSysUserService.checkUserAllowed(userId); - } - return toAjax(iSupplierUserService.deleteUserByIds(userIds, SecurityUtils.getUserId())); - } - - - /** - * 状态修改 - * - * @param user - * @return - */ - @Log(module = EOperationModule.SUPPLIER_USER, business = EOperationBusiness.SUPPLIER_USER, method = EOperationMethod.UPDATE_STATUS) - @PutMapping("/change-status") - public AjaxResult changeStatus(@RequestBody SysUser user) { - if (null == user.getUserId()) { - return AjaxResult.error("缺少参数"); - } - iSysUserService.checkUserAllowed(user.getUserId()); - user.setPkModified(SecurityUtils.getUserId()); - return toAjax(iSysUserService.updateUserStatus(user)); - } - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SysApprovalController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SysApprovalController.java deleted file mode 100644 index 53278935..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SysApprovalController.java +++ /dev/null @@ -1,288 +0,0 @@ -package com.hzs.system.sys.controller.manage; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.constant.msg.DocumentMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.system.sys.SysApproval; -import com.hzs.common.domain.system.sys.SysUser; -import com.hzs.common.domain.system.sys.ext.SysApprovalExt; -import com.hzs.common.domain.system.sys.ext.SysApprovalItemExt; -import com.hzs.common.domain.system.sys.ext.SysApprovalSendExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.service.ITransactionCommonService; -import com.hzs.common.util.TransactionUtils; -import com.hzs.system.sys.param.ApprovalParam; -import com.hzs.system.sys.param.ApprovalSaveParam; -import com.hzs.system.sys.service.*; -import com.hzs.system.sys.vo.*; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.*; -import java.util.stream.Collectors; - -/** - * Description: 签呈配置相关 - * Author: jiang chao - * Time: 2022/9/15 15:08 - * Classname: SysApprovalController - * PackageName: com.hzs.system.sys.controller.manage - */ -@Slf4j -@RestController -@RequestMapping("/manage/approval") -public class SysApprovalController extends BaseController { - - @Autowired - private ISysApprovalService iSysApprovalService; - @Autowired - private ISysApprovalItemService iSysApprovalItemService; - @Autowired - private ISysApprovalSendService iSysApprovalSendService; - @Autowired - private ITransactionCommonService iTransactionCommonService; - @Autowired - private ISysUserService iSysUserService; - @Autowired - private ISysDeptService iSysDeptService; - - - /** - * 获取签呈配置列表 - * - * @param param 查询参数 - * @return - */ - @Log(module = EOperationModule.SIGN_CONFIG, business = EOperationBusiness.SIGN_CONFIG, method = EOperationMethod.SELECT) - @GetMapping("/list") - public TableDataInfo list(ApprovalParam param) { - startPage(); - return getDataTable(iSysApprovalService.approvalList(param, SecurityUtils.getPkCountry())); - } - - /** - * 导出 - * - * @param response - * @param param 查询参数 - */ - @Log(module = EOperationModule.SIGN_CONFIG, business = EOperationBusiness.SIGN_CONFIG, method = EOperationMethod.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, ApprovalParam param) { - List resultList = iSysApprovalService.approvalList(param, SecurityUtils.getPkCountry()); - - // 当查询有数据才进行处理 - if (resultList.size() > 0) { - // 获取需要翻译的枚举翻译 - Map transactionMap = iTransactionCommonService.exportEnumTransaction(EApprovalBusiness.values()); - - for (ApprovalVO approvalVO : resultList) { - approvalVO.setApprovalBusinessVal(transactionMap.get(EnumsPrefixConstants.APPROVAL_BUSINESS + approvalVO.getApprovalBusiness())); - } - } - ExcelUtil util = new ExcelUtil<>(ApprovalVO.class); - util.exportExcel(response, resultList, "签呈配置导出"); - } - - /** - * 保存 - * - * @param paramList 保存入参 - * @return - */ - @Log(module = EOperationModule.SIGN_CONFIG, business = EOperationBusiness.SIGN_CONFIG, method = EOperationMethod.INSERT) - @PostMapping - public AjaxResult save(@RequestBody List paramList) { - for (ApprovalSaveParam param : paramList) { - if (null == param.getApprovalBusiness() - || CollectionUtils.isEmpty(param.getUserIdList()) - || null == param.getEffectiveDate()) { - return AjaxResult.error("缺少参数"); - } - // 2024.05.20 去掉此校验 -// // 校验审批流程中有没有重复部门（2023.01.09 与产品沟通，同一审批流中同一部门只能出现一次） -// if (CollectionUtil.isNotEmpty(iSysDeptService.queryRepeatDept(param.getUserIdList()))) { -// // 审批流程中出现重复部门 -// return AjaxResult.error(TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_FLOW_REPEAT)); -// } - - // 业务类型处理业务大类 - param.setApprovalType(EApprovalType.getEnumByApprovalBusinessValue(param.getApprovalBusiness()).getValue()); - // 抄送用户去重 - param.setSendIdList(param.getSendIdList().stream().distinct().collect(Collectors.toList())); - } - iSysApprovalService.saveApproval(paramList, SecurityUtils.getUserId(), SecurityUtils.getPkCountry()); - return AjaxResult.success(); - } - - /** - * 详情 - * - * @param id 签呈ID - * @return - */ - @GetMapping("/{id}") - public AjaxResult get(@PathVariable("id") Integer id) { - ApprovalDetailVO detailVO = new ApprovalDetailVO(); - - SysApproval sysApproval = iSysApprovalService.getById(id); - if (null != sysApproval) { - detailVO.setPkId(sysApproval.getPkId()); - detailVO.setApprovalBusiness(sysApproval.getApprovalBusiness()); - - // 审批流程 - List itemList = iSysApprovalItemService.queryListByApproval(id); - detailVO.setItemList(BeanUtil.copyToList(itemList, ApprovalDetailItemVO.class)); - - // 审批抄送人 - List sendList = iSysApprovalSendService.queryListByApproval(Collections.singletonList(id)); - if (CollectionUtil.isNotEmpty(sendList)) { - detailVO.setSendList(BeanUtil.copyToList(sendList, ApprovalDetailItemVO.class)); - } - } - - return AjaxResult.success(detailVO); - } - - /** - * 删除 - * - * @param id 签呈ID - * @return - */ - @Log(module = EOperationModule.SIGN_CONFIG, business = EOperationBusiness.SIGN_CONFIG, method = EOperationMethod.DELETE) - @DeleteMapping("/{id}") - public AjaxResult delete(@PathVariable("id") Integer id) { - iSysApprovalService.deleteApproval(id, SecurityUtils.getUserId(), SecurityUtils.getPkCountry()); - return AjaxResult.success(); - } - - /** - * 是否存在签呈 - * - * @param approvalBusinessList - * @return - */ - @GetMapping("/has-sign/{approvalBusinessList}") - public AjaxResult hasSign(@PathVariable("approvalBusinessList") List approvalBusinessList) { - // 查询是否存在签呈 - List sysApprovalList = iSysApprovalService.lastApproval(approvalBusinessList, SecurityUtils.getPkCountry()); - if (CollectionUtil.isNotEmpty(sysApprovalList)) { - approval: - for (Integer approvalBusiness : approvalBusinessList) { - for (SysApproval sysApproval : sysApprovalList) { - if (sysApproval.getApprovalBusiness().equals(approvalBusiness)) { - // 存在则直接进行下次 - continue approval; - } - } - EApprovalBusiness eApprovalBusiness = EApprovalBusiness.getEnumByValue(approvalBusiness); - if (null != eApprovalBusiness) { - // %s 未配置签呈 - return AjaxResult.error(TransactionUtils.getContent(DocumentMsgConstants.SIGN_NOT_CONFIG, eApprovalBusiness.getLabel())); - } - // 签呈业务类型错误 - return AjaxResult.error(TransactionUtils.getContent(DocumentMsgConstants.SIGN_TYPE_ERROR)); - } - } - return AjaxResult.success(); - } - - /** - * 签呈内容 - * - * @param approvalBusinessList - * @return - */ - @GetMapping("/sign-data/{approvalBusinessList}") - public AjaxResult signData(@PathVariable("approvalBusinessList") List approvalBusinessList) { - // 查询当前操作用户 - SysUser sysUser = iSysUserService.selectUserById(SecurityUtils.getUserId()); - if (null == sysUser) { - return AjaxResult.error("用户不存在"); - } - - // 签呈推送列表 - Map> sendMap = new HashMap<>(); - - // 查询签呈内容 - List sysApprovalExtList = iSysApprovalService.lastApprovalAndItem(approvalBusinessList, SecurityUtils.getPkCountry()); - if (CollectionUtil.isNotEmpty(sysApprovalExtList)) { - // 签呈ID列表 - List approvalIdList = sysApprovalExtList.stream().map(SysApprovalExt::getPkId).collect(Collectors.toList()); - // 签呈推送列表 - sendMap = iSysApprovalSendService.queryApprovalSendMap(approvalIdList); - } - - Date nowDate = new Date(); - - // 返回结果列表 - List resultList = new ArrayList<>(); - - for (Integer approvalBusiness : approvalBusinessList) { - // 审批主体 - SysApprovalExt sysApproval = null; - // 审批明细 - List detailList = new ArrayList<>(); - // 抄送人列表 - List sendList = new ArrayList<>(); - - for (SysApprovalExt sysApprovalExt : sysApprovalExtList) { - if (approvalBusiness.equals(sysApprovalExt.getApprovalBusiness())) { - sysApproval = sysApprovalExt; - } - } - if (null != sysApproval) { - // 返回审批明细列表 - for (SysApprovalItemExt sysApprovalItemExt : sysApproval.getItemList()) { - detailList.add(ApprovalBusinessDetailVO.builder() - .approvalLevel(sysApprovalItemExt.getApprovalLevel()) - .pkApprover(sysApprovalItemExt.getPkUser()) - .approver(sysApprovalItemExt.getNickName()) - .approverDept(sysApprovalItemExt.getDeptName()) - .build()); - } - - // 返回审核抄送人列表 - List approvalSendList = sendMap.get(sysApproval.getPkId()); - if (CollectionUtil.isNotEmpty(approvalSendList)) { - for (SysApprovalSendExt sysApprovalSend : approvalSendList) { - sendList.add(ApprovalBusinessSendVO.builder() - .pkSend(sysApprovalSend.getPkUser()) - .send(sysApprovalSend.getNickName()) - .sendDept(sysApprovalSend.getDeptName()) - .build()); - } - } - } - - String approvalBusinessVal = null; - if (EApprovalBusiness.CUSTOM.getValue() == approvalBusiness) { - approvalBusinessVal = ""; - } - // 不存在审批配置，没有明细 - resultList.add(ApprovalBusinessVO.builder() - .deptName(sysUser.getDeptName()) - .userName(sysUser.getNickName()) - .approvalBusiness(approvalBusiness) - .approvalBusinessVal(approvalBusinessVal) - .creationTime(nowDate) - .detailList(detailList) - .sendList(sendList) - .build()); - } - - return AjaxResult.success(resultList); - } - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/mapper/SysApprovalItemMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/mapper/SysApprovalItemMapper.java index 56780ba0..f6e43127 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/mapper/SysApprovalItemMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/mapper/SysApprovalItemMapper.java @@ -2,42 +2,10 @@ package com.hzs.system.sys.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.system.sys.SysApprovalItem; -import com.hzs.common.domain.system.sys.ext.SysApprovalItemExt; -import org.apache.ibatis.annotations.Param; - -import java.util.List; /** * 审批配置项表 Mapper 接口 - * - * @author hzs - * @since 2022-09-15 */ public interface SysApprovalItemMapper extends BaseMapper { - /** - * 批量插入数据 - * - * @param list 审批配置明细列表 - * @return - */ - int insertBatch(List list); - - /** - * 根据审批查询列表 - * - * @param pkApproval - * @return - */ - List queryListByApproval(@Param("pkApproval") Integer pkApproval); - - /** - * 非当前用户指定部门是否存在审批 - * - * @param userId - * @param deptId - * @return - */ - Integer itemExistByUserAndDept(@Param("userId") Long userId, @Param("deptId") Long deptId); - } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/mapper/SysApprovalMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/mapper/SysApprovalMapper.java index fb38e880..2003128f 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/mapper/SysApprovalMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/mapper/SysApprovalMapper.java @@ -3,38 +3,15 @@ package com.hzs.system.sys.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.system.sys.SysApproval; import com.hzs.common.domain.system.sys.ext.SysApprovalExt; -import com.hzs.system.sys.param.ApprovalParam; -import com.hzs.system.sys.vo.ApprovalVO; import org.apache.ibatis.annotations.Param; import java.util.List; /** * 审批配置表 Mapper 接口 - * - * @author hzs - * @since 2022-09-15 */ public interface SysApprovalMapper extends BaseMapper { - /** - * 审批列表 - * - * @param param 审批查询参数 - * @param pkCountry 国家ID - * @return - */ - List approvalList(@Param("param") ApprovalParam param, @Param("pkCountry") Integer pkCountry); - - /** - * 根据审批业务类型相关最新的审批 - * - * @param approvalBusinessList 审批业务类型列表 - * @param pkCountry 国家ID - * @return - */ - List lastApproval(@Param("approvalBusinessList") List approvalBusinessList, @Param("pkCountry") Integer pkCountry); - /** * 根据审批业务相关最新的审批以及审批项 * diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/mapper/SysApprovalSendMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/mapper/SysApprovalSendMapper.java index cd68589b..82d7c762 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/mapper/SysApprovalSendMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/mapper/SysApprovalSendMapper.java @@ -9,20 +9,9 @@ import java.util.List; /** * 审批抄送人表 Mapper 接口 - * - * @author hzs - * @since 2023-04-27 */ public interface SysApprovalSendMapper extends BaseMapper { - /** - * 批量插入数据 - * - * @param list 明细列表 - * @return - */ - int insertBatch(List list); - /** * 根据审批查询列表 * diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/mapper/SysUserMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/mapper/SysUserMapper.java index 49d14f14..ee746478 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/mapper/SysUserMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/mapper/SysUserMapper.java @@ -108,14 +108,6 @@ public interface SysUserMapper { */ SysUser queryUserAndDeptName(@Param("userId") Long userId, @Param("userType") Integer userType); - /** - * 查询会员列表列表以及部门名称 - * - * @param userIdList - * @return - */ - List queryUserListAndDeptName(@Param("userIdList") List userIdList); - /** * 查询角色用户信息 * diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/param/ApprovalParam.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/param/ApprovalParam.java deleted file mode 100644 index 1d3472ad..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/param/ApprovalParam.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hzs.system.sys.param; - -import lombok.Data; - -/** - * @Description: 审批入参 - * @Author: jiang chao - * @Time: 2022/11/10 11:46 - * @Classname: ApprovalParam - * @PackageName: com.hzs.system.sys.param - */ -@Data -public class ApprovalParam { - - /** - * 业务类型（EApprovalBusiness） - */ - private Integer approvalBusiness; - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/param/ApprovalSaveParam.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/param/ApprovalSaveParam.java deleted file mode 100644 index ee2d53d2..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/param/ApprovalSaveParam.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.hzs.system.sys.param; - -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * @Description: 审批保存入参 - * @Author: jiang chao - * @Time: 2022/11/10 11:46 - * @Classname: ApprovalParam - * @PackageName: com.hzs.system.sys.param - */ -@Data -public class ApprovalSaveParam { - - /** - * 业务类型（EApprovalBusiness） -- 入参 - */ - private Integer approvalBusiness; - - /** - * 用户ID列表 -- 入参 - */ - private List userIdList; - - /** - * 抄送用户ID列表 -- 入参 - */ - private List sendIdList; - - /** - * 生效日期 -- 入参 - */ - private Date effectiveDate; - - ///////////////////////////////////////////////// - - /** - * 业务大类（EApprovalType） - */ - private Integer approvalType; - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISupplierUserService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISupplierUserService.java deleted file mode 100644 index bec09125..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISupplierUserService.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.hzs.system.sys.service; - -import com.hzs.system.sys.param.SysUserParam; - -/** - * @Description: 供应商用户服务 - * @Author: jiang chao - * @Time: 2024/3/23 14:39 - * @Classname: ISupplierService - * @PackageName: com.hzs.system.sys.service - */ -public interface ISupplierUserService { - - /** - * 插入供应商 - * - * @param param - * @param userId - * @return - */ - int insertSupplierUser(SysUserParam param, Long userId); - - /** - * 修改供应商 - * - * @param param - * @param userId - * @return - */ - int updateSupplierUser(SysUserParam param, Long userId); - - /** - * 批量删除供应商 - * - * @param userIds 需要删除的供应商ID - * @param userId - * @return 结果 - */ - int deleteUserByIds(Long[] userIds, Long userId); - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISysApprovalItemService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISysApprovalItemService.java index 5b051ae5..2b880539 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISysApprovalItemService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISysApprovalItemService.java @@ -2,33 +2,11 @@ package com.hzs.system.sys.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.system.sys.SysApprovalItem; -import com.hzs.common.domain.system.sys.ext.SysApprovalItemExt; - -import java.util.List; /** * 审批配置项表 服务类 - * - * @author hzs - * @since 2022-09-15 */ public interface ISysApprovalItemService extends IService { - /** - * 根据审批查询列表 - * - * @param pkApproval - * @return - */ - List queryListByApproval(Integer pkApproval); - - /** - * 非当前用户指定部门是否存在审批 - * - * @param userId - * @param deptId - * @return - */ - Integer itemExistByUserAndDept(Long userId, Long deptId); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISysApprovalSendService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISysApprovalSendService.java index 36394f25..276c5500 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISysApprovalSendService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISysApprovalSendService.java @@ -9,20 +9,9 @@ import java.util.Map; /** * 审批抄送人表 服务类 - * - * @author hzs - * @since 2023-04-27 */ public interface ISysApprovalSendService extends IService { - /** - * 根据审批查询列表 - * - * @param pkApprovalList - * @return - */ - List queryListByApproval(List pkApprovalList); - /** * 根据审批查询抄送map * diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISysApprovalService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISysApprovalService.java index a15d0e7b..5f7a1639 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISysApprovalService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISysApprovalService.java @@ -3,54 +3,14 @@ package com.hzs.system.sys.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.system.sys.SysApproval; import com.hzs.common.domain.system.sys.ext.SysApprovalExt; -import com.hzs.system.sys.param.ApprovalParam; -import com.hzs.system.sys.param.ApprovalSaveParam; -import com.hzs.system.sys.vo.ApprovalVO; import java.util.List; /** * 审批配置表 服务类 - * - * @author hzs - * @since 2022-09-15 */ public interface ISysApprovalService extends IService { - /** - * 审批列表 - * - * @param param 审批查询参数 - * @param pkCountry 国家ID - * @return - */ - List approvalList(ApprovalParam param, Integer pkCountry); - - /** - * 保存审批 - * - * @param paramList 保存参数 - * @param userId 用户ID - * @param pkCountry 国家ID - */ - void saveApproval(List paramList, Long userId, Integer pkCountry); - - /** - * 删除审批 - * - * @param id - */ - void deleteApproval(Integer id, Long userId, Integer pkCountry); - - /** - * 根据审批业务类型相关最新的审批 - * - * @param approvalBusinessList 审批业务类型列表 - * @param pkCountry 国家ID - * @return - */ - List lastApproval(List approvalBusinessList, Integer pkCountry); - /** * 根据审批业务相关最新的审批以及审批项 * diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISysUserService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISysUserService.java index 24d13fbc..450041fb 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISysUserService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISysUserService.java @@ -11,8 +11,6 @@ import com.hzs.system.sys.vo.SysUserQueryVO; /** * 用户 业务层 - * - * @author hzs */ public interface ISysUserService { @@ -141,14 +139,6 @@ public interface ISysUserService { */ SysUser queryUserAndDeptName(Long userId, Integer userType); - /** - * 查询会员列表列表以及部门名称 - * - * @param userIdList - * @return - */ - List queryUserListAndDeptName(List userIdList); - /** * 查询角色用户信息 * diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SupplierUserServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SupplierUserServiceImpl.java deleted file mode 100644 index 6ae58fa8..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SupplierUserServiceImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.hzs.system.sys.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import com.hzs.common.core.constant.CountryConstants; -import com.hzs.common.core.enums.ELoginType; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.domain.system.sys.SysUser; -import com.hzs.system.sys.mapper.SysUserMapper; -import com.hzs.system.sys.param.SysUserParam; -import com.hzs.system.sys.service.ISupplierUserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; - -/** - * @Description: 供应商用户服务 - * @Author: jiang chao - * @Time: 2024/3/23 14:39 - * @Classname: SupplierServiceImpl - * @PackageName: com.hzs.system.sys.service.impl - */ -@Service -public class SupplierUserServiceImpl implements ISupplierUserService { - - @Autowired - private SysUserMapper sysUserMapper; - - @Override - public int insertSupplierUser(SysUserParam param, Long userId) { - SysUser sysUser = BeanUtil.copyProperties(param, SysUser.class); - sysUser.setPkDept(0L); - sysUser.setPkCountry(CountryConstants.CHINA_COUNTRY); - sysUser.setAuthority(EYesNo.NO.getIntValue()); - sysUser.setUsualAuthority(EYesNo.NO.getIntValue()); - sysUser.setPkCreator(userId); - - return sysUserMapper.insertUser(sysUser); - } - - @Override - public int updateSupplierUser(SysUserParam param, Long userId) { - SysUser sysUser = BeanUtil.copyProperties(param, SysUser.class); - sysUser.setPkDept(0L); - sysUser.setPkCountry(CountryConstants.CHINA_COUNTRY); - sysUser.setAuthority(EYesNo.NO.getIntValue()); - sysUser.setUsualAuthority(EYesNo.NO.getIntValue()); - sysUser.setPkModified(userId); - sysUser.setModifiedTime(new Date()); - - return sysUserMapper.updateUser(sysUser); - } - - @Override - public int deleteUserByIds(Long[] userIds, Long userId) { - return sysUserMapper.deleteUserByIds(userIds, userId, ELoginType.SUPPLIER.getValueInt()); - } - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SysApprovalItemServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SysApprovalItemServiceImpl.java index 4d06f940..bfc96c99 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SysApprovalItemServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SysApprovalItemServiceImpl.java @@ -2,30 +2,15 @@ package com.hzs.system.sys.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.domain.system.sys.SysApprovalItem; -import com.hzs.common.domain.system.sys.ext.SysApprovalItemExt; import com.hzs.system.sys.mapper.SysApprovalItemMapper; import com.hzs.system.sys.service.ISysApprovalItemService; import org.springframework.stereotype.Service; -import java.util.List; - /** * 审批配置项表 服务实现类 - * - * @author hzs - * @since 2022-09-15 */ @Service public class SysApprovalItemServiceImpl extends ServiceImpl implements ISysApprovalItemService { - @Override - public List queryListByApproval(Integer pkApproval) { - return baseMapper.queryListByApproval(pkApproval); - } - - @Override - public Integer itemExistByUserAndDept(Long userId, Long deptId) { - return baseMapper.itemExistByUserAndDept(userId, deptId); - } } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SysApprovalSendServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SysApprovalSendServiceImpl.java index 419559fa..2a48f72b 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SysApprovalSendServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SysApprovalSendServiceImpl.java @@ -15,18 +15,10 @@ import java.util.stream.Collectors; /** * 审批抄送人表 服务实现类 - * - * @author hzs - * @since 2023-04-27 */ @Service public class SysApprovalSendServiceImpl extends ServiceImpl implements ISysApprovalSendService { - @Override - public List queryListByApproval(List pkApprovalList) { - return baseMapper.queryListByApproval(pkApprovalList); - } - @Override public Map> queryApprovalSendMap(List pkApprovalList) { Map> resultMap = new HashMap<>(); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SysApprovalServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SysApprovalServiceImpl.java index 64df6e30..175e4f06 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SysApprovalServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SysApprovalServiceImpl.java @@ -1,105 +1,20 @@ package com.hzs.system.sys.service.impl; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.EDelFlag; import com.hzs.common.domain.system.sys.SysApproval; -import com.hzs.common.domain.system.sys.SysApprovalItem; -import com.hzs.common.domain.system.sys.SysApprovalSend; import com.hzs.common.domain.system.sys.ext.SysApprovalExt; -import com.hzs.system.sys.mapper.SysApprovalItemMapper; import com.hzs.system.sys.mapper.SysApprovalMapper; -import com.hzs.system.sys.mapper.SysApprovalSendMapper; -import com.hzs.system.sys.param.ApprovalParam; -import com.hzs.system.sys.param.ApprovalSaveParam; import com.hzs.system.sys.service.ISysApprovalService; -import com.hzs.system.sys.vo.ApprovalVO; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.*; /** * 审批配置表 服务实现类 - * - * @author hzs - * @since 2022-09-15 */ @Service public class SysApprovalServiceImpl extends ServiceImpl implements ISysApprovalService { - @Autowired - private SysApprovalItemMapper sysApprovalItemMapper; - @Autowired - private SysApprovalSendMapper sysApprovalSendMapper; - - @Override - public List approvalList(ApprovalParam param, Integer pkCountry) { - return baseMapper.approvalList(param, pkCountry); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void saveApproval(List paramList, Long userId, Integer pkCountry) { - Date nowDate = new Date(); - - // 遍历处理业务审批 - for (ApprovalSaveParam param : paramList) { - SysApproval sysApproval = new SysApproval(); - sysApproval.setApprovalType(param.getApprovalType()); - sysApproval.setApprovalBusiness(param.getApprovalBusiness()); - sysApproval.setEffectiveDate(param.getEffectiveDate()); - sysApproval.setPkCreator(userId); - sysApproval.setCreationTime(nowDate); - sysApproval.setPkCountry(pkCountry); - if (baseMapper.insert(sysApproval) > 0) { - // 审批保存成功，处理审批明细项 - List itemList = new ArrayList<>(param.getUserIdList().size()); - for (int i = 0; i < param.getUserIdList().size(); i++) { - SysApprovalItem sysApprovalItem = new SysApprovalItem(); - sysApprovalItem.setPkApproval(sysApproval.getPkId()); - sysApprovalItem.setApprovalLevel(i + 1); - sysApprovalItem.setPkUser(param.getUserIdList().get(i)); - - itemList.add(sysApprovalItem); - } - sysApprovalItemMapper.insertBatch(itemList); - - if (CollectionUtil.isNotEmpty(param.getSendIdList())) { - // 抄送用户ID列表 - List sendList = new ArrayList<>(param.getSendIdList().size()); - for (Long sendId : param.getSendIdList()) { - SysApprovalSend sysApprovalSend = new SysApprovalSend(); - sysApprovalSend.setPkApproval(sysApproval.getPkId()); - sysApprovalSend.setPkUser(sendId); - sendList.add(sysApprovalSend); - } - sysApprovalSendMapper.insertBatch(sendList); - } - } - } - } - - @Override - public void deleteApproval(Integer id, Long userId, Integer pkCountry) { - // 删除审批 - UpdateWrapper approvalUpdateWrapper = new UpdateWrapper<>(); - approvalUpdateWrapper.eq(SystemFieldConstants.PK_COUNTRY, pkCountry); - approvalUpdateWrapper.eq(SystemFieldConstants.PK_ID, id); - approvalUpdateWrapper.set(SystemFieldConstants.DEL_FLAG, EDelFlag.DELETE.getValue()); - approvalUpdateWrapper.set(SystemFieldConstants.PK_MODIFIED, userId); - approvalUpdateWrapper.set(SystemFieldConstants.MODIFIED_TIME, new Date()); - baseMapper.update(null, approvalUpdateWrapper); - } - - @Override - public List lastApproval(List approvalBusinessList, Integer pkCountry) { - return baseMapper.lastApproval(approvalBusinessList, pkCountry); - } - @Override public List lastApprovalAndItem(List approvalBusinessList, Integer pkCountry) { return baseMapper.lastApprovalAndItem(approvalBusinessList, pkCountry); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SysUserServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SysUserServiceImpl.java index 70f4f651..4c58be20 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SysUserServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SysUserServiceImpl.java @@ -28,8 +28,6 @@ import com.hzs.system.sys.service.ISysUserService; /** * 用户 业务层处理 - * - * @author hzs */ @Slf4j @Service @@ -393,11 +391,6 @@ public class SysUserServiceImpl implements ISysUserService { return sysUserMapper.queryUserAndDeptName(userId, userType); } - @Override - public List queryUserListAndDeptName(List userIdList) { - return sysUserMapper.queryUserListAndDeptName(userIdList); - } - @Override public List selectSysUserRole(Integer pkCountry) { return sysUserMapper.selectSysUserRole(pkCountry); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/vo/ApprovalVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/vo/ApprovalVO.java deleted file mode 100644 index eb040087..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/vo/ApprovalVO.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.hzs.system.sys.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.Data; - -import java.util.Date; - -/** - * @Description: 审批VO - * @Author: jiang chao - * @Time: 2022/11/10 11:43 - * @Classname: ApprovalVO - * @PackageName: com.hzs.system.sys.vo - */ -@Data -public class ApprovalVO { - - /** - * 审批ID - */ - private Integer pkId; - - /** - * 业务类型（EApprovalBusiness） - */ - @Transaction(transactionKey = EnumsPrefixConstants.APPROVAL_BUSINESS) - @JsonIgnore - private Integer approvalBusiness; - /** - * 业务类型显示 - */ - @Excel(name = "业务类型") - private String approvalBusinessVal; - - /** - * 审批流程 - */ - @Excel(name = "审批流程") - private String process; - - /** - * 抄送人 - */ - @Excel(name = "抄送人") - private String send; - - /** - * 生效日期 - */ - @Excel(name = "生效日期", dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date effectiveDate; - -} diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdProductStorehouseAreaMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdProductStorehouseAreaMapper.xml deleted file mode 100644 index 1f12d327..00000000 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdProductStorehouseAreaMapper.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - CREATION_TIME, - MODIFIED_TIME, - DEL_FLAG, - PK_COUNTRY, - PK_CREATOR, - PK_MODIFIED, - PK_ID, PK_PRODUCT_STOREHOUSE, PROVINCE - - - - - - diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdProductStorehouseMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdProductStorehouseMapper.xml index e3af4833..89f5a665 100644 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdProductStorehouseMapper.xml +++ b/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdProductStorehouseMapper.xml @@ -4,98 +4,17 @@ - - - - - - - - - + + + + + + + + + - - - CREATION_TIME, - MODIFIED_TIME, - DEL_FLAG, - PK_COUNTRY, - PK_CREATOR, - PK_MODIFIED, - PK_ID, PK_STOREHOUSE, PK_PRODUCT - - - - select sai.*, su.nick_name, su.user_name, sd.dept_name - from SYS_APPROVAL_ITEM sai - left join sys_user su - on su.user_id = sai.pk_user - left join sys_dept sd - on sd.dept_id = su.pk_dept - where sai.pk_approval = #{pkApproval} - order by sai.approval_level - - - - - diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/sys/SysApprovalMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/sys/SysApprovalMapper.xml index a03383d6..c8e7601f 100644 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/sys/SysApprovalMapper.xml +++ b/bd-business/bd-business-system/src/main/resources/mapper/system/sys/SysApprovalMapper.xml @@ -28,56 +28,6 @@ - - - - - - select sas.*, su.nick_name, su.user_name, sd.dept_name diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/sys/SysUserMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/sys/SysUserMapper.xml index 29d3ecef..e1fba9d1 100644 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/sys/SysUserMapper.xml +++ b/bd-business/bd-business-system/src/main/resources/mapper/system/sys/SysUserMapper.xml @@ -311,19 +311,6 @@ - - -