From 249791b8847c0a7f2a78be238078fb309d38a25c Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Fri, 6 Jun 2025 17:07:36 +0800 Subject: [PATCH 01/17] =?UTF-8?q?##=20=E5=8E=BB=E6=8E=89=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=86=85=E5=AE=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/clean.bat | 12 ------------ bin/package.bat | 12 ------------ bin/run-auth.bat | 14 -------------- bin/run-gateway.bat | 14 -------------- bin/run-modules-file.bat | 14 -------------- bin/run-modules-gen.bat | 14 -------------- bin/run-modules-job.bat | 14 -------------- bin/run-modules-system.bat | 14 -------------- bin/run-monitor.bat | 14 -------------- 9 files changed, 122 deletions(-) delete mode 100644 bin/clean.bat delete mode 100644 bin/package.bat delete mode 100644 bin/run-auth.bat delete mode 100644 bin/run-gateway.bat delete mode 100644 bin/run-modules-file.bat delete mode 100644 bin/run-modules-gen.bat delete mode 100644 bin/run-modules-job.bat delete mode 100644 bin/run-modules-system.bat delete mode 100644 bin/run-monitor.bat diff --git a/bin/clean.bat b/bin/clean.bat deleted file mode 100644 index 24c09741..00000000 --- a/bin/clean.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -echo. -echo [信息] 清理工程target生成路径。 -echo. - -%~d0 -cd %~dp0 - -cd .. -call mvn clean - -pause \ No newline at end of file diff --git a/bin/package.bat b/bin/package.bat deleted file mode 100644 index c693ec06..00000000 --- a/bin/package.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -echo. -echo [信息] 打包Web工程，生成war/jar包文件。 -echo. - -%~d0 -cd %~dp0 - -cd .. -call mvn clean package -Dmaven.test.skip=true - -pause \ No newline at end of file diff --git a/bin/run-auth.bat b/bin/run-auth.bat deleted file mode 100644 index 0d0952af..00000000 --- a/bin/run-auth.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Auth工程。 -echo. - -cd %~dp0 -cd ../ruoyi-auth/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-auth.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-gateway.bat b/bin/run-gateway.bat deleted file mode 100644 index e43d60bc..00000000 --- a/bin/run-gateway.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Gateway工程。 -echo. - -cd %~dp0 -cd ../ruoyi-gateway/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-gateway.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-modules-file.bat b/bin/run-modules-file.bat deleted file mode 100644 index 6d89c905..00000000 --- a/bin/run-modules-file.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Modules-File工程。 -echo. - -cd %~dp0 -cd ../ruoyi-modules/ruoyi-file/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-file.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-modules-gen.bat b/bin/run-modules-gen.bat deleted file mode 100644 index 0a4c3905..00000000 --- a/bin/run-modules-gen.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Modules-Gen工程。 -echo. - -cd %~dp0 -cd ../ruoyi-modules/ruoyi-gen/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-gen.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-modules-job.bat b/bin/run-modules-job.bat deleted file mode 100644 index 443e59d0..00000000 --- a/bin/run-modules-job.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Modules-Job工程。 -echo. - -cd %~dp0 -cd ../ruoyi-modules/ruoyi-job/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-job.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-modules-system.bat b/bin/run-modules-system.bat deleted file mode 100644 index 26db55e4..00000000 --- a/bin/run-modules-system.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Modules-System工程。 -echo. - -cd %~dp0 -cd ../ruoyi-modules/ruoyi-system/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-system.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-monitor.bat b/bin/run-monitor.bat deleted file mode 100644 index 3e8e322b..00000000 --- a/bin/run-monitor.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Monitor工程。 -echo. - -cd %~dp0 -cd ../ruoyi-visual/ruoyi-monitor/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-visual-monitor.jar - -cd bin -pause \ No newline at end of file From a6e5e94a446f2ab25a236ab569b5b53c69fea827 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Fri, 6 Jun 2025 17:19:44 +0800 Subject: [PATCH 02/17] =?UTF-8?q?##=20=E6=B5=8B=E8=AF=95=E6=8E=A8=E9=80=81?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 鏂囨。/mybatis璇存槑.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/鏂囨。/mybatis璇存槑.txt b/鏂囨。/mybatis璇存槑.txt index d8df68fd..8f76d9dc 100644 --- a/鏂囨。/mybatis璇存槑.txt +++ b/鏂囨。/mybatis璇存槑.txt @@ -2,3 +2,4 @@ mybatis 閰嶇疆鐨 configuration 灞炴т笅娣诲姞: default-fetch-size: 100 璇存槑锛 淇敼mybatis榛樿鎻愬彇鏁版嵁澶у皬锛堥粯璁や负10锛夛紝淇敼鍚庢瘡娆℃煡璇㈡暟鎹彁鍙栦竴娆100鏉★紝澶ф壒閲忔煡璇㈡暟鏁版嵁鏃讹紝鍑忓皯涓巓racle鏁版嵁搴撲氦浜掓彁楂樺姞杞芥暟鎹熷害锛屼絾鏄暟鎹簱姣忔鏌ヨ浣跨敤鍐呭瓨澧楀ぇ锛岄渶瑕佽皑鎱庝娇鐢紝闃叉OOM + From 07ffadeab001ce20d77a1a457032e01d20916aeb Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Sun, 8 Jun 2025 16:05:57 +0800 Subject: [PATCH 03/17] =?UTF-8?q?##=20=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/mapper/CuMemberRetailLogMapper.java | 11 +- .../bonus/service/IBonusSettleService.java | 31 +- .../service/ICuMemberRetailLogService.java | 16 +- .../bonus/service/impl/BonusSettleHandle.java | 63 +--- .../impl/BonusSettlePurchaseHandle.java | 4 +- .../service/impl/BonusSettleRangeHandle.java | 342 +++++++----------- .../service/impl/BonusSettleServiceImpl.java | 41 +-- .../impl/CuMemberRetailLogServiceImpl.java | 18 +- .../bonus/listener/SaOrderSecondListener.java | 17 +- .../member/achieve/CuMemberAchieveMapper.xml | 20 +- .../member/bonus/CuMemberRetailLogMapper.xml | 20 +- .../controller/manage/CuMemberController.java | 30 +- .../controller/api/MarketNewsController.java | 11 +- .../member/achieve/CuMemberAchieveMapper.xml | 20 +- .../mapper/member/base/CuMemberMapper.xml | 7 +- .../statis/CuBonusVertexStatisMapper.xml | 2 +- .../report/member/MemberReportMapper.xml | 40 +- .../manage/BdProductController.java | 29 -- .../manage/params/ProductParams.java | 7 - .../service/impl/BdProductServiceImpl.java | 13 - .../sale/deliver/SaDeliverItemsMapper.xml | 20 - .../mapper/sale/deliver/SaDeliverMapper.xml | 10 - .../controller/api/ApiFeedbackController.java | 60 --- .../controller/api/ApiNoticeController.java | 17 +- .../manage/BdFeedbackController.java | 136 ------- .../system/base/mapper/BdFeedbackMapper.java | 55 --- .../base/mapper/BdFeedbackReplyMapper.java | 17 - .../base/service/IBdFeedbackReplyService.java | 37 -- .../base/service/IBdFeedbackService.java | 67 ---- .../impl/BdFeedbackReplyServiceImpl.java | 53 --- .../service/impl/BdFeedbackServiceImpl.java | 92 ----- .../hzs/system/base/vo/BdFeedbackReplyVO.java | 56 --- .../hzs/system/base/vo/BdNoticeCountVO.java | 11 - .../com/hzs/system/base/vo/FeedbackVO.java | 153 -------- .../enums/controller/EnumsController.java | 42 +-- .../enums/controller/EnumsInitController.java | 11 - .../mapper/system/base/BdFeedbackMapper.xml | 118 ------ .../system/base/BdFeedbackReplyMapper.xml | 29 -- .../core/constant/EnumsPrefixConstants.java | 6 - .../common/core/constant/SysConstants.java | 4 +- .../com/hzs/common/core/enums/EAccount.java | 2 - .../com/hzs/common/core/enums/EAwards.java | 32 +- .../hzs/common/core/enums/EBonusItems.java | 87 +++-- .../common/core/enums/EFeedbackStatus.java | 46 --- .../hzs/common/core/enums/EFeedbackType.java | 56 --- .../com/hzs/common/core/enums/EGrade.java | 12 +- .../common/core/enums/EOperationBusiness.java | 2 - .../common/core/enums/EOperationModule.java | 2 - .../java/com/hzs/common/core/enums/EUnit.java | 8 +- .../achieve/ext/CuMemberRetailRangeExt.java | 7 +- .../member/bonus/CuMemberRetailLog.java | 6 - .../domain/sale/product/BdProductBas.java | 6 - .../common/domain/system/base/BdFeedback.java | 61 ---- .../domain/system/base/BdFeedbackReply.java | 48 --- .../domain/system/ext/BdFeedbackExt.java | 49 --- 55 files changed, 340 insertions(+), 1820 deletions(-) delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiFeedbackController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/manage/BdFeedbackController.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdFeedbackMapper.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdFeedbackReplyMapper.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdFeedbackReplyService.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdFeedbackService.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdFeedbackReplyServiceImpl.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdFeedbackServiceImpl.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdFeedbackReplyVO.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/FeedbackVO.java delete mode 100644 bd-business/bd-business-system/src/main/resources/mapper/system/base/BdFeedbackMapper.xml delete mode 100644 bd-business/bd-business-system/src/main/resources/mapper/system/base/BdFeedbackReplyMapper.xml delete mode 100644 bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFeedbackStatus.java delete mode 100644 bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFeedbackType.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdFeedback.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdFeedbackReply.java delete mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdFeedbackExt.java diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberRetailLogMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberRetailLogMapper.java index f13b56d5..fed3aac8 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberRetailLogMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberRetailLogMapper.java @@ -7,20 +7,13 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 绉掓帴鏃ュ織璁板綍琛 Mapper 鎺ュ彛 - *

- * - * @author hzs - * @since 2024-12-27 */ public interface CuMemberRetailLogMapper extends BaseMapper { /* - * @description: 鏇存柊浼氬憳鏃ュ織 - * @author: sui q - * @date: 2024/12/31 13:44 - * @param: null null + * 鏇存柊浼氬憳鏃ュ織 **/ void updateCuMemberRetailLogByList(@Param("cuMemberRetailLogs") List cuMemberRetailLogs); + } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusSettleService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusSettleService.java index 3489cd83..b93db1fd 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusSettleService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusSettleService.java @@ -1,27 +1,20 @@ package com.hzs.bonus.bonus.service; import com.hzs.common.domain.member.bonus.CuMemberRetail; -import com.hzs.common.domain.member.ext.CuMemberSettleExt; import com.hzs.common.domain.sale.ext.SaOrderExt; import java.util.List; /** - * @Description: 濂栭噾缁撶畻鏈嶅姟绫 - * @Author: sui q - * @Time: 2022/11/3 18:49 - * @Classname: IBonusSettleService - * @PackageName: com.hzs.member.achieve.service + * 濂栭噾缁撶畻鏈嶅姟绫 */ public interface IBonusSettleService { /** * 鏍规嵁绉掔粨绠椾細鍛樺閲 + * * @param orderCode 璁㈠崟 - * @return: List - * @Author: sui q - * @Date: 2023/2/1 21:27 - */ + */ void calculateCumberBonusBySecond(String orderCode); /** @@ -29,32 +22,22 @@ public interface IBonusSettleService { * * @param date 缁撶畻鏃ユ湡 * @param saOrderExtList 璁㈠崟 - * @Author: sui q - * @Date: 2022/11/3 13:56 */ void calculateCuMemberBonus(String date, List saOrderExtList); /* - * @description: 鏍规嵁璁㈠崟璁＄畻鏂伴浂鍞閲 - * @author: sui q - * @date: 2024/12/12 9:39 - * @param: null null + * 鏍规嵁璁㈠崟璁＄畻鏂伴浂鍞閲 **/ void calculateCuMemberRetailRangeBonusBySaOrder(String orderCode); /* - * @description: 4-n閰嶇疆淇敼鍚庯紝閲嶇畻棣栬喘濂栭噾 - * @author: sui q - * @date: 2024/7/23 11:15 - * @param: null null + * 4-n閰嶇疆淇敼鍚庯紝閲嶇畻棣栬喘濂栭噾 **/ void repeatCuMemberBonusByExpand(String settleDate, List saOrderExtList); /* - * @description: 鏍规嵁浼氬憳鏌ヨ浼氬憳鐨 澶у皬鍖虹洅鏁般佷笟缁 - * @author: sui q - * @date: 2025/2/20 15:10 - * @param: null null + * 鏍规嵁浼氬憳鏌ヨ浼氬憳鐨 澶у皬鍖虹洅鏁般佷笟缁 **/ CuMemberRetail queryValidateBoxOrAchieve(Long pkMember); + } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberRetailLogService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberRetailLogService.java index 363fe74e..2c7b76f6 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberRetailLogService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberRetailLogService.java @@ -6,28 +6,18 @@ import com.hzs.common.domain.member.bonus.CuMemberRetailLog; import java.util.List; /** - *

* 绉掓帴鏃ュ織璁板綍琛 鏈嶅姟绫 - *

- * - * @author hzs - * @since 2024-12-27 */ public interface ICuMemberRetailLogService extends IService { /* - * @description: 鏌ヨ24灏忔椂涔嬪唴澶辫触鐨勮褰曪紝閲嶈瘯 - * @author: sui q - * @date: 2024/12/31 13:35 - * @param: null null + * 鏌ヨ24灏忔椂涔嬪唴澶辫触鐨勮褰曪紝閲嶈瘯 **/ List queryCuMemberRetailLog(); /* - * @description: 鏇存柊浼氬憳鏃ュ織 - * @author: sui q - * @date: 2024/12/31 13:44 - * @param: null null + * 鏇存柊浼氬憳鏃ュ織 **/ void updateCuMemberRetailLogByList(List cuMemberRetailLogs); + } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java index b35f2d44..f7fd7985 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java @@ -1,12 +1,8 @@ package com.hzs.bonus.bonus.service.impl; -import cn.hutool.core.collection.CollectionUtil; import com.hzs.bonus.achieve.param.MemberAchieveParam; -import com.hzs.bonus.achieve.service.ICuMemberAchieveService; import com.hzs.bonus.achieve.service.ICuMemberSettlePeriodService; import com.hzs.bonus.achieve.service.ICuMemberTreeService; -import com.hzs.bonus.base.service.ICuMemberService; -import com.hzs.bonus.bonus.service.ICuBonusExpandService; import com.hzs.bonus.detail.service.ICuMemberAssessService; import com.hzs.common.core.constant.BonusFieldConstants; import com.hzs.common.core.constant.CountryConstants; @@ -18,7 +14,6 @@ import com.hzs.common.core.utils.ComputeUtil; import com.hzs.common.core.utils.DateUtils; import com.hzs.common.core.utils.reflect.ReflectUtils; import com.hzs.common.domain.bonus.BdBonusDeduct; -import com.hzs.common.domain.member.achieve.CuMemberRetailRange; import com.hzs.common.domain.member.achieve.CuMemberTree; import com.hzs.common.domain.member.achieve.ext.CuMemberRangeExt; import com.hzs.common.domain.member.achieve.ext.CuMemberRetailRangeExt; @@ -28,7 +23,6 @@ import com.hzs.common.domain.member.detail.CuMemberAssess; import com.hzs.common.domain.member.ext.CuMemberSettleExt; import com.hzs.common.domain.sale.ext.SaOrderExt; import com.hzs.common.domain.sale.order.SaOrder; -import com.hzs.common.domain.sale.order.SaOrderBonus; import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.domain.system.config.BdGrade; import com.hzs.common.domain.system.config.ext.BdBonusItemsExt; @@ -47,27 +41,18 @@ import org.springframework.stereotype.Component; import java.math.BigDecimal; import java.util.*; -/** - * @Description: - * @Author: sui q - * @Time: 2022/11/16 11:24 - * @Classname: BonusSettleHandle - * @PackageName: com.hzs.member.achieve.service.impl - */ @Component public abstract class BonusSettleHandle { - protected ICuMemberTreeService cuMemberTreeService; - @DubboReference protected ISaOrderServiceApi saOrderServiceApi; - @DubboReference protected IBonusItemsServiceApi bonusItemsServiceApi; - @DubboReference private ICurrencyServiceApi currencyServiceApi; + protected ICuMemberTreeService cuMemberTreeService; + @Autowired public void setCuMemberTreeService(ICuMemberTreeService cuMemberTreeService) { this.cuMemberTreeService = cuMemberTreeService; @@ -148,14 +133,12 @@ public abstract class BonusSettleHandle { } /** + * 鑾峰緱鍥藉瀵瑰簲鐨4-n鍙傛暟姣斾緥 + * * @param bonusConfigDTO 濂栭噾閰嶇疆姹囨 * @param memberSettleExt 浼氬憳 * @param endTouch 4-n鐨勬鏁 * @param bdGrade 绛夌骇 - * @Description: 鑾峰緱鍥藉瀵瑰簲鐨4-n鍙傛暟姣斾緥 - * @return: BigDecimal - * @Author: sui q - * @Date: 2022/11/16 11:27 */ protected BigDecimal getCountryExpand(BonusConfigDTO bonusConfigDTO, CuMemberSettleExt memberSettleExt, Integer endTouch, BdGrade bdGrade, BigDecimal addTouch, BigDecimal editExpandRatio) { @@ -175,14 +158,12 @@ public abstract class BonusSettleHandle { } /** + * 鑾峰緱鍥藉瀵瑰簲鐨4-n鍙傛暟姣斾緥 + * * @param bonusConfigDTO 濂栭噾閰嶇疆姹囨 * @param memberSettleExt 浼氬憳 * @param endTouch 4-n鐨勬鏁 * @param bdGrade 绛夌骇 - * @Description: 鑾峰緱鍥藉瀵瑰簲鐨4-n鍙傛暟姣斾緥 - * @return: BigDecimal - * @Author: sui q - * @Date: 2022/11/16 11:27 */ protected BigDecimal getCountryRepurchaseExpand(BonusConfigDTO bonusConfigDTO, CuMemberSettleExt memberSettleExt, Integer endTouch, BdGrade bdGrade, BigDecimal addTouch, BigDecimal editExpandRatio) { BonusExpandDTO bonusExpand = bonusConfigDTO.getBonusExpandMap().get(memberSettleExt.getPkSettleCountry()); @@ -728,14 +709,12 @@ public abstract class BonusSettleHandle { } /** + * 鑾峰緱 鎶ュ崟鏈嶅姟璐规敹鐩婄殑澶囨敞 + * * @param saOrderExt 璁㈠崟缂栧彿 * @param cuMemberBonusRange 鎶ュ崟鏈嶅姟璐 * @param sourceMemberRangeExt 鎻愪緵濂栭噾鐨勪汉 * @param targetMemberRangeExt 鑾峰緱濂栭噾鐨勪汉 - * @Description: 鑾峰緱 鎶ュ崟鏈嶅姟璐规敹鐩婄殑澶囨敞 - * @return: String - * @Author: sui q - * @Date: 2022/11/17 11:22 */ protected void rangeBenefitRetailRemark(SaOrder saOrderExt, CuMemberBonusRange cuMemberBonusRange, CuMemberRetailRangeExt sourceMemberRangeExt, CuMemberRetailRangeExt targetMemberRangeExt) { @@ -747,14 +726,12 @@ public abstract class BonusSettleHandle { } /** + * 鑾峰緱 鎶ュ崟鏈嶅姟璐规敹鐩婄殑澶囨敞 + * * @param saOrderExt 璁㈠崟缂栧彿 * @param cuMemberBonusRange 鎶ュ崟鏈嶅姟璐 * @param sourceMemberRangeExt 鎻愪緵濂栭噾鐨勪汉 * @param targetMemberRangeExt 鑾峰緱濂栭噾鐨勪汉 - * @Description: 鑾峰緱 鎶ュ崟鏈嶅姟璐规敹鐩婄殑澶囨敞 - * @return: String - * @Author: sui q - * @Date: 2022/11/17 11:22 */ protected void oriRangeRemark(SaOrderExt saOrderExt, CuMemberBonusRange cuMemberBonusRange, CuMemberRangeExt sourceMemberRangeExt, CuMemberRangeExt targetMemberRangeExt) { @@ -785,33 +762,29 @@ public abstract class BonusSettleHandle { } /** + * 鑾峰緱 鎶ュ崟鏈嶅姟璐规敹鐩婄殑澶囨敞 + * * @param saOrderExt 璁㈠崟缂栧彿 * @param cuMemberBonusRange 鎶ュ崟鏈嶅姟璐 * @param sourceCuMemberSettleExt 鎻愪緵濂栭噾鐨勪汉 * @param targetCuMemberSettleExt 鑾峰緱濂栭噾鐨勪汉 - * @Description: 鑾峰緱 鎶ュ崟鏈嶅姟璐规敹鐩婄殑澶囨敞 - * @return: String - * @Author: sui q - * @Date: 2022/11/17 11:22 */ protected void xueRangeRemark(SaOrderExt saOrderExt, CuMemberBonusRange cuMemberBonusRange, CuMemberSettleExt sourceCuMemberSettleExt, CuMemberSettleExt targetCuMemberSettleExt) { String remark = String.format(BonusMsgConstants.LE_XUE_SHARE_RANGE, saOrderExt.getOrderCode(), sourceCuMemberSettleExt.getMemberCode() + sourceCuMemberSettleExt.getMemberName(), targetCuMemberSettleExt.getMemberCode() + targetCuMemberSettleExt.getMemberName(), - ComputeUtil.computeDivide(targetCuMemberSettleExt.getRetailPrice(), BigDecimal.valueOf(6.4)), targetCuMemberSettleExt.getGradeValue()); + ComputeUtil.computeDivide(targetCuMemberSettleExt.getRetailPrice(), BigDecimal.ONE), targetCuMemberSettleExt.getGradeValue()); cuMemberBonusRange.setRemark(remark); } /** + * 鑾峰緱 鎶ュ崟鏈嶅姟璐规敹鐩婄殑澶囨敞 + * * @param saOrder 璁㈠崟缂栧彿 * @param cuMemberBonusDetail 浜戜唬棣栬喘 * @param sourceCuMemberSettleExt 鎻愪緵濂栭噾鐨勪汉 * @param targetCuMemberSettleExt 鑾峰緱濂栭噾鐨勪汉 - * @Description: 鑾峰緱 鎶ュ崟鏈嶅姟璐规敹鐩婄殑澶囨敞 - * @return: String - * @Author: sui q - * @Date: 2022/11/17 11:22 */ protected void cloudAgentRemark(SaOrder saOrder, CuMemberBonusDetail cuMemberBonusDetail, CuMemberSettleExt sourceCuMemberSettleExt, CuMemberSettleExt targetCuMemberSettleExt, String msg) { @@ -1206,13 +1179,11 @@ public abstract class BonusSettleHandle { } /** + * 璁剧疆濂栭噾鎵ｉ」锛岃绠楃◣鍓嶆敹鐩婏紝鎵ｇ◣锛屽疄闄呮敹鐩, 璁剧疆鏄庣粏琛 + * * @param cuMemberDetail 濂栭噾鏄庣粏 * @param orderAmount 璁㈠崟閲戦 * @param exchangeRate 鍏ユ眹鐜 - * @Description: 璁剧疆濂栭噾鎵ｉ」锛岃绠楃◣鍓嶆敹鐩婏紝鎵ｇ◣锛屽疄闄呮敹鐩, 璁剧疆鏄庣粏琛 - * @return: void - * @Author: sui q - * @Date: 2023/1/11 11:17 */ protected BdBonusDeduct setBonusDetailDeduct(BonusConfigDTO bonusConfigDTO, Object cuMemberDetail, BigDecimal orderAmount, BigDecimal exchangeRate) { Integer pkBonusItems = ReflectUtils.invokeGetter(cuMemberDetail, BonusFieldConstants.PK_BONUS_ITEMS); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java index 10471d58..772ce9e2 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java @@ -724,12 +724,12 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { cuMemberBonusRange.setCalAchieve(saOrderItemsExt.getAchievement()); cuMemberBonusRange.setCalValue(BigDecimal.ZERO); cuMemberBonusRange.setPretaxIncome(ComputeUtil.computeMultiply(BigDecimal.valueOf(saOrderItemsExt.getWaresQuantity()), - ComputeUtil.computeDivide(targetMemberSettleExt.getRetailPrice(), BigDecimal.valueOf(6.4)))); + ComputeUtil.computeDivide(targetMemberSettleExt.getRetailPrice(), BigDecimal.ONE))); String key = targetMemberSettleExt.getPkSettleCountry().toString() + ERangeType.GRADE.getValue() + targetMemberSettleExt.getPkGrade(); cuMemberBonusRange.setPkRange(rangeDtoMap.get(key).getPkRange()); String beforeKey = targetMemberSettleExt.getPkSettleCountry().toString() + ERangeType.GRADE.getValue() + targetMemberSettleExt.getPkGrade(); cuMemberBonusRange.setPkBeforeRange(rangeDtoMap.get(beforeKey).getPkRange()); - cuMemberBonusRange.setIncomeRatio(ComputeUtil.computeDivide(ComputeUtil.computeMultiply(cuMemberBonusRange.getPretaxIncome(), BigDecimal.valueOf(6.4)), saOrderExt.getOrderAmount())); + cuMemberBonusRange.setIncomeRatio(ComputeUtil.computeDivide(ComputeUtil.computeMultiply(cuMemberBonusRange.getPretaxIncome(), BigDecimal.ONE), saOrderExt.getOrderAmount())); cuMemberBonusRange.setPkOrderItems(0L); // 璁＄畻姣斾緥 cuMemberBonusRange.setPkBonusItems(getPkBonusItems(bonusConfigDTO, targetMemberSettleExt.getPkSettleCountry(), EBonusItems.REPURCHASE_RANGE_INCOME.getValue())); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java index 1b3bc523..3b2fd395 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java @@ -3,9 +3,6 @@ package com.hzs.bonus.bonus.service.impl; import com.hzs.bonus.achieve.service.ICuMemberRangeService; import com.hzs.bonus.achieve.service.ICuMemberRetailRangeService; import com.hzs.bonus.base.service.ICuMemberService; -import com.hzs.bonus.bonus.param.BdWaresBonusParam; -import com.hzs.bonus.bonus.service.IBdWaresBonusService; -import com.hzs.bonus.bonus.service.ICuMemberSpeRetailService; import com.hzs.bonus.bonus.vo.BonusRecordDetailVO; import com.hzs.bonus.detail.service.ICuMemberAwardsService; import com.hzs.bonus.detail.service.ICuMemberGradeService; @@ -31,9 +28,7 @@ import com.hzs.common.domain.sale.order.SaOrder; import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.domain.system.config.BdGrade; import com.hzs.common.domain.system.config.BdRangeAwards; -import com.hzs.system.config.IAwardsServiceApi; import com.hzs.system.config.dto.BonusConfigDTO; -import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -42,51 +37,33 @@ import java.time.temporal.ChronoUnit; import java.util.*; /** - * @description: 璁＄畻涔愪韩鏋佸樊鏀剁泭 - * @author: sui q - * @time: 2024/10/15 13:53 - * @classname: BonusSettleRangeHandle - * @package_name: com.hzs.bonus.bonus.service.impl - * version 1.0.0 + * 璁＄畻涔愪韩鏋佸樊鏀剁泭 */ @Component public class BonusSettleRangeHandle extends BonusSettleHandle { - @DubboReference - private IAwardsServiceApi awardsServiceApi; - @Autowired - private ICuMemberRangeService cuMemberRangeService; - + private ICuMemberRangeService iCuMemberRangeService; @Autowired - private ICuMemberRetailRangeService cuMemberRetailRangeService; - + private ICuMemberRetailRangeService iCuMemberRetailRangeService; @Autowired - private ICuMemberAwardsService cuMemberAwardsService; - + private ICuMemberAwardsService iCuMemberAwardsService; @Autowired - private ICuMemberGradeService cuMemberGradeService; - + private ICuMemberGradeService iCuMemberGradeService; @Autowired - private ICuMemberService cuMemberService; + private ICuMemberService iCuMemberService; - @Autowired - private ICuMemberSpeRetailService cuMemberSpeRetailService; - - /* - * @description: 瀹炴椂璁＄畻褰撴湀濂栬 - * @author: sui q - * @date: 2024/10/22 15:16 - * @param: null null - **/ + /** + * 瀹炴椂璁＄畻褰撴湀濂栬 + */ List calculateCuMemberRetailRangeBonusBySecond(String settleDate, SaOrderExt saOrderExt, BonusConfigDTO bonusConfigDTO, String secondRangeTableName, int beforePeriod, int currentPeriod, Map cuMemberBonusMap, List cuMemberBonusDetailList) { String rangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + beforePeriod; - cuMemberRetailRangeService.mergeMemberSecondRetailRangeByRange(rangeTableName, secondRangeTableName, saOrderExt.getPkMember()); - cuMemberGradeService.updateCuMemberGradeSecond(secondRangeTableName, currentPeriod); + iCuMemberRetailRangeService.mergeMemberSecondRetailRangeByRange(rangeTableName, secondRangeTableName, saOrderExt.getPkMember()); + iCuMemberGradeService.updateCuMemberGradeSecond(secondRangeTableName, currentPeriod); // 鎸夌収琛缂橈紝鏌ヨ璇ヤ細鍛樻墍鏈変紴涓婁細鍛 - List memberRetailRangeExtList = cuMemberRetailRangeService.queryCuMemberSecondRangeParent(rangeTableName, secondRangeTableName, saOrderExt.getPkMember()); + List memberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberSecondRangeParent(rangeTableName, secondRangeTableName, saOrderExt.getPkMember()); Map memberRangeExtMap = new HashMap<>(); Map retaiBuyGradeMap = new TreeMap<>(); @@ -175,7 +152,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } } Map countyRangeExtMap = new HashMap<>(); - List countyRangeExtList = cuMemberRetailRangeService.batchQueryMemberRetailSecondRangeByCounty(rangeTableName, secondRangeTableName, saOrderExt.getRecCounty()); + List countyRangeExtList = iCuMemberRetailRangeService.batchQueryMemberRetailSecondRangeByCounty(rangeTableName, secondRangeTableName, saOrderExt.getRecCounty()); countyRangeExtList.forEach(cuMemberRetailRangeExt -> countyRangeExtMap.put(cuMemberRetailRangeExt.getSystemType() + "_" + cuMemberRetailRangeExt.getRegionAddress(), cuMemberRetailRangeExt)); // 璁＄畻鍖哄煙濂 @@ -183,28 +160,25 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { if (cuMemberBonusDetail != null) { cuMemberBonusDetailList.add(cuMemberBonusDetail); } - cuMemberGradeService.updateCuMemberGrade(secondRangeTableName, saOrderExt.getPkId()); + iCuMemberGradeService.updateCuMemberGrade(secondRangeTableName, saOrderExt.getPkId()); if (cuMemberAwardsList.size() > 0) { - cuMemberAwardsService.saveBatchCuMemberAwards(cuMemberAwardsList); + iCuMemberAwardsService.saveBatchCuMemberAwards(cuMemberAwardsList); // 鏇存柊浼氬憳琛,鏇存柊濂栬 - cuMemberService.updateCuMemberRetailRangeByList(cuMemberAwardsList, currentPeriod); + iCuMemberService.updateCuMemberRetailRangeByList(cuMemberAwardsList, currentPeriod); } if (cuMemberGradeList.size() > 0) { - cuMemberGradeService.insertCuMemberGrade(cuMemberGradeList); - cuMemberService.updateCuMemberGradeByList(cuMemberGradeList, currentPeriod); + iCuMemberGradeService.insertCuMemberGrade(cuMemberGradeList); + iCuMemberService.updateCuMemberGradeByList(cuMemberGradeList, currentPeriod); } if (memberRetailRangeExtList.size() > 0) { - cuMemberRetailRangeService.updateCuMemberSecondRange(secondRangeTableName, memberRangeExtMap); + iCuMemberRetailRangeService.updateCuMemberSecondRange(secondRangeTableName, memberRangeExtMap); } return cuMemberBonusRangeList; } - /* - * @description: 瀹炴椂璁＄畻褰撴湀濂栬 - * @author: sui q - * @date: 2024/10/22 15:16 - * @param: null null - **/ + /** + * 瀹炴椂璁＄畻褰撴湀濂栬 + */ void calculateCuMemberBackRetailIncome(SaOrderExt saOrderExt, BonusConfigDTO bonusConfigDTO, String secondRangeTableName, int beforePeriod, int currentPeriod) { // 褰撳ぉ鐨勬挙鍗 @@ -212,18 +186,18 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { String rangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + beforePeriod; if (DateUtils.isSameDay(saOrderExt.getPayTime(), DateUtils.currentDate())) { // 鎸夌収琛缂橈紝鏌ヨ璇ヤ細鍛樻墍鏈変紴涓婁細鍛 - cuMemberRetailRangeService.mergeMemberRetailGradeByMember(secondRangeTableName, saOrderExt.getPkMember()); + iCuMemberRetailRangeService.mergeMemberRetailGradeByMember(secondRangeTableName, saOrderExt.getPkMember()); // 鎭㈠濂栬 - cuMemberAwardsService.mergeCuMemberBackAwards(secondRangeTableName, saOrderExt.getPkMember(), currentPeriod); - memberRetailRangeExtList = cuMemberRetailRangeService.queryCuMemberSecondRangeParent(rangeTableName, secondRangeTableName, saOrderExt.getPkMember()); + iCuMemberAwardsService.mergeCuMemberBackAwards(secondRangeTableName, saOrderExt.getPkMember(), currentPeriod); + memberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberSecondRangeParent(rangeTableName, secondRangeTableName, saOrderExt.getPkMember()); } else { rangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + currentPeriod; List retailOrderList = new ArrayList<>(); retailOrderList.add(saOrderExt); - cuMemberRetailRangeService.mergeMemberRetailGradeByMember(rangeTableName, saOrderExt.getPkMember()); + iCuMemberRetailRangeService.mergeMemberRetailGradeByMember(rangeTableName, saOrderExt.getPkMember()); // 鎭㈠濂栬 - cuMemberAwardsService.mergeCuMemberBackAwards(rangeTableName, saOrderExt.getPkMember(), beforePeriod); - memberRetailRangeExtList = cuMemberRetailRangeService.queryCuMemberRetailRangeParent(rangeTableName, retailOrderList); + iCuMemberAwardsService.mergeCuMemberBackAwards(rangeTableName, saOrderExt.getPkMember(), beforePeriod); + memberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeParent(rangeTableName, retailOrderList); } Map memberRangeExtMap = new HashMap<>(); @@ -278,9 +252,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { List cuMemberRetailRangeExtList = calculateRetailBackRangeGradeAwards(currentPeriod, memberRangeExtMap, rangeTableName, saOrderExt, retailTeamGradeMap, retailAwardsMap, secondRangeTableName, boxNum, cuMemberGradeMap, cuMemberAwardsMap); cuMemberRetailRangeExtList.add(sourceMemberRangeExt); // 鏌ヨ鏈熼棿鐨勭瓑绾у拰濂栬 - List memberGradeList = cuMemberGradeService.queryCuMemberGrade(cuMemberRetailRangeExtList, currentPeriod); + List memberGradeList = iCuMemberGradeService.queryCuMemberGrade(cuMemberRetailRangeExtList, currentPeriod); // 鏌ヨ鏈澶х殑鎵嬪姩濂栬 - List cuMemberGradeList1 = cuMemberGradeService.queryCuMemberGradeByList(currentPeriod, memberRetailRangeExtList); + List cuMemberGradeList1 = iCuMemberGradeService.queryCuMemberGradeByList(currentPeriod, memberRetailRangeExtList); if (cuMemberGradeList1.size() > 0) { Map memberGradeMap = new HashMap<>(); for (CuMemberGrade cuMemberGrade : cuMemberGradeList1) { @@ -316,11 +290,11 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } } if (cuMemberGradeList.size() > 0) { - cuMemberGradeService.deleteCuMemberGrade(cuMemberGradeList, currentPeriod); - cuMemberService.updateCuMemberMinGradeByList(cuMemberGradeList, currentPeriod); + iCuMemberGradeService.deleteCuMemberGrade(cuMemberGradeList, currentPeriod); + iCuMemberService.updateCuMemberMinGradeByList(cuMemberGradeList, currentPeriod); } } - List memberAwardsList = cuMemberAwardsService.queryCuMemberAwards(cuMemberRetailRangeExtList, currentPeriod); + List memberAwardsList = iCuMemberAwardsService.queryCuMemberAwards(cuMemberRetailRangeExtList, currentPeriod); if (memberAwardsList.size() > 0) { List cuMemberAwardsList = new ArrayList<>(); for (CuMemberAwards cuMemberAwards : memberAwardsList) { @@ -340,17 +314,17 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } // 澶勭悊绛夌骇銆佸琛 if (cuMemberAwardsList.size() > 0) { - cuMemberAwardsService.deleteCuMemberAwards(cuMemberAwardsList, currentPeriod); + iCuMemberAwardsService.deleteCuMemberAwards(cuMemberAwardsList, currentPeriod); // 鏇存柊浼氬憳琛,鏇存柊濂栬 - cuMemberService.updateCuMemberMinAwardsByList(cuMemberAwardsList, currentPeriod); + iCuMemberService.updateCuMemberMinAwardsByList(cuMemberAwardsList, currentPeriod); } } // 澶勭悊涓氱哗 if (memberRangeExtMap.size() > 0) { if (DateUtils.isSameDay(saOrderExt.getPayTime(), DateUtils.currentDate())) { - cuMemberRetailRangeService.updateCuMemberSecondRange(secondRangeTableName, memberRangeExtMap); + iCuMemberRetailRangeService.updateCuMemberSecondRange(secondRangeTableName, memberRangeExtMap); } else { - cuMemberRetailRangeService.updateCuMemberRetailRange(rangeTableName, memberRangeExtMap); + iCuMemberRetailRangeService.updateCuMemberRetailRange(rangeTableName, memberRangeExtMap); } } } @@ -368,13 +342,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { return cuMemberGrade; } - /* - * @description: 璁＄畻鏂伴浂鍞洟闃熺殑濂栭噾锛屾瀬宸佸钩绾с佺鍒┿佺鍒╁垎绾€佸尯鍩 - * 璁㈠崟锛 HZS30720290 - * @author: sui q - * @date: 2024/10/15 13:55 - * @param: null null - **/ + /** + * 璁＄畻鏂伴浂鍞洟闃熺殑濂栭噾锛屾瀬宸佸钩绾с佺鍒┿佺鍒╁垎绾€佸尯鍩 + */ void calculateRetailBonusByDay(String settleDate, Map cuMemberBonusMap, BonusConfigDTO bonusConfigDTO, BonusRecordDetailVO bonusRecordDetailVO, Integer period, Integer yesterdayPeriod, Boolean isSameMonth) { Date settleStartDate = DateUtils.parseStringToDate(settleDate); @@ -392,19 +362,19 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { String rangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + period; String yesterdayRangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + yesterdayPeriod; // 鍥為濂栬锛屽皢濂栬鍥為鍒扮粨绠楀墠鐘舵 - cuMemberAwardsService.calculateCuMemberRetailRangeAwardsInit(settleDate, period, rangeTableName); + iCuMemberAwardsService.calculateCuMemberRetailRangeAwardsInit(settleDate, period, rangeTableName); // 鏇存柊缃戜綋 - cuMemberRetailRangeService.mergeMemberRetailRangeByYesterday(settleEndDate, rangeTableName, yesterdayRangeTableName, isSameMonth); - List memberLevelList = cuMemberGradeService.calculateCuMemberRetailGradeInit(period, settleStartDate, settleEndDate, rangeTableName); + iCuMemberRetailRangeService.mergeMemberRetailRangeByYesterday(settleEndDate, rangeTableName, yesterdayRangeTableName, isSameMonth); + List memberLevelList = iCuMemberGradeService.calculateCuMemberRetailGradeInit(period, settleStartDate, settleEndDate, rangeTableName); Map memberLevelMap = new HashMap<>(); memberLevelList.forEach(cuMemberLevel -> memberLevelMap.put(cuMemberLevel.getPkOrder(), cuMemberLevel)); // 鍥為鍘嗗彶娉ㄦ按 - cuMemberRetailRangeService.mergeCuMemberRetailBackBoxBySpecial(rangeTableName, yesterdayRangeTableName, period); + iCuMemberRetailRangeService.mergeCuMemberRetailBackBoxBySpecial(rangeTableName, yesterdayRangeTableName, period); // 鏇存柊娉ㄦ按 - cuMemberRetailRangeService.mergeCuMemberRetailRangeBySpecial(rangeTableName, period); + iCuMemberRetailRangeService.mergeCuMemberRetailRangeBySpecial(rangeTableName, period); if (retailOrderList.size() > 0) { // 鎸夌収琛缂橈紝鏌ヨ璇ヤ細鍛樻墍鏈変紴涓婁細鍛 - List memberRetailRangeExtList = cuMemberRetailRangeService.queryCuMemberRetailRangeParent(rangeTableName, retailOrderList); + List memberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeParent(rangeTableName, retailOrderList); Map memberRangeExtMap = new HashMap<>(); Map retaiBuyGradeMap = new TreeMap<>(); Map retailTeamGradeMap = new TreeMap<>(); @@ -450,7 +420,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } } Map countyRangeExtMap = new HashMap<>(); - List countyRangeExtList = cuMemberRetailRangeService.batchQueryMemberRetailRangeByCounty(rangeTableName); + List countyRangeExtList = iCuMemberRetailRangeService.batchQueryMemberRetailRangeByCounty(rangeTableName); countyRangeExtList.forEach(cuMemberRetailRangeExt -> countyRangeExtMap.put(cuMemberRetailRangeExt.getSystemType() + "_" + cuMemberRetailRangeExt.getRegionAddress(), cuMemberRetailRangeExt)); // 濂栬鍗囩骇璁板綍 @@ -496,37 +466,31 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 鍥㈤槦涓氱哗锛岃绠楀琛 calculateGradeAwards(period, memberRangeExtMap, rangeTableName, saOrderExt, retailTeamGradeMap, retailAwardsMap, null, cuMemberGradeList, cuMemberAwardsList, sourceMemberRangeExt); cuMemberAwardsList.addAll(calculateRetailRangeGradeAwards(period, memberRangeExtMap, rangeTableName, saOrderExt, retailTeamGradeMap, retailAwardsMap, null, boxNum, cuMemberGradeList)); - // 缇庝笟璁㈠崟璁＄畻鏋佸樊鏀剁泭,娌℃湁骞崇骇鏀剁泭 - if (EOrderType.RETAIL_SHOP_ORDER.getValue() == saOrderExt.getOrderType()) { - for (SaOrderItemsExt saOrderItems : saOrderExt.getOrderItemsExtList()) { -// cuMemberBonusRangeList.addAll(calculateRetailRangeBonus(memberRangeExtMap, cuMemberBonusMap, gradeMap, bonusConfigDTO, period, saOrderItems, saOrderExt)); - } - } else { - // 璁＄畻濂栭噾 璁＄畻鏋佸樊骞崇骇鏀剁泭 - for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) { - for (String waresCode : RetailProductConstants.ALL_BOX_WARES_LIST) { - if (saOrderItems.getWaresCode() != null && saOrderItems.getWaresCode().equals(waresCode)) { - int waresQuantity = saOrderItems.getWaresQuantity(); - cuMemberBonusRangeList.addAll(calculateRetailRangeBonus(memberRangeExtMap, cuMemberBonusMap, gradeMap, bonusConfigDTO, period, saOrderItems, saOrderExt)); - // 璁＄畻瀹屽閲戠畻绛夌骇 - if (EOrderType.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType() || - EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType() || + + // 璁＄畻濂栭噾 璁＄畻鏋佸樊骞崇骇鏀剁泭 + for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) { + for (String waresCode : RetailProductConstants.ALL_BOX_WARES_LIST) { + if (saOrderItems.getWaresCode() != null && saOrderItems.getWaresCode().equals(waresCode)) { + int waresQuantity = saOrderItems.getWaresQuantity(); + cuMemberBonusRangeList.addAll(calculateRetailRangeBonus(memberRangeExtMap, cuMemberBonusMap, gradeMap, bonusConfigDTO, period, saOrderItems, saOrderExt)); + // 璁＄畻瀹屽閲戠畻绛夌骇 + if (EOrderType.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType() || + EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType() || EOrderType.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType()) { - // 璁＄畻涓汉绛夌骇锛屾秷璐圭瓑绾 - int buyBoxNum = sourceMemberRangeExt.getBuyNum() + waresQuantity; - if (memberLevelMap.containsKey(saOrderExt.getPkId())) { - CuMemberLevel cuMemberLevel = memberLevelMap.get(saOrderExt.getPkId()); - if (gradeIdMap.containsKey(cuMemberLevel.getNewLevel())) { - BdGrade bdGrade = gradeIdMap.get(cuMemberLevel.getNewLevel()); - if (bdGrade.getGradeValue() > sourceMemberRangeExt.getGradeValue()) { - sourceMemberRangeExt.setGradeValue(bdGrade.getGradeValue()); - sourceMemberRangeExt.setPkGrade(bdGrade.getPkId()); - sourceMemberRangeExt.setGradeName(bdGrade.getGradeName()); - if (sourceMemberRangeExt.getSameDate() == EYesNo.NO.getIntValue()) { - sourceMemberRangeExt.setBuyNum(bdGrade.getBoxNumber()); - } else { - sourceMemberRangeExt.setBuyNum(buyBoxNum); - } + // 璁＄畻涓汉绛夌骇锛屾秷璐圭瓑绾 + int buyBoxNum = sourceMemberRangeExt.getBuyNum() + waresQuantity; + if (memberLevelMap.containsKey(saOrderExt.getPkId())) { + CuMemberLevel cuMemberLevel = memberLevelMap.get(saOrderExt.getPkId()); + if (gradeIdMap.containsKey(cuMemberLevel.getNewLevel())) { + BdGrade bdGrade = gradeIdMap.get(cuMemberLevel.getNewLevel()); + if (bdGrade.getGradeValue() > sourceMemberRangeExt.getGradeValue()) { + sourceMemberRangeExt.setGradeValue(bdGrade.getGradeValue()); + sourceMemberRangeExt.setPkGrade(bdGrade.getPkId()); + sourceMemberRangeExt.setGradeName(bdGrade.getGradeName()); + if (sourceMemberRangeExt.getSameDate() == EYesNo.NO.getIntValue()) { + sourceMemberRangeExt.setBuyNum(bdGrade.getBoxNumber()); + } else { + sourceMemberRangeExt.setBuyNum(buyBoxNum); } } } @@ -559,32 +523,29 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } } if (cuMemberAwardsList.size() > 0) { - cuMemberAwardsService.saveBatchCuMemberAwards(cuMemberAwardsList); + iCuMemberAwardsService.saveBatchCuMemberAwards(cuMemberAwardsList); // 鏇存柊浼氬憳琛,鏇存柊濂栬 - cuMemberService.updateCuMemberRetailRangeByPeriod(cuMemberAwardsList, period); + iCuMemberService.updateCuMemberRetailRangeByPeriod(cuMemberAwardsList, period); } if (cuMemberGradeList.size() > 0) { - cuMemberGradeService.insertCuMemberGrade(cuMemberGradeList); - cuMemberService.updateCuMemberGradeByPeriod(cuMemberGradeList, period); + iCuMemberGradeService.insertCuMemberGrade(cuMemberGradeList); + iCuMemberService.updateCuMemberGradeByPeriod(cuMemberGradeList, period); // 鏍规嵁cu_member_level鏇存柊cu_member - cuMemberService.updateCuMemberLevel(settleStartDate, settleEndDate); + iCuMemberService.updateCuMemberLevel(settleStartDate, settleEndDate); } // 鏇存柊缃戜綋 - cuMemberRetailRangeService.updateCuMemberRetailRange(rangeTableName, memberRangeExtMap); + iCuMemberRetailRangeService.updateCuMemberRetailRange(rangeTableName, memberRangeExtMap); } } - /* - * @description: 鏌ヨ浼氬憳楠岃瘉澶у皬鍖猴紝鍖哄煙绠楁硶2绉嶆潯浠讹紝1 瀹為檯婊¤冻V5 1绉嶆槸婊¤冻 30w 灏忓尯10w - * @author: sui q - * @date: 2025/2/20 15:22 - * @param: null null - **/ + /** + * 鏌ヨ浼氬憳楠岃瘉澶у皬鍖猴紝鍖哄煙绠楁硶2绉嶆潯浠讹紝1 瀹為檯婊¤冻V5 1绉嶆槸婊¤冻 30w 灏忓尯10w + */ CuMemberRetail queryValidateBoxOrAchieve(int currentPeriod, int beforePeriod, Long pkMember) { CuMemberRetail cuMemberRetail = new CuMemberRetail(); String rangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + beforePeriod; String secondRangeTableName = TableNameConstants.CU_MEMBER_RETAIL_S + currentPeriod; - List memberRetailRangeExtList = cuMemberRetailRangeService.queryCuMemberSecondRange(rangeTableName, secondRangeTableName, pkMember); + List memberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberSecondRange(rangeTableName, secondRangeTableName, pkMember); List cuMemberRangeExtList = new ArrayList<>(); CuMemberRetailRangeExt targetMemberRangeExt = null; for (CuMemberRetailRangeExt cuMemberRetailRangeExt : memberRetailRangeExtList) { @@ -724,14 +685,11 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } } - /* - * @description: 鍏堣绠楀琛,濂栬璁＄畻鍒嗕负2绉嶏紝鍏堣绠楄嚜宸辨秷璐硅冻澶熺殑锛孲1-S3锛孲4浠ヤ笂鐨勫彟涓绉嶆柟寮忥紝鑷秷璐圭殑鍙湁璐拱浜猴紝鍏朵粬鐨勯兘鏄牴鎹笟缁╋紝娉ㄦ剰锛屾湁浜哄彲浠ョ洿鎺ユ槸S4 + /** + * 鍏堣绠楀琛,濂栬璁＄畻鍒嗕负2绉嶏紝鍏堣绠楄嚜宸辨秷璐硅冻澶熺殑锛孲1-S3锛孲4浠ヤ笂鐨勫彟涓绉嶆柟寮忥紝鑷秷璐圭殑鍙湁璐拱浜猴紝鍏朵粬鐨勯兘鏄牴鎹笟缁╋紝娉ㄦ剰锛屾湁浜哄彲浠ョ洿鎺ユ槸S4 * 鍏堥獙璇佸洟闃熶笟缁╋紝灏忓尯涓氱哗锛岄獙璇佸皬甯傚満闇瑕佷粠涓婂線涓嬭蛋 s1鍙兘閫氳繃鑷秷璐癸紝闄や簡璐拱浜哄叾浠栦汉涓汼2寮濮嬪崌绾 * 璁＄畻涓汉娑堣垂濂栭」 - * @author: sui q - * @date: 2024/10/15 17:10 - * @param: null null - **/ + */ public List calculateConsumeRangeAwards(Integer period, Map> parentRangeExtMap, Map memberRangeExtMap, String rangeTableName, CuMemberRangeExt sourceMemberRangeExt, SaOrderExt saOrderExt, Map consumeRangeAwardsMap) { @@ -745,7 +703,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 鍘荤粨绠楄〃绉嶆煡璇㈣浼氬憳涓嬫墍鏈変細鍛橈紝浼氬憳鍥㈤槦涓氱哗+娑堣垂涓氱哗鏄笟缁 璁＄畻灏忓尯涓氱哗 鍥㈤槦涓氱哗-灏忓尯涓氱哗 楠岃瘉灏忓尯銆佺洿鎺ㄥ繀鏈変竴绉 // 濡傛灉闇瑕侀獙璇佸皬鍖 if (ComputeUtil.compareValue(bdRangeAwards.getCommunityCheck())) { - List cuMemberRangeExtList = cuMemberRangeService.queryCuMemberRangeExtByParent(rangeTableName, sourceMemberRangeExt.getPkMember(), saOrderExt.getPayTime()); + List cuMemberRangeExtList = iCuMemberRangeService.queryCuMemberRangeExtByParent(rangeTableName, sourceMemberRangeExt.getPkMember(), saOrderExt.getPayTime()); // 闇瑕侀獙璇佸洟闃熶笟缁╋紝灏忓尯涓氱哗 if (calculateAwards(parentRangeExtMap, memberRangeExtMap, sourceMemberRangeExt, bdRangeAwards, cuMemberRangeExtList, false)) { break; @@ -768,12 +726,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { return cuMemberAwardsList; } - /* - * @description: 璁＄畻鍥㈤槦鏋佸樊濂栬 - * @author: sui q - * @date: 2024/10/15 17:10 - * @param: null null - **/ + /** + * 璁＄畻鍥㈤槦鏋佸樊濂栬 + */ public List calculateBloodRangeAwards(Integer period, Map> parentRangeExtMap, Map memberRangeExtMap, String rangeTableName, SaOrderExt saOrderExt, Map bloodRangeAwardsMap, long pkParent, String secondRangeTableName) { // 璁＄畻琛缂樺琛旓紝涓绾т竴绾у崌绾э紝鍒嗕负2娈碉紝s2銆乻3 涓绾э紝s3浠ヤ笂涓绾э紝鍏堥獙璇佸洟闃熸讳笟缁, @@ -808,9 +763,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 鍘荤粨绠楄〃绉嶆煡璇㈣浼氬憳涓嬫墍鏈変細鍛橈紝浼氬憳鍥㈤槦涓氱哗+娑堣垂涓氱哗鏄笟缁 璁＄畻灏忓尯涓氱哗 鍥㈤槦涓氱哗-灏忓尯涓氱哗 楠岃瘉灏忓尯銆佺洿鎺ㄥ繀鏈変竴绉 List cuMemberRangeExtList; if (secondRangeTableName != null) { - cuMemberRangeExtList = cuMemberRangeService.querySecondCuMemberRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); + cuMemberRangeExtList = iCuMemberRangeService.querySecondCuMemberRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); } else { - cuMemberRangeExtList = cuMemberRangeService.queryCuMemberRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember(), saOrderExt.getPayTime()); + cuMemberRangeExtList = iCuMemberRangeService.queryCuMemberRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember(), saOrderExt.getPayTime()); } if (cuMemberRangeExtList.size() > 0) { if (calculateAwards(parentRangeExtMap, memberRangeExtMap, targetMemberRangeExt, bdRangeAwards, cuMemberRangeExtList, true)) { @@ -820,17 +775,17 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 褰撴棩鐨勫疄鏃跺琛旓紝杩欎釜浣嶇疆鐩存帴鍦ㄤ細鍛樿〃涓绠楀氨鍙互 if (bdRangeAwards.getPlaceNum() > 0) { if (secondRangeTableName != null) { - cuMemberRangeService.mergeSecondCuMemberRangeExt(secondRangeTableName, parentRangeExtMap.get(targetMemberRangeExt.getPkMember())); + iCuMemberRangeService.mergeSecondCuMemberRangeExt(secondRangeTableName, parentRangeExtMap.get(targetMemberRangeExt.getPkMember())); // 楠岃瘉 - Integer placeNum = cuMemberRangeService.validateSecondCuMemberPlaceAwards(secondRangeTableName, cuMemberRangeExtList, bdRangeAwards.getCheckAwards()); + Integer placeNum = iCuMemberRangeService.validateSecondCuMemberPlaceAwards(secondRangeTableName, cuMemberRangeExtList, bdRangeAwards.getCheckAwards()); if (bdRangeAwards.getPlaceNum() > placeNum) { break; } } else { // 鏇存柊缃戜綋锛屾洿鏂颁紴涓 - cuMemberRangeService.mergeCuMemberRangeExt(rangeTableName, parentRangeExtMap.get(targetMemberRangeExt.getPkMember())); + iCuMemberRangeService.mergeCuMemberRangeExt(rangeTableName, parentRangeExtMap.get(targetMemberRangeExt.getPkMember())); // 楠岃瘉 - Integer placeNum = cuMemberRangeService.validateCuMemberPlaceAwards(rangeTableName, cuMemberRangeExtList, bdRangeAwards.getCheckAwards(), saOrderExt.getPayTime()); + Integer placeNum = iCuMemberRangeService.validateCuMemberPlaceAwards(rangeTableName, cuMemberRangeExtList, bdRangeAwards.getCheckAwards(), saOrderExt.getPayTime()); if (bdRangeAwards.getPlaceNum() > placeNum) { break; } @@ -853,12 +808,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { return cuMemberAwardsList; } - /* - * @description: 璁＄畻鍥㈤槦鏋佸樊濂栬 - * @author: sui q - * @date: 2024/10/15 17:10 - * @param: null null - **/ + /** + * 璁＄畻鍥㈤槦鏋佸樊濂栬 + */ public List calculateRetailRangeGradeAwards(Integer period, Map memberRangeExtMap, String rangeTableName, SaOrderExt saOrderExt, Map retailTeamGradeMap, Map retailAwardsMap, String secondRangeTableName, Integer boxNum, List cuMemberGradeList) { @@ -897,9 +849,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 楠岃瘉灏忓尯锛岃绠楀皬鍖虹疮璁＄洅鏁 鏌ヨ浼炰笅浼氬憳 List cuMemberRangeExtList; if (secondRangeTableName != null) { - cuMemberRangeExtList = cuMemberRetailRangeService.queryCuMemberSecondRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); + cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberSecondRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); } else { - cuMemberRangeExtList = cuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember()); + cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember()); } // 鏈夋敞姘寸殑锛屽ぇ鍖烘棤闄愬ぇ锛屾柊澧炲叏绠楀皬鍖 int bigBoxNum = targetMemberRangeExt.getConsumeBoxNum(); @@ -939,9 +891,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // // 楠岃瘉灏忓尯锛岃绠楀皬鍖轰笟缁 // List cuMemberRangeExtList; // if (secondRangeTableName != null) { -// cuMemberRangeExtList = cuMemberRetailRangeService.queryCuMemberSecondRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); +// cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberSecondRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); // } else { -// cuMemberRangeExtList = cuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember()); +// cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember()); // } // for (CuMemberRetailRangeExt cuMemberRetailRangeExt : cuMemberRangeExtList) { // if (memberRangeExtMap.containsKey(cuMemberRetailRangeExt.getPkMember())) { @@ -976,7 +928,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 鍏堥獙璇佺疮璁′笟缁 if (ComputeUtil.compareValue(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamMonthPv(), targetMemberRangeExt.getMonthConsumePv()), bdAwards.getShareTotalCheck())) { // 楠岃瘉灏忓尯锛岃绠楀皬鍖轰笟缁 - List cuMemberRangeExtList = cuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember()); + List cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember()); BigDecimal consumeBigPv = targetMemberRangeExt.getMonthConsumePv(); // if (ComputeUtil.compareGreaterThan(targetMemberRangeExt.getBigTeamPv(), consumeBigPv)) { // consumeBigPv = targetMemberRangeExt.getBigTeamPv(); @@ -994,14 +946,14 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { if (ComputeUtil.compareValue(smallAreaPv, bdAwards.getShareCommunityCheck())) { if (bdAwards.getPlaceDeptNum() > 0) { // 楠岃瘉鏄惁鏈夊涓尯婊¤冻涓氱哗 - List cuMemberRetailRangeExtList = cuMemberRetailRangeService.queryCuMemberRetailRangeEnoughAchieve(rangeTableName, targetMemberRangeExt.getPkMember(), bdAwards.getShareCommunityCheck()); + List cuMemberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeEnoughAchieve(rangeTableName, targetMemberRangeExt.getPkMember(), bdAwards.getShareCommunityCheck()); int enoughNum = 0; - for(CuMemberRetailRangeExt cuMemberRetailRangeExt : cuMemberRetailRangeExtList){ + for (CuMemberRetailRangeExt cuMemberRetailRangeExt : cuMemberRetailRangeExtList) { if (memberRangeExtMap.containsKey(cuMemberRetailRangeExt.getPkMember())) { cuMemberRetailRangeExt = memberRangeExtMap.get(cuMemberRetailRangeExt.getPkMember()); } - if(ComputeUtil.compareValue(ComputeUtil.computeAdd(cuMemberRetailRangeExt.getMonthConsumePv(), cuMemberRetailRangeExt.getTeamMonthPv()), bdAwards.getShareCommunityCheck())){ - enoughNum+=1; + if (ComputeUtil.compareValue(ComputeUtil.computeAdd(cuMemberRetailRangeExt.getMonthConsumePv(), cuMemberRetailRangeExt.getTeamMonthPv()), bdAwards.getShareCommunityCheck())) { + enoughNum += 1; } } if (bdAwards.getPlaceDeptNum() > enoughNum) { @@ -1019,12 +971,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } } - /* - * @description: 璁＄畻鍥㈤槦鏋佸樊濂栬 - * @author: sui q - * @date: 2024/10/15 17:10 - * @param: null null - **/ + /** + * 璁＄畻鍥㈤槦鏋佸樊濂栬 + */ public List calculateRetailBackRangeGradeAwards(Integer period, Map memberRangeExtMap, String rangeTableName, SaOrderExt saOrderExt, Map retailTeamGradeMap, Map retailAwardsMap, String secondRangeTableName, Integer boxNum, Map cuMemberGradeMap, Map cuMemberAwardsMap) { @@ -1062,9 +1011,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 楠岃瘉灏忓尯锛岃绠楀皬鍖虹疮璁＄洅鏁 鏌ヨ浼炰笅浼氬憳 List cuMemberRangeExtList; if (secondRangeTableName != null) { - cuMemberRangeExtList = cuMemberRetailRangeService.queryCuMemberSecondRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); + cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberSecondRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); } else { - cuMemberRangeExtList = cuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember()); + cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember()); } int bigBoxNum = targetMemberRangeExt.getConsumeBoxNum(); if (targetMemberRangeExt.getBigBoxNum() > 0) { @@ -1101,9 +1050,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 楠岃瘉灏忓尯锛岃绠楀皬鍖轰笟缁 List cuMemberRangeExtList; if (secondRangeTableName != null) { - cuMemberRangeExtList = cuMemberRetailRangeService.queryCuMemberSecondRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); + cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberSecondRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember()); } else { - cuMemberRangeExtList = cuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember()); + cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember()); } BigDecimal consumeBigPv = BigDecimal.ZERO; for (CuMemberRetailRangeExt cuMemberRetailRangeExt : cuMemberRangeExtList) { @@ -1130,12 +1079,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } } - /* - * @description: 璁＄畻濂栬锛岄獙璇佸皬鍖轰笟缁╁拰鎺ㄨ崘鏁伴噺鏄惁婊¤冻 - * @author: sui q - * @date: 2024/10/16 16:31 - * @param: null null - **/ + /** + * 璁＄畻濂栬锛岄獙璇佸皬鍖轰笟缁╁拰鎺ㄨ崘鏁伴噺鏄惁婊¤冻 + */ private boolean calculateAwards(Map> parentRangeExtMap, Map memberRangeExtMap, CuMemberRangeExt targetMemberRangeExt, BdRangeAwards bdRangeAwards, List cuMemberRangeExtList, Boolean isRecommend) { BigDecimal bigAreaPv = BigDecimal.ZERO; Integer recommendNum = 0; @@ -1171,7 +1117,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } // /* -// * @description: 璁＄畻骞歌繍濂栵紝鍏堣绠楁湁鏁堜唬鏁帮紝鎵鏈夋湁鏁堜唬鏁板潎鍒嗭紝姣斾緥10% +// * 璁＄畻骞歌繍濂栵紝鍏堣绠楁湁鏁堜唬鏁帮紝鎵鏈夋湁鏁堜唬鏁板潎鍒嗭紝姣斾緥10% // * @author: sui q // * @date: 2024/10/17 11:34 // * @param: null null @@ -1221,12 +1167,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // return memberBonusCoachList; // } - /* - * @description: 璁＄畻鏋佸樊鏀剁泭锛屾牴鎹瀬宸敹鐩婅绠楀钩绾ф敹鐩 - * @author: sui q - * @date: 2024/10/17 14:31 - * @param: null null - **/ + /** + * 璁＄畻鏋佸樊鏀剁泭锛屾牴鎹瀬宸敹鐩婅绠楀钩绾ф敹鐩 + */ List calculateRetailRangeBonus(Map memberRangeExtMap, Map cuMemberBonusMap, Map gradeMap, BonusConfigDTO bonusConfigDTO, Integer period, SaOrderWaresExt saOrderItems, SaOrderExt saOrderExt) { List memberBonusRangeList = new ArrayList<>(); @@ -1272,7 +1215,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { int pkBonusItems = getPkBonusItems(bonusConfigDTO, targetMemberRangeExt.getPkSettleCountry(), EBonusItems.RETAIL_RANGE_INCOME.getValue()); CuMemberBonusRange cuMemberBonusRange = getCuMemberRetailBonusRange(saOrderExt, targetMemberRangeExt, cuMemberBonus, pkBonusItems); cuMemberBonusRange.setCalValue(BigDecimal.ZERO); - cuMemberBonusRange.setPretaxIncome(ComputeUtil.computeDivide(ComputeUtil.computeMultiply(ComputeUtil.computeSubtract(ComputeUtil.computeSubtract(beginBuyPrice, buyPrice), calBonusIncome), saOrderItems.getWaresQuantity()), BigDecimal.valueOf(6.4))); + cuMemberBonusRange.setPretaxIncome(ComputeUtil.computeDivide(ComputeUtil.computeMultiply(ComputeUtil.computeSubtract(ComputeUtil.computeSubtract(beginBuyPrice, buyPrice), calBonusIncome), saOrderItems.getWaresQuantity()), BigDecimal.ONE)); cuMemberBonusRange.setPkRange(targetMemberRangeExt.getPkGrade()); cuMemberBonusRange.setPkBeforeRange(sourceMemberRangeExt.getPkGrade()); cuMemberBonusRange.setPkOrderItems(saOrderItems.getPkId()); @@ -1313,7 +1256,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { BigDecimal sameBuyPrice = gradeMap.get(calGradeValue).getBuyPrice(); // 鏈夊钩绾 // if (calGradeValue < beginGradeValue) { - if(ComputeUtil.compareGreaterThan(sameBuyPrice, comBuyPrice)){ + if (ComputeUtil.compareGreaterThan(sameBuyPrice, comBuyPrice)) { lastPkParent = targetMemberRangeExt.getPkParent(); pkParent = targetMemberRangeExt.getPkParent(); j--; @@ -1342,13 +1285,13 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } else if (j == 2) { bonusIncome = bdGrade.getThirdAlgebra(); } - if (/*calGradeValue == beginGradeValue && */ComputeUtil.compareEqual(beginBuyPrice, sameBuyPrice)) { + if (ComputeUtil.compareEqual(beginBuyPrice, sameBuyPrice)) { CuMemberBonus cuMemberBonus = getCuMemberBonus(period, cuMemberBonusMap, targetMemberRangeExt.getPkMember(), targetMemberRangeExt.getIncomeStatus(), targetMemberRangeExt.getPkSettleCountry(), targetMemberRangeExt.getPkRate() == null ? saOrderExt.getPkRate() : targetMemberRangeExt.getPkRate()); int pkBonusItems = getPkBonusItems(bonusConfigDTO, targetMemberRangeExt.getPkSettleCountry(), EBonusItems.RETAIL_SAME_LEVEL_INCOME.getValue()); CuMemberBonusRange oriMemberBonusRange = getCuMemberRetailBonusRange(saOrderExt, targetMemberRangeExt, cuMemberBonus, pkBonusItems); oriMemberBonusRange.setCalValue(BigDecimal.valueOf(10)); - oriMemberBonusRange.setPretaxIncome(ComputeUtil.computeDivide(ComputeUtil.computeMultiply(bonusIncome, saOrderItems.getWaresQuantity()), BigDecimal.valueOf(6.4))); + oriMemberBonusRange.setPretaxIncome(ComputeUtil.computeDivide(ComputeUtil.computeMultiply(bonusIncome, saOrderItems.getWaresQuantity()), BigDecimal.ONE)); oriMemberBonusRange.setPkRange(targetMemberRangeExt.getPkGrade()); oriMemberBonusRange.setPkBeforeRange(sourceMemberRangeExt.getPkGrade()); oriMemberBonusRange.setPkOrderItems(saOrderItems.getPkId()); @@ -1417,10 +1360,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { /** * 璁＄畻鏌愭潯璁㈠崟鐨勬帹鑽愬閲 - * - * @return: void - * @Author: sui q - * @Date: 2023/2/4 13:57 */ CuMemberBonusPush calculatePushBonusOne(CuMemberRangeExt sourceMemberRangeExt, Map cuMemberRangeExtMap, BonusConfigDTO bonusConfigDTO, Integer period, Map cuMemberBonusMap, SaOrderExt saOrderExt, int algebra, BigDecimal orderAssAchieve, List cuMemberBonusPushList) { @@ -1500,10 +1439,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } /** - * @Description: 璁＄畻鏈嶅姟涓績濂 - * @return: CuMemberBonusDetail - * @Author: sui q - * @Date: 2023/2/8 17:22 + * 璁＄畻鏈嶅姟涓績濂 */ CuMemberBonusDetail calculateRangeStoreBonusOne(Map cuMemberRangeExtMap, CuMemberRangeExt targetMemberRangeExt, BonusConfigDTO bonusConfigDTO, Integer period, Map cuMemberBonusMap, SaOrderExt saOrderExt) { CuMemberRangeExt sourceMemberRangeExt = cuMemberRangeExtMap.get(saOrderExt.getPkMember()); @@ -1535,10 +1471,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { /** * @param settleDateStr 缁撶畻鏃ユ湡 - * @Desccription: 璁＄畻鏂伴浂鍞殑鏈堝锛屽尯鍩熴佺鍒┿佺鍒╁垎绾 - * @return: Map 闇瑕佹洿鏂扮殑 - * @Author: sui q - * @Date: 2022/11/10 17:40 */ void calculateRetailShareBonus(String settleDateStr, BonusConfigDTO bonusConfigDTO, Integer period, BonusRecordDetailVO bonusRecordDetailVO, Map cuMemberBonusMap) { @@ -1570,7 +1502,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { if (totalMonthOrderList.size() > 0) { Set pkMemberSet = new HashSet<>(); totalMonthOrderList.forEach(saOrder -> pkMemberSet.add(saOrder.getPkMember())); - List cuMemberRetailRangeExtList = cuMemberRetailRangeService.batchQueryMemberRetailRangeByMemberPk(rangeTableName, pkMemberSet); + List cuMemberRetailRangeExtList = iCuMemberRetailRangeService.batchQueryMemberRetailRangeByMemberPk(rangeTableName, pkMemberSet); Map memberRangeExtMap = new HashMap<>(); cuMemberRetailRangeExtList.forEach(cuMemberRetailRangeExt -> memberRangeExtMap.put(cuMemberRetailRangeExt.getPkMember(), cuMemberRetailRangeExt)); @@ -1632,7 +1564,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { cuMemberBonusRange.setPkBeforeRange(sourceMemberRetailRangeExt.getPkGrade()); cuMemberBonusRange.setPkOrderItems(0L); rangeBenefitRetailRemark(saOrder, cuMemberBonusRange, sourceMemberRetailRangeExt, targetMemberRangeExt); - BdBonusDeduct bdBonusDeduct = setBonusDetailDeduct(bonusConfigDTO, cuMemberBonusRange, saOrder.getOrderAmount(), BigDecimal.valueOf(6.4)); + BdBonusDeduct bdBonusDeduct = setBonusDetailDeduct(bonusConfigDTO, cuMemberBonusRange, saOrder.getOrderAmount(), BigDecimal.ONE); if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusRange.getIncomeStatus()) { cuMemberBonus.setRetailBenefitRangeIncome(ComputeUtil.computeAdd(cuMemberBonus.getRetailBenefitRangeIncome(), cuMemberBonusRange.getPretaxIncome())); setRetailTotal(bdBonusDeduct, cuMemberBonus, cuMemberBonusRange); @@ -1645,9 +1577,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } // CAR_AWARD_POINTS 绂忓埄骞冲潎鏀剁泭 SHARE_INCOME 绂忓埄鏀剁泭 // 鏌ヨv5 绛夌骇 涓斿琛>=S4鐨 - List memberRetailRangeExtList = cuMemberRetailRangeService.batchQueryMemberRetailRangeByAwards(rangeTableName); + List memberRetailRangeExtList = iCuMemberRetailRangeService.batchQueryMemberRetailRangeByAwards(rangeTableName); if (memberRetailRangeExtList.size() > 0) { - List retailRangeExtList = cuMemberRetailRangeService.batchQueryMemberRetailRangeByParent(rangeTableName, memberRetailRangeExtList); + List retailRangeExtList = iCuMemberRetailRangeService.batchQueryMemberRetailRangeByParent(rangeTableName, memberRetailRangeExtList); Map> parentMemberRangeExtMap = new HashMap<>(); for (CuMemberRetailRangeExt cuMemberRetailRangeExt : retailRangeExtList) { if (parentMemberRangeExtMap.containsKey(cuMemberRetailRangeExt.getPkParent())) { @@ -1737,7 +1669,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } // for (SaOrder saOrder : totalMonthOrderList) { // Map countyRangeExtMap = new HashMap<>(); -// List countyRangeExtList = cuMemberRetailRangeService.batchQueryMemberRetailRangeByCounty(rangeTableName); +// List countyRangeExtList = iCuMemberRetailRangeService.batchQueryMemberRetailRangeByCounty(rangeTableName); // countyRangeExtList.forEach(cuMemberRetailRangeExt -> // countyRangeExtMap.put(cuMemberRetailRangeExt.getRegionAddress(), cuMemberRetailRangeExt)); // // 璁＄畻鍖哄煙锛岃幏鍙栨墍鏈夋湁鍖哄煙鐨勪細鍛 @@ -1784,7 +1716,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusDetail.getIncomeStatus()) { if (bonusItemsValue == EBonusItems.RETAIL_AREA_INCOME.getValue()) { cuMemberBonus.setRetailAreaIncome(ComputeUtil.computeAdd(cuMemberBonus.getRetailAreaIncome(), cuMemberBonusDetail.getPretaxIncome())); - }else if(bonusItemsValue == EBonusItems.RETAIL_BENEFIT_AVG_INCOME.getValue()) { + } else if (bonusItemsValue == EBonusItems.RETAIL_BENEFIT_AVG_INCOME.getValue()) { cuMemberBonus.setRetailBenefitAvgIncome(ComputeUtil.computeAdd(cuMemberBonus.getRetailBenefitAvgIncome(), cuMemberBonusDetail.getPretaxIncome())); } else { cuMemberBonus.setRetailBenefitIncome(ComputeUtil.computeAdd(cuMemberBonus.getRetailBenefitIncome(), cuMemberBonusDetail.getPretaxIncome())); @@ -1885,11 +1817,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } /** + * 璁板綍闇瑕佷慨鏀圭殑浼氬憳缁撶畻琛ㄦ暟鎹, 瀹夌疆鐨 + * * @param memberRangeMap 鏌ヨ鍑烘潵鐨勭粨绠楁暟鎹 - * @Description: 璁板綍闇瑕佷慨鏀圭殑浼氬憳缁撶畻琛ㄦ暟鎹, 瀹夌疆鐨 - * @return: void - * @Author: sui q - * @Date: 2022/11/15 9:52 */ private Map getMemberSettle(Map> memberRangeMap) { Map memberRangeExtMap = new HashMap<>(); @@ -1949,12 +1879,10 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } /** + * 濂栭噾鏄庣粏 鎶ュ崟鏈嶅姟璐广佸垎绾€佷簯浠ｉ璐佷簯浠ｅ璐佹捣璞嗘敹鐩 + * * @param saOrderExt 璁㈠崟 * @param cuMemberBonus 濂栭噾涓昏〃 - * @Description: 濂栭噾鏄庣粏 鎶ュ崟鏈嶅姟璐广佸垎绾€佷簯浠ｉ璐佷簯浠ｅ璐佹捣璞嗘敹鐩 - * @return: CuMemberBonusDetail - * @Author: sui q - * @Date: 2023/1/5 16:31 */ private CuMemberBonusDetail getCuMemberBonusDetail(SaOrder saOrderExt, Integer incomeStatus, Integer pkCountry, CuMemberBonus cuMemberBonus) { CuMemberBonusDetail cuMemberBonusDetail = CuMemberBonusDetail.builder() diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java index 53acd4c6..5674dd78 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java @@ -58,17 +58,17 @@ import java.util.*; public class BonusSettleServiceImpl implements IBonusSettleService { @DubboReference - IGradeServiceApi gradeServiceApi; + ISystemConfigServiceApi iSystemConfigServiceApi; @DubboReference - IAwardsServiceApi awardsServiceApi; + IGradeServiceApi iGradeServiceApi; @DubboReference - ISystemConfigServiceApi systemConfigServiceApi; + IAwardsServiceApi iAwardsServiceApi; @DubboReference - IRangeServiceApi rangeServiceApi; + IRangeServiceApi iRangeServiceApi; @DubboReference - IBonusItemsServiceApi bonusItemsServiceApi; + ISaOrderServiceApi iSaOrderServiceApi; @DubboReference - ISaOrderServiceApi saOrderServiceApi; + IBonusItemsServiceApi iBonusItemsServiceApi; @Autowired private ICuRegionAssessService cuRegionAssessService; @@ -143,10 +143,10 @@ public class BonusSettleServiceImpl implements IBonusSettleService { public void calculateCumberBonusBySecond(String orderCode) { log.info("寮濮嬫墽琛岀鎺ワ紝璁㈠崟缂栧彿锛歿}", orderCode); Date startDate = DateUtils.currentDate(); - SaOrderExt saOrderExt = saOrderServiceApi.querySaOrderByDay(startDate, + SaOrderExt saOrderExt = iSaOrderServiceApi.querySaOrderByDay(startDate, DateUtils.afterDate(1, ChronoUnit.DAYS, startDate), orderCode).getData(); - Map systemConfigMap = systemConfigServiceApi.getBonusSystemConfig().getData(); - Map rangeDtoMap = rangeServiceApi.queryRangeDto().getData(); + Map systemConfigMap = iSystemConfigServiceApi.getBonusSystemConfig().getData(); + Map rangeDtoMap = iRangeServiceApi.queryRangeDto().getData(); // 澶勭悊濂栭噾缁撶畻绉掔粨琛紝鍒ゆ柇鏄惁瀛樺湪褰撳ぉ缁撶畻鐨勭鎺ヨ〃锛屼粠cu_member涓幏鍙栫綉浣擄紝浠庢槰鏃ョ粨绠楄〃涓幏鍙栫疮璁°佺粨浣欐暟鎹 String settleDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, saOrderExt.getPayTime()); String beforeDay = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, saOrderExt.getPayTime())); @@ -160,7 +160,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService { // 鍓嶅ぉ String yesSettleTableName = TableNameConstants.CU_MEMBER_SETTLE + beforeYesPeriod; Map cuMemberBonusMap = new HashMap<>(MagicNumberConstants.DELETE_DATA_BATCH_UPDATE_NUM); - BonusConfigDTO bonusConfigDTO = bonusItemsServiceApi.queryBonusConfigDTO().getData(); + BonusConfigDTO bonusConfigDTO = iBonusItemsServiceApi.queryBonusConfigDTO().getData(); Map cuMemberSettleExtMap = new HashMap<>(); Map cuAwardsControlMap = getCuAwardsControlMap(); // 璁＄畻濂栭噾 @@ -185,8 +185,8 @@ public class BonusSettleServiceImpl implements IBonusSettleService { bonusSettleFirstPurchaseHandle.getSecondMemberSettle(cuMemberSettleExtMap, cuMemberSettleExtList); // 璁＄畻濂栭噾 // 璁＄畻鐩存帹濂 - List gradeDtoList = gradeServiceApi.queryGradeConfigByCondition(saOrderExt.getPkCountry()).getData(); - CuMemberBonusPush cuMemberBonusPush = bonusSettleFirstPurchaseHandle.calculatePushBonusOne(cuMemberSettleExtMap, bonusConfigDTO, systemConfigMap, period, cuMemberBonusMap, saOrderExt, awardsServiceApi.getAwards().getData(), gradeDtoList); + List gradeDtoList = iGradeServiceApi.queryGradeConfigByCondition(saOrderExt.getPkCountry()).getData(); + CuMemberBonusPush cuMemberBonusPush = bonusSettleFirstPurchaseHandle.calculatePushBonusOne(cuMemberSettleExtMap, bonusConfigDTO, systemConfigMap, period, cuMemberBonusMap, saOrderExt, iAwardsServiceApi.getAwards().getData(), gradeDtoList); log.info("鑾峰緱鐩存帹濂栵紝濂栭噾涓猴細{}", JSONUtil.toJsonStr(cuMemberBonusPush)); // 璁＄畻閲忓 // 鎵鏈夐渶瑕佽绠楃殑鐖惰妭鐐癸紝鍙绠楁柊澧 @@ -266,7 +266,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService { List cuMemberBonusExpandList = bonusSettlePurchaseHandle.calculateRepurchaseExpandSecondBonus(riskControlMap, settleTableName, cuMemberSettleExtMap, bonusConfigDTO, systemConfigMap, period, weekMemberBonusMap, cuMemberBonusMap, saOrderExt, cuMemberSettleExtList, settleDate, BigDecimal.ZERO, BigDecimal.ZERO, 0); // c)澧炲姞濂栬璁板綍琛 - Map awardsMap = awardsServiceApi.getAwards().getData(); + Map awardsMap = iAwardsServiceApi.getAwards().getData(); List cuMemberBonusRangeList = bonusSettlePurchaseHandle.calculateRepurchaseRangeBonus(cuMemberSettleExtMap, settleTableName, settleDate, rangeDtoMap, awardsMap, bonusConfigDTO, Collections.singletonList(saOrderExt), period, cuMemberBonusMap, cuAwardsControlMap, new LeXueRangeParam()); if (cuMemberBonusMap.size() > 0) { @@ -325,9 +325,6 @@ public class BonusSettleServiceImpl implements IBonusSettleService { } } - /** - * 姣忔棩璁＄畻浼氬憳濂栭噾锛屾渶缁堢殑濂栭噾 - */ @Override @Transactional(rollbackFor = Exception.class) public void calculateCuMemberBonus(String settleDate, List saOrderExtList) { @@ -338,7 +335,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService { // 灏嗗垹闄ょ殑璁㈠崟鐨勭偣浣嶅彉涓烘鐐 //********************************* 鏇存柊褰撳ぉ鏈鏂扮殑涓氱哗*************************/ // 鑾峰彇鎵鏈夊浗瀹剁殑濂栭噾椤 key = 鍥藉 + 濂栭噾椤圭殑鍊 - BonusConfigDTO bonusConfigDTO = bonusItemsServiceApi.queryBonusConfigDTO().getData(); + BonusConfigDTO bonusConfigDTO = iBonusItemsServiceApi.queryBonusConfigDTO().getData(); Map cuMemberBonusMap = new HashMap<>(); BonusRecordDetailVO recordDetailVO = new BonusRecordDetailVO(); Boolean isSameMonth = DateUtils.getMonth(settleDate).equals(DateUtils.getMonth(yesterday)); @@ -367,8 +364,8 @@ public class BonusSettleServiceImpl implements IBonusSettleService { @Override public void calculateCuMemberRetailRangeBonusBySaOrder(String orderCode) { Map cuMemberBonusMap = new HashMap<>(MagicNumberConstants.DELETE_DATA_BATCH_UPDATE_NUM); - BonusConfigDTO bonusConfigDTO = bonusItemsServiceApi.queryBonusConfigDTO().getData(); - List retailOrderList = saOrderServiceApi.queryRetailSaOrderByDay(DateUtils.beforeDate(6, ChronoUnit.DAYS), DateUtils.afterDate(1, ChronoUnit.DAYS), orderCode).getData(); + BonusConfigDTO bonusConfigDTO = iBonusItemsServiceApi.queryBonusConfigDTO().getData(); + List retailOrderList = iSaOrderServiceApi.queryRetailSaOrderByDay(DateUtils.beforeDate(6, ChronoUnit.DAYS), DateUtils.afterDate(1, ChronoUnit.DAYS), orderCode).getData(); if (retailOrderList != null && retailOrderList.size() > 0) { SaOrderExt saOrderExt = retailOrderList.get(0); // 澶勭悊濂栭噾缁撶畻绉掔粨琛紝鍒ゆ柇鏄惁瀛樺湪褰撳ぉ缁撶畻鐨勭鎺ヨ〃锛屼粠cu_member涓幏鍙栫綉浣擄紝浠庢槰鏃ョ粨绠楄〃涓幏鍙栫疮璁°佺粨浣欐暟鎹 @@ -415,14 +412,14 @@ public class BonusSettleServiceImpl implements IBonusSettleService { Integer yesterdayPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(yesterday).getPkId(); String yesterdayTableName = TableNameConstants.CU_MEMBER_SETTLE + yesterdayPeriod; cuMemberTreeService.initCuMemberExpandTreeTable(yesterdayTableName, currentSettleTableName); - BonusConfigDTO bonusConfigDTO = bonusItemsServiceApi.queryBonusConfigDTO().getData(); + BonusConfigDTO bonusConfigDTO = iBonusItemsServiceApi.queryBonusConfigDTO().getData(); Map cuMemberSettleExtMap = new HashMap<>(); Map cuMemberBonusMap = new HashMap<>(); Map cuAwardsControlMap = getCuAwardsControlMap(); Map weekMemberBonusMap = getWeekMemberBonusMap(settleDate, period); - Map systemConfigMap = systemConfigServiceApi.getBonusSystemConfig().getData(); + Map systemConfigMap = iSystemConfigServiceApi.getBonusSystemConfig().getData(); BonusRecordDetailVO recordDetailVO = new BonusRecordDetailVO(); - Map awardsMap = awardsServiceApi.getAwards().getData(); + Map awardsMap = iAwardsServiceApi.getAwards().getData(); // 棣栬喘璁㈠崟 List firPurchaseOrderList = new ArrayList<>(); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberRetailLogServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberRetailLogServiceImpl.java index fe15f0bb..461632b1 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberRetailLogServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberRetailLogServiceImpl.java @@ -1,10 +1,9 @@ package com.hzs.bonus.bonus.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.bonus.bonus.mapper.CuMemberRetailLogMapper; import com.hzs.bonus.bonus.service.ICuMemberRetailLogService; -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.CuMemberRetailLog; @@ -15,25 +14,20 @@ import java.util.Date; import java.util.List; /** - *

* 绉掓帴鏃ュ織璁板綍琛 鏈嶅姟瀹炵幇绫 - *

- * - * @author hzs - * @since 2024-12-27 */ @Service public class CuMemberRetailLogServiceImpl extends ServiceImpl implements ICuMemberRetailLogService { @Override public List queryCuMemberRetailLog() { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("ENABLE_STATUS", EYesNo.NO.getIntValue()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CuMemberRetailLog::getEnableStatus, EYesNo.NO.getIntValue()); Date endTime = DateUtils.currentDateTime(); Date startTime = DateUtils.beforeDate(1, ChronoUnit.DAYS, endTime); - queryWrapper.gt(SystemFieldConstants.CREATION_TIME, startTime); - queryWrapper.le(SystemFieldConstants.CREATION_TIME, endTime); - queryWrapper.orderByAsc(SystemFieldConstants.CREATION_TIME); + queryWrapper.gt(CuMemberRetailLog::getCreationTime, startTime); + queryWrapper.le(CuMemberRetailLog::getCreationTime, endTime); + queryWrapper.orderByAsc(CuMemberRetailLog::getCreationTime); return baseMapper.selectList(queryWrapper); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/listener/SaOrderSecondListener.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/listener/SaOrderSecondListener.java index db5144ae..f2832d26 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/listener/SaOrderSecondListener.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/listener/SaOrderSecondListener.java @@ -17,21 +17,17 @@ import org.springframework.messaging.Message; import org.springframework.stereotype.Component; /** - * @Description: 璁㈠崟绉掓帴 - * @Author: sui q - * @Time: 2023/3/1 16:30 - * @Classname: SaOrderSecondListener - * @PackageName: com.hzs.third.mqcall.listener + * 璁㈠崟绉掓帴 */ @Slf4j @Component public class SaOrderSecondListener { @Autowired - private IBonusSettleService bonusSettleService; + private IBonusSettleService iBonusSettleService; @Autowired - private ICuMemberRetailLogService cuMemberRetailLogService; + private ICuMemberRetailLogService iCuMemberRetailLogService; @RabbitListener(bindings = @QueueBinding( exchange = @Exchange(value = RabbitMqConstants.ORDER_SECOND_EXCHANGE, type = "topic"), @@ -47,19 +43,18 @@ public class SaOrderSecondListener { cuMemberRetailLog.setPkCountry(CountryConstants.CHINA_COUNTRY); cuMemberRetailLog.setPkCreator(MagicNumberConstants.PK_ADMIN); cuMemberRetailLog.setOrderCode(saOrderExt.getOrderCode()); - if(saOrderExt.getCancelBool() != null && saOrderExt.getCancelBool()){ + if (saOrderExt.getCancelBool() != null && saOrderExt.getCancelBool()) { cuMemberRetailLog.setCancelStatus(EYesNo.YES.getIntValue()); } try { Thread.sleep(500); - bonusSettleService.calculateCuMemberRetailRangeBonusBySaOrder(saOrderExt.getOrderCode()); + iBonusSettleService.calculateCuMemberRetailRangeBonusBySaOrder(saOrderExt.getOrderCode()); } catch (Exception e) { cuMemberRetailLog.setEnableStatus(EYesNo.NO.getIntValue()); cuMemberRetailLog.setMsg(e.getMessage()); e.printStackTrace(); } finally { - cuMemberRetailLogService.save(cuMemberRetailLog); + iCuMemberRetailLogService.save(cuMemberRetailLog); } - // todo 澶辫触鐨勬椂鍊欒褰曟棩蹇 } } diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml index 601194e1..e904a79e 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml @@ -490,16 +490,16 @@ merge into ${tableName} a using(select #{period} period, a.* from (select user_id pk_member, - sum(CURR_DAY_MAIN_REG_AMOUNT)/6.4 REGISTER_AMOUNT, - sum(CURR_DAY_MAIN_REG_PV)/6.4 REGISTER_PV, - sum(CURR_DAY_MAIN_UP_AMOUNT)/6.4 UPGRADE_AMOUNT, - sum(CURR_DAY_MAIN_UP_PV)/6.4 UPGRADE_PV, - sum(CURR_DAY_MAIN_REPUR_AMOUNT)/6.4 REPURCHASE_AMOUNT, - sum(CURR_DAY_MAIN_REPURCHASE_PV)/6.4 REPURCHASE_PV, - sum(CURR_DAY_SEA2_REG_AMOUNT)/6.4 HI_FUN_AMOUNT, - sum(CURR_DAY_SEA2_REG_PV)/6.4 HI_FUN_PV, - sum(CURR_DAY_MALL_AMOUNT)/6.4 MALL_AMOUNT, - sum(CURR_DAY_MALL_PV)/6.4 MALL_PV + sum(CURR_DAY_MAIN_REG_AMOUNT) REGISTER_AMOUNT, + sum(CURR_DAY_MAIN_REG_PV) REGISTER_PV, + sum(CURR_DAY_MAIN_UP_AMOUNT) UPGRADE_AMOUNT, + sum(CURR_DAY_MAIN_UP_PV) UPGRADE_PV, + sum(CURR_DAY_MAIN_REPUR_AMOUNT) REPURCHASE_AMOUNT, + sum(CURR_DAY_MAIN_REPURCHASE_PV) REPURCHASE_PV, + sum(CURR_DAY_SEA2_REG_AMOUNT) HI_FUN_AMOUNT, + sum(CURR_DAY_SEA2_REG_PV) HI_FUN_PV, + sum(CURR_DAY_MALL_AMOUNT) MALL_AMOUNT, + sum(CURR_DAY_MALL_PV) MALL_PV from G_MEMBER_ACHIV@link_test where period between - 729 and #{period} group by user_id) a) b on diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberRetailLogMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberRetailLogMapper.xml index 5075934f..c77e7b95 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberRetailLogMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberRetailLogMapper.xml @@ -2,23 +2,11 @@ - - - - - - - - - - - - - - - update cu_member_retail_log set enable_status=0 - where del_flag=0 and pk_id in + update cu_member_retail_log + set enable_status = 0 + where del_flag = 0 + and pk_id in #{item.pkId} 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 db16e999..93b001ba 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 @@ -110,7 +110,7 @@ public class CuMemberController extends BaseController { /** - * 瀵煎叆鎵归噺鏌ヨ浼氬憳淇℃伅 + * 瀵煎叆鎵归噺鏌ヨ浼氬憳淇℃伅 **/ @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_CODE, method = EOperationMethod.IMPORT) @PostMapping("/batch-importData") @@ -168,7 +168,8 @@ public class CuMemberController extends BaseController { /** - * 鐪熷疄淇℃伅 + * 鐪熷疄淇℃伅 + * * @author: zhang jing * @date: 2022/11/15 17:59 * @param: [memberParam] @@ -208,7 +209,8 @@ public class CuMemberController extends BaseController { } /** - * 鏍规嵁浼氬憳缂栧彿鏌ヨ浼氬憳淇℃伅 + * 鏍规嵁浼氬憳缂栧彿鏌ヨ浼氬憳淇℃伅 + * * @author: zhang jing * @date: 2022/11/9 18:25 * @param: [pkId] @@ -567,7 +569,8 @@ public class CuMemberController extends BaseController { /** - * 瀵煎嚭鐪熷疄淇℃伅 + * 瀵煎嚭鐪熷疄淇℃伅 + * * @author: zhang jing * @date: 2023/7/15 17:02 * @param: [response, memberRealInfoParam] @@ -650,7 +653,8 @@ public class CuMemberController extends BaseController { /** - * 鏍￠獙韬唤璇佹牸寮 + * 鏍￠獙韬唤璇佹牸寮 + * * @author: zhang jing * @date: 2023/10/17 14:10 * @param: [idCard] @@ -787,17 +791,12 @@ public class CuMemberController extends BaseController { /** - * 鏂伴浂鍞細鍛樹俊鎭 - * @author: zhang jing - * @date: 2024/12/9 17:34 - * @param: [memberParam] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 鏂伴浂鍞細鍛樹俊鎭 **/ @Log(module = EOperationModule.MEMBER_INFORMATION, business = EOperationBusiness.RETAIL_MEMBER_INFO, method = EOperationMethod.SELECT) @GetMapping("/query-member") public TableDataInfo retailMember(RetailMemberVO memberParam) { memberParam.setPkCountry(SecurityUtils.getPkCountry()); - memberParam.setSystemType(SecurityUtils.getSystemType()); List memberCodeList = new ArrayList<>(); List memberCodeList1 = new ArrayList<>(); @@ -909,11 +908,7 @@ public class CuMemberController extends BaseController { /** - * 瀵煎嚭鏂伴浂鍞 - * @author: zhang jing - * @date: 2024/12/10 17:22 - * @param: [response, memberParam] - * @return: void + * 瀵煎嚭鏂伴浂鍞 **/ @Log(module = EOperationModule.MEMBER_INFORMATION, business = EOperationBusiness.RETAIL_MEMBER_INFO, method = EOperationMethod.EXPORT) @PostMapping("/export") @@ -1045,7 +1040,8 @@ public class CuMemberController extends BaseController { } /** - * 鍏嶅瘑鐧诲綍 + * 鍏嶅瘑鐧诲綍 + * * @author: zhang jing * @date: 2023/6/6 10:05 * @param: [memberTeamInfoParam] diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/controller/api/MarketNewsController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/controller/api/MarketNewsController.java index b1984b87..a3181c2c 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/controller/api/MarketNewsController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/controller/api/MarketNewsController.java @@ -242,15 +242,10 @@ public class MarketNewsController extends BaseController { if (cuMemberBonusPush.getOrderType() != null) { cuMemberBonusPush.setOrderTypeStr(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + cuMemberBonusPush.getOrderType())); } - // 娉ㄥ唽涓氱哗 鍥藉唴 * 6.4 - if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { - if (cuMemberBonusPush.getOrderAchieve() == null) { - cuMemberBonusPush.setOrderAchieve(BigDecimal.ZERO); - } - cuMemberBonusPush.setOrderAchieve(cuMemberBonusPush.getOrderAchieve().multiply(inExchangeRate)); - } else { - cuMemberBonusPush.setOrderAchieve(cuMemberBonusPush.getOrderAchieve()); + if (cuMemberBonusPush.getOrderAchieve() == null) { + cuMemberBonusPush.setOrderAchieve(BigDecimal.ZERO); } + cuMemberBonusPush.setOrderAchieve(cuMemberBonusPush.getOrderAchieve().multiply(inExchangeRate)); cuMemberBonusPush.setCreationTime(cuMemberBonusPush.getMemberPayTime()); // 璺ㄥ浗鎶ュ崟 姹囩巼杞崲 diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml index a5a04949..8018e415 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml @@ -716,16 +716,16 @@ merge into ${tableName} a using (select #{period} period, a.* from (select user_id pk_member, - sum(CURR_DAY_MAIN_REG_AMOUNT) / 6.4 REGISTER_AMOUNT, - sum(CURR_DAY_MAIN_REG_PV) / 6.4 REGISTER_PV, - sum(CURR_DAY_MAIN_UP_AMOUNT) / 6.4 UPGRADE_AMOUNT, - sum(CURR_DAY_MAIN_UP_PV) / 6.4 UPGRADE_PV, - sum(CURR_DAY_MAIN_REPUR_AMOUNT) / 6.4 REPURCHASE_AMOUNT, - sum(CURR_DAY_MAIN_REPURCHASE_PV) / 6.4 REPURCHASE_PV, - sum(CURR_DAY_SEA2_REG_AMOUNT) / 6.4 HI_FUN_AMOUNT, - sum(CURR_DAY_SEA2_REG_PV) / 6.4 HI_FUN_PV, - sum(CURR_DAY_MALL_AMOUNT) / 6.4 MALL_AMOUNT, - sum(CURR_DAY_MALL_PV) / 6.4 MALL_PV + sum(CURR_DAY_MAIN_REG_AMOUNT) REGISTER_AMOUNT, + sum(CURR_DAY_MAIN_REG_PV) REGISTER_PV, + sum(CURR_DAY_MAIN_UP_AMOUNT) UPGRADE_AMOUNT, + sum(CURR_DAY_MAIN_UP_PV) UPGRADE_PV, + sum(CURR_DAY_MAIN_REPUR_AMOUNT) REPURCHASE_AMOUNT, + sum(CURR_DAY_MAIN_REPURCHASE_PV) REPURCHASE_PV, + sum(CURR_DAY_SEA2_REG_AMOUNT) HI_FUN_AMOUNT, + sum(CURR_DAY_SEA2_REG_PV) HI_FUN_PV, + sum(CURR_DAY_MALL_AMOUNT) MALL_AMOUNT, + sum(CURR_DAY_MALL_PV) MALL_PV from G_MEMBER_ACHIV@link_test where period between - 729 and #{period} group by user_id) a) b on diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml index bd0333d8..c8775727 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml @@ -2346,7 +2346,7 @@ FROM cu_member cm inner join CU_MEMBER_ACCOUNT cma on cm.pk_id = cma.PK_MEMBER - INNER JOIN cu_member par + left join cu_member par ON par.pk_id = cm.pk_parent left join bd_awards awa on awa.pk_id = cm.PK_AWARDS @@ -2374,7 +2374,7 @@ FROM cu_member cm inner join CU_MEMBER_ACCOUNT cma on cm.pk_id = cma.PK_MEMBER - INNER JOIN cu_member par + left join cu_member par ON par.pk_id = cm.pk_parent left join bd_awards awa on awa.pk_id = cm.PK_AWARDS @@ -2395,9 +2395,6 @@ and cm.pk_settle_country = #{pkCountry} - - and cm.SYSTEM_TYPE = #{systemType} - and cm.member_code like #{memberCode}||'%' diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml index 5432230d..9d79ec7d 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml @@ -147,7 +147,7 @@ (nvl(cbs.MAIN_REG_PV,0)+nvl(cbs.MAIN_UP_PV,0)+nvl(cbs.MAIN_REPUR_PV,0)+nvl(cbs.RETAIL_CONSUME_PV,0)),4) end as backPointsRate, - 6.4*(nvl(cbs.retail_range_income,0)+nvl(cbs.retail_same_level_income_V1V4,0)+nvl(cbs.retail_same_level_income_V5,0) + (nvl(cbs.retail_range_income,0)+nvl(cbs.retail_same_level_income_V1V4,0)+nvl(cbs.retail_same_level_income_V5,0) +nvl(cbs.retail_area_income,0)+nvl(cbs.retail_benefit_avg_income,0) +nvl(cbs.retail_benefit_income,0)+nvl(cbs.retail_benefit_range_income,0)+nvl(cbs.BACK_POINTS,0)) totalBonus, diff --git a/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml b/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml index 5f382809..e6074edc 100644 --- a/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml +++ b/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml @@ -892,11 +892,11 @@ t6.rightSumPv, t6.leftSumPv, t2.dept, - t2.a_sum_pv * 6.4 historyLeftSumPv, - t2.b_sum_pv * 6.4 historyRightSumPv, + t2.a_sum_pv historyLeftSumPv, + t2.b_sum_pv historyRightSumPv, t6.pk_member - FROM (SELECT NVL(SUM(t1.a_new_pv) * 6.4, 0) leftSumPv, - NVL(SUM(t1.b_new_pv) * 6.4, 0) rightSumPv, + FROM (SELECT NVL(SUM(t1.a_new_pv), 0) leftSumPv, + NVL(SUM(t1.b_new_pv), 0) rightSumPv, t1.pk_member FROM ( @@ -951,12 +951,12 @@ bv.vertex_name vertexName, CASE WHEN t5.a_new_pv > t5.b_new_pv THEN - NVL(t5.b_new_pv * 6.4, 0) + NVL(t5.b_new_pv, 0) WHEN t5.a_new_pv <= t5.b_new_pv THEN - NVL(t5.a_new_pv * 6.4, 0) + NVL(t5.a_new_pv, 0) END achieve, - t5.a_new_pv * 6.4 leftSumPv, - t5.b_new_pv * 6.4 rightSumPv, + t5.a_new_pv leftSumPv, + t5.b_new_pv rightSumPv, CASE WHEN t5.a_new_pv > t5.b_new_pv THEN 2 @@ -1006,8 +1006,8 @@ ) t2 GROUP BY t2.pk_member) t3 ON t1.pk_id = t3.pk_member - WHERE t3.a_new_pv * 6.4 >= #{achieve} - AND t3.b_new_pv * 6.4 >= #{achieve}) t5 + WHERE t3.a_new_pv >= #{achieve} + AND t3.b_new_pv >= #{achieve}) t5 LEFT JOIN bd_awards a ON a.pk_id = t5.pk_awards AND a.pk_country = #{pkCountry} @@ -1035,11 +1035,11 @@ t6.rightSumPv, t6.leftSumPv, t2.dept, - t2.a_sum_pv * 6.4 historyLeftSumPv, - t2.b_sum_pv * 6.4 historyRightSumPv, + t2.a_sum_pv historyLeftSumPv, + t2.b_sum_pv historyRightSumPv, t6.pk_member - FROM (SELECT NVL(SUM(t1.a_new_pv) * 6.4, 0) leftSumPv, - NVL(SUM(t1.b_new_pv) * 6.4, 0) rightSumPv, + FROM (SELECT NVL(SUM(t1.a_new_pv), 0) leftSumPv, + NVL(SUM(t1.b_new_pv), 0) rightSumPv, t1.pk_member FROM ( @@ -1091,12 +1091,12 @@ bv.vertex_name vertexName, CASE WHEN t5.a_new_pv > t5.b_new_pv THEN - NVL(t5.b_new_pv * 6.4, 0) + NVL(t5.b_new_pv, 0) WHEN t5.a_new_pv <= t5.b_new_pv THEN - NVL(t5.a_new_pv * 6.4, 0) + NVL(t5.a_new_pv, 0) END achieve, - t5.a_new_pv * 6.4 leftSumPv, - t5.b_new_pv * 6.4 rightSumPv, + t5.a_new_pv leftSumPv, + t5.b_new_pv rightSumPv, CASE WHEN t5.a_new_pv > t5.b_new_pv THEN 2 @@ -1146,8 +1146,8 @@ ) t2 GROUP BY t2.pk_member) t3 ON t1.pk_id = t3.pk_member - WHERE t3.a_new_pv * 6.4 >= #{achieve} - AND t3.b_new_pv * 6.4 >= #{achieve}) t5 + WHERE t3.a_new_pv >= #{achieve} + AND t3.b_new_pv >= #{achieve}) t5 LEFT JOIN bd_awards a ON a.pk_id = t5.pk_awards AND a.pk_country = #{pkCountry} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/BdProductController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/BdProductController.java index 9c56ea43..705ac976 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/BdProductController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/BdProductController.java @@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hzs.common.core.annotation.AccessPermissions; import com.hzs.common.core.annotation.Log; import com.hzs.common.core.constant.HttpStatus; import com.hzs.common.core.constant.msg.ProductMsgConstants; @@ -48,13 +47,6 @@ import javax.servlet.http.HttpServletResponse; import java.util.*; import java.util.stream.Collectors; -/** - * @Description: - * @Author: yuhui - * @Time: 2022/9/1 14:14 - * @Classname: BdProductController - * @PackageName: com.hzs.sale.product.controller.manage - */ @Slf4j @RestController @RequestMapping("/manage/product") @@ -226,16 +218,6 @@ public class BdProductController extends BaseController { if (productCount > 0) { return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_NUMBER_ALREADY_EXISTS)); } - if (productParams.getPkProductBas() != null) { - // 鏍￠獙姣忎釜鍥藉璇ヤ骇鍝乥as鍙兘鏈変竴娆 - LambdaQueryWrapper qe = new LambdaQueryWrapper<>(); - qe.eq(BdProduct::getPkProductBas, productParams.getPkProductBas()); - qe.eq(BdProduct::getPkCountry, SecurityUtils.getPkCountry()); - int ct = productService.count(qe); - if (ct > 0) { - return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_BAS_COUNTYR_FIRST)); - } - } productService.saveProduct(productParams, loginUser); return AjaxResult.success(); } @@ -276,17 +258,6 @@ public class BdProductController extends BaseController { if (productCount > 0) { return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_NUMBER_ALREADY_EXISTS)); } - if (productParams.getPkProductBas() != null) { - // 鏍￠獙姣忎釜鍥藉璇ヤ骇鍝乥as鍙兘鏈変竴娆 - LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - qw.eq(BdProduct::getPkProductBas, productParams.getPkProductBas()); - qw.eq(BdProduct::getPkCountry, SecurityUtils.getPkCountry()); - qw.notIn(BdProduct::getPkId, productParams.getPkId()); - int ct = productService.count(qw); - if (ct > 0) { - return AjaxResult.error(TransactionUtils.getContent(ProductMsgConstants.PRODUCT_BAS_COUNTYR_FIRST)); - } - } // 淇敼鍟嗗搧淇℃伅 productService.updateProduct(productParams, loginUser); return AjaxResult.success(productParams.getProductCode()); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/params/ProductParams.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/params/ProductParams.java index 624f6bae..f7e31bac 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/params/ProductParams.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/params/ProductParams.java @@ -7,13 +7,6 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; -/** - * @Description: - * @Author: yuhui - * @Time: 2022/9/1 15:48 - * @Classname: Product - * @PackageName: com.hzs.sale.product.controller.manage.params - */ @Data public class ProductParams implements Serializable { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java index e98e7a2e..702c59fc 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java @@ -100,8 +100,6 @@ public class BdProductServiceImpl extends ServiceImpl cubasdocDTO = cubasdocApi.getCubasdoc(productParams.getPkCubasdoc()); CubasdocDTO cubasdoc = cubasdocDTO.getData(); @@ -239,13 +237,6 @@ public class BdProductServiceImpl extends ServiceImpl and bp.product_name like '%' || #{param.productName} || '%' - - - - and so.PK_ORIGINAL_ORDER is not null - - - and so.PK_ORIGINAL_ORDER is null - - - and so.rec_province in @@ -368,16 +358,6 @@ and bp.product_name like '%' || #{param.productName} || '%' - - - - and so.PK_ORIGINAL_ORDER is not null - - - and so.PK_ORIGINAL_ORDER is null - - - and so.rec_province in diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml index 55534716..a8b1b4c3 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml @@ -373,16 +373,6 @@ and sd.deliver_time >= #{param.deliverTime[0]} and #{param.deliverTime[1]} >= sd.deliver_time - - - - and so.PK_ORIGINAL_ORDER is not null - - - and so.PK_ORIGINAL_ORDER is null - - - and so.rec_province in diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiFeedbackController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiFeedbackController.java deleted file mode 100644 index 1ffcf7e6..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiFeedbackController.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.hzs.system.base.controller.api; - -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.ext.BdFeedbackExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.system.base.service.IBdFeedbackService; -import com.hzs.system.base.vo.FeedbackVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import java.util.List; - -/** - * 鎰忚鍙嶉 鍓嶇鎺у埗鍣 - * - * @author hzs - * @since 2023-02-05 - */ -@RestController -@RequestMapping("/api/feedback") -public class ApiFeedbackController extends BaseController { - - @Autowired - IBdFeedbackService bdFeedbackService; - - /** - * 娣诲姞鎰忚鍙嶉 - * - * @return - */ - @PostMapping("save") - public AjaxResult save(@Valid @RequestBody FeedbackVO feedbackVO) { - feedbackVO.setPkMember(SecurityUtils.getUserId()); - feedbackVO.setPkCountry(SecurityUtils.getPkCountry()); - return toAjax(bdFeedbackService.saveFeedback(feedbackVO)); - } - - - @GetMapping("index-list") - public TableDataInfo indexList(Integer isShowDay) { - Integer pkCountry = SecurityUtils.getPkCountry(); - FeedbackVO feedbackVO = FeedbackVO.builder().pkCountry(pkCountry).isShowDay(isShowDay) - .pkMember(SecurityUtils.getUserId()) - .build(); - startPage(); - Object[] objects = bdFeedbackService.selectFeedbackList(feedbackVO); - TableDataInfo tableDataInfo = getDataTable((List) objects[0]); - tableDataInfo.setRows((List) objects[1]); - return tableDataInfo; - } - - @GetMapping("index-detail") - public AjaxResult index(Long pkId) { - return AjaxResult.success(bdFeedbackService.showFeedbackVOById(pkId)); - } - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiNoticeController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiNoticeController.java index c91955cf..c3f8af3f 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiNoticeController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiNoticeController.java @@ -8,7 +8,6 @@ import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.domain.system.base.BdNotice; import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.system.base.service.IBdFeedbackService; import com.hzs.system.base.service.IBdNoticeService; import com.hzs.system.base.vo.BdNoticeCountVO; import com.hzs.system.base.vo.BdNoticeVO; @@ -22,12 +21,6 @@ import java.util.List; /** * 鍏憡銆佺珯鍐呬俊 - * - * @Description: - * @Author: ljc - * @Time: 2023/2/6 16:52 - * @Classname: ApiNoticeController - * @Package_name: com.hzs.system.base.controller.api */ @RestController @RequestMapping("/api/notice") @@ -36,9 +29,6 @@ public class ApiNoticeController extends BaseController { @Autowired private IBdNoticeService noticeService; - @Autowired - private IBdFeedbackService bdFeedbackService; - /** * 棣栭〉鏄剧ず鍏憡銆佺珯鍐呬俊 * @@ -83,7 +73,7 @@ public class ApiNoticeController extends BaseController { } /** - * 浼氬憳棣栭〉 鍏憡銆佺珯鍐呬俊銆佹剰瑙佸弽棣堟暟 + * 浼氬憳棣栭〉 鍏憡銆佺珯鍐呬俊 * * @return */ @@ -100,11 +90,8 @@ public class ApiNoticeController extends BaseController { BdNoticeVO stationVO = BdNoticeVO.builder().pkCountry(pkCountry).pkMember(SecurityUtils.getUserId()) .websiteType(websiteType).functionType(ENoticeFunctionType.MAIL.getValue()).build(); Integer stationNum = noticeService.showIndexMailCount(stationVO); - //鏌ヨ鎰忚鍙嶉鏁 - Integer feedbackNum = bdFeedbackService.selectIndexFeedbackCount(pkCountry, SecurityUtils.getUserId()); BdNoticeCountVO noticeCountVO = BdNoticeCountVO.builder() - .noticeNum(noticeNum).stationNum(stationNum) - .feedbackNum(feedbackNum).build(); + .noticeNum(noticeNum).stationNum(stationNum).build(); return AjaxResult.success(noticeCountVO); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/manage/BdFeedbackController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/manage/BdFeedbackController.java deleted file mode 100644 index 5ad79d83..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/manage/BdFeedbackController.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.hzs.system.base.controller.manage; - - -import cn.hutool.core.collection.CollUtil; -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.constant.msg.FinanceMsgConstants; -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.ext.BdFeedbackExt; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.service.ITransactionCommonService; -import com.hzs.common.util.TransactionUtils; -import com.hzs.system.base.service.IBdFeedbackReplyService; -import com.hzs.system.base.service.IBdFeedbackService; -import com.hzs.system.base.vo.BdFeedbackReplyVO; -import com.hzs.system.base.vo.FeedbackVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - -/** - *

- * 鎰忚鍙嶉 鍓嶇鎺у埗鍣 - *

- * - * @author hzs - * @since 2023-02-05 - */ -@RestController -@RequestMapping("/manage/feedback") -public class BdFeedbackController extends BaseController { - - @Autowired - IBdFeedbackService bdFeedbackService; - - @Autowired - IBdFeedbackReplyService bdFeedbackReplyService; - - - @Autowired - ITransactionCommonService iTransactionCommonService; - - /** - * 鏌ヨ鍒楄〃 - * - * @return - */ - @Log(module = EOperationModule.MEMBER_FEEDBACK, business = EOperationBusiness.MEMBER_FEEDBACK, method = EOperationMethod.SELECT) - @PostMapping("list") - public TableDataInfo getFeedbackList(@RequestBody FeedbackVO feedbackVO) { - feedbackVO.setPkCountry(SecurityUtils.getPkCountry()); - startPage(); - Object[] objects = bdFeedbackService.selectFeedbackList(feedbackVO); - - TableDataInfo tableDataInfo = getDataTable((List) objects[0]); - tableDataInfo.setRows((List) objects[1]); - return tableDataInfo; - - } - - - /** - * 鎰忚鍙嶉鍒楄〃瀵煎嚭 - * - * @param response 鍝嶅簲 - * @param feedbackVO 鏌ヨ鍏ュ弬 - */ - @Log(module = EOperationModule.MEMBER_FEEDBACK, business = EOperationBusiness.MEMBER_FEEDBACK, method = EOperationMethod.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, FeedbackVO feedbackVO) { - feedbackVO.setPkCountry(SecurityUtils.getPkCountry()); - List feedbackVOList = (List) bdFeedbackService.selectFeedbackList(feedbackVO)[1]; - if (CollUtil.isNotEmpty(feedbackVOList)) { - //鏋氫妇缈昏瘧 - Map transactionMap = iTransactionCommonService.exportEnumTransaction(EFeedbackType.values(), EFeedbackStatus.values()); - for (FeedbackVO feedback : feedbackVOList) { - feedback.setTypeVal(transactionMap.get(EnumsPrefixConstants.FEEDBACK_TYPE + feedback.getType())); - feedback.setStatusVal(transactionMap.get(EnumsPrefixConstants.FEEDBACK_STATUS + feedback.getStatus())); - } - } - ExcelUtil util = new ExcelUtil<>(FeedbackVO.class); - util.exportExcel(response, feedbackVOList, "鎰忚鍙嶉"); - } - - /** - * 鍒犻櫎鍏憡淇℃伅 - * - * @param pkId - * @return - */ - @Log(module = EOperationModule.MEMBER_FEEDBACK, business = EOperationBusiness.MEMBER_FEEDBACK, method = EOperationMethod.DELETE) - @GetMapping("/delete") - public AjaxResult delete(Long pkId) { - FeedbackVO feedbackVO = new FeedbackVO(); - feedbackVO.setPkId(pkId); - feedbackVO.setPkModified(SecurityUtils.getUserId()); - return toAjax(bdFeedbackService.deleteById(feedbackVO)); - } - - /** - * 鏌ヨ淇敼鐘舵 - * - * @return - */ - @Log(module = EOperationModule.MEMBER_FEEDBACK, business = EOperationBusiness.MEMBER_FEEDBACK, method = EOperationMethod.UPDATE) - @GetMapping("/show") - public AjaxResult showFeedbackVOById(Long pkId) { - return AjaxResult.success(bdFeedbackService.showFeedbackVOById(pkId)); - } - - - /** - * 娣诲姞鎰忚鍙嶉 - * - * @return - */ - @Log(module = EOperationModule.MEMBER_FEEDBACK, business = EOperationBusiness.MEMBER_FEEDBACK, method = EOperationMethod.INSERT, remark = "鎰忚鍙嶉") - @PostMapping("save") - public AjaxResult save(@RequestBody BdFeedbackReplyVO feedbackReplyVO) { - - if (null == feedbackReplyVO.getReplyContent()) { - return AjaxResult.error("鍥炲鍐呭涓嶈兘涓虹┖锛"); - } - feedbackReplyVO.setPkCreator(SecurityUtils.getUserId()); - feedbackReplyVO.setPkCountry(SecurityUtils.getPkCountry()); - return toAjax(bdFeedbackReplyService.saveFeedbackReplyInfo(feedbackReplyVO)); - } - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdFeedbackMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdFeedbackMapper.java deleted file mode 100644 index b2fdf28c..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdFeedbackMapper.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.hzs.system.base.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.system.base.BdFeedback; -import com.hzs.common.domain.system.ext.BdFeedbackExt; -import com.hzs.system.base.vo.FeedbackVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 鎰忚鍙嶉 Mapper 鎺ュ彛 - *

- * - * @author hzs - * @since 2023-02-05 - */ -public interface BdFeedbackMapper extends BaseMapper { - - /** - * 鏌ヨ鎰忚鍙嶉鍒楄〃 - * - * @param feedbackVO VO - * @return List - */ - List selectFeedbackList(FeedbackVO feedbackVO); - - - /** - * 鍒犻櫎淇℃伅 - * - * @param feedbackVO 鍙傛暟 - * @return pkCountry - */ - Integer deleteById(FeedbackVO feedbackVO); - - /** - * 鏌ョ湅璇︽儏 - * - * @param pkId 涓婚敭ID - * @return BdFeedbackExt - */ - BdFeedbackExt showFeedbackVOById(Long pkId); - - /** - * 鏌ヨ浼氬憳棣栭〉鎰忚鍙嶉鏁 - * - * @param pkCountry 鍥藉ID - * @return pkCountry - */ - Integer selectIndexFeedbackCount(@Param("pkCountry") Integer pkCountry,@Param("pkMember") Long pkMember); - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdFeedbackReplyMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdFeedbackReplyMapper.java deleted file mode 100644 index 65656290..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdFeedbackReplyMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.system.base.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.system.base.BdFeedbackReply; - -/** - *

- * 鎰忚鍙嶉鍥炲 Mapper 鎺ュ彛 - *

- * - * @author hzs - * @since 2023-04-25 - */ -public interface BdFeedbackReplyMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdFeedbackReplyService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdFeedbackReplyService.java deleted file mode 100644 index e6a68a70..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdFeedbackReplyService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.hzs.system.base.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.system.base.BdFeedbackReply; -import com.hzs.system.base.vo.BdFeedbackReplyVO; - -import java.util.List; - -/** - *

- * 鎰忚鍙嶉鍥炲 鏈嶅姟绫 - *

- * - * @author hzs - * @since 2023-04-25 - */ -public interface IBdFeedbackReplyService extends IService { - - /** - * 淇濆瓨鎰忚鍙嶉鍥炲 - * - * @param feedbackReplyVO 鎰忚鍙嶉鍥炲淇℃伅 - * @return Boolean - */ - Boolean saveFeedbackReplyInfo(BdFeedbackReplyVO feedbackReplyVO); - - /** - * 鏍规嵁鎰忚鍙嶉ID鏌ヨ鍥炲淇℃伅 - * - * @param pkFeedbackId - * @param pkCountry - * @return - */ - List selectFeedbackReplyById(Long pkFeedbackId, Integer pkCountry); - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdFeedbackService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdFeedbackService.java deleted file mode 100644 index 757fbb5a..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdFeedbackService.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.hzs.system.base.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.system.base.BdFeedback; -import com.hzs.system.base.vo.FeedbackVO; - -/** - *

- * 鎰忚鍙嶉 鏈嶅姟绫 - *

- * - * @author hzs - * @since 2023-02-05 - */ -public interface IBdFeedbackService extends IService { - /** - * 淇濆瓨鎰忚鍙嶉 - * - * @param feedbackVO - * @return - */ - Integer saveFeedback(FeedbackVO feedbackVO); - - /** - * 鏌ヨ鎰忚鍙嶉鍒楄〃 - * - * @param feedbackVO VO - * @return List - */ - Object[] selectFeedbackList(FeedbackVO feedbackVO); - - /** - * 鍒犻櫎淇℃伅 - * - * @param feedbackVO - * @return - */ - Integer deleteById(FeedbackVO feedbackVO); - - /** - * 鏌ョ湅璇︽儏 - * - * @param pkId - * @return - */ - FeedbackVO showFeedbackVOById(Long pkId); - - /** - * 鏍规嵁ID淇敼鐘舵 - * - * @param pkMember 鐢ㄦ埛ID - * @param pkId 涓诲仴 - * @return Boolean - */ - Boolean updateFeedbackById(Long pkMember, Long pkId); - - - /** - * 鏌ヨ浼氬憳棣栭〉鎰忚鍙嶉鏁 - * - * @param pkCountry 鍥藉ID - * @return pkCountry - */ - Integer selectIndexFeedbackCount(Integer pkCountry,Long pkMember); - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdFeedbackReplyServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdFeedbackReplyServiceImpl.java deleted file mode 100644 index bcc37edc..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdFeedbackReplyServiceImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.hzs.system.base.service.impl; - - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.enums.EFeedbackStatus; -import com.hzs.common.domain.system.base.BdFeedback; -import com.hzs.common.domain.system.base.BdFeedbackReply; -import com.hzs.system.base.mapper.BdFeedbackReplyMapper; -import com.hzs.system.base.service.IBdFeedbackReplyService; -import com.hzs.system.base.service.IBdFeedbackService; -import com.hzs.system.base.vo.BdFeedbackReplyVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - *

- * 鎰忚鍙嶉鍥炲 鏈嶅姟瀹炵幇绫 - *

- * - * @author hzs - * @since 2023-04-25 - */ -@Service -public class BdFeedbackReplyServiceImpl extends ServiceImpl implements IBdFeedbackReplyService { - @Autowired - IBdFeedbackService bdFeedbackService; - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean saveFeedbackReplyInfo(BdFeedbackReplyVO feedbackReplyVO) { - BdFeedback BdFeedback = bdFeedbackService.getById(feedbackReplyVO.getPkFeedbackId()); - if (BdFeedback.getStatus().equals(EFeedbackStatus.NO_FEEDBACK.getValue())) { - bdFeedbackService.updateFeedbackById(feedbackReplyVO.getPkCreator(), feedbackReplyVO.getPkFeedbackId()); - } - return save(BeanUtil.copyProperties(feedbackReplyVO, BdFeedbackReply.class)); - } - - @Override - public List selectFeedbackReplyById(Long pkFeedbackId, Integer pkCountry) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_FEEDBACK_ID", pkFeedbackId); - queryWrapper.eq("PK_COUNTRY", pkCountry); - queryWrapper.orderByAsc("CREATION_TIME"); - return BeanUtil.copyToList(baseMapper.selectList(queryWrapper), BdFeedbackReplyVO.class); - } - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdFeedbackServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdFeedbackServiceImpl.java deleted file mode 100644 index edcd8675..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdFeedbackServiceImpl.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.hzs.system.base.service.impl; - - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -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.EFeedbackStatus; -import com.hzs.common.domain.system.base.BdFeedback; -import com.hzs.common.domain.system.ext.BdFeedbackExt; -import com.hzs.system.base.mapper.BdFeedbackMapper; -import com.hzs.system.base.service.IBdFeedbackReplyService; -import com.hzs.system.base.service.IBdFeedbackService; -import com.hzs.system.base.vo.BdFeedbackReplyVO; -import com.hzs.system.base.vo.FeedbackVO; -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 hzs - * @since 2023-02-05 - */ -@Service -public class BdFeedbackServiceImpl extends ServiceImpl implements IBdFeedbackService { - - @Autowired - IBdFeedbackReplyService bdFeedbackReplyService; - - @Override - public Integer saveFeedback(FeedbackVO feedbackVO) { - BdFeedback bdFeedback = BeanUtil.copyProperties(feedbackVO, BdFeedback.class); - bdFeedback.setPkCreator(feedbackVO.getPkMember()); - return baseMapper.insert(bdFeedback); - } - - @Override - public Object[] selectFeedbackList(FeedbackVO feedbackVO) { - FeedbackVO feedback; - List feedbackVOList = new ArrayList<>(); - List feedbackExtList = baseMapper.selectFeedbackList(feedbackVO); - if (CollUtil.isNotEmpty(feedbackExtList)) { - for (BdFeedbackExt feedbackExt : feedbackExtList) { - List bdFeedbackReplyVOList = bdFeedbackReplyService.selectFeedbackReplyById(feedbackExt.getPkId(), feedbackExt.getPkCountry()); - feedback = BeanUtil.copyProperties(feedbackExt, FeedbackVO.class); - feedback.setFeedbackReplyList(bdFeedbackReplyVOList); - feedbackVOList.add(feedback); - } - } - Object[] objects = new Object[]{feedbackExtList, feedbackVOList}; - return objects; - } - - @Override - public Integer deleteById(FeedbackVO feedbackVO) { - return baseMapper.deleteById(feedbackVO); - - } - - @Override - public FeedbackVO showFeedbackVOById(Long pkId) { - FeedbackVO feedbackVO = BeanUtil.copyProperties(baseMapper.showFeedbackVOById(pkId), FeedbackVO.class); - List bdFeedbackReplyVOList = bdFeedbackReplyService.selectFeedbackReplyById(feedbackVO.getPkId(), feedbackVO.getPkCountry()); - feedbackVO.setFeedbackReplyList(bdFeedbackReplyVOList); - return feedbackVO; - } - - @Override - public Boolean updateFeedbackById(Long pkMember, Long pkId) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set("STATUS", EFeedbackStatus.FEEDBACK_PROVIDED.getValue()); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, new Date()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.eq("PK_ID", pkId); - return update(updateWrapper); - } - - @Override - public Integer selectIndexFeedbackCount(Integer pkCountry,Long pkMember) { - return baseMapper.selectIndexFeedbackCount(pkCountry,pkMember); - } - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdFeedbackReplyVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdFeedbackReplyVO.java deleted file mode 100644 index 9029cca6..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdFeedbackReplyVO.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.hzs.system.base.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.Date; - -/** - * 鎰忚鍙嶉鍥炲VO - * - * @Description: - * @Author: ljc - * @Time: 2023/4/25 14:01 - * @Classname: BdFeedbackReplyVO - * @Package_name: com.hzs.system.base.vo - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class BdFeedbackReplyVO implements Serializable { - - /** - * 涓婚敭 - */ - private Long pkId; - - /** - * 涓昏〃ID - */ - private Long pkFeedbackId; - - /** - * 鍥炲鍐呭 - */ - private String replyContent; - - /** - * 浼氬憳涓婚敭 - */ - private Long pkCreator; - - /** - * 鍥藉 ID - */ - private Integer pkCountry; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - - - -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdNoticeCountVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdNoticeCountVO.java index 67f974e2..9eb053fe 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdNoticeCountVO.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/BdNoticeCountVO.java @@ -9,12 +9,6 @@ import java.io.Serializable; /** * 浼氬憳棣栭〉 璁板綍鏁版樉绀 - * - * @Description: - * @Author: ljc - * @Time: 2023/5/9 17:37 - * @Classname: BdNoticeCountVO - * @Package_name: com.hzs.system.base.vo */ @Data @Builder @@ -31,9 +25,4 @@ public class BdNoticeCountVO implements Serializable { */ private Integer stationNum; - /** - * 鎰忚鍙嶉鏁 - */ - private Integer feedbackNum; - } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/FeedbackVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/FeedbackVO.java deleted file mode 100644 index def40552..00000000 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/vo/FeedbackVO.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.hzs.system.base.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.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -/** - * 鎰忚鍙嶉VO - * - * @Description: - * @Author: ljc - * @Time: 2023/2/5 14:05 - * @Classname: Feedback - * @Package_name: com.hzs.system.base.vo - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class FeedbackVO implements Serializable { - private static final long serialVersionUID = -847776348100846568L; - - /** - * 涓婚敭 - */ - private Long pkId; - - /** - * 浼氬憳涓婚敭 - */ - private Long pkMember; - - - /** - * 鍥藉 ID - */ - private Integer pkCountry; - - - /** - * 浼氬憳缂栧彿 - */ - @Excel(name = "浼氬憳缂栧彿") - private String memberCode; - - /** - * 浼氬憳鍚嶇О - */ - @Excel(name = "浼氬憳濮撳悕") - private String memberName; - /** - * 浣撶郴鍚嶇О - */ - @Excel(name = "闅跺睘浣撶郴") - private String vertexName; - /** - * 鍥㈤槦鍚嶇О - */ - @Excel(name = "闅跺睘鍥㈤槦") - private String teamName; - - - /** - * 绫诲瀷锛1锛氫笟鍔 2锛氬钩鍙癇UG 3锛氬鏈嶉棶棰 4锛氬晢鍝侀棶棰 - */ - @NotNull(message = "璇烽夋嫨鍙嶉绫诲瀷") - @Transaction(transactionKey = EnumsPrefixConstants.FEEDBACK_TYPE) - private Integer type; - - @Excel(name = "绫诲瀷") - private String typeVal; - - /** - * 鎰忚 - */ - @NotEmpty(message = "璇峰～鍐欏弽棣堝唴瀹") - @Size(max = 500, message = "涓汉鎰忚涓嶈兘瓒呰繃500浣") - @Excel(name = "涓汉鎰忚") - private String idea; - - /** - * 鐘舵侊紙1锛氬凡鍙嶉 2锛氭湭鍙嶉"锛 - */ - @Transaction(transactionKey = EnumsPrefixConstants.FEEDBACK_STATUS) - private Integer status; - - @Excel(name = "鍙嶉鐘舵") - private String statusVal; - - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "濉啓鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 浼氬憳鏄电О - */ - private String nickName; - - - /** - * 浼氬憳澶村儚 - */ - private String headPath; - - /** - * 鏄惁鏄剧ず涓冨ぉ鐨勬暟鎹 - */ - private Integer isShowDay; - - /** - * 淇敼浜篒D - */ - private Long pkModified; - - /** - * 寮濮嬫椂闂 - */ - private String startDate; - /** - * 缁撴潫鏃堕棿 - */ - private String endDate; - /** - * 闅跺睘浣撶郴 - */ - private Integer pkVertex; - /** - * 闅跺睘鍥㈤槦 - */ - private Integer pkTeamCode; - - - - - - /** - * 鍥炲淇℃伅 - */ - private List feedbackReplyList; -} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java index 2090313a..9aaa2233 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java @@ -1540,26 +1540,7 @@ public class EnumsController extends BaseController { } /** - * 鎰忚鍙嶉绫诲瀷 - * - * @return AjaxResult - */ - @GetMapping("/feedback-type") - public AjaxResult getFeedback() { - List enumEntityList = new ArrayList<>(); - for (EFeedbackType value : EFeedbackType.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.FEEDBACK_TYPE)); - } - return AjaxResult.success(enumEntityList); - } - - - /** - * @description: 鍙戝竷浣嶇疆 - * @author: zhang jing - * @date: 2022/12/8 17:48 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 鍙戝竷浣嶇疆 **/ @GetMapping("/position") public AjaxResult getEPosition() { @@ -1571,11 +1552,7 @@ public class EnumsController extends BaseController { } /** - * @description: 鍙戝竷浣嶇疆 - * @author: zhang jing - * @date: 2022/12/8 17:48 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 鍙戝竷浣嶇疆 **/ @GetMapping("/position-two") public AjaxResult getEPositionTwo() { @@ -2441,21 +2418,6 @@ public class EnumsController extends BaseController { return AjaxResult.success(enumEntityList); } - - /** - * 鎰忚鍙嶉鐘舵 - * - * @return - */ - @GetMapping("/get-feedback-status") - public AjaxResult getFeedbackStatus() { - List enumEntityList = new ArrayList<>(); - for (EFeedbackStatus value : EFeedbackStatus.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.FEEDBACK_STATUS)); - } - return AjaxResult.success(enumEntityList); - } - /** * 姣旂巼绫诲瀷 * diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java index 77e67035..34cac8aa 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java @@ -481,13 +481,6 @@ public class EnumsInitController { for (ENoticeGrade value : ENoticeGrade.values()) { initList.add(this.createData(value.getKey(), value.getLabel())); } - - /** - * 鎰忚鍙嶉绫诲瀷 - */ - for (EFeedbackType value : EFeedbackType.values()) { - initList.add(this.createData(value.getKey(), value.getLabel())); - } /** * 涓氬姟鍔炵悊娴佺▼绫诲瀷 */ @@ -629,10 +622,6 @@ public class EnumsInitController { for (EReachState value : EReachState.values()) { initList.add(this.createData(value.getKey(), value.getLabel())); } - // 鎰忚鍙嶉鐘舵 - for (EFeedbackStatus value : EFeedbackStatus.values()) { - initList.add(this.createData(value.getKey(), value.getLabel())); - } // 姣旂巼绫诲瀷 for (ERatioType value : ERatioType.values()) { initList.add(this.createData(value.getKey(), value.getLabel())); diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdFeedbackMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdFeedbackMapper.xml deleted file mode 100644 index 880905bf..00000000 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdFeedbackMapper.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - CREATION_TIME, - MODIFIED_TIME, - DEL_FLAG, - PK_COUNTRY, - PK_CREATOR, - PK_MODIFIED, - PK_ID, PK_MEMBER, TYPE, IDEA - - - - - - - - - - update bd_feedback f - set f.del_flag = 1, f.modified_time = sysdate, f.pk_modified = #{pkModified} - where f.pk_id = #{pkId} - - - - - diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdFeedbackReplyMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdFeedbackReplyMapper.xml deleted file mode 100644 index 161b4906..00000000 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdFeedbackReplyMapper.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - CREATION_TIME, - MODIFIED_TIME, - DEL_FLAG, - PK_COUNTRY, - PK_CREATOR, - PK_MODIFIED, - PK_ID, PK_FEEDBACK_ID, REPLY_CONTENT - - - diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java index 904fd928..09876792 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java @@ -821,12 +821,6 @@ public class EnumsPrefixConstants { */ public static final String NOTICE_GRADE = "ENU_NOTICE_GRADE_"; - - /** - * 鎰忚鍙嶉绫诲瀷 - */ - public static final String FEEDBACK_TYPE = "ENU_FEEDBACK_T_"; - /** * 娉ㄦ按鏂瑰紡 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java index 23f1b60f..397ca9f5 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java @@ -14,9 +14,9 @@ public class SysConstants { */ public static final String RETAIL_PREFIX = "RE"; /** - * 鏂伴浂鍞《鐐 + * 椤剁偣 */ - public static final String RETAIL_TOP_CODE = "HZS30720290"; + public static final String RETAIL_TOP_CODE = "GJ30720200"; /** * 鐧诲綍瀵嗙爜 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccount.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccount.java index a13ca940..705b5edc 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccount.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAccount.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 璐у竵绉嶇被 - * - * @author: hzs */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAwards.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAwards.java index 6aef44cd..8fb8c680 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAwards.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAwards.java @@ -21,54 +21,46 @@ public enum EAwards { * 0=鏃 */ MEMBER(1, 0, "鏃", 0, EnumsPrefixConstants.AWARDS + 0), - /** - * V1 + * 榛勫疂 */ HEADER(2, 5, "涓绾", 0, EnumsPrefixConstants.AWARDS + 5), - /** - * V2 + * 缁垮疂 */ MANAGER(3, 10, "浜岀骇", 0, EnumsPrefixConstants.AWARDS + 10), - /** - * V3 + * 钃濆疂 */ HIGH_MANAGER(4, 15, "涓夌骇", 0, EnumsPrefixConstants.AWARDS + 15), - /** - * V4 + * 閽荤煶 */ SENIOR_MANAGER(5, 20, "鍥涚骇", 0, EnumsPrefixConstants.AWARDS + 20), - /** - * V5 + * 榛勯捇 */ CHIEF(6, 25, "浜旂骇", 0, EnumsPrefixConstants.AWARDS + 25), - /** - * V6 + * 缁块捇 */ HIGH_CHIEF(7, 30, "鍏骇", 0, EnumsPrefixConstants.AWARDS + 30), - /** - * 钁ｄ簨 + * 鏄熻钃濋捇 */ SENIOR_CHIEF(8, 35, "涓冪骇", 0, EnumsPrefixConstants.AWARDS + 35), - /** - * 鍚堜紮浜 + * 鐜嬭呯孩閽 */ CHAIRMAN(9, 40, "鍏骇", 0, EnumsPrefixConstants.AWARDS + 40), - - /** - * 鑽ｈ獕钁ｄ簨 + * 浼犲绱捇 */ HONOR_CHAIRMAN(10, 45, "涔濈骇", 0, EnumsPrefixConstants.AWARDS + 45), + + /** - * 鍏ㄧ悆钁ｄ簨 + * 10 */ GLOBAL_CHAIRMAN(11, 50, "鍗佺骇", 0, EnumsPrefixConstants.AWARDS + 50), /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java index b44e5280..2f29ee18 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java @@ -14,41 +14,35 @@ public enum EBonusItems { /** * 鍡ㄧ矇鐩存帹 绂佺敤 */ - HI_PINK(1, "鍡ㄧ矇鐩存帹", 1, EnumsPrefixConstants.BONUS_ITEMS + 1), - + HI_PINK(1, "鏃у棬绮夌洿鎺", 1, EnumsPrefixConstants.BONUS_ITEMS + 1), /** * 鍚姩鍗＄洿鎺 */ - BOOT_CARD(2, "鍚姩鍗＄洿鎺", 0, EnumsPrefixConstants.BONUS_ITEMS + 2), - - /** - * 鐩存帹鏀剁泭 - */ - DIRECT_INCOME(3, "鐩存帹鏀剁泭", 0, EnumsPrefixConstants.BONUS_ITEMS + 3), + BOOT_CARD(2, "鏃у惎鍔ㄥ崱鐩存帹", 0, EnumsPrefixConstants.BONUS_ITEMS + 2), /** * 鎷撳睍鏀剁泭 */ - EXPANSION_INCOME(4, "鎷撳睍鏀剁泭", 0, EnumsPrefixConstants.BONUS_ITEMS + 4), + EXPANSION_INCOME(4, "鏃ф嫇灞曟敹鐩", 0, EnumsPrefixConstants.BONUS_ITEMS + 4), /** * 杈呭鏀剁泭 */ - COACHING_INCOME(5, "杈呭鏀剁泭", 0, EnumsPrefixConstants.BONUS_ITEMS + 5), + COACHING_INCOME(5, "鏃ц緟瀵兼敹鐩", 0, EnumsPrefixConstants.BONUS_ITEMS + 5), /** * 鍒嗙孩鏀剁泭 */ - DIVIDEND_INCOME(6, "鍒嗙孩鏀剁泭", 0, EnumsPrefixConstants.BONUS_ITEMS + 6), + DIVIDEND_INCOME(6, "鏃у垎绾㈡敹鐩", 0, EnumsPrefixConstants.BONUS_ITEMS + 6), /** * 鏈嶅姟琛ヨ创 */ - SERVICE_SUBSIDIES(7, "鏈嶅姟琛ヨ创", 0, EnumsPrefixConstants.BONUS_ITEMS + 7), + SERVICE_SUBSIDIES(7, "鏃ф湇鍔¤ˉ璐", 0, EnumsPrefixConstants.BONUS_ITEMS + 7), /** * 澶嶈喘鏋佸樊鏀剁泭 */ - REPURCHASE_RANGE_INCOME(8, "澶嶈喘鏋佸樊鏀剁泭", 0, EnumsPrefixConstants.BONUS_ITEMS + 8), + REPURCHASE_RANGE_INCOME(8, "鏃у璐瀬宸敹鐩", 0, EnumsPrefixConstants.BONUS_ITEMS + 8), /** * 娑堣垂鎷撳睍鏀剁泭 */ - CONSUMPTION_EXPANSION_INCOME(9, "娑堣垂鎷撳睍鏀剁泭", 0, EnumsPrefixConstants.BONUS_ITEMS + 9), + CONSUMPTION_EXPANSION_INCOME(9, "鏃ф秷璐规嫇灞曟敹鐩", 0, EnumsPrefixConstants.BONUS_ITEMS + 9), /** * 鍟嗗煄閲嶉攢 */ @@ -56,50 +50,75 @@ public enum EBonusItems { /** * 骞冲彴鏈嶅姟璐 */ - PLATFORM_SERVICE_FEE(11, "骞冲彴鏈嶅姟璐", 0, EnumsPrefixConstants.BONUS_ITEMS + 11), + PLATFORM_SERVICE_FEE(11, "鏃у钩鍙版湇鍔¤垂", 0, EnumsPrefixConstants.BONUS_ITEMS + 11), /** * 澶嶈喘鍒 */ - REPURCHASE_COUPONS(12, "澶嶈喘鍒", 0, EnumsPrefixConstants.BONUS_ITEMS + 12), + REPURCHASE_COUPONS(12, "鏃у璐埜", 0, EnumsPrefixConstants.BONUS_ITEMS + 12), /** * 澶嶈喘鍒稿潎鍒嗘敹鐩 */ - REPURCHASE_COUPONS_SHARE(13, "澶嶈喘鍒稿潎鍒", 0, EnumsPrefixConstants.BONUS_ITEMS + 13), + REPURCHASE_COUPONS_SHARE(13, "鏃у璐埜鍧囧垎", 0, EnumsPrefixConstants.BONUS_ITEMS + 13), /** * 浜戜唬鐩存帹鏀剁泭 淇敼涓哄垢杩愭敹鐩 */ - CLOUD_AGENT_DIRECT_PUSH(14, "骞歌繍鏀剁泭", 0, EnumsPrefixConstants.BONUS_ITEMS + 14), + CLOUD_AGENT_DIRECT_PUSH(14, "鏃у垢杩愭敹鐩", 0, EnumsPrefixConstants.BONUS_ITEMS + 14), /** * 浜戜唬棣栬喘鏀剁泭 淇敼涓烘瀬宸敹鐩 */ - CLOUD_AGENT_FIRST_PURCHASE(15, "鏋佸樊鏀剁泭", 0, EnumsPrefixConstants.BONUS_ITEMS + 15), + CLOUD_AGENT_FIRST_PURCHASE(15, "鏃ф瀬宸敹鐩", 0, EnumsPrefixConstants.BONUS_ITEMS + 15), /** * 浜戜唬澶嶈喘鏀剁泭 淇敼涓哄钩绾ф敹鐩 */ - CLOUD_AGENT_REPURCHASE(16, "骞崇骇鏀剁泭", 0, EnumsPrefixConstants.BONUS_ITEMS + 16), - + CLOUD_AGENT_REPURCHASE(16, "鏃у钩绾ф敹鐩", 0, EnumsPrefixConstants.BONUS_ITEMS + 16), /** * 搴楅摵鏀剁泭 */ - STORE_INCOME(23, "搴楅摵鏀剁泭", 0, EnumsPrefixConstants.BONUS_ITEMS + 23), - + STORE_INCOME(23, "鏃у簵閾烘敹鐩", 0, EnumsPrefixConstants.BONUS_ITEMS + 23), /** * 澶嶈喘鐩存帹鏀剁泭 淇敼涓轰簰鍔╂敹鐩 */ - HELP_EACH_INCOME(24, "浜掑姪鏀剁泭", 0, EnumsPrefixConstants.BONUS_ITEMS + 24), + HELP_EACH_INCOME(24, "鏃т簰鍔╂敹鐩", 0, EnumsPrefixConstants.BONUS_ITEMS + 24), + ////////////////////////////////////////////////// 鏂板椤 ////////////////////////////////////////////////// - RETAIL_RANGE_INCOME(25, "鏂伴浂鍞瀬宸敹鐩", 0, EnumsPrefixConstants.BONUS_ITEMS + 25), + /** + * 鐩存帹鏀剁泭 -- 绉掔粨锛屾棩濂 + */ + DIRECT_INCOME(3, "鐩存帹鏀剁泭", 0, EnumsPrefixConstants.BONUS_ITEMS + 3), + /** + * 骞崇骇鏀剁泭锛堟柊闆跺敭骞崇骇鏀剁泭锛 -- 绉掔粨锛屾棩濂 + */ + RETAIL_SAME_LEVEL_INCOME(26, "骞崇骇鏀剁泭", 0, EnumsPrefixConstants.BONUS_ITEMS + 26), + /** + * 鍖哄煙鍒嗙孩锛堟柊闆跺敭鍖哄煙鏀剁泭锛 -- 绉掔粨锛屾棩濂 + */ + RETAIL_AREA_INCOME(27, "鍖哄煙鍒嗙孩", 0, EnumsPrefixConstants.BONUS_ITEMS + 27), + /** + * 鏈堝害绾у樊鏀剁泭锛堟柊闆跺敭鏋佸樊鏀剁泭锛 -- 鏈堢粨锛屾湀濂 + */ + RETAIL_RANGE_INCOME(25, "鏈堝害绾у樊鏀剁泭", 0, EnumsPrefixConstants.BONUS_ITEMS + 25), + /** + * 澶嶈喘绾у樊鏀剁泭锛堟柊锛 -- 鏈堢粨锛屾湀濂 + */ + RETAIL_MONTH_REPURCHASE_INCOME(31, "澶嶈喘绾у樊鏀剁泭", 0, EnumsPrefixConstants.BONUS_ITEMS + 31), + /** + * 鏈堝害鍒嗙孩 - 骞冲潎鏀剁泭锛堟柊闆跺敭绂忓埄骞冲潎鏀剁泭锛 -- 鏈堢粨锛屾湀濂 + */ + RETAIL_BENEFIT_AVG_INCOME(28, "鏈堝害鍒嗙孩骞冲潎鏀剁泭", 0, EnumsPrefixConstants.BONUS_ITEMS + 28), + /** + * 鏈堝害鍒嗙孩 - 鍔犳潈鏀剁泭锛堟柊闆跺敭绂忓埄鍔犳潈鏀剁泭锛 -- 鏈堢粨锛屾湀濂 + */ + RETAIL_BENEFIT_INCOME(29, "鏈堝害鍒嗙孩鍔犳潈鏀剁泭", 0, EnumsPrefixConstants.BONUS_ITEMS + 29), + /** + * 鍩硅偛娲ヨ创锛堟柊锛 -- 鏈堢粨锛屾湀濂 + */ + RETAIL_COACHING_INCOME(32, "鍩硅偛娲ヨ创", 0, EnumsPrefixConstants.BONUS_ITEMS + 32), - RETAIL_SAME_LEVEL_INCOME(26, "鏂伴浂鍞钩绾ф敹鐩", 0, EnumsPrefixConstants.BONUS_ITEMS + 26), - - RETAIL_AREA_INCOME(27, "鏂伴浂鍞尯鍩熸敹鐩", 0, EnumsPrefixConstants.BONUS_ITEMS + 27), - - RETAIL_BENEFIT_AVG_INCOME(28, "鏂伴浂鍞鍒╁钩鍧囨敹鐩", 0, EnumsPrefixConstants.BONUS_ITEMS + 28), - - RETAIL_BENEFIT_INCOME(29, "鏂伴浂鍞鍒╁姞鏉冩敹鐩", 0, EnumsPrefixConstants.BONUS_ITEMS + 29), - - RETAIL_BENEFIT_RANGE_INCOME(30, "鏂伴浂鍞鍒╂瀬宸敹鐩", 0, EnumsPrefixConstants.BONUS_ITEMS + 30), + /** + * 鏃ф柊闆跺敭绂忓埄鏋佸樊鏀剁泭锛堟柊闆跺敭绂忓埄鏋佸樊鏀剁泭锛 + */ + RETAIL_BENEFIT_RANGE_INCOME(30, "鏃ф柊闆跺敭绂忓埄鏋佸樊鏀剁泭", 0, EnumsPrefixConstants.BONUS_ITEMS + 30), ; diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFeedbackStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFeedbackStatus.java deleted file mode 100644 index 50ff29a0..00000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFeedbackStatus.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hzs.common.core.enums; - -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 鎰忚鍙嶉鐘舵 - * - * @Description: - * @Author: ljc - * @Time: 2023/5/6 11:27 - * @Classname: EFeedbackStatus - * @Package_name: com.hzs.common.core.enums - */ -@AllArgsConstructor -@Getter -public enum EFeedbackStatus { - - /** - * 宸插弽棣 - */ - FEEDBACK_PROVIDED(1, "宸插弽棣", 0, EnumsPrefixConstants.FEEDBACK_STATUS + 1), - - /** - * 鏈弽棣 - */ - NO_FEEDBACK(2, "鏈弽棣", 0, EnumsPrefixConstants.FEEDBACK_STATUS + 2); - - /** - * 瀹為檯鍊 - */ - private final int value; - /** - * 鏄剧ず鏍囩 - */ - private final String label; - /** - * 鏄惁鍚敤锛0=鏄,1=鍚︼級 -- 鏉ユ簮EYesNo - */ - private final int enable; - /** - * 鍥介檯鍖栫炕璇慿ey鍊 - */ - private final String key; -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFeedbackType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFeedbackType.java deleted file mode 100644 index 55dd001e..00000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFeedbackType.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.hzs.common.core.enums; - -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 鎰忚鍙嶉绫诲瀷 - * - * @Description: - * @Author: ljc - * @Time: 2023/2/2 11:35 - * @Classname: ENoticeType - * @Package_name: com.hzs.common.core.enums - */ -@AllArgsConstructor -@Getter -public enum EFeedbackType { - - /** - * 涓氬姟鍜ㄨ - */ - BUSINESS(1, "涓氬姟鍜ㄨ", 0, EnumsPrefixConstants.FEEDBACK_TYPE + "1"), - - /** - * 骞冲彴BUG - */ - PLATFORM_BUG(2, "骞冲彴BUG", 0, EnumsPrefixConstants.FEEDBACK_TYPE + "2"), - - /** - * 瀹㈡湇闂 - */ - CUSTOMER_QUESTION(3, "瀹㈡湇闂", 0,EnumsPrefixConstants.FEEDBACK_TYPE + "3"), - - /** - * 鍟嗗搧闂 - */ - COMMODITY_QUESTION(4, "鍟嗗搧闂", 0, EnumsPrefixConstants.FEEDBACK_TYPE + "4"); - - /** - * 瀹為檯鍊 - */ - private final int value; - /** - * 鏄剧ず鏍囩 - */ - private final String label; - /** - * 鏄惁鍚敤锛0=鏄,1=鍚︼級 -- 鏉ユ簮EYesNo - */ - private final int enable; - /** - * 鍥介檯鍖栫炕璇慿ey鍊 - */ - private final String key; -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java index 94423f58..df85c634 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java @@ -26,32 +26,32 @@ public enum EGrade { LOGGED_OUT(-2, 0, "宸叉敞閿", 1, EnumsPrefixConstants.ENU_CAT + 2, MemberFrameworkConstants.LOG_OFF), /** - * + * 椤惧 */ START_UP(1, 20, "V0", 0, EnumsPrefixConstants.GRADE + "20", MemberFrameworkConstants.START_UP), /** - * + * VIP */ HAI_FAN(2, 30, "V1", 0, EnumsPrefixConstants.GRADE + "30", MemberFrameworkConstants.Hi_Pink), /** - * 娑堣垂鍟 + * SVIP */ YOU_KE(3, 40, "V2", 0, EnumsPrefixConstants.GRADE + "40", MemberFrameworkConstants.YOU_KE), /** - * 鍗撹秺缁忛攢鍟 + * 鍗撹秺 */ MAKER(4, 50, "V3", 0, EnumsPrefixConstants.GRADE + "50", MemberFrameworkConstants.MAKER), /** - * 棣栧腑缁忛攢鍟 + * 棣栧腑 */ VIP(5, 60, "V4", 0, EnumsPrefixConstants.GRADE + "60", MemberFrameworkConstants.VIP), /** - * + * 鍚堜紮浜 */ S_VIP(6, 70, "V5", 0, EnumsPrefixConstants.GRADE + "70", MemberFrameworkConstants.S_VIP), diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java index 51daa5fb..d5e19fc5 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java @@ -203,8 +203,6 @@ public enum EOperationBusiness { MESSAGE_MANAGE("绔欏唴淇"), - MEMBER_FEEDBACK("鎰忚鍙嶉"), - MESSAGE_CONFIG("绔欏唴淇￠厤缃"), //////////////////// 璐㈠姟绠＄悊 //////////////////// diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java index af830287..50af7683 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java @@ -138,8 +138,6 @@ public enum EOperationModule { NOTICE_MANAGE("鍚庡彴鍏憡"), - MEMBER_FEEDBACK("鎰忚鍙嶉"), - NOTICE_RELEASE("鍙戝竷鍏憡"), MESSAGE_CONFIG("绔欏唴淇￠厤缃"), diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUnit.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUnit.java index d8766596..eed91917 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUnit.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUnit.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 鍟嗗搧鍗曚綅绫诲瀷 - * @Author: yuhui - * @Time: 2022/9/2 14:03 - * @Classname: EUnit - * @PackageName: com.hzs.common.core.enums + * 鍟嗗搧鍗曚綅绫诲瀷 */ @AllArgsConstructor @Getter @@ -58,7 +54,7 @@ public enum EUnit { return BOX; } else if (ALONE.getValue() == value) { return ALONE; - }else if (PIECE.getValue() == value) { + } else if (PIECE.getValue() == value) { return PIECE; } return BOX; diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberRetailRangeExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberRetailRangeExt.java index d6ec0b9e..8cef6955 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberRetailRangeExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberRetailRangeExt.java @@ -7,12 +7,7 @@ import lombok.EqualsAndHashCode; import java.math.BigDecimal; /** - * @description: 鏂伴浂鍞瀬宸疄浣 - * @author: sui q - * @time: 2024/12/9 13:54 - * @classname: CuMemberRetailRangeExt - * @package_name: com.hzs.common.domain.member.achieve.ext - * version 1.0.0 + * 鏂伴浂鍞瀬宸疄浣 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberRetailLog.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberRetailLog.java index 1158f7fc..033eb08e 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberRetailLog.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberRetailLog.java @@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 绉掓帴鏃ュ織璁板綍琛 - *

- * - * @author hzs - * @since 2024-12-27 */ @Data @EqualsAndHashCode(callSuper = true) @@ -62,5 +57,4 @@ public class CuMemberRetailLog extends BaseEntity { @TableField("RETRY_NUM") private Integer retryNum; - } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProductBas.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProductBas.java index c5e9f022..3fd6f49d 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProductBas.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProductBas.java @@ -13,12 +13,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 浜у搧鍩烘湰璁剧疆 - *

- * - * @author hzs - * @since 2023-11-21 */ @Data @EqualsAndHashCode(callSuper = true) @@ -60,7 +55,6 @@ public class BdProductBas extends BaseEntity { private Integer unit; - /** * 闀 浠ュ帢绫充綔涓哄崟浣 */ diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdFeedback.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdFeedback.java deleted file mode 100644 index 7064c15c..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdFeedback.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hzs.common.domain.system.base; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 鎰忚鍙嶉 - *

- * - * @author hzs - * @since 2023-02-05 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("BD_FEEDBACK") -@KeySequence("BD_FEEDBACK_SEQ") -public class BdFeedback extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 涓婚敭 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 浼氬憳涓婚敭 - */ - @TableField("PK_MEMBER") - private Long pkMember; - - /** - * 绫诲瀷锛1锛氫笟鍔 2锛氬钩鍙癇UG 3锛氬鏈嶉棶棰 4锛氬晢鍝侀棶棰 - */ - @TableField("TYPE") - private Integer type; - - /** - * 鎰忚 - */ - @TableField("IDEA") - private String idea; - - - /** - * 鐘舵侊紙1锛氬凡鍙嶉 2锛氭湭鍙嶉"锛 - */ - @TableField("STATUS") - private Integer status; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdFeedbackReply.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdFeedbackReply.java deleted file mode 100644 index f32dd0b3..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdFeedbackReply.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hzs.common.domain.system.base; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 鎰忚鍙嶉鍥炲 - *

- * - * @author hzs - * @since 2023-04-25 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("BD_FEEDBACK_REPLY") -@KeySequence("BD_FEEDBACK_REPLY_SEQ") -public class BdFeedbackReply extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 涓婚敭 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 涓昏〃ID - */ - @TableField("PK_FEEDBACK_ID") - private Long pkFeedbackId; - - /** - * 鍥炲鍐呭 - */ - @TableField("REPLY_CONTENT") - private String replyContent; - - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdFeedbackExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdFeedbackExt.java deleted file mode 100644 index e0613f01..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/ext/BdFeedbackExt.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.hzs.common.domain.system.ext; - -import com.hzs.common.domain.system.base.BdFeedback; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 鎰忚鍙嶉 - * - * @Description: - * @Author: ljc - * @Time: 2023/2/5 14:55 - * @Classname: BdFeedbackExt - * @Package_name: com.hzs.common.domain.system.ext - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class BdFeedbackExt extends BdFeedback { - /** - * 浼氬憳缂栧彿 - */ - private String memberCode; - - /** - * 浼氬憳鍚嶇О - */ - private String memberName; - - /** - * 浼氬憳鏄电О - */ - private String nickName; - - - /** - * 浼氬憳澶村儚 - */ - private String headPath; - /** - * 浣撶郴鍚嶇О - */ - private String vertexName; - /** - * 鍥㈤槦鍚嶇О - */ - private String teamName; - - -} From bf08c889e6ac264e00b4770bca86e8bfe9a5a498 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Sun, 8 Jun 2025 16:29:05 +0800 Subject: [PATCH 04/17] =?UTF-8?q?##=20=E4=BB=93=E5=82=A8=E5=8F=91=E5=BA=93?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8A=9F=E8=83=BD=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/SaDeliverController.java | 22 ++-- .../manage/SaDeliverHandledController.java | 76 ++++++++++++- .../deliver/param/DeliverTemplateParam.java | 45 ++++---- .../hzs/sale/deliver/vo/DeliverHandledVO.java | 15 ++- .../sale/deliver/vo/DeliverUnhandledVO.java | 6 +- .../com/hzs/sale/deliver/vo/DeliverWmsVO.java | 106 ++++++++++++++++++ .../manage/params/ProductParams.java | 5 + .../sale/product/mapper/BdProductMapper.java | 11 +- .../service/impl/BdProductServiceImpl.java | 18 ++- .../com/hzs/sale/product/vo/ProductVo.java | 23 ++-- .../mapper/sale/product/BdProductMapper.xml | 2 + .../common/domain/sale/product/BdProduct.java | 6 + 12 files changed, 250 insertions(+), 85 deletions(-) create mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverWmsVO.java diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java index 4a46dd72..328e1ae6 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java @@ -215,23 +215,25 @@ public class SaDeliverController extends BaseController { public AjaxResult batchDeliverImport(MultipartFile file, @RequestParam("idList") List idList) throws Exception { ExcelUtil util = new ExcelUtil<>(DeliverTemplateParam.class); List deliverTemplateParamList = util.importExcel(file.getInputStream()); - Map templateParamMap = deliverTemplateParamList.stream().collect(Collectors.toMap(DeliverTemplateParam::getDeliverCode, val -> val)); // 杩斿洖鏁版嵁 List resultList = new ArrayList<>(idList.size()); // 鏌ヨ鍙戣揣鍗曚俊鎭 - List saDeliverList = iSaDeliverService.listDataBatch(idList); + List saDeliverList = iSaDeliverService.listByIds(idList); for (SaDeliver saDeliver : saDeliverList) { - DeliverTemplateParam deliverTemplate = templateParamMap.get(saDeliver.getDeliverCode()); - if (null != deliverTemplate) { - // 鍙戣揣鍗曞彿鐩稿悓 锛屽垯杩涜杩斿洖 - resultList.add(DeliverTemplateVO.builder() - .pkId(saDeliver.getPkId()) - .logisticsCompany(deliverTemplate.getLogisticsCompany().trim()) - .logisticsCode(deliverTemplate.getLogisticsCode().trim()) - .build()); + // 閬嶅巻瀵煎叆鏁版嵁锛屽尮閰嶅彂璐у崟鍙戣揣鏁版嵁锛屽鏋滅浉鍚屽垯灏佽杩斿洖鍙戣揣淇℃伅 + for (DeliverTemplateParam deliverTemplate : deliverTemplateParamList) { + if (saDeliver.getDeliverCode().equals(deliverTemplate.getDeliverCode())) { + // 鐗╂祦鍗曞彿鐩稿悓锛岃繘琛岃繑鍥 + resultList.add(DeliverTemplateVO.builder() + .pkId(saDeliver.getPkId()) + .logisticsCompany(deliverTemplate.getLogisticsCompany().trim()) + .logisticsCode(deliverTemplate.getLogisticsCode().trim()) + .build()); + break; + } } } return AjaxResult.success(resultList); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java index c4dfe5e9..2334a220 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java @@ -3,6 +3,7 @@ package com.hzs.sale.deliver.controller.manage; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.DesensitizedUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.hzs.common.core.annotation.AccessPermissions; import com.hzs.common.core.annotation.Log; import com.hzs.common.core.annotation.RepeatSubmitSimple; @@ -18,6 +19,7 @@ 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.sale.deliver.SaDeliver; +import com.hzs.common.domain.sale.deliver.SaDeliverBarCode; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.service.ITransactionCommonService; import com.hzs.common.util.TransactionUtils; @@ -43,11 +45,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 鍙戣揣娓呭崟宸插悎鍗曟帶鍒跺櫒 - * @Author: jiang chao - * @Time: 2022/10/19 16:43 - * @Classname: SaDeliverController - * @PackageName: com.hzs.sale.order.controller.manager + * 鍙戣揣娓呭崟宸插悎鍗曟帶鍒跺櫒 */ @RestController @RequestMapping("/manage/deliver-handled") @@ -162,6 +160,74 @@ public class SaDeliverHandledController extends BaseController { util.exportExcel(response, resultList, "鍙戣揣娓呭崟宸插悎鍗曞鍑"); } + /** + * 浠撳偍瀵煎嚭 + * + * @param response + * @param param + */ + @PostMapping("/wms-export") + public void wmsExport(HttpServletResponse response, DeliverHandledParam param) { + DateUtils.handTimeStartAndEnd(param.getCreationTime()); + DateUtils.handTimeStartAndEnd(param.getPayTime()); + + // 鍥藉ID + Integer pkCountry = SecurityUtils.getPkCountry(); + + List voList = new ArrayList<>(); + + // 鑾峰彇绠＄悊鍛樻潈闄愶紙瑙掕壊鍦板尯鑼冨洿銆佷綋绯诲垪琛ㄣ佸洟闃熷垪琛級 + UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData(); + param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList()); + param.setVertexIdList(userAuthorityDTO.getVertexIdList()); + param.setTeamList(userAuthorityDTO.getUserTeamList()); + + List resultList = iSaDeliverService.queryDeliverHandledList(param, pkCountry); + + // 褰撴煡璇㈡湁鏁版嵁鎵嶈繘琛屽鐞 + if (resultList.size() > 0) { + // 鑾峰彇琛屾斂鍖哄垝map + Map areaMap = iAreaServiceApi.getAreaMap(pkCountry).getData(); + + String deliverCode = ""; + DeliverWmsVO vo = null; + // 鍚堝苟 key锛 鍙戣揣鍗曞彿 + 浠撳偍缂栧彿 + 瑙勬牸锛屼竴鏍风殑绱鏁伴噺 + String key = null; + for (DeliverHandledVO deliverHandled : resultList) { + if (null == key || !key.equals(deliverHandled.getDeliverCode() + "-" + deliverHandled.getWmsCode() + "-" + deliverHandled.getSpecsName())) { + // key锛 鍙戣揣鍗曞彿 + 浠撳偍缂栧彿 + 瑙勬牸锛屼竴鏍风殑绱鏁伴噺 + key = deliverHandled.getDeliverCode() + "-" + deliverHandled.getWmsCode() + "-" + deliverHandled.getSpecsName(); + + vo = DeliverWmsVO.builder() + .wmsCode(deliverHandled.getWmsCode()) + .productName(deliverHandled.getProductName()) + .specsName(deliverHandled.getSpecsName()) + .quantity(deliverHandled.getQuantity()) + .price(BigDecimal.ZERO) + .build(); + if (!deliverCode.equals(deliverHandled.getDeliverCode())) { + deliverCode = deliverHandled.getDeliverCode(); + vo.setDeliverCode(deliverHandled.getDeliverCode()); + vo.setRecName(deliverHandled.getRecName()); + vo.setRecPhone(deliverHandled.getRecPhone()); + + // 鐪佸競鍖哄鐞 + OrderUtil.handleOrderAddress(areaMap, deliverHandled); + String address = deliverHandled.getRecProvinceVal() + + (StringUtils.isNotEmpty(deliverHandled.getRecCityVal()) ? deliverHandled.getRecCityVal() : "") + + (StringUtils.isNotEmpty(deliverHandled.getRecCountyVal()) ? deliverHandled.getRecCountyVal() : "") + + deliverHandled.getRecAddress(); + vo.setRecAddress(address); + } + voList.add(vo); + } else { + vo.setQuantity(vo.getQuantity() + deliverHandled.getQuantity()); + } + } + } + ExcelUtil util = new ExcelUtil<>(DeliverWmsVO.class); + util.exportExcel(response, voList, "鍙戣揣娓呭崟宸插悎鍗曞鍑"); + } /** * 鎵撳嵃璐у崟 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/param/DeliverTemplateParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/param/DeliverTemplateParam.java index 60b4f395..ce783341 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/param/DeliverTemplateParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/param/DeliverTemplateParam.java @@ -4,48 +4,45 @@ import com.hzs.common.core.annotation.Excel; import lombok.Data; /** - * @Description: 瀵煎叆鍙戣揣鏁版嵁鍙傛暟 - * @Author: jiang chao - * @Time: 2022/10/31 10:00 - * @Classname: BatchDeliverVO - * @PackageName: com.hzs.sale.deliver.vo + * 瀵煎叆鍙戣揣鏁版嵁鍙傛暟 */ @Data public class DeliverTemplateParam { - /** - * 鏀惰揣濮撳悕 - */ - @Excel(name = "鏀惰揣濮撳悕") - private String recName; +// /** +// * 鏀惰揣濮撳悕 +// */ +// @Excel(name = "鏀惰揣濮撳悕") +// private String recName; +// +// /** +// * 鏀惰揣鐢佃瘽 +// */ +// @Excel(name = "鏀惰揣鐢佃瘽") +// private String recPhone; +// +// /** +// * 鏀惰揣鍦板潃 +// */ +// @Excel(name = "鏀惰揣鍦板潃") +// private String recAddress; - /** - * 鏀惰揣鐢佃瘽 - */ - @Excel(name = "鏀惰揣鐢佃瘽") - private String recPhone; - - /** - * 鏀惰揣鍦板潃 - */ - @Excel(name = "鏀惰揣鍦板潃") - private String recAddress; /** * 鍙戣揣鍗曞彿 */ - @Excel(name = "鍙戣揣鍗曞彿") + @Excel(name = "璁㈠崟鍙") private String deliverCode; /** * 鐗╂祦鍏徃 */ - @Excel(name = "鐗╂祦鍏徃") + @Excel(name = "蹇掑叕鍙") private String logisticsCompany; /** * 鐗╂祦鍗曞彿 */ - @Excel(name = "鐗╂祦鍗曞彿") + @Excel(name = "蹇掑崟鍙") private String logisticsCode; } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverHandledVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverHandledVO.java index 18cba58e..6e53ffc5 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverHandledVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverHandledVO.java @@ -10,11 +10,7 @@ import lombok.Data; import java.util.Date; /** - * @Description: 鍙戣揣鍗曞凡鍚堝苟鍒楄〃VO - * @Author: jiang chao - * @Time: 2022/11/5 15:51 - * @Classname: DeliverHandledVO - * @PackageName: com.hzs.sale.deliver.vo + * 鍙戣揣鍗曞凡鍚堝苟鍒楄〃VO */ @Data public class DeliverHandledVO { @@ -68,7 +64,7 @@ public class DeliverHandledVO { * 璁㈠崟绫诲瀷鏄剧ず */ @Excel(name = "璁㈠崟绫诲瀷") - private String orderTypeVal; + private String orderTypeVal; /** * 璁㈠崟鐘舵侊紙EOrderStatus锛 @@ -102,6 +98,13 @@ public class DeliverHandledVO { */ @Excel(name = "浜у搧缂栧彿") private String productCode; + + /** + * 浜у搧缂栧彿 + */ + @Excel(name = "浠撳偍缂栧彿") + private String wmsCode; + /** * 浜у搧鍚嶇О */ diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverUnhandledVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverUnhandledVO.java index d0d01ac3..d602ba53 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverUnhandledVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverUnhandledVO.java @@ -11,11 +11,7 @@ import java.math.BigDecimal; import java.util.Date; /** - * @Description: 鍙戣揣鍗曟湭鍚堝苟鍒楄〃VO - * @Author: jiang chao - * @Time: 2022/11/4 11:29 - * @Classname: DeliverUnhandledVO - * @PackageName: com.hzs.sale.deliver.vo + * 鍙戣揣鍗曟湭鍚堝苟鍒楄〃VO */ @Data public class DeliverUnhandledVO { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverWmsVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverWmsVO.java new file mode 100644 index 00000000..0d66a917 --- /dev/null +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverWmsVO.java @@ -0,0 +1,106 @@ +package com.hzs.sale.deliver.vo; + +import com.hzs.common.core.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 鍙戣揣鍗昗MS瀵煎嚭VO + */ +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Data +public class DeliverWmsVO implements Serializable { + + @Excel(name = "<蹇呭～>璁㈠崟鍙") + private String deliverCode; + + @Excel(name = "涓嬪崟鏃堕棿") + private String createTime; + @Excel(name = "浠樻鏃堕棿") + private String payTime; + + @Excel(name = "浜ゆ槗绫诲瀷") + private String payType; + @Excel(name = "涓氬姟鍛") + private String peopleName; + @Excel(name = "澶囨敞") + private String orderRemark; + @Excel(name = "涔板鐣欒█") + private String buyRemark; + @Excel(name = "绯荤粺澶囨敞") + private String sysRemark; + @Excel(name = "浠撳簱") + private String storeName; + @Excel(name = "鎬婚噾棰") + private BigDecimal totalAmount; + @Excel(name = "杩愯垂") + private String postAmount; + @Excel(name = "瀹炰粯鎬婚") + private String realTotalAmount; + @Excel(name = "鏈鏀舵") + private String receiveAmount; + @Excel(name = "缁撶畻璐︽埛") + private String settleAccount; + + @Excel(name = "<蹇呭～>鏀惰揣浜哄鍚") + private String recName; + + @Excel(name = "鎵嬫満") + private String recPhone; + + @Excel(name = "鍥鸿瘽") + private String fixedPhone; + + @Excel(name = "<蹇呭～>鍦板潃") + private String recAddress; + + @Excel(name = "閭紪") + private String postal; + + @Excel(name = "鐢靛瓙閭") + private String email; + + @Excel(name = "<蹇呭～>鍟嗗搧缂栫爜") + private String wmsCode; + + @Excel(name = "浜у搧鍚嶇О") + private String productName; + + @Excel(name = "瑙勬牸鍚嶇О") + private String specsName; + + @Excel(name = "<蹇呭～>鏁伴噺") + private Integer quantity; + + @Excel(name = "鍗曚环") + private BigDecimal price; + + @Excel(name = "瀹炰粯") + private BigDecimal realPay; + + @Excel(name = "閰嶉佹柟寮") + private String delivery; + + @Excel(name = "鏄庣粏澶囨敞") + private String remark; + + @Excel(name = "鎵规鍙") + private String batchNo; + + @Excel(name = "鐢熶骇鏃ユ湡") + private String produceDate; + + @Excel(name = "杩囨湡鏃ユ湡") + private String expireDate; + + + + +} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/params/ProductParams.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/params/ProductParams.java index f7e31bac..143b509a 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/params/ProductParams.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/params/ProductParams.java @@ -251,4 +251,9 @@ public class ProductParams implements Serializable { */ private Date removalTime; + /** + * 浠撳偍浜у搧缂栧彿 + */ + private String wmsCode; + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/mapper/BdProductMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/mapper/BdProductMapper.java index 6b9cbe73..e46173b8 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/mapper/BdProductMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/mapper/BdProductMapper.java @@ -13,11 +13,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * @Description: 浜у搧鐩稿叧mapper - * @Author: yuhui - * @Time: 2022/8/29 10:59 - * @Classname: BdProductMapper - * @PackageName: com.hzs.sale.product.mapper + * 浜у搧鐩稿叧mapper */ public interface BdProductMapper extends BaseMapper { @@ -37,10 +33,7 @@ public interface BdProductMapper extends BaseMapper { List selectByQueryList(ProductParams productParams); /* - * @description: 鏍规嵁瑙勬牸銆佷富閿煡璇骇鍝 - * @author: sui q - * @date: 2023/11/27 15:52 - * @param: null null + * 鏍规嵁瑙勬牸銆佷富閿煡璇骇鍝 **/ List queryProductExtBySpecsId(@Param("productSpecsList") List productSpecsList, @Param("pkCountry") Integer pkCountry); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java index 702c59fc..7e2e96c2 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java @@ -108,6 +108,10 @@ public class BdProductServiceImpl extends ServiceImpl pkProductBasList) { - productBasSpecsServiceApi.removeByPkProductBasList(pkProductBasList); - } - @Override @Transactional(rollbackFor = Exception.class) public void updateProduct(ProductParams productParams, LoginUser loginUser) { @@ -243,6 +237,10 @@ public class BdProductServiceImpl extends ServiceImpl + @@ -75,6 +76,7 @@ + - select bp.pk_id,bp.product_code,bp.product_name,bp.pk_country,bp.cover,bc.pk_id pk_specs_id,bc.pk_specs_type,bc.specs_name from bd_product bp + select bp.pk_id,bp.product_code,bp.product_name,bp.pk_country,bp.cover,bc.pk_id pk_specs_id,bc.pk_specs_type,bc.specs_name from bd_product + bp inner join bd_product_extend be on bp.pk_id = be.pk_product inner join bd_product_specs bs @@ -234,4 +235,24 @@ and bp.pk_id = #{productId} + + + diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecialPostageMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecialPostageMapper.xml index 59fa24d7..1f44c020 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecialPostageMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecialPostageMapper.xml @@ -15,7 +15,9 @@ - delete from BD_WARES_SPECIAL_POSTAGE where PK_POSTAGE = #{pkPostage} + delete + from BD_WARES_SPECIAL_POSTAGE + where PK_POSTAGE = #{pkPostage} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdMemberSpecialCurrencyMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdMemberSpecialCurrencyMapper.java index e9f94a0e..6c283d1c 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdMemberSpecialCurrencyMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdMemberSpecialCurrencyMapper.java @@ -11,9 +11,6 @@ import java.util.List; /** * 浼氬憳鐗规畩娑堣垂閰嶇疆 Mapper 鎺ュ彛 - * - * @author hzs - * @since 2025-02-20 */ public interface BdMemberSpecialCurrencyMapper extends BaseMapper { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MyProductConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MyProductConstants.java deleted file mode 100644 index be3bfff8..00000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MyProductConstants.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.hzs.common.core.constant; - -import java.util.Arrays; -import java.util.List; - -/** - * 缇庝笟鍟嗗搧甯搁噺绫 - */ -public class MyProductConstants { - - /** - * 鐩掓暟鍟嗗搧鍒楄〃 - */ - public static final List BOX_WARES_LIST = Arrays.asList( - // 浼氬憳鍟嗗搧 - "HZS202541301", "HZS202541302", "HZS202541303", "HZS202541304", - // 澶嶈喘涓撳尯 - "HZS202543301", "HZS202543302", "HZS202543303", "HZS202543304", - // 閲嶆秷涓撳尯 - "HZS202544301", "HZS202544302", "HZS202544303", "HZS202544304" - ); - -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailProductConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailProductConstants.java index ad5d0f46..5c82dad3 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailProductConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailProductConstants.java @@ -9,29 +9,10 @@ import java.util.List; public class RetailProductConstants { /** - * 鐩掓暟鍟嗗搧鍒楄〃 -- 鏂伴浂鍞 + * 鐩掓暟浜у搧鍒楄〃 */ - public static final List BOX_WARES_LIST = Arrays.asList( - // 浼氬憳鍟嗗搧 - "HZS202412001", "HZS202412002", "HZS202412003", "HZS202412004", "HZS202412005", "HZS202412006", - // 澶嶈喘涓撳尯 - "HZS202412431", "HZS202412432", "HZS202412433", "HZS202412434", "HZS202412435", "HZS202412436", - // 閲嶆秷涓撳尯 - "HZS202412441", "HZS202412442", "HZS202412443", "HZS202412444", "HZS202412445", "HZS202412446" + public static final List BOX_PRODUCT_LIST = Arrays.asList( + "CP20250001", "CP20250002", "CP20250003", "CP20250004", "CP20250005", "CP20250006" ); - public static final List ALL_BOX_WARES_LIST = Arrays.asList( - // 浼氬憳鍟嗗搧 - "HZS202412001", "HZS202412002", "HZS202412003", "HZS202412004", "HZS202412005", "HZS202412006", - // 澶嶈喘涓撳尯 - "HZS202412431", "HZS202412432", "HZS202412433", "HZS202412434", "HZS202412435", "HZS202412436", - // 閲嶆秷涓撳尯 - "HZS202412441", "HZS202412442", "HZS202412443", "HZS202412444", "HZS202412445", "HZS202412446", - // 浼氬憳鍟嗗搧 - "HZS202541301", "HZS202541302", "HZS202541303", "HZS202541304", - // 澶嶈喘涓撳尯 - "HZS202543301", "HZS202543302", "HZS202543303", "HZS202543304", - // 閲嶆秷涓撳尯 - "HZS202544301", "HZS202544302", "HZS202544303", "HZS202544304" - ); } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java index b7755495..28b406d2 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java @@ -12,7 +12,7 @@ public class MemberMsgConstants { /** * 閲嶅鎻愪氦锛屾垨鑰呮病鏈塼oken鐢熸垚锛屼笉鏄瑙勬祦绋嬭繘鍏ョ殑淇濆瓨 鎻愪氦token澶辨晥 -- 璇锋眰宸茬粡澶辨晥锛岃鍒锋柊閲嶈瘯锛 */ -public static final String TOKEN_REPEAT_SUBMIT = "璇锋眰宸茬粡澶辨晥锛岃鍒锋柊閲嶈瘯锛"; + public static final String TOKEN_REPEAT_SUBMIT = "璇锋眰宸茬粡澶辨晥锛岃鍒锋柊閲嶈瘯锛"; /** * 鎵嬫満鍙风爜闀垮害楠岃瘉 -- 鑱旂郴鏂瑰紡闀垮害瓒呴暱 @@ -23,223 +23,223 @@ public static final String TOKEN_REPEAT_SUBMIT = "璇锋眰宸茬粡澶辨晥锛岃鍒锋柊 /** * 蹇呰緭椤逛笉鑳戒负绌 -- 蹇呰緭椤逛笉鑳戒负绌猴紒 */ -public static final String REQUIRED_NOT_EMPTY = "蹇呰緭椤逛笉鑳戒负绌猴紒"; + public static final String REQUIRED_NOT_EMPTY = "蹇呰緭椤逛笉鑳戒负绌猴紒"; /** * 楠岃瘉鎺ㄨ崘浜烘槸鍚﹀張鎺ㄨ崘鏌愮瓑绾ф潈闄 -- 鎺ㄨ崘浜烘病鏈夋帹鑽愯绛夌骇鏉冮檺锛 */ -public static final String PARENT_NO_JURISDICTION = "鎺ㄨ崘浜烘病鏈夋帹鑽愯绛夌骇鏉冮檺锛"; + public static final String PARENT_NO_JURISDICTION = "鎺ㄨ崘浜烘病鏈夋帹鑽愯绛夌骇鏉冮檺锛"; /** * 楠岃瘉鎵嬫満鍙锋槸鍚﹁娉ㄥ唽 -- 浼氬憳淇℃伅宸插瓨鍦紒 */ -public static final String SYSTEM_REGISTER_COUNT = "浼氬憳淇℃伅宸插瓨鍦紒"; + public static final String SYSTEM_REGISTER_COUNT = "浼氬憳淇℃伅宸插瓨鍦紒"; /** * 楠岃瘉鎵嬫満鍙锋槸鍚﹁鐢ㄦ埛浣跨敤 -- 浼氬憳淇℃伅宸叉敞鍐岋紝鑻ユ湁寮傝璇峰強鏃惰仈绯诲湪绾垮鏈嶏紒 */ -public static final String PHONE_ALREADY_REGISTER = "浼氬憳淇℃伅宸叉敞鍐岋紝鑻ユ湁寮傝璇峰強鏃惰仈绯诲湪绾垮鏈嶏紒"; + public static final String PHONE_ALREADY_REGISTER = "浼氬憳淇℃伅宸叉敞鍐岋紝鑻ユ湁寮傝璇峰強鏃惰仈绯诲湪绾垮鏈嶏紒"; /** * 楠岃瘉鎵嬫満鍙锋槸鍚﹀湪鍚屼竴涓洟闃 -- 娉ㄥ唽淇℃伅宸插瓨鍦,璇烽噸鏂拌緭鍏ユ敞鍐屼俊鎭紒 */ -public static final String REGISTER_EXIST_OTHER_TEAM = "娉ㄥ唽淇℃伅宸插瓨鍦,璇烽噸鏂拌緭鍏ユ敞鍐屼俊鎭紒"; + public static final String REGISTER_EXIST_OTHER_TEAM = "娉ㄥ唽淇℃伅宸插瓨鍦,璇烽噸鏂拌緭鍏ユ敞鍐屼俊鎭紒"; /** * 楠岃瘉鎶ュ崟涓績鏄惁杩樺瓨鍦ㄧ郴缁熶腑 -- 鎶ュ崟涓績鏉冮檺宸插叧闂紝璇峰強鏃惰仈绯诲鏈嶏紒 */ -public static final String CENTER_NOT_EXISTS = "鎶ュ崟涓績鏉冮檺宸插叧闂紝璇峰強鏃惰仈绯诲鏈嶏紒"; + public static final String CENTER_NOT_EXISTS = "鎶ュ崟涓績鏉冮檺宸插叧闂紝璇峰強鏃惰仈绯诲鏈嶏紒"; /** * 楠岃瘉鏀粯瀵嗙爜鏄惁涓虹┖ -- 鏀粯瀵嗙爜涓嶈兘涓虹┖锛 */ -public static final String MEMBER_PASSWORD_EMPTY = "鏀粯瀵嗙爜涓嶈兘涓虹┖锛"; + public static final String MEMBER_PASSWORD_EMPTY = "鏀粯瀵嗙爜涓嶈兘涓虹┖锛"; /** * 楠岃瘉鏀粯瀵嗙爜鏄惁鏁村彇 -- 鏀粯瀵嗙爜杈撳叆閿欒锛岃閲嶆柊杈撳叆锛 */ -public static final String MEMBER_PASSWORD_NOT_MATCH = "鏀粯瀵嗙爜杈撳叆閿欒锛岃閲嶆柊杈撳叆锛"; + public static final String MEMBER_PASSWORD_NOT_MATCH = "鏀粯瀵嗙爜杈撳叆閿欒锛岃閲嶆柊杈撳叆锛"; /** * 楠岃瘉璐︽埛鐘舵侊紝鏄惁閿佸畾 -- 浼氬憳璐︽埛瀛樺湪寮傚父锛岃鍙婃椂鑱旂郴瀹㈡湇锛 */ -public static final String MEMBER_ACCOUNT_STATUS_LOCK = "浼氬憳璐︽埛瀛樺湪寮傚父锛岃鍙婃椂鑱旂郴瀹㈡湇锛"; + public static final String MEMBER_ACCOUNT_STATUS_LOCK = "浼氬憳璐︽埛瀛樺湪寮傚父锛岃鍙婃椂鑱旂郴瀹㈡湇锛"; /** * 瀹夌疆浜虹紪鍙锋槸鍚﹁緭鍏 -- 瀹夌疆缂栧彿杈撳叆閿欒锛岃閲嶆柊杈撳叆锛 */ -public static final String PLACE_PARENT_NOT_EMPTY = "瀹夌疆缂栧彿杈撳叆閿欒锛岃閲嶆柊杈撳叆锛"; + public static final String PLACE_PARENT_NOT_EMPTY = "瀹夌疆缂栧彿杈撳叆閿欒锛岃閲嶆柊杈撳叆锛"; /** * 瀹夌疆浜虹紪鍙锋槸鍚﹀瓨鍦 -- 瀹夌疆缂栧彿涓嶅瓨鍦紝璇烽噸鏂拌緭鍏ワ紒 */ -public static final String PLACE_PARENT_NOT_EXISTS = "瀹夌疆缂栧彿涓嶅瓨鍦紝璇烽噸鏂拌緭鍏ワ紒"; + public static final String PLACE_PARENT_NOT_EXISTS = "瀹夌疆缂栧彿涓嶅瓨鍦紝璇烽噸鏂拌緭鍏ワ紒"; /** * 瀹夌疆浜烘槸鍚﹀湪鎺ㄨ崘浜轰紴涓 -- 瀹夌疆浜轰笉鍦ㄦ帹鑽愪汉浼炰笅锛岃閲嶆柊杈撳叆锛 */ -public static final String PLACE_NOT_TEAM = "瀹夌疆浜轰笉鍦ㄦ帹鑽愪汉浼炰笅锛岃閲嶆柊杈撳叆锛"; + public static final String PLACE_NOT_TEAM = "瀹夌疆浜轰笉鍦ㄦ帹鑽愪汉浼炰笅锛岃閲嶆柊杈撳叆锛"; /** * 瀹夌疆鐐逛綅鏄惁閲嶅瀹夌疆 -- 瀹夌疆浣嶇疆宸叉湁瀹夌疆锛岃閲嶆柊瀹夌疆锛 */ -public static final String PLACE_PARENT_DEPT_EXIST = "瀹夌疆浣嶇疆宸叉湁瀹夌疆锛岃閲嶆柊瀹夌疆锛"; + public static final String PLACE_PARENT_DEPT_EXIST = "瀹夌疆浣嶇疆宸叉湁瀹夌疆锛岃閲嶆柊瀹夌疆锛"; /** * 瀹夌疆绗簩閮ㄩ棬锛屽垽鏂槸鍚︽帹鑽愯繃棣栧崟 -- 瀹夌疆浜烘病鏈夋帹鑽愰鍗曪紝涓嶈兘鐩存帴瀹夌疆鍙抽儴闂紒 */ -public static final String PLACE_PARENT_NOT_REFERENCE = "瀹夌疆浜烘病鏈夋帹鑽愰鍗曪紝涓嶈兘鐩存帴瀹夌疆鍙抽儴闂紒"; + public static final String PLACE_PARENT_NOT_REFERENCE = "瀹夌疆浜烘病鏈夋帹鑽愰鍗曪紝涓嶈兘鐩存帴瀹夌疆鍙抽儴闂紒"; /** * 瀹夌疆绗簩閮ㄩ棬锛屽垽鏂槸鍚﹀畨缃繃绗竴閮ㄩ棬 -- 瀹夌疆浜烘病鏈夊畨缃乏閮ㄩ棬锛屼笉鑳界洿鎺ュ畨缃彸閮ㄩ棬锛 */ -public static final String PLACE_PARENT_NOT_EXIST = "瀹夌疆浜烘病鏈夊畨缃乏閮ㄩ棬锛屼笉鑳界洿鎺ュ畨缃彸閮ㄩ棬锛"; + public static final String PLACE_PARENT_NOT_EXIST = "瀹夌疆浜烘病鏈夊畨缃乏閮ㄩ棬锛屼笉鑳界洿鎺ュ畨缃彸閮ㄩ棬锛"; /** * 楠岃瘉鏄惁鎺ㄨ崘杩囬鍗 -- 鎺ㄨ崘浜烘湭鎺ㄨ崘杩囬鍗曪紝鍙兘瀹夌疆鍦ㄦ帹鑽愪汉鏋佸乏鏋佷笅锛 */ -public static final String PLACE_IS_LAST_LEFT = "鎺ㄨ崘浜烘湭鎺ㄨ崘杩囬鍗曪紝鍙兘瀹夌疆鍦ㄦ帹鑽愪汉鏋佸乏鏋佷笅锛"; + public static final String PLACE_IS_LAST_LEFT = "鎺ㄨ崘浜烘湭鎺ㄨ崘杩囬鍗曪紝鍙兘瀹夌疆鍦ㄦ帹鑽愪汉鏋佸乏鏋佷笅锛"; /** * 鎺ㄨ崘浜虹紪鍙锋槸鍚﹁緭鍏 -- 鎺ㄨ崘缂栧彿涓嶈兘浣嶇┖锛岃杈撳叆鎺ㄨ崘缂栧彿锛 */ -public static final String PARENT_NOT_EMPTY = "鎺ㄨ崘缂栧彿涓嶈兘浣嶇┖锛岃杈撳叆鎺ㄨ崘缂栧彿锛"; + public static final String PARENT_NOT_EMPTY = "鎺ㄨ崘缂栧彿涓嶈兘浣嶇┖锛岃杈撳叆鎺ㄨ崘缂栧彿锛"; /** * 鎺ㄨ崘浜虹紪鍙锋槸鍚﹀瓨鍦 -- 鎺ㄨ崘缂栧彿涓嶅瓨鍦紝璇烽噸鏂拌緭鍏ワ紒 */ -public static final String PARENT_NOT_EXISTS = "鎺ㄨ崘缂栧彿涓嶅瓨鍦紝璇烽噸鏂拌緭鍏ワ紒"; + public static final String PARENT_NOT_EXISTS = "鎺ㄨ崘缂栧彿涓嶅瓨鍦紝璇烽噸鏂拌緭鍏ワ紒"; /** * 鎺ㄨ崘浜烘槸鍚﹀凡缁忔敮浠 -- 鎺ㄨ崘浜烘湭鏀粯锛屼笉鑳戒綔涓烘湁鏁堟帹鑽愪汉锛 */ -public static final String PARENT_NOT_PAY = "鎺ㄨ崘浜烘湭鏀粯锛屼笉鑳戒綔涓烘湁鏁堟帹鑽愪汉锛"; + public static final String PARENT_NOT_PAY = "鎺ㄨ崘浜烘湭鏀粯锛屼笉鑳戒綔涓烘湁鏁堟帹鑽愪汉锛"; /** * 鎺ㄨ崘浜哄湪鎶ュ崟涓績浼炰笅 -- 鎺ㄨ崘浜轰笉鍦ㄦ姤鍗曚腑蹇冧紴涓嬶紝涓嶈兘浣滀负鎺ㄨ崘浜猴紒 */ -public static final String PARENT_NOT_TEAM = "鎺ㄨ崘浜轰笉鍦ㄦ姤鍗曚腑蹇冧紴涓嬶紝涓嶈兘浣滀负鎺ㄨ崘浜猴紒"; + public static final String PARENT_NOT_TEAM = "鎺ㄨ崘浜轰笉鍦ㄦ姤鍗曚腑蹇冧紴涓嬶紝涓嶈兘浣滀负鎺ㄨ崘浜猴紒"; /** * 楠岃瘉鎶ュ崟鏉冮檺 鏄惁鏈夋姤鍗曟潈闄 -- 娌℃湁娉ㄥ唽鏉冮檺锛屼笉鑳芥敞鍐屾柊浼氬憳锛 */ -public static final String REGISTER_AUTHORITY = "娌℃湁娉ㄥ唽鏉冮檺锛屼笉鑳芥敞鍐屾柊浼氬憳锛"; + public static final String REGISTER_AUTHORITY = "娌℃湁娉ㄥ唽鏉冮檺锛屼笉鑳芥敞鍐屾柊浼氬憳锛"; /** * 璐︽埛浣欓涓嶈冻 -- 璐︽埛浣欓涓嶈冻锛 */ -public static final String MEMBER_ACCOUNT_BALANCE_NOT_ENOUGH = "璐︽埛浣欓涓嶈冻锛"; + public static final String MEMBER_ACCOUNT_BALANCE_NOT_ENOUGH = "璐︽埛浣欓涓嶈冻锛"; /** * 鍚屾椂鎿嶄綔 -- 鏈夊叾浠栫敤鎴峰湪鎿嶄綔璇ユ暟鎹紝璇烽噸鏂板埛鏂扮晫闈紒 */ -public static final String MEMBER_IS_OPERATION = "鏈夊叾浠栫敤鎴峰湪鎿嶄綔璇ユ暟鎹紝璇烽噸鏂板埛鏂扮晫闈紒"; + public static final String MEMBER_IS_OPERATION = "鏈夊叾浠栫敤鎴峰湪鎿嶄綔璇ユ暟鎹紝璇烽噸鏂板埛鏂扮晫闈紒"; /** * 鍗囩骇-鏄惁婊¤冻鍗囩骇鏉′欢 -- 涓嶆弧瓒冲崌绾ф潯浠讹紒 */ -public static final String LEVEL_NOT_ENOUGH = " 涓嶆弧瓒冲崌绾ф潯浠讹紒"; + public static final String LEVEL_NOT_ENOUGH = " 涓嶆弧瓒冲崌绾ф潯浠讹紒"; /** * 娉ㄥ唽-鏄惁婊¤冻鍗囩骇鏉′欢 -- 涓嶆弧瓒冲崌绾ф潯浠讹紒 */ -public static final String REGISTER_LEVEL_NOT_ENOUGH = "涓嶆弧瓒冲崌绾ф潯浠"; + public static final String REGISTER_LEVEL_NOT_ENOUGH = "涓嶆弧瓒冲崌绾ф潯浠"; /** * 鍒ゆ柇浼氬憳璐﹀彿鏄惁婊¤冻鏀粯 -- 浣欓涓嶈冻锛岃鍙婃椂鍏呭硷紒 */ -public static final String MEMBER_BALANCE_NOT_PAY = "浣欓涓嶈冻锛岃鍙婃椂鍏呭硷紒"; + public static final String MEMBER_BALANCE_NOT_PAY = "浣欓涓嶈冻锛岃鍙婃椂鍏呭硷紒"; /** * 浼氬憳涓嶅瓨鍦 -- 浼氬憳缂栧彿涓嶅瓨鍦紒 */ -public static final String MEMBER_DOES_NOT_EXITS = "浼氬憳缂栧彿涓嶅瓨鍦"; + public static final String MEMBER_DOES_NOT_EXITS = "浼氬憳缂栧彿涓嶅瓨鍦"; /** * 浼氬憳涓嶅瓨鍦 -- 浼氬憳缂栧彿涓嶅瓨鍦紝璇烽噸鏂拌緭鍏ワ紒 */ -public static final String MEMBER_NOT_EXITS = "浼氬憳缂栧彿涓嶅瓨鍦紝璇烽噸鏂拌緭鍏ワ紒"; + public static final String MEMBER_NOT_EXITS = "浼氬憳缂栧彿涓嶅瓨鍦紝璇烽噸鏂拌緭鍏ワ紒"; /** * 宸茬敵璇疯嚜鎻 -- 璁㈠崟宸茬敵璇疯嚜鎻愶紝涓嶈兘鍐嶆鐢宠锛 */ -public static final String SELF_PICKUP_ORDER_REPEAT = "璁㈠崟宸茬敵璇疯嚜鎻愶紝涓嶈兘鍐嶆鐢宠锛"; + public static final String SELF_PICKUP_ORDER_REPEAT = "璁㈠崟宸茬敵璇疯嚜鎻愶紝涓嶈兘鍐嶆鐢宠锛"; /** * 鎾ゅ崟鏃堕獙璇佷細鍛樻槸鍚﹀瓨鍦 -- 鎶ュ崟浼氬憳涓嶅瓨鍦紝涓嶈兘鎾ゅ崟锛 */ -public static final String CREATE_MEMBER_NOT_EXITS = "鎶ュ崟浼氬憳涓嶅瓨鍦紝涓嶈兘鎾ゅ崟锛"; + public static final String CREATE_MEMBER_NOT_EXITS = "鎶ュ崟浼氬憳涓嶅瓨鍦紝涓嶈兘鎾ゅ崟锛"; /** * 浣撶郴缂栧彿宸插瓨鍦 -- 浣撶郴缂栧彿宸插瓨鍦紒 */ -public static final String MEMBER_CODE_EXITS = "浣撶郴缂栧彿宸插瓨鍦紒"; + public static final String MEMBER_CODE_EXITS = "浣撶郴缂栧彿宸插瓨鍦紒"; /** * 浣撶郴鍚嶇О宸插瓨鍦 -- 浣撶郴鍚嶇О宸插瓨鍦紒 */ -public static final String VERTEX_NAME_EXITS = "浣撶郴鍚嶇О宸插瓨鍦紒"; + public static final String VERTEX_NAME_EXITS = "浣撶郴鍚嶇О宸插瓨鍦紒"; /** * 浣撶郴宸茶鍥㈤槦浣跨敤 -- 浣撶郴宸茶鍥㈤槦浣跨敤,鏃犳硶鍒犻櫎锛 */ -public static final String VERTEX_MEMBER_TEAM_REGISTER = "浣撶郴宸茶鍥㈤槦浣跨敤,鏃犳硶鍒犻櫎锛"; + public static final String VERTEX_MEMBER_TEAM_REGISTER = "浣撶郴宸茶鍥㈤槦浣跨敤,鏃犳硶鍒犻櫎锛"; /** * 鎾ゅ崟鏃讹紝楠岃瘉浼氬憳缁撶畻鍥借窡璁㈠崟缁撶畻鍥芥槸鍚︿竴鑷 -- 浼氬憳宸茶浆缁撶畻鍥斤紝涓嶈兘鎾ゅ崟锛 */ -public static final String MEMBER_CHANGE_SETTLE_COUNTRY = "浼氬憳宸茶浆缁撶畻鍥斤紝涓嶈兘鎾ゅ崟锛"; + public static final String MEMBER_CHANGE_SETTLE_COUNTRY = "浼氬憳宸茶浆缁撶畻鍥斤紝涓嶈兘鎾ゅ崟锛"; /** * 鎾ゆ敞鍐岃鍗曟椂锛岄獙璇佷細鍛樿处鎴烽噾棰濇槸鍚︿负0 -- 缂栧彿瀛樺湪浣欓锛屼笉鑳芥挙鍗曪紒 */ -public static final String MEMBER_ACCOUNT_NOT_ZERO = "缂栧彿瀛樺湪浣欓锛屼笉鑳芥挙鍗曪紒"; + public static final String MEMBER_ACCOUNT_NOT_ZERO = "缂栧彿瀛樺湪浣欓锛屼笉鑳芥挙鍗曪紒"; /** * 鍚堝苟鎾ゅ崟璁㈠崟鏃讹紝楠岃瘉浼氬憳浼炰笅璐︽埛閲戦鏄惁涓0 -- 瀹夌疆瀛愯妭鐐逛細鍛樼紪鍙峰瓨鍦ㄤ綑棰濓紝涓嶈兘鎾ゅ崟锛 */ -public static final String UNDER_UMBRELLA_ACCOUNT_NOT_ZERO = "瀹夌疆瀛愯妭鐐逛細鍛樼紪鍙峰瓨鍦ㄤ綑棰濓紝涓嶈兘鎾ゅ崟锛"; + public static final String UNDER_UMBRELLA_ACCOUNT_NOT_ZERO = "瀹夌疆瀛愯妭鐐逛細鍛樼紪鍙峰瓨鍦ㄤ綑棰濓紝涓嶈兘鎾ゅ崟锛"; /** * 鍚堝苟鎾ゅ崟璁㈠崟鏃讹紝楠岃瘉浼氬憳浼炰笅浼氬憳鏄惁瀛樺湪璁㈠崟 -- 瀹夌疆瀛樺湪瀛愯妭鐐癸紝涓嶈兘鎾ゅ崟锛 */ -public static final String UNDER_UMBRELLA_MEMBER_EXIST_ORDER = "瀹夌疆瀛樺湪瀛愯妭鐐癸紝涓嶈兘鎾ゅ崟锛"; + public static final String UNDER_UMBRELLA_MEMBER_EXIST_ORDER = "瀹夌疆瀛樺湪瀛愯妭鐐癸紝涓嶈兘鎾ゅ崟锛"; /** * 鎾ゆ敞鍐岃鍗曟椂锛岄獙璇佷細鍛樻槸鍚﹀瓨鍦ㄦ湭瀹屾垚鐨勭鍛 -- 浼氬憳瀛樺湪鏈畬鎴愮殑绛惧憟锛屼笉鑳芥挙鍗曪紒 */ -public static final String MEMBER_EXIST_NO_FISH_DOCUMENT = "浼氬憳瀛樺湪鏈畬鎴愮殑绛惧憟锛屼笉鑳芥挙鍗曪紒"; + public static final String MEMBER_EXIST_NO_FISH_DOCUMENT = "浼氬憳瀛樺湪鏈畬鎴愮殑绛惧憟锛屼笉鑳芥挙鍗曪紒"; /** * 浼氬憳淇敼瀵嗙爜锛屾彁绀烘棫瀵嗙爜閿欒 -- 鏃у瘑鐮侀敊璇紝璇疯緭鍏ユ纭瘑鐮侊紒 */ -public static final String PASSWORD_ERROR = "鏃у瘑鐮侀敊璇紝璇疯緭鍏ユ纭瘑鐮侊紒"; + public static final String PASSWORD_ERROR = "鏃у瘑鐮侀敊璇紝璇疯緭鍏ユ纭瘑鐮侊紒"; /** * 绌哄崟娉ㄥ唽锛屽鍏ョ殑鏁版嵁瀛楁鏈変负绌虹殑 -- 瀵煎叆鏁版嵁瀛樺湪涓虹┖ */ -public static final String EMPTY_IMPORT_EMPTY = "瀵煎叆鏁版嵁瀛樺湪涓虹┖"; + public static final String EMPTY_IMPORT_EMPTY = "瀵煎叆鏁版嵁瀛樺湪涓虹┖"; /** * 绌哄崟娉ㄥ唽锛屽鍏ョ殑鏁版嵁瀹夌疆閮ㄩ棬鍊间笉鍚堟硶锛屼笉鏄涓鎴栬呯浜岄儴闂 -- 瀵煎叆瀹夌疆閮ㄩ棬鏁版嵁鏈夎 */ -public static final String EMPTY_IMPORT_PLACE_ERROR = "瀵煎叆瀹夌疆閮ㄩ棬鏁版嵁鏈夎"; + public static final String EMPTY_IMPORT_PLACE_ERROR = "瀵煎叆瀹夌疆閮ㄩ棬鏁版嵁鏈夎"; /** * 绌哄崟娉ㄥ唽锛屽鍏ョ殑鏁版嵁鏍￠獙涔嬪悗瀛樺湪鐐逛綅寮傚父鐘舵 -- %s鏉℃暟鎹瓨鍦ㄥ紓甯革紝璇锋鏌 */ -public static final String EMPTY_POINT_ERROR = "%s鏉℃暟鎹瓨鍦ㄥ紓甯革紝璇锋鏌"; + public static final String EMPTY_POINT_ERROR = "%s鏉℃暟鎹瓨鍦ㄥ紓甯革紝璇锋鏌"; /** * 绌哄崟娉ㄥ唽锛屾彁浜ょ鍛堟椂娌℃湁浼氬憳鐐逛綅鏁版嵁 -- 璇ユ壒娆′笅娌℃湁鎶ュ崟鏁版嵁 */ -public static final String EMPTY_DATA_DETAIL_EMPTY = "璇ユ壒娆′笅娌℃湁鎶ュ崟鏁版嵁"; + public static final String EMPTY_DATA_DETAIL_EMPTY = "璇ユ壒娆′笅娌℃湁鎶ュ崟鏁版嵁"; /** * 绌哄崟娉ㄥ唽锛屽厤绛句繚瀛樹細鍛樺苟涓斾笂鏍戝け璐 -- 绌哄崟娉ㄥ唽鏁版嵁淇濆瓨澶辫触 */ -public static final String EMPTY_SAVE_ERROR = "绌哄崟娉ㄥ唽鏁版嵁淇濆瓨澶辫触"; + public static final String EMPTY_SAVE_ERROR = "绌哄崟娉ㄥ唽鏁版嵁淇濆瓨澶辫触"; /** * 绌哄崟娉ㄥ唽锛屽鍏ョ殑浼氬憳缂栧彿涓瓨鍦ㄩ噸澶 -- 浼氬憳缂栧彿瀛樺湪閲嶅 */ -public static final String EMPTY_MEMBER_REPEAT = "浼氬憳缂栧彿瀛樺湪閲嶅"; + public static final String EMPTY_MEMBER_REPEAT = "浼氬憳缂栧彿瀛樺湪閲嶅"; /** * 绌哄崟娉ㄥ唽锛屽鍏ョ殑浼氬憳缂栧彿涓瓨鍦ㄩ噸澶 -- 鎺ㄨ崘缂栧彿涓嶅瓨鍦 */ -public static final String EMPTY_PARENT_NOT = "鎺ㄨ崘缂栧彿涓嶅瓨鍦"; + public static final String EMPTY_PARENT_NOT = "鎺ㄨ崘缂栧彿涓嶅瓨鍦"; /** * 绌哄崟娉ㄥ唽锛屽鍏ョ殑浼氬憳鑱旂郴鏂瑰紡涓瓨鍦ㄩ噸澶 -- 鑱旂郴鏂瑰紡瀛樺湪閲嶅 */ @@ -247,21 +247,21 @@ public static final String EMPTY_PARENT_NOT = "鎺ㄨ崘缂栧彿涓嶅瓨鍦"; /** * 绌哄崟娉ㄥ唽锛屼細鍛樼紪鍙蜂笌鎺ㄨ崘缂栧彿鐩稿悓 -- 浼氬憳缂栧彿涓庢帹鑽愮紪鍙风浉鍚 */ -public static final String EMPTY_MEMBER_EQ_PARENT = "浼氬憳缂栧彿涓庢帹鑽愮紪鍙风浉鍚"; + public static final String EMPTY_MEMBER_EQ_PARENT = "浼氬憳缂栧彿涓庢帹鑽愮紪鍙风浉鍚"; /** * 绌哄崟娉ㄥ唽锛屼細鍛樼紪鍙蜂笌瀹夌疆缂栧彿鐩稿悓 -- 浼氬憳缂栧彿涓庡畨缃紪鍙风浉鍚 */ -public static final String EMPTY_MEMBER_EQ_PLACE = "浼氬憳缂栧彿涓庡畨缃紪鍙风浉鍚"; + public static final String EMPTY_MEMBER_EQ_PLACE = "浼氬憳缂栧彿涓庡畨缃紪鍙风浉鍚"; /** * 璁㈠崟鎾ゅ崟鏃讹紝浼氬憳璐︽埛涓嶅瓨鍦 -- 浼氬憳璐︽埛涓嶅瓨鍦 */ -public static final String NOT_EXIST_MEMBER_ACCOUNT = "浼氬憳璐︽埛涓嶅瓨鍦"; + public static final String NOT_EXIST_MEMBER_ACCOUNT = "浼氬憳璐︽埛涓嶅瓨鍦"; /** * 璁㈠崟鍙栨秷鏃讹紝濡傛灉鏄敞鍐屽崟锛屾牎楠屼紴涓嬫槸鍚︽帹鑽愭垨鑰呭畨缃繃浜 -- 璁㈠崟鎵灞炰細鍛樹笅瀛樺湪鐢ㄦ埛涓嶈兘鍙栨秷 */ -public static final String EXIST_MEMBER_NOT_CANCEL = "璁㈠崟鎵灞炰細鍛樹笅瀛樺湪鐢ㄦ埛涓嶈兘鍙栨秷"; + public static final String EXIST_MEMBER_NOT_CANCEL = "璁㈠崟鎵灞炰細鍛樹笅瀛樺湪鐢ㄦ埛涓嶈兘鍙栨秷"; /** * 宸茶秴鏈澶ч棬绁ㄩ攢鍞暟閲忥紝涓嶈兘璐拱锛 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleModel.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleModel.java index 3c1f7b6a..5d96e02c 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleModel.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleModel.java @@ -1,23 +1,9 @@ -package com.hzs.common.core.enums;/** - * @Description: - * @Author: yuhui - * @Time: 2024/3/29 10:54 - * @Classname: ESaleModel - * @PackageName: com.hzs.common.core.enums - */ +package com.hzs.common.core.enums; import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.common.core.enums - *@Author: yh - *@CreateTime: 2024-03-29 10:54 - *@Description: TODO - *@Version: 1.0 - */ @AllArgsConstructor @Getter public enum ESaleModel { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java index b315a706..a1bec3fc 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java @@ -57,13 +57,13 @@ public enum ESpecialArea { HAI_FUN_UPGRADE_ORDER(27, "娴风矇鍗囩骇", 0, EnumsPrefixConstants.ORDER_TYPE + 27, 20, EMenuDetail.UPGRADE_HAI_FUN.getValue()), /** - * 鏂伴浂鍞細鍛樹笓鍖猴紙娉ㄥ唽+鍗囩骇锛 + * 鏂伴浂鍞細鍛樹笓鍖猴紙娉ㄥ唽锛 */ RETAIL_REGISTER(41, "鏂伴浂鍞細鍛樹笓鍖", 0, EnumsPrefixConstants.SPECIAL_AREA + 41, 41, -1), /** - * 鏂伴浂鍞細鍛樹笓鍖猴紙鍗囩骇锛 -- 鎺ュ彛浣跨敤锛屽墠绔笉鏄剧ず + * 鏂伴浂鍞細鍛樹笓鍖猴紙鍗囩骇锛 */ - RETAIL_UPGRADE(42, "鏂伴浂鍞崌绾т笓鍖", 1, EnumsPrefixConstants.SPECIAL_AREA + 42, 42, -1), + RETAIL_UPGRADE(42, "鏂伴浂鍞崌绾т笓鍖", 0, EnumsPrefixConstants.SPECIAL_AREA + 42, 42, -1), /** * 鏂伴浂鍞璐笓鍖 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/retail/ERetailWaresPrice.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/retail/ERetailWaresPrice.java index d44df40d..39e4f7ff 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/retail/ERetailWaresPrice.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/retail/ERetailWaresPrice.java @@ -7,25 +7,16 @@ import lombok.Getter; import java.math.BigDecimal; /** - * @Description: 鏂伴浂鍞晢鍝佺瓑绾т环鏍兼灇涓 - * @Author: jiang chao - * @Time: 2024/12/12 13:49 - * @Classname: ERetailWaresPrice - * @PackageName: com.hzs.common.core.enums.retail + * 鏂伴浂鍞晢鍝佺瓑绾т环鏍兼灇涓 */ @AllArgsConstructor @Getter public enum ERetailWaresPrice { - /** - * 2024.12.30 娣诲姞闇姹傦紝绗竴鐩掑浐瀹209鍏 - */ -// FIRST(1, new BigDecimal("209")), - /** * V0锛20锛 */ - V0(EGrade.START_UP.getValue(), new BigDecimal("499")), + V0(EGrade.START_UP.getValue(), new BigDecimal("399")), /** * V1锛30锛 */ @@ -33,19 +24,19 @@ public enum ERetailWaresPrice { /** * V2锛40锛 */ - V2(EGrade.YOU_KE.getValue(), new BigDecimal("359")), + V2(EGrade.YOU_KE.getValue(), new BigDecimal("399")), /** * V3锛50锛 */ - V3(EGrade.MAKER.getValue(), new BigDecimal("309")), + V3(EGrade.MAKER.getValue(), new BigDecimal("399")), /** * V4锛60锛 */ - V4(EGrade.VIP.getValue(), new BigDecimal("259")), + V4(EGrade.VIP.getValue(), new BigDecimal("399")), /** * V5锛70锛 */ - V5(EGrade.S_VIP.getValue(), new BigDecimal("209")), + V5(EGrade.S_VIP.getValue(), new BigDecimal("399")), ; diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/BoxProductUtil.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/BoxProductUtil.java index bb49622c..7c1d4e58 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/BoxProductUtil.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/BoxProductUtil.java @@ -1,6 +1,5 @@ package com.hzs.common.core.utils; -import com.hzs.common.core.constant.MyProductConstants; import com.hzs.common.core.constant.RetailProductConstants; import com.hzs.common.core.enums.ESystemType; @@ -19,13 +18,13 @@ public class BoxProductUtil { List productList = new ArrayList<>(0); if (null == systemType || ESystemType.ALL.getValue() == systemType) { - productList.addAll(RetailProductConstants.BOX_WARES_LIST); - productList.addAll(MyProductConstants.BOX_WARES_LIST); + productList.addAll(RetailProductConstants.BOX_PRODUCT_LIST); return productList; + } if (ESystemType.DEFAULT.getValue() == systemType) { // 鏂伴浂鍞 - productList = RetailProductConstants.BOX_WARES_LIST; + productList = RetailProductConstants.BOX_PRODUCT_LIST; } return productList; } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/CreateNormsCodeUtils.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/CreateNormsCodeUtils.java index ef4c755c..ff8bf2e9 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/CreateNormsCodeUtils.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/CreateNormsCodeUtils.java @@ -1,11 +1,7 @@ package com.hzs.common.core.utils; /** - * @Description: 鐢熸垚鎸囧畾瑙勫垯鐨勭紪鍙 - * @Author: yuhui - * @Time: 2022/10/27 17:19 - * @Classname: CreateNormsCodeUtils - * @PackageName: com.hzs.common.core.utils + * 鐢熸垚鎸囧畾瑙勫垯鐨勭紪鍙 */ public class CreateNormsCodeUtils { @@ -13,47 +9,37 @@ public class CreateNormsCodeUtils { * 浜у搧鍓嶇紑 */ private static final String CP = "CP"; + /** + * 鍟嗗搧鍓嶇紑 + */ private static final String SP = "SP"; /** * 鐢熸垚浜у搧瑙勫垯鐨勭紪鍙 + * * @return */ - public static String createProductCode(String lastProductCode){ - if (StringUtils.isNotBlank(lastProductCode)){ -// String code = lastProductCode.substring(2); -// int numberCode = Integer.parseInt(code) + 1; -// return String.format(CP + "%05d", numberCode); - return SP+System.currentTimeMillis(); - }else { - String code = "00001"; - return CP+code; + public static String createProductCode(String lastProductCode) { + if (StringUtils.isNotBlank(lastProductCode)) { + return SP + System.currentTimeMillis(); + } else { + String code = "000001"; + return CP + code; } } /** * 鐢熸垚鍟嗗搧瑙勫垯鐨勭紪鍙 + * * @return */ - public static String createWaresCode(String lastWaresCode){ - if (StringUtils.isNotBlank(lastWaresCode)){ - // String code = lastWaresCode.replace(SP, ""); - // String code = DateUtils.parseDateToFormat(DateUtils.YAMMERERS, DateUtils.currentDate()); - // int numberCode = Integer.parseInt(code) ; - // return String.format(SP + "%05d", numberCode); - return SP+System.currentTimeMillis(); - }else { - String code = "00001"; - return SP+code; + public static String createWaresCode(String lastWaresCode) { + if (StringUtils.isNotBlank(lastWaresCode)) { + return SP + System.currentTimeMillis(); + } else { + String code = "000001"; + return SP + code; } } - public static void main(String[] args) { - int serialNumber = 1; // 鍋囪搴忓彿浠1寮濮 - String formattedString = String.format("%05d", serialNumber); - System.out.println(formattedString); // 杈撳嚭: 00001 - String str = "TG00032"; - int number = Integer.parseInt(str.replaceAll("[^\\d]", "")); - System.out.println(number); // 杈撳嚭 31 - } } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresDetailExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresDetailExt.java index 88b770ae..a331f646 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresDetailExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresDetailExt.java @@ -1,19 +1,11 @@ package com.hzs.common.domain.sale.ext; -import com.baomidou.mybatisplus.annotation.TableField; import com.hzs.common.domain.sale.wares.BdWaresDetail; import lombok.*; import java.math.BigDecimal; import java.util.List; -/** - * @Description: - * @Author: sui q - * @Time: 2022/9/16 16:41 - * @Classname: BdWaresDetailsExt - * @PackageName: com.hzs.common.domain.sale.ext - */ @EqualsAndHashCode(callSuper = true) @Data @Builder @@ -102,12 +94,12 @@ public class BdWaresDetailExt extends BdWaresDetail { private Integer waresQuantity; /** - * 鏄惁鍒涘绀煎寘 + * 鏄惁鍒涘绀煎寘 */ private Integer isMakerGift; /** - * 娑堣垂閰嶇疆涓婚敭 + * 娑堣垂閰嶇疆涓婚敭 */ private Integer pkSpecialCurrency; @@ -141,7 +133,6 @@ public class BdWaresDetailExt extends BdWaresDetail { */ private Integer pkProductBas; - /** * 鍗曚綅 */ diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderItems.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderItems.java index f25e74ab..5e7569a9 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderItems.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderItems.java @@ -9,12 +9,7 @@ import org.apache.ibatis.type.JdbcType; import java.math.BigDecimal; /** - *

* 閿鍞鍗-鏄庣粏琛 - *

- * - * @author hzs - * @since 2022-08-31 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecialPostage.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecialPostage.java index f3b75db8..a64c55a1 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecialPostage.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecialPostage.java @@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 鍟嗗搧鐗规畩閭垂閰嶇疆 - *

- * - * @author hzs - * @since 2023-10-27 */ @Data @EqualsAndHashCode(callSuper = true) From 8ddb794adad19d96c61656ba59e2f0516babc118 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 9 Jun 2025 15:48:48 +0800 Subject: [PATCH 15/17] =?UTF-8?q?##=20=E5=A4=8D=E8=B4=AD=E3=80=81=E9=87=8D?= =?UTF-8?q?=E6=B6=88=E8=AE=A2=E5=8D=95=E4=B8=8B=E5=8D=95=E5=A4=84=E7=90=86?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CuMemberBusinessServiceImpl.java | 21 ++++++++++--------- .../api/ApiRetailOrderController.java | 14 ++++++++++--- .../service/impl/SaOrderServiceImpl.java | 2 +- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java index d8d1dbd5..27d0d54b 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java @@ -1525,16 +1525,17 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { boolean updateFlag = false; LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - if (null != saOrder.getPkGrade()) { - updateWrapper.set(CuMember::getPkSettleGrade, saOrder.getPkGrade()); - updateFlag = true; - - cuMember.setPkSettleGrade(saOrder.getPkGrade()); - } +// if (null != saOrder.getPkGrade()) { +// updateWrapper.set(CuMember::getPkSettleGrade, saOrder.getPkGrade()); +// updateFlag = true; +// +// cuMember.setPkSettleGrade(saOrder.getPkGrade()); +// } if (activateFlag) { updateWrapper.set(null != cuMember.getIsActivate(), CuMember::getIsActivate, cuMember.getIsActivate()); updateWrapper.set(null != cuMember.getPayStatus(), CuMember::getPayStatus, cuMember.getPayStatus()); updateWrapper.set(null != cuMember.getPayTime(), CuMember::getPayTime, cuMember.getPayTime()); + updateFlag = true; } if (updateFlag) { // 鏇存柊浼氬憳淇℃伅 @@ -1543,10 +1544,10 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { cuMemberService.update(updateWrapper); } - if (!cuMember.getPkSettleGrade().equals(saOrder.getPkGradeOld())) { - // 淇濆瓨浼氬憳绛夌骇鍙樺姩锛堝鏋滄棫绛夌骇鍜屾柊绛夌骇鐩稿悓锛屽垯涓嶈褰曪級 - saveLevelUpgrade(cuMember, EUpgradeType.BUY_UPGRADE.getValue(), saOrder, saOrder.getPkGradeOld()); - } +// if (!cuMember.getPkSettleGrade().equals(saOrder.getPkGradeOld())) { +// // 淇濆瓨浼氬憳绛夌骇鍙樺姩锛堝鏋滄棫绛夌骇鍜屾柊绛夌骇鐩稿悓锛屽垯涓嶈褰曪級 +// saveLevelUpgrade(cuMember, EUpgradeType.BUY_UPGRADE.getValue(), saOrder, saOrder.getPkGradeOld()); +// } this.handleRetailMemberAccount(saOrder, cuMemberAccountExt); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java index d67af901..54ea00d2 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java @@ -342,6 +342,10 @@ public class ApiRetailOrderController { if (null == updateGradeMember) { throw new ServiceException("鍗囩骇缂栧彿涓嶅瓨鍦紝璇烽噸璇"); } + String otherCheckStr = this.otherOrderCheck(updateGradeMember, upgradeParam.getSpecialArea()); + if (null != otherCheckStr) { + return AjaxResult.error(otherCheckStr); + } upgradeParam.setUpgradeMember(updateGradeMember); // 璐墿杞︿腑鑾峰彇鍟嗗搧淇℃伅 @@ -375,6 +379,10 @@ public class ApiRetailOrderController { if (null == updateGradeMember) { throw new ServiceException("鍗囩骇缂栧彿涓嶅瓨鍦紝璇烽噸璇"); } + String otherCheckStr = this.otherOrderCheck(updateGradeMember, payParam.getSpecialArea()); + if (null != otherCheckStr) { + return AjaxResult.error(otherCheckStr); + } // 灏佽璁㈠崟淇℃伅 SaOrderExt saOrderExt = iRetailOrderService.createSaOrder(upgradeParam, null, updateGradeMember); @@ -710,9 +718,9 @@ public class ApiRetailOrderController { if (null == buyMember) { return "璐拱浼氬憳缂栧彿涓嶅瓨鍦紝璇烽噸璇"; } - if (ESpecialArea.RETAIL_REPURCHASE.getValue() != specialArea) { - // 2025.02.24 鏂伴渶姹傦紝鍗囩骇涓撳尯鍙栨秷锛孷0鍙互鐩存帴璐拱澶嶈喘涓撳尯 - // 鍒ゆ柇璐拱浼氬憳鏄惁鏄疺0锛孷0涓嶅厑璁镐笅鍗囩骇浠ュ璁㈠崟 + if (ESpecialArea.RETAIL_UPGRADE.getValue() != specialArea + && ESpecialArea.RETAIL_REPURCHASE.getValue() != specialArea) { + // 鍒ゆ柇璐拱浼氬憳鏄惁鏄疺0锛孷0涓嶅厑璁镐笅鍗囩骇銆佸璐互澶栬鍗 GradeDTO gradeDTO = iGradeServiceApi.getGrade(buyMember.getPkSettleGrade()).getData(); if (gradeDTO.getGradeValue() == EGrade.START_UP.getValue()) { return "褰撳墠璐拱浼氬憳缂栧彿涓嶅厑璁镐笅鍗"; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index acfff3a0..968b39b2 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -2673,7 +2673,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl BdGrade memberGrade = gradeList.stream().filter(tmpGrade -> tmpGrade.getPkId().equals(updateGradeMember.getPkSettleGrade())).findFirst().get(); if (memberGrade.getGradeValue().compareTo(EGrade.MAKER.getValue()) >= 0) { // 浼氬憳绛夌骇澶т簬绛変簬V3锛堝崜瓒婏級锛屼笉鑳介氳繃鍗囩骇杩涜璐拱浜 - throw new ServiceException("褰撳墠宸叉槸鏈楂樼瓑绾"); + throw new ServiceException("褰撳墠宸茬粡鏄彲浠ヨ喘涔扮殑鏈楂樼瓑绾"); } // 璁＄畻绛夌骇 From f9c50f26c351b296017ed0eb2b7e1034f6dece6b Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 9 Jun 2025 16:37:08 +0800 Subject: [PATCH 16/17] =?UTF-8?q?##=20=E5=8D=87=E7=BA=A7=E3=80=81=E5=A4=8D?= =?UTF-8?q?=E8=B4=AD=E6=81=A2=E5=A4=8D=E6=92=A4=E5=8D=95=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=9B=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/ICuMemberDetailServiceApi.java | 6 +- .../impl/CuMemberBusinessServiceImpl.java | 1 - .../detail/mapper/CuMemberLevelMapper.java | 3 - .../provider/CuMemberDetailProvider.java | 6 +- .../detail/service/ICuMemberLevelService.java | 6 - .../impl/CuMemberLevelServiceImpl.java | 3 - .../api/ApiRetailWaresController.java | 13 +- .../manager/SaOrderBusinessController.java | 6 +- .../service/impl/SaOrderItemsServiceImpl.java | 13 -- .../service/impl/SaOrderServiceImpl.java | 64 +++---- .../wares/mapper/BdWaresSpecsSkuMapper.java | 21 +-- .../service/impl/BdWaresServiceImpl.java | 28 ---- .../impl/BdWaresSpecsSkuServiceImpl.java | 158 ++++-------------- .../mapper/sale/wares/BdWaresMapper.xml | 1 + .../core/constant/RetailProductConstants.java | 7 + .../hzs/common/core/enums/ESpecialArea.java | 4 +- .../domain/member/detail/CuMemberLevel.java | 9 +- .../common/domain/sale/ext/BdWaresExt.java | 13 +- .../hzs/common/domain/sale/wares/BdWares.java | 3 - .../domain/sale/wares/BdWaresSpecsSku.java | 5 - .../domain/system/config/BdRetailRange.java | 5 - 21 files changed, 90 insertions(+), 285 deletions(-) diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java index d7a7b25b..81d8a032 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberDetailServiceApi.java @@ -8,11 +8,7 @@ import com.hzs.common.domain.member.detail.ext.CuMemberAwardsExt; import java.util.List; /** - * @Description: 浼氬憳鍗囩骇璁板綍dubbo鏈嶅姟 - * @Author: jiang chao - * @Time: 2024/1/30 17:24 - * @Classname: ICuMemberLevelServiceApi - * @PackageName: com.hzs.member.detail + * 浼氬憳鍗囩骇璁板綍dubbo鏈嶅姟 */ public interface ICuMemberDetailServiceApi { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java index 27d0d54b..1bcb3274 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java @@ -863,7 +863,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { for (int i = memberList.size() - 1; i >= 0; i--) { Long pkMember = memberList.get(i); SaOrderExt saOrder = saOrderMap.get(pkMember); - CuMember cuMember = cuMemberService.getMemberById(pkMember); // 鍒犻櫎绛夌骇 cuMemberLevelService.deleteCuMemberLevelRecord(saOrder.getPkId(), pkApprove, currentDateTime); // 鍥為濂栬,鏍规嵁璁㈠崟浠 cu_member_awards鏌ヨ diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java index 61c220a2..39503912 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java @@ -10,9 +10,6 @@ import java.util.List; /** * 浼氬憳淇℃伅-绛夌骇鍗囩骇璁板綍 Mapper 鎺ュ彛 - * - * @author hzs - * @since 2022-10-11 */ public interface CuMemberLevelMapper extends BaseMapper { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberDetailProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberDetailProvider.java index ac97121f..e60f1eae 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberDetailProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberDetailProvider.java @@ -14,11 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; /** - * @Description: 浼氬憳鍗囩骇璁板綍dubbo鏈嶅姟 - * @Author: jiang chao - * @Time: 2024/1/30 17:25 - * @Classname: CuMemberLevelProvider - * @PackageName: com.hzs.member.detail.provider + * 浼氬憳鍗囩骇璁板綍dubbo鏈嶅姟 */ @DubboService public class CuMemberDetailProvider implements ICuMemberDetailServiceApi { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java index 9b053255..db92ef4b 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java @@ -9,9 +9,6 @@ import java.util.List; /** * 浼氬憳淇℃伅-绛夌骇鍗囩骇璁板綍 鏈嶅姟绫 - * - * @author hzs - * @since 2022-10-11 */ public interface ICuMemberLevelService extends IService { @@ -21,9 +18,6 @@ public interface ICuMemberLevelService extends IService { * @param pkOrder 璁㈠崟 * @param pkApprove 瀹℃牳浜 * @param currentDateTime 褰撳墠鏃堕棿 - * @return: void - * @Author: sui q - * @Date: 2023/3/30 9:15 */ void deleteCuMemberLevelRecord(Long pkOrder, Long pkApprove, Date currentDateTime); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java index 3beba667..86477026 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java @@ -15,9 +15,6 @@ import java.util.List; /** * 浼氬憳淇℃伅-绛夌骇鍗囩骇璁板綍 鏈嶅姟瀹炵幇绫 - * - * @author hzs - * @since 2022-10-11 */ @Service public class CuMemberLevelServiceImpl extends ServiceImpl implements ICuMemberLevelService { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/controller/api/ApiRetailWaresController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/controller/api/ApiRetailWaresController.java index 791c8d4b..576f317d 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/controller/api/ApiRetailWaresController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/controller/api/ApiRetailWaresController.java @@ -22,7 +22,6 @@ import com.hzs.common.domain.sale.wares.BdWaresLabel; import com.hzs.common.domain.sale.wares.BdWaresRange; import com.hzs.common.domain.sale.wares.BdWaresSpecsSku; import com.hzs.common.domain.system.config.BdLabel; -import com.hzs.common.domain.system.config.BdRetailRange; import com.hzs.common.domain.system.ext.BdLabelExt; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.member.base.IMemberServiceApi; @@ -37,7 +36,6 @@ import com.hzs.sale.wares.service.IBdWaresSpecsSkuService; import com.hzs.system.base.ICurrencyServiceApi; import com.hzs.system.base.dto.CurrencyDTO; import com.hzs.system.config.IAreaCurrencyServiceApi; -import com.hzs.system.config.IRetailRangeServiceApi; import com.hzs.system.config.dto.AreaCurrencyDTO; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; @@ -201,17 +199,11 @@ public class ApiRetailWaresController extends BaseController { List waresRangeList = new ArrayList<>(); if (ESpecialArea.RETAIL_REPURCHASE.getValue() == specialArea || ESpecialArea.RETAIL_RESCISSION.getValue() == specialArea) { - // 鏂伴浂鍞璐笓鍖猴紝闇瑕佸鐞嗙骇宸 - // 2024.12.30 娣诲姞闇姹傦紝澶嶆秷涔熼渶瑕佸鐞嗙骇宸 + // 澶嶈喘銆佸娑堥渶瑕佸鐞嗙骇宸 if (waresIdList.size() > 0) { waresRangeList = iBdWaresRangeService.listRetailWaresRange(pkGrade, waresIdList); } } - // 涓撳尯绾у樊 - BdRetailRange retailRange = new BdRetailRange(); - if (ESpecialArea.RETAIL_SHOP_ORDER.getValue() == specialArea) { - - } for (BdWaresExt bdWaresExt : bdWaresExtList) { if (null != list) { @@ -255,8 +247,7 @@ public class ApiRetailWaresController extends BaseController { if (ESpecialArea.RETAIL_REPURCHASE.getValue() == specialArea || ESpecialArea.RETAIL_RESCISSION.getValue() == specialArea) { - // 鏂伴浂鍞璐渶瑕佸鐞嗘瀬宸 - // 2024.12.30 娣诲姞闇姹傦紝澶嶆秷涔熼渶瑕佸鐞嗙骇宸 + // 澶嶈喘銆佸娑堥渶瑕佸鐞嗙骇宸 for (BdWaresRange waresRange : waresRangeList) { if (bdWaresExt.getPkId().equals(waresRange.getPkWares())) { waresPrice = waresPrice.add(waresRange.getPrice()); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java index dff29833..401f32db 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java @@ -66,11 +66,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 璁㈠崟涓氬姟鍔炵悊 - * @Author: jiang chao - * @Time: 2023/1/31 10:31 - * @Classname: OrderBusinessController - * @PackageName: com.hzs.sale.order.controller.manager + * 璁㈠崟涓氬姟鍔炵悊 */ @Slf4j @RestController diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java index bb70f68e..ce3f48ec 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java @@ -76,13 +76,6 @@ public class SaOrderItemsServiceImpl extends ServiceImpl - **/ @Override public List waresListByOrderId(List orderIdList) { return baseMapper.waresListByOrderId(orderIdList); @@ -98,12 +91,6 @@ public class SaOrderItemsServiceImpl extends ServiceImpl selectByInvestmentList(WaresOrderParam waresOrderParam) { return baseMapper.selectByInvestmentList(waresOrderParam); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 968b39b2..9f36458e 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -2537,11 +2537,12 @@ public class SaOrderServiceImpl extends ServiceImpl impl // 瀛樺湪鎵嬪姩鍗囩骇 cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel()); } - } else { - // 绱鍗囩骇鍒讹紝浼犵殑璁㈠崟鏄綋鍓嶆挙鐨勮鍗 - GradeDTO gradeDTO = calculateRetailCancelGrade(cuMember, saOrderExt); - cuMember.setPkSettleGrade(gradeDTO.getPkId()); } +// else { +// // 绱鍗囩骇鍒讹紝浼犵殑璁㈠崟鏄綋鍓嶆挙鐨勮鍗 +// GradeDTO gradeDTO = calculateRetailCancelGrade(cuMember, saOrderExt); +// cuMember.setPkSettleGrade(gradeDTO.getPkId()); +// } Date firstDate = baseMapper.getFirstPayTime(cuMember.getPkId()); if (null == firstDate) { @@ -2563,33 +2564,34 @@ public class SaOrderServiceImpl extends ServiceImpl impl saOrderExt.setUpdateFlag(EYesNo.YES.getIntValue()); } - // 濡傛灉澶嶈喘璁㈠崟鍚庨潰杩樻湁鍗囩骇璁㈠崟锛屼笉闇瑕佸鐞嗙瓑绾ч棶棰橈紱 澶嶈喘璁㈠崟鍚庨潰娌℃湁鍗囩骇璁㈠崟锛岃蛋鏂伴昏緫鏍￠獙 - if (this.count(Wrappers.lambdaQuery() - .eq(SaOrder::getPkMember, saOrderExt.getPkMember()) - .eq(SaOrder::getOrderType, EOrderType.RETAIL_UPGRADE.getValue()) - .ge(SaOrder::getPayTime, saOrderExt.getPayTime()) - .eq(SaOrder::getOrderStatus, EPayStatus.PAID.getValue()) - ) == 0) { - // 甯︽湁鐩掓暟鍟嗗搧鐨勮鍗曪紝闇瑕佹牎楠岀瓑绾 - List gradeList = iGradeServiceApi.getRetailGradeList().getData(); - // 褰撳墠浼氬憳绛夌骇 - BdGrade memberGrade = this.getGrade(cuMember.getPkSettleGrade(), gradeList); - - // 闇瑕佹坊鍔犵殑鍗囩骇璁板綍鍒楄〃 - List createLevelList = new ArrayList<>(); - // 闇瑕佸垹闄ょ殑鍗囩骇璁板綍鍒楄〃 - List deleteLevelList = new ArrayList<>(); - // 鏂扮瓑绾ц绠 - BdGrade newGrade = this.handleNewGrade(cuMember, memberGrade, gradeList, saOrderExt, createLevelList, deleteLevelList); - - if (memberGrade.getGradeValue() < EGrade.VIP.getValue() && newGrade.getGradeValue() < memberGrade.getGradeValue()) { - // 褰撳墠浼氬憳绛夌骇涓嶆槸V4鎴栬匳5 骞朵笖 鏂扮瓑绾у皬浜庡綋鍓嶇瓑绾ч渶瑕佽繘琛屽鐞 - saOrderExt.setNewGrade(newGrade); - saOrderExt.setUpdateFlag(EYesNo.YES.getIntValue()); - } - saOrderExt.setCreateLevelList(createLevelList); - saOrderExt.setDeleteLevelList(deleteLevelList); - } + // TODO new 鎭㈠鍗囩骇涓撳尯锛屽璐笓鍖轰笉闇瑕佸鐞嗙瓑绾ч棶棰 +// // 濡傛灉澶嶈喘璁㈠崟鍚庨潰杩樻湁鍗囩骇璁㈠崟锛屼笉闇瑕佸鐞嗙瓑绾ч棶棰橈紱 澶嶈喘璁㈠崟鍚庨潰娌℃湁鍗囩骇璁㈠崟锛岃蛋鏂伴昏緫鏍￠獙 +// if (this.count(Wrappers.lambdaQuery() +// .eq(SaOrder::getPkMember, saOrderExt.getPkMember()) +// .eq(SaOrder::getOrderType, EOrderType.RETAIL_UPGRADE.getValue()) +// .ge(SaOrder::getPayTime, saOrderExt.getPayTime()) +// .eq(SaOrder::getOrderStatus, EPayStatus.PAID.getValue()) +// ) == 0) { +// // 甯︽湁鐩掓暟鍟嗗搧鐨勮鍗曪紝闇瑕佹牎楠岀瓑绾 +// List gradeList = iGradeServiceApi.getRetailGradeList().getData(); +// // 褰撳墠浼氬憳绛夌骇 +// BdGrade memberGrade = this.getGrade(cuMember.getPkSettleGrade(), gradeList); +// +// // 闇瑕佹坊鍔犵殑鍗囩骇璁板綍鍒楄〃 +// List createLevelList = new ArrayList<>(); +// // 闇瑕佸垹闄ょ殑鍗囩骇璁板綍鍒楄〃 +// List deleteLevelList = new ArrayList<>(); +// // 鏂扮瓑绾ц绠 +// BdGrade newGrade = this.handleNewGrade(cuMember, memberGrade, gradeList, saOrderExt, createLevelList, deleteLevelList); +// +// if (memberGrade.getGradeValue() < EGrade.VIP.getValue() && newGrade.getGradeValue() < memberGrade.getGradeValue()) { +// // 褰撳墠浼氬憳绛夌骇涓嶆槸V4鎴栬匳5 骞朵笖 鏂扮瓑绾у皬浜庡綋鍓嶇瓑绾ч渶瑕佽繘琛屽鐞 +// saOrderExt.setNewGrade(newGrade); +// saOrderExt.setUpdateFlag(EYesNo.YES.getIntValue()); +// } +// saOrderExt.setCreateLevelList(createLevelList); +// saOrderExt.setDeleteLevelList(deleteLevelList); +// } } } else if (EOrderType.RETAIL_PICK.getValue() == saOrderExt.getOrderType()) { // 鏂版彁璐ц鍗 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresSpecsSkuMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresSpecsSkuMapper.java index 6bedebdf..beaf1ad5 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresSpecsSkuMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresSpecsSkuMapper.java @@ -14,9 +14,6 @@ import java.util.Set; /** * 瑙勬牸sku琛 Mapper 鎺ュ彛 - * - * @author hzs - * @since 2022-09-09 */ public interface BdWaresSpecsSkuMapper extends BaseMapper { @@ -26,9 +23,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper { * @param specialArea 涓撳尯 * @param systemType 绯荤粺绫诲瀷 * @param waresCode 鍟嗗搧缂栧彿 - * @return: List - * @Author: sui q - * @Date: 2022/9/19 11:21 */ List queryWaresSpecsSku(@Param("specialArea") Integer specialArea, @Param("systemType") Integer systemType, @@ -38,9 +32,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper { * 鏍规嵁sku涓婚敭鏌ヨ瑙勬牸鍚嶇О * * @param pkSkuId sku涓婚敭 - * @return: List - * @Author: sui q - * @Date: 2023/1/13 15:25 */ List queryWaresSpecsNameSku(@Param("pkSkuIdList") Set pkSkuId); @@ -48,9 +39,6 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper { * 閫氳繃瑙勬牸鍒楄〃鏌ヨ鍟嗗搧鏈灏忓簱瀛樺崟浣嶏紝 * * @param cuWaresItemsParams 涓撳尯 - * @return: SpecsSkuParam - * @Author: sui q - * @Date: 2022/9/19 16:26 */ BdWaresSpecsSkuExt queryWaresDetailSkuBySpecs(@Param("cuWaresItemsParams") CuWaresItemsParams cuWaresItemsParams); @@ -85,12 +73,9 @@ public interface BdWaresSpecsSkuMapper extends BaseMapper { */ List selectByPkIds(@Param("pkWaresSpecsSku") List pkWaresSpecsSku); - /* - * @description: 鏌ヨ鍟嗗搧灏佽涓鸿繑鍥炲埌浼氬憳绔晢鍝佷俊鎭 - * @author: sui q - * @date: 2023/5/10 19:57 - * @param: null null - **/ + /** + * 鏌ヨ鍟嗗搧灏佽涓鸿繑鍥炲埌浼氬憳绔晢鍝佷俊鎭 + */ WaresItemVo selectWaresItemsVO(@Param("specialArea") Integer specialArea, @Param("waresCode") String waresCode, @Param("productGroup") List productGroup); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java index 9f006d3f..c09a2d95 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java @@ -48,9 +48,6 @@ import java.util.stream.Collectors; /** * 鍟嗗搧 鏈嶅姟瀹炵幇绫 - * - * @author hzs - * @since 2022-09-08 */ @Service public class BdWaresServiceImpl extends ServiceImpl implements IBdWaresService { @@ -1220,21 +1217,14 @@ public class BdWaresServiceImpl extends ServiceImpl impl rangePriceVoList.add(rangePriceVo); } } - // 瀵圭粨鏋滃艰繘琛屾帓搴 rangePriceVoList.sort(Comparator.comparing(RangePriceVo::getPkRange)); computeWaresPrice.setRangePriceVoList(rangePriceVoList); } } return computeWaresPriceList; - } - /** - * 鏌ヨ鍟嗗搧鍥㈤槦淇℃伅 - * - * @return - */ @Override public Map> getWaresAuthority(List pkWaresList) { Map> map = new HashMap<>(); @@ -1247,34 +1237,16 @@ public class BdWaresServiceImpl extends ServiceImpl impl return map; } - /** - * 鎵ｅ噺棰勫敭鏁伴噺搴撳瓨 - * - * @param waresCode - * @param quantity - */ @Override public void updatePreSaleQuantityByWaresCode(String waresCode, Integer quantity) { baseMapper.updatePreSaleQuantityByWaresCode(waresCode, quantity); } - /** - * 鏌ヨ鍟嗗搧鍙绫诲瀷 - * - * @param pkWares - * @return - */ @Override public WaresAuthorityVo getWaresAuthorityFirst(Integer pkWares) { return baseMapper.getWaresAuthorityFirst(pkWares); } - /** - * 缃簳 - * - * @param waresId - * @param loginUser - */ @Override public void bottomUp(Integer waresId, LoginUser loginUser) { BdWares bdWares = new BdWares(); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java index 3371dd83..5565f0ae 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java @@ -49,42 +49,42 @@ import java.util.stream.Collectors; public class BdWaresSpecsSkuServiceImpl extends ServiceImpl implements IBdWaresSpecsSkuService { @Autowired - private IBdWaresSpecsRelationService waresSpecsRelationService; + private IBdWaresSpecsRelationService iBdWaresSpecsRelationService; @Autowired - private IBdWaresLabelService waresLabelService; + private IBdWaresLabelService iBdWaresLabelService; @Autowired - private IBdWaresDetailService waresDetailService; + private IBdWaresDetailService iBdWaresDetailService; @Autowired - private IBdWaresRangeService bdWaresRangeService; + private IBdWaresRangeService iBdWaresRangeService; @Autowired - private ISaOrderService saOrderService; + private ISaOrderService iSaOrderService; @DubboReference - ICurrencyServiceApi currencyServiceApi; + ICurrencyServiceApi iCurrencyServiceApi; @DubboReference - IRangeServiceApi rangeServiceApi; + IRangeServiceApi iRangeServiceApi; @DubboReference - IMemberServiceApi memberServiceApi; + IMemberServiceApi iMemberServiceApi; @DubboReference - IAwardsServiceApi awardsServiceApi; + IAwardsServiceApi iAwardsServiceApi; @Override public CuWaresParams queryWaresSpecsSku(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry) { List bdWaresSpecsSkuExtList; - R memberDate = memberServiceApi.getMember(loginMemberId); + R memberDate = iMemberServiceApi.getMember(loginMemberId); CuMember cuMember = memberDate.getData(); if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea || EOrderType.MALL_ORDER.getValue() == specialArea || EOrderType.COOPERATE_ORDER.getValue() == specialArea) { int level = cuMember.getPkSettleGrade(); int rangeType = ERangeType.GRADE.getValue(); - BdAwards bdAwards = awardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData(); + BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData(); if (bdAwards.getAwardsValue() > EAwards.MEMBER.getValue()) { level = cuMember.getPkAwards(); rangeType = ERangeType.AWARDS.getValue(); } - RangeDTO rangeDTO = rangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData(); + RangeDTO rangeDTO = iRangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData(); if (rangeDTO == null) { return new CuWaresParams(); } @@ -94,7 +94,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl 0) { - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); Set pkSkuIdList = new HashSet<>(); bdWaresSpecsSkuExtList.forEach(bdWaresSpecsSkuExt -> @@ -115,7 +115,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl labelList = waresLabelService.selectByList(waresLabel); + List labelList = iBdWaresLabelService.selectByList(waresLabel); // 淇濊瘉鏍囩 List ensureLabelList = new ArrayList<>(); // 鍗栫偣鏍囩 @@ -147,9 +147,9 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl kgCurrency = null; if (pkCountry != null) { - kgCurrency = currencyServiceApi.getCurrency(pkCountry); + kgCurrency = iCurrencyServiceApi.getCurrency(pkCountry); } - List productParams = waresDetailService.selectByWaresCode(waresCode, specialArea, null); + List productParams = iBdWaresDetailService.selectByWaresCode(waresCode, specialArea, null); List productParamsResultList = new ArrayList<>(); for (CuProductParams cuProductParams : productParams) { List list = new ArrayList<>(); @@ -168,7 +168,6 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl 0) { @@ -194,12 +193,12 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl memberDate = memberServiceApi.getMember(loginMemberId); + R memberDate = iMemberServiceApi.getMember(loginMemberId); CuMember cuMember = memberDate.getData(); int level = cuMember.getPkSettleGrade(); int rangeType = ERangeType.GRADE.getValue(); - RangeDTO rangeDTO = rangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData(); + RangeDTO rangeDTO = iRangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData(); if (rangeDTO == null) { return new CuWaresParams(); } @@ -212,10 +211,10 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl specsNameMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdWaresSpecsSkuExtList.size())); CuWaresParams cuWaresParams = BeanUtil.copyProperties(bdWaresSpecsSkuExtList.get(0), CuWaresParams.class); - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); List cuWaresItemsParamsList = setUpWaresItemsParams(bdWaresSpecsSkuExtList, specsNameMap, currency.getData().getInExchangeRate()); // 鍓嶅彴浼犻掔粨绠楀浗 璺ㄥ浗鎶ュ崟璁＄畻浠锋牸浣跨敤 - List productParams = waresDetailService.selectByWaresCode(waresCode, specialArea, null); + List productParams = iBdWaresDetailService.selectByWaresCode(waresCode, specialArea, null); List productParamsResultList = new ArrayList<>(); for (CuProductParams cuProductParams : productParams) { List list = new ArrayList<>(); @@ -243,28 +242,20 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); List bdWaresSpecsSkuExtList; - if (EOrderType.RETAIL_REPURCHASE.getValue() == specialArea || EOrderType.RETAIL_CONSUME.getValue() == specialArea) { - // 2024.12.30 娣诲姞闇姹傦紝澶嶆秷涔熼渶瑕佸鐞嗙骇宸 + // 澶嶆秷涔熼渶瑕佸鐞嗙骇宸 int level = cuMember.getPkSettleGrade(); int rangeType = ERangeType.GRADE.getValue(); - RangeDTO rangeDTO = rangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData(); + RangeDTO rangeDTO = iRangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData(); if (rangeDTO == null) { return new CuWaresParams(); } @@ -295,7 +286,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl kgCurrency; if (pkCountry != null && !pkCountry.equals(SecurityUtils.getPkCountry())) { - kgCurrency = currencyServiceApi.getCurrency(pkCountry); + kgCurrency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal inExchangeRate = cuWaresParams.getInExchangeRate(); BigDecimal kgInExchangeRate = kgCurrency.getData().getInExchangeRate(); cuWaresItemsParamsList.forEach(item -> { @@ -305,7 +296,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl productParams = waresDetailService.selectByWaresCode(waresCode, specialArea, null); + List productParams = iBdWaresDetailService.selectByWaresCode(waresCode, specialArea, null); List productParamsResultList = productParams.stream() .peek(param -> { List list = cuWaresItemsParamsList.stream() @@ -321,14 +312,10 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl - * @Author: sui q - * @Date: 2022/9/27 10:51 */ private List setUpWaresItemsParams(List bdWaresSpecsSkuExtList, Map specsNameMap, BigDecimal inExchangeRate) { List cuWaresItemsParamsList = new ArrayList<>(); @@ -377,46 +364,6 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl specsTypeParamsMap) { - SpecsTypeParams bdWaresSpecs = SpecsTypeParams.builder() - .pkSpecsType(bdWaresSpecsSkuExt.getPkSpecsType()) - .typeName(bdWaresSpecsSkuExt.getSpecsTypeName()) - .build(); - // 瑙勬牸 - Set specsParamsSet = new HashSet<>(); - setSpecsParams(bdWaresSpecsSkuExt, specsParamsSet); - bdWaresSpecs.setSpecsParamsSet(specsParamsSet); - specsTypeParamsMap.put(bdWaresSpecs.getPkSpecsType(), bdWaresSpecs); - } - - /** - * 璁剧疆瑙勬牸鏄庣粏 - * - * @param bdWaresSpecsSkuExt sku - * @param specsParamsList 瑙勬牸鏄庣粏 - */ - private void setSpecsParams(BdWaresSpecsSkuExt bdWaresSpecsSkuExt, Set specsParamsList) { - SpecsParams specsParams = SpecsParams.builder() - .pkSpecs(bdWaresSpecsSkuExt.getPkSpecs()) - .specsName(bdWaresSpecsSkuExt.getSpecsName()) - .build(); - specsParamsList.add(specsParams); - } - - /** - * 閫氳繃瑙勬牸鍒楄〃鏌ヨ鍟嗗搧鏈灏忓簱瀛樺崟浣嶏紝 - * - * @param cuWaresItemsParams 鏄庣粏鍙傛暟 - * @return: SpecsSkuParam - * @Author: sui q - * @Date: 2022/9/19 16:26 - */ @Override public SpecsSkuParam queryWaresDetailSkuBySpecs(CuWaresItemsParams cuWaresItemsParams) { BdWaresSpecsSkuExt bdWaresSpecsSkuExt = baseMapper.queryWaresDetailSkuBySpecs(cuWaresItemsParams); @@ -427,44 +374,21 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl selectByWaresSpecsSku(List waresIds) { return baseMapper.selectByWaresSpecsSku(waresIds); } - /** - * 鏍规嵁id 鎵归噺鏌ヨsku 淇℃伅 - * - * @param pkWaresSpecsSku - * @return - */ @Override public List selectByPkIds(List pkWaresSpecsSku) { return baseMapper.selectByPkIds(pkWaresSpecsSku); @@ -489,7 +413,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl { waresDetailExtMap.put(waresItemWaresInfo.getPkWaresDetail().toString() + waresItemWaresInfo.getPkWaresSpecsSku(), waresItemWaresInfo); // 璁剧疆瑙勬牸鍊 鍚嶇О鎷兼帴 - List waresSpecsRelationExts = waresSpecsRelationService.selectByWaresSpecsSku(waresItemWaresInfo.getPkWaresSpecsSku()); + List waresSpecsRelationExts = iBdWaresSpecsRelationService.selectByWaresSpecsSku(waresItemWaresInfo.getPkWaresSpecsSku()); Set specsNames = waresSpecsRelationExts.stream().map(BdWaresSpecsRelationExt::getSpecsName).collect(Collectors.toSet()); waresItemWaresInfo.setSkuInfo(StringUtils.join(specsNames, ",")); }); @@ -497,11 +421,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl pkWaresSpecsSku = productGroup.stream().map(ProductGroup::getPkSkuId).collect(Collectors.toList()); - List bdWaresRangeList = bdWaresRangeService.querySkuWaresRangeByCondition(cuMember.getPkSettleCountry(), rangeType, level, pkWaresSpecsSku); + List bdWaresRangeList = iBdWaresRangeService.querySkuWaresRangeByCondition(cuMember.getPkSettleCountry(), rangeType, level, pkWaresSpecsSku); bdWaresRangeList.forEach(bdWaresRange -> { String key = bdWaresRange.getPkWaresDetail().toString() + bdWaresRange.getPkWaresSpecsSku(); if (waresDetailExtMap.containsKey(key)) { @@ -519,11 +443,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); if (pkCountry != null) { // 褰撶櫥闄嗕汉鐨勭粨绠楀浗鍜屽墠绔粨绠楀浗涓嶄竴鑷 鍗充负璺ㄥ浗鎶ュ崟 if (!pkCountry.equals(SecurityUtils.getPkCountry())) { - R kgCurrency = currencyServiceApi.getCurrency(pkCountry); + R kgCurrency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal price = waresItemVo.getPrice(); waresItemVo.setPrice(price.multiply(currency.getData().getInExchangeRate()).divide(kgCurrency.getData().getInExchangeRate(), 2, BigDecimal.ROUND_HALF_UP)); @@ -539,23 +463,11 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl selectByMinWaresSpecsSkuByPkWaresList(List pkWaresIds) { return baseMapper.selectByMinWaresSpecsSkuByPkWaresList(pkWaresIds); } - /** - * 鏍规嵁id 鏌ヨ - * - * @param pkWaresSpecsSku - * @return - */ @Override public BdWaresSpecsSkuExt selectByPkWaresSpecsSku(Integer pkWaresSpecsSku) { return baseMapper.selectByPkWaresSpecsSku(pkWaresSpecsSku); @@ -573,7 +485,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); // 鍟嗗搧鍏宠仈浜у搧瑙勬牸ID Set pkSkuIdList = waresSpecsSkuExtList.stream().map(BdWaresSpecsSkuExt::getPkId).collect(Collectors.toSet()); @@ -609,7 +521,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl labelList = waresLabelService.selectByList(waresLabel); + List labelList = iBdWaresLabelService.selectByList(waresLabel); // 淇濊瘉鏍囩 List ensureLabelList = new ArrayList<>(); @@ -640,7 +552,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl cuWaresItemsParamsList = setUpWaresItemsParams(waresSpecsSkuExtList, specsNameMap, currency.getData().getInExchangeRate()); // 鍟嗗搧缂栧彿鏌ヨ浜у搧璇︽儏 - List productList = waresDetailService.selectByWaresCode(waresCode, specialArea, null); + List productList = iBdWaresDetailService.selectByWaresCode(waresCode, specialArea, null); List productResultList = new ArrayList<>(); for (CuProductParams productVO : productList) { List list = new ArrayList<>(); diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml index b6766159..da3e9700 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml @@ -373,6 +373,7 @@ bw.WARES_CODE, bw.WARES_NAME, PK_AREA_CLASSIFY, + COVER, COVER1, bw.WARES_PRICE, bw.WARES_ACHIEVE, diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailProductConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailProductConstants.java index 5c82dad3..8f6550f7 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailProductConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailProductConstants.java @@ -15,4 +15,11 @@ public class RetailProductConstants { "CP20250001", "CP20250002", "CP20250003", "CP20250004", "CP20250005", "CP20250006" ); + /** + * 鐩掓暟浜у搧鍒楄〃 + */ + public static final List ALL_BOX_WARES_LIST = Arrays.asList( + "CP20250001", "CP20250002", "CP20250003", "CP20250004", "CP20250005", "CP20250006" + ); + } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java index a1bec3fc..f45c9e4e 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java @@ -59,7 +59,7 @@ public enum ESpecialArea { /** * 鏂伴浂鍞細鍛樹笓鍖猴紙娉ㄥ唽锛 */ - RETAIL_REGISTER(41, "鏂伴浂鍞細鍛樹笓鍖", 0, EnumsPrefixConstants.SPECIAL_AREA + 41, 41, -1), + RETAIL_REGISTER(41, "鏂伴浂鍞敞鍐屼笓鍖", 0, EnumsPrefixConstants.SPECIAL_AREA + 41, 41, -1), /** * 鏂伴浂鍞細鍛樹笓鍖猴紙鍗囩骇锛 */ @@ -75,8 +75,6 @@ public enum ESpecialArea { RETAIL_TICKET(45, "鑷姪璐エ", 0, EnumsPrefixConstants.SPECIAL_AREA + 45, 45, -1), - RETAIL_SHOP_ORDER(47, "搴楅摵涓撲緵", 0, EnumsPrefixConstants.SPECIAL_AREA + 47, 47, -1), - ; /** diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberLevel.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberLevel.java index 35279ee1..722db93a 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberLevel.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberLevel.java @@ -2,23 +2,20 @@ package com.hzs.common.domain.member.detail; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; + import java.util.Date; + import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; + import java.io.Serializable; import com.hzs.common.core.web.domain.BaseEntity; import lombok.*; import lombok.experimental.Accessors; - /** - *

* 浼氬憳淇℃伅-绛夌骇鍗囩骇璁板綍 - *

- * - * @author hzs - * @since 2022-10-11 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresExt.java index cb3d9e85..adb7205b 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresExt.java @@ -11,11 +11,7 @@ import java.util.Date; import java.util.List; /** - * @Description: 鍟嗗搧鎵╁睍琛 - * @Author: sui q - * @Time: 2022/9/16 11:11 - * @Classname: BdWaresExt - * @PackageName: com.hzs.common.domain.sale.ext + * 鍟嗗搧鎵╁睍琛 */ @EqualsAndHashCode(callSuper = true) @Data @@ -52,7 +48,7 @@ public class BdWaresExt extends BdWares { private Integer isOceanTrans; /** - * 鏄惁鍒涘绀煎寘 + * 鏄惁鍒涘绀煎寘 */ private Integer isMakerGift; @@ -174,11 +170,6 @@ public class BdWaresExt extends BdWares { */ private BigDecimal retailPrice; - /** - * 鍙戣捣浜烘敹鐩婏紙鐩墠澶嶈喘浣跨敤锛変繚瀛樹负缇庨噾 - */ - private BigDecimal makerIncome; - /** * 娑堣垂閰嶇疆涓婚敭 */ diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java index 65cf0b46..c7882dd9 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWares.java @@ -14,9 +14,6 @@ import lombok.experimental.Accessors; /** * 鍟嗗搧鍙戝竷 - * - * @author hzs - * @since 2022-09-08 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsSku.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsSku.java index 6f6f56aa..1abc620c 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsSku.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresSpecsSku.java @@ -12,12 +12,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 瑙勬牸sku琛 - *

- * - * @author hzs - * @since 2022-09-09 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdRetailRange.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdRetailRange.java index 7051895f..471a531b 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdRetailRange.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdRetailRange.java @@ -12,12 +12,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 鏂伴浂鍞瀬宸瓑绾ч厤缃〃 - *

- * - * @author hzs - * @since 2025-02-13 */ @Data @EqualsAndHashCode(callSuper = true) From bbc299e50afb7802c0ba022277a112aff601a9d1 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 9 Jun 2025 16:55:32 +0800 Subject: [PATCH 17/17] =?UTF-8?q?##=20=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hzs/sale/shopping/vo/WaresItemVo.java | 21 ++++--------- .../sale/wares/BdWaresSpecsSkuMapper.xml | 30 +++++++++++++------ bd-third/pom.xml | 10 +++---- .../pay/constants/PayConfigConstants.java | 6 +--- .../pay/controller/api/PayController.java | 6 +--- .../third/pay/listener/HuiFuLoadListener.java | 8 ++--- pom.xml | 12 ++++---- 7 files changed, 41 insertions(+), 52 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/WaresItemVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/WaresItemVo.java index 8fb34d72..97c68804 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/WaresItemVo.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/WaresItemVo.java @@ -1,11 +1,4 @@ package com.hzs.sale.shopping.vo; -/** - * @Description: - * @Author: yuhui - * @Time: 2023/3/20 14:03 - * @Classname: WaresItemVo - * @PackageName: com.hzs.sale.shopping.vo - */ import com.hzs.common.core.annotation.BigDecimalFormat; import lombok.AllArgsConstructor; @@ -16,14 +9,6 @@ import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.util.List; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.sale.shopping.vo - *@Author: yh - *@CreateTime: 2023-03-20 14:03 - *@Description: TODO - *@Version: 1.0 - */ @Data @Builder @AllArgsConstructor @@ -41,6 +26,11 @@ public class WaresItemVo { */ private String waresCode; + /** + * 鍟嗗搧灞曠ず鍥剧墖 + */ + private String cover; + /** * 鍟嗗搧灞曠ず鍥剧墖 */ @@ -64,7 +54,6 @@ public class WaresItemVo { private BigDecimal achieve; /** * bv - * */ @BigDecimalFormat private BigDecimal assAchieve; diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecsSkuMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecsSkuMapper.xml index 66ae7eeb..06418e05 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecsSkuMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecsSkuMapper.xml @@ -52,6 +52,7 @@ + @@ -144,10 +145,10 @@ and br.del_flag = 0 and bk.del_flag = 0 - and wd.DEL_FLAG=0 - and bs.DEL_FLAG=0 - and st.DEL_FLAG=0 - and sp.DEL_FLAG=0 + and wd.DEL_FLAG = 0 + and bs.DEL_FLAG = 0 + and st.DEL_FLAG = 0 + and sp.DEL_FLAG = 0 order by bs.PK_SPECS_TYPE @@ -217,7 +218,8 @@ - select bw.wares_code,bw.cover1,bw.WARES_NAME,be.is_maker_gift, - bs.price price,bs.achieve achieve,bs.ass_achieve ass_achieve, - bd.pk_id pk_wares_detail,bs.pk_id pk_wares_specs_sku,bp.product_name, - bs.spec_cover,#{item.quantity} quantity from BD_WARES bw + select bw.wares_code, + bw.cover, + bw.cover1, + bw.WARES_NAME, + be.is_maker_gift, + bs.price price, + bs.achieve achieve, + bs.ass_achieve ass_achieve, + bd.pk_id pk_wares_detail, + bs.pk_id pk_wares_specs_sku, + bp.product_name, + bs.spec_cover, + #{item.quantity} quantity + from BD_WARES bw inner join bd_wares_extend be on bw.pk_id = be.pk_wares inner join bd_wares_detail bd diff --git a/bd-third/pom.xml b/bd-third/pom.xml index 82004846..f7855c12 100644 --- a/bd-third/pom.xml +++ b/bd-third/pom.xml @@ -135,11 +135,11 @@ dg-java-sdk - - - com.alipay.sdk - alipay-sdk-java - + + + + + diff --git a/bd-third/src/main/java/com/hzs/third/pay/constants/PayConfigConstants.java b/bd-third/src/main/java/com/hzs/third/pay/constants/PayConfigConstants.java index 276081ae..a29c4357 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/constants/PayConfigConstants.java +++ b/bd-third/src/main/java/com/hzs/third/pay/constants/PayConfigConstants.java @@ -1,11 +1,7 @@ package com.hzs.third.pay.constants; /** - * @Description: 鏀粯閰嶇疆甯搁噺 - * @Author: jiang chao - * @Time: 2022/11/17 9:59 - * @Classname: PayConfigConstants - * @PackageName: com.hzs.common.constant + * 鏀粯閰嶇疆甯搁噺 */ public class PayConfigConstants { diff --git a/bd-third/src/main/java/com/hzs/third/pay/controller/api/PayController.java b/bd-third/src/main/java/com/hzs/third/pay/controller/api/PayController.java index 993b2664..9a9e4860 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/controller/api/PayController.java +++ b/bd-third/src/main/java/com/hzs/third/pay/controller/api/PayController.java @@ -29,11 +29,7 @@ import java.math.BigDecimal; import java.util.Date; /** - * @Description: 缁熶竴鏀粯鎺у埗鍣 - * @Author: jiang chao - * @Time: 2022/12/27 17:35 - * @Classname: PayController - * @PackageName: com.hzs.third.pay.controller + * 缁熶竴鏀粯鎺у埗鍣 */ @Slf4j @RestController diff --git a/bd-third/src/main/java/com/hzs/third/pay/listener/HuiFuLoadListener.java b/bd-third/src/main/java/com/hzs/third/pay/listener/HuiFuLoadListener.java index 38591d47..43e5821c 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/listener/HuiFuLoadListener.java +++ b/bd-third/src/main/java/com/hzs/third/pay/listener/HuiFuLoadListener.java @@ -12,13 +12,9 @@ import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; /** - * @Description: 姹囦粯鏂版敮浠樼殑鍚姩閰嶇疆 - * @Author: jiang chao - * @Time: 2024/12/5 11:09 - * @Classname: HuiFuLoadListener - * @PackageName: com.hzs.third.pay.listener + * 姹囦粯鏂版敮浠樼殑鍚姩閰嶇疆 */ -@Component +//@Component @Slf4j public class HuiFuLoadListener implements ServletContextListener { diff --git a/pom.xml b/pom.xml index c4d34d7a..c33de852 100644 --- a/pom.xml +++ b/pom.xml @@ -314,12 +314,12 @@ ${huifu-new.version} - - - com.alipay.sdk - alipay-sdk-java - ${alipay.version} - + + + + + +