From 13cc2e0178c60f42a3d31a9da245002ebfaa3ac3 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 8 Apr 2025 17:29:53 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E4=B9=90=E5=AD=A6=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E3=80=81=E4=B9=90=E5=AD=A6=E5=8D=87=E7=BA=A7=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E6=92=A4=E5=8D=95=EF=BC=9B=E5=8E=BB=E6=8E=89=E6=96=B0=E4=BA=BA?= =?UTF-8?q?=E7=A4=BC=E5=8C=85=EF=BC=8C=E6=B5=B7=E8=B1=86=E7=AD=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzs/activity/bean/ISeaBeanServiceApi.java | 25 -- .../people/IAcPeopleServiceServiceApi.java | 26 -- .../impl/BonusSettleFirstPurchaseHandle.java | 55 ++-- .../impl/CuMemberBusinessServiceImpl.java | 151 ++++------ .../bean/mapper/AcBeanRuleConfigMapper.java | 14 - .../bean/provider/SeaBeanServiceApi.java | 28 -- .../service/IAcBeanRuleConfigService.java | 14 - .../impl/AcBeanRuleConfigServiceImpl.java | 18 -- .../activity/bean/vo/AcBeanRuleConfigVO.java | 104 ------- .../AcFestivalRuleConfigController.java | 17 -- .../mapper/AcFestivalRuleConfigMapper.java | 14 - .../service/IAcFestivalRuleConfigService.java | 14 - .../impl/AcFestivalRuleConfigServiceImpl.java | 18 -- .../fest/vo/AcFestivalRuleConfigVO.java | 45 --- .../api/ApiAcPeopleServiceController.java | 64 ----- .../manage/AcPeopleServiceController.java | 48 ---- .../mapper/AcNewPeopleRuleConfigMapper.java | 28 -- .../people/mapper/AcPeopleServiceMapper.java | 46 --- .../people/param/AcBaseConfigParam.java | 16 -- .../AcPeopleServiceServiceProvider.java | 44 --- .../IAcNewPeopleRuleConfigService.java | 14 - .../service/IAcPeopleServiceService.java | 60 ---- .../AcNewPeopleRuleConfigServiceImpl.java | 18 -- .../impl/AcPeopleServiceServiceImpl.java | 111 -------- .../activity/people/vo/AcBaseConfigVO.java | 14 - .../people/vo/AcNewPeopleRuleConfigVO.java | 85 ------ .../people/vo/AcPeopleGiftPackVO.java | 91 ------ .../people/vo/AcPeopleGiftProductVO.java | 71 ----- .../activity/people/vo/AcPeopleServiceVO.java | 128 --------- .../api/ApiGiftSaOrderController.java | 48 ---- .../api/ApiOthSaOrderController.java | 12 +- .../api/ApiRegSaOrderController.java | 31 ++- .../api/ApiTargetPerformanceController.java | 185 ------------ .../manager/SaOrderBusinessController.java | 37 +-- .../mapper/SaOrderRelationItemsMapper.java | 2 - .../order/mapper/SaOrderRelationMapper.java | 10 - .../service/ISaOrderRelationItemsService.java | 4 +- .../service/ISaOrderRelationService.java | 10 - .../sale/order/service/ISaOrderService.java | 8 - .../impl/OrderBusinessServiceImpl.java | 21 +- .../impl/SaOrderRelationItemsServiceImpl.java | 2 - .../impl/SaOrderRelationServiceImpl.java | 6 - .../service/impl/SaOrderServiceImpl.java | 263 ++++-------------- .../activity/bean/AcBeanRuleConfigMapper.xml | 21 -- .../fest/AcFestivalRuleConfigMapper.xml | 18 -- .../people/AcNewPeopleRuleConfigMapper.xml | 55 ---- .../activity/people/AcPeopleServiceMapper.xml | 115 -------- .../mapper/sale/order/SaOrderMapper.xml | 2 +- .../sale/order/SaOrderRelationMapper.xml | 19 -- .../service/impl/BdGradeServiceImpl.java | 9 +- .../core/constant/MagicNumberConstants.java | 48 ++++ .../constant/msg/ActivityMsgConstants.java | 17 +- .../core/constant/msg/MemberMsgConstants.java | 2 +- .../constant/msg/SaOrderMsgConstants.java | 2 +- .../com/hzs/common/core/enums/EActType.java | 37 +-- .../com/hzs/common/core/enums/EPickType.java | 38 --- .../hzs/common/core/utils/ComputeUtil.java | 4 +- .../hzs/common/core/utils/UploadFileUtil.java | 4 - .../activity/fest/AcFestivalRuleConfig.java | 54 ---- .../people/AcNewPeopleRuleConfig.java | 86 ------ .../activity/people/AcPeopleService.java | 60 ---- 61 files changed, 236 insertions(+), 2375 deletions(-) delete mode 100644 hzs-api/hzs-api-sale/src/main/java/com/hzs/activity/bean/ISeaBeanServiceApi.java delete mode 100644 hzs-api/hzs-api-sale/src/main/java/com/hzs/activity/people/IAcPeopleServiceServiceApi.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/bean/mapper/AcBeanRuleConfigMapper.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/bean/provider/SeaBeanServiceApi.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/bean/service/IAcBeanRuleConfigService.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/bean/service/impl/AcBeanRuleConfigServiceImpl.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/bean/vo/AcBeanRuleConfigVO.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/fest/controller/manage/AcFestivalRuleConfigController.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/fest/mapper/AcFestivalRuleConfigMapper.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/fest/service/IAcFestivalRuleConfigService.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/fest/service/impl/AcFestivalRuleConfigServiceImpl.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/fest/vo/AcFestivalRuleConfigVO.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/controller/api/ApiAcPeopleServiceController.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/controller/manage/AcPeopleServiceController.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/mapper/AcNewPeopleRuleConfigMapper.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/mapper/AcPeopleServiceMapper.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/provider/AcPeopleServiceServiceProvider.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/service/IAcNewPeopleRuleConfigService.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/service/IAcPeopleServiceService.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/service/impl/AcNewPeopleRuleConfigServiceImpl.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/service/impl/AcPeopleServiceServiceImpl.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/vo/AcNewPeopleRuleConfigVO.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/vo/AcPeopleGiftPackVO.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/vo/AcPeopleGiftProductVO.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/vo/AcPeopleServiceVO.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiGiftSaOrderController.java delete mode 100644 hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiTargetPerformanceController.java delete mode 100644 hzs-business/hzs-business-sale/src/main/resources/mapper/activity/bean/AcBeanRuleConfigMapper.xml delete mode 100644 hzs-business/hzs-business-sale/src/main/resources/mapper/activity/fest/AcFestivalRuleConfigMapper.xml delete mode 100644 hzs-business/hzs-business-sale/src/main/resources/mapper/activity/people/AcNewPeopleRuleConfigMapper.xml delete mode 100644 hzs-business/hzs-business-sale/src/main/resources/mapper/activity/people/AcPeopleServiceMapper.xml delete mode 100644 hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/activity/fest/AcFestivalRuleConfig.java delete mode 100644 hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/activity/people/AcNewPeopleRuleConfig.java delete mode 100644 hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/activity/people/AcPeopleService.java diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/activity/bean/ISeaBeanServiceApi.java b/hzs-api/hzs-api-sale/src/main/java/com/hzs/activity/bean/ISeaBeanServiceApi.java deleted file mode 100644 index b45bbcbe..00000000 --- a/hzs-api/hzs-api-sale/src/main/java/com/hzs/activity/bean/ISeaBeanServiceApi.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.hzs.activity.bean; - -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.activity.bean.AcBeanRuleConfig; - -/** - * @Description: 海豆赠送dubbo服务接口 - * @Author: jiang chao - * @Time: 2023/10/19 9:31 - * @Classname: ISeaBeanServiceApi - * @PackageName: com.hzs.activity.bean - */ -public interface ISeaBeanServiceApi { - -// /** -// * 查询最新符合规则 -// * -// * @param actType 活动类型 -// * @param pkGrade 等级 -// * @param pkCountry 所属国家 -// * @return -// */ -// R queryLastBeanRuleConfig(Integer actType, Integer pkGrade, Integer pkCountry); - -} diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/activity/people/IAcPeopleServiceServiceApi.java b/hzs-api/hzs-api-sale/src/main/java/com/hzs/activity/people/IAcPeopleServiceServiceApi.java deleted file mode 100644 index f4dc6380..00000000 --- a/hzs-api/hzs-api-sale/src/main/java/com/hzs/activity/people/IAcPeopleServiceServiceApi.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.activity.people; - -import com.hzs.activity.dto.AcPeopleGiftProductDTO; -import com.hzs.common.core.domain.R; - -import java.util.List; - -/** - * @description: 新人礼包活动-保存业务数据 - * @author: zhang jing - * @date: 2023/5/8 9:53 - * @param: - * @return: - **/ -public interface IAcPeopleServiceServiceApi { - - /** - * @description: 根据活动规则查询礼包产品信息 - * @author: zhang jing - * @date: 2023/5/10 15:16 - * @param: [新人礼包规则id： pkNewPeople] - * @return: com.hzs.common.core.domain.R> - **/ - R> getGiftPackProductList(Long pkNewPeople); - -} diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java index 9d0cf200..cccac875 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java @@ -90,9 +90,10 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { } }); if (specialOrderList.size() > 0) { - // 优客 推荐 6000/36000/12800给 1800 vip 拿600 svip拿600 - // vip 推荐 36000给 10800 svip拿7200 - //svip推荐128000给38000 + // 优客 推荐 6000/36000/128000 给 1800 vip 拿 600 svip拿 600 + // vip 推荐 36000 给 10800 svip 拿 7200 + // svip推荐 128000 给 38000 + // TODO new 需要按新逻辑修改 Set memberSet = new HashSet<>(); specialOrderList.forEach(saOrderExt -> memberSet.add(saOrderExt.getPkMember())); @@ -102,13 +103,20 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { for (SaOrderExt saOrderExt : specialOrderList) { BigDecimal maxBonus; // 根据金额验证最大金额 - if (ComputeUtil.compareValue(saOrderExt.getOrderAmount(), BigDecimal.valueOf(128000))) { - maxBonus = BigDecimal.valueOf(38000); - } else if (ComputeUtil.compareValue(saOrderExt.getOrderAmount(), BigDecimal.valueOf(36000))) { - maxBonus = BigDecimal.valueOf(18000); - } else if (ComputeUtil.compareValue(saOrderExt.getOrderAmount(), BigDecimal.valueOf(6000))) { - maxBonus = BigDecimal.valueOf(3000); + if (ComputeUtil.compareValue(saOrderExt.getOrderAmount(), MagicNumberConstants.V4_AMOUNT)) { + // 订单金额大于 128000，封顶奖金 43000 + maxBonus = MagicNumberConstants.V4_V4_BONUS; + } else if (ComputeUtil.compareValue(saOrderExt.getOrderAmount(), MagicNumberConstants.V3_AMOUNT)) { + // 订单金额大于 36000，封顶奖金 18000 + maxBonus = MagicNumberConstants.V4_V3_BONUS; + } else if (ComputeUtil.compareValue(saOrderExt.getOrderAmount(), MagicNumberConstants.V2_AMOUNT)) { + // 订单金额大于 6000，封顶奖金 3000 + maxBonus = MagicNumberConstants.V4_V2_BONUS; + } else if (ComputeUtil.compareValue(saOrderExt.getOrderAmount(), MagicNumberConstants.V1_AMOUNT)) { + // 订单金额大于 2000，封顶奖金 1000 + maxBonus = MagicNumberConstants.V4_V1_BONUS; } else { + // 订单金额小于 2000，没有奖金 maxBonus = BigDecimal.ZERO; } CuMemberSettleExt sourceSettleExt = cuMemberSettleExtMap.get(saOrderExt.getPkMember()); @@ -137,12 +145,18 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { cuMemberBonusPush.setCalValue(BigDecimal.ZERO); BigDecimal pretaxIncome; // 验证等级，根据等级给奖金 - if (ComputeUtil.compareValue(saOrderExt.getOrderAmount(), BigDecimal.valueOf(128000))) { - pretaxIncome = computePushRangeBonus(targetMemberSettleExt, BigDecimal.valueOf(38000), BigDecimal.valueOf(10800), BigDecimal.valueOf(1800)); - } else if (ComputeUtil.compareValue(saOrderExt.getOrderAmount(), BigDecimal.valueOf(36000))) { - pretaxIncome = computePushRangeBonus(targetMemberSettleExt, BigDecimal.valueOf(18000), BigDecimal.valueOf(10800), BigDecimal.valueOf(1800)); + if (ComputeUtil.compareValue(saOrderExt.getOrderAmount(), MagicNumberConstants.V4_AMOUNT)) { + // 订单金额 128000，V4推拿43000，V3推拿10800，V2推拿1800，V1推拿400 + pretaxIncome = computePushRangeBonus(targetMemberSettleExt, MagicNumberConstants.V4_V4_BONUS, MagicNumberConstants.V3_V4_BONUS, MagicNumberConstants.V2_V4_BONUS, MagicNumberConstants.V1_V_BONUS); + } else if (ComputeUtil.compareValue(saOrderExt.getOrderAmount(), MagicNumberConstants.V3_AMOUNT)) { + // 订单金额 36000，V4推拿18000，V3推拿10800，V2推拿1800，V1推拿400 + pretaxIncome = computePushRangeBonus(targetMemberSettleExt, MagicNumberConstants.V4_V3_BONUS, MagicNumberConstants.V3_V3_BONUS, MagicNumberConstants.V2_V3_BONUS, MagicNumberConstants.V1_V_BONUS); + } else if (ComputeUtil.compareValue(saOrderExt.getOrderAmount(), MagicNumberConstants.V2_AMOUNT)) { + // 订单金额 6000，V4推拿3000，V3推拿2400，V2推拿1800，V1推拿400 + pretaxIncome = computePushRangeBonus(targetMemberSettleExt, MagicNumberConstants.V4_V2_BONUS, MagicNumberConstants.V3_V2_BONUS, MagicNumberConstants.V2_V2_BONUS, MagicNumberConstants.V1_V_BONUS); } else { - pretaxIncome = computePushRangeBonus(targetMemberSettleExt, BigDecimal.valueOf(3000), BigDecimal.valueOf(2400), BigDecimal.valueOf(1800)); + // 订单金额 2000，V4推拿1000，V3推拿800，V2推拿600，V1推拿400 + pretaxIncome = computePushRangeBonus(targetMemberSettleExt, MagicNumberConstants.V4_V1_BONUS, MagicNumberConstants.V3_V1_BONUS, MagicNumberConstants.V2_V1_BONUS, MagicNumberConstants.V1_V_BONUS); } pretaxIncome = ComputeUtil.computeSubtract(pretaxIncome, grantBonus); if (!ComputeUtil.compareValue(pretaxIncome)) { @@ -170,15 +184,18 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { return cuMemberBonusPushList; } - private BigDecimal computePushRangeBonus(CuMemberSettleExt targetMemberSettleExt, BigDecimal siVipBonus, - BigDecimal vipBonus, BigDecimal youBonus) { + private BigDecimal computePushRangeBonus(CuMemberSettleExt targetMemberSettleExt, + BigDecimal V4Bonus, BigDecimal V3Bonus, + BigDecimal V2Bonus, BigDecimal V1Bonus) { BigDecimal pretaxIncome; if (targetMemberSettleExt.getGradeValue() == EGrade.S_VIP.getValue()) { - pretaxIncome = siVipBonus; + pretaxIncome = V4Bonus; } else if (targetMemberSettleExt.getGradeValue() == EGrade.VIP.getValue()) { - pretaxIncome = vipBonus; + pretaxIncome = V3Bonus; + } else if (targetMemberSettleExt.getGradeValue() == EGrade.MAKER.getValue()) { + pretaxIncome = V2Bonus; } else { - pretaxIncome = youBonus; + pretaxIncome = V1Bonus; } return pretaxIncome; } diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java index a0252740..2c980ecb 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java @@ -58,7 +58,9 @@ import com.hzs.system.base.dto.CurrencyDTO; import com.hzs.system.config.IAccountServiceApi; import com.hzs.system.config.IAreaCurrencyServiceApi; import com.hzs.system.config.IAwardsServiceApi; +import com.hzs.system.config.IGradeServiceApi; import com.hzs.system.config.dto.AreaCurrencyDTO; +import com.hzs.system.config.dto.GradeDTO; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; @@ -81,110 +83,51 @@ import java.util.stream.Collectors; public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { @DubboReference - IAreaCurrencyServiceApi areaCurrencyServiceApi; + IAreaCurrencyServiceApi iAreaCurrencyServiceApi; @DubboReference - IAccountServiceApi accountServiceApi; + IAccountServiceApi iAccountServiceApi; @DubboReference - IAwardsServiceApi awardsServiceApi; + IAwardsServiceApi iAwardsServiceApi; @DubboReference - ICurrencyServiceApi currencyServiceApi; + ICurrencyServiceApi iCurrencyServiceApi; @DubboReference - IAcPickServiceApi acPickServiceApi; + IAcPickServiceApi iAcPickServiceApi; @DubboReference ISaOrderServiceApi iSaOrderServiceApi; + @DubboReference + IGradeServiceApi iGradeServiceApi; @Autowired private MemberToolsHandler memberToolsHandler; - @Autowired private ICuMemberAchieveService cuMemberAchieveService; - @Autowired private ICuMemberExpireHistoryService iCuMemberExpireHistoryService; - + @Autowired private RedisService redisService; - + @Autowired private ICuMemberService cuMemberService; - + @Autowired private ICuMemberRegisterService cuMemberRegisterService; - + @Autowired private ICuMemberAccountService cuMemberAccountService; - + @Autowired private ICuMemberTradeService cuMemberTradeService; - + @Autowired private ICuMemberLevelService cuMemberLevelService; - + @Autowired private ICuMemberAwardsService cuMemberAwardsService; - + @Autowired private ICuMemberChangeLogService cuMemberChangeLogService; - + @Autowired private ICuMemberShareService cuMemberShareService; - + @Autowired private ICuMemberTradeDetailService cuMemberTradeDetailService; - + @Autowired private ICuMemberTradeBonusService cuMemberTradeBonusService; - + @Autowired private ICuMemberSettlePeriodService cuMemberSettlePeriodService; - @Autowired - public void setCuMemberSettlePeriodService(ICuMemberSettlePeriodService cuMemberSettlePeriodService) { - this.cuMemberSettlePeriodService = cuMemberSettlePeriodService; - } - - @Autowired - public void setCuMemberTradeBonusService(ICuMemberTradeBonusService cuMemberTradeBonusService) { - this.cuMemberTradeBonusService = cuMemberTradeBonusService; - } - - @Autowired - public void setCuMemberTradeDetailService(ICuMemberTradeDetailService cuMemberTradeDetailService) { - this.cuMemberTradeDetailService = cuMemberTradeDetailService; - } - - @Autowired - public void setCuMemberAwardsService(ICuMemberAwardsService cuMemberAwardsService) { - this.cuMemberAwardsService = cuMemberAwardsService; - } - - @Autowired - public void setCuMemberShareService(ICuMemberShareService cuMemberShareService) { - this.cuMemberShareService = cuMemberShareService; - } - - @Autowired - public void setCuMemberLevelService(ICuMemberLevelService cuMemberLevelService) { - this.cuMemberLevelService = cuMemberLevelService; - } - - @Autowired - public void setCuMemberTradeService(ICuMemberTradeService cuMemberTradeService) { - this.cuMemberTradeService = cuMemberTradeService; - } - - @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } - - @Autowired - public void setCuMemberAccountService(ICuMemberAccountService cuMemberAccountService) { - this.cuMemberAccountService = cuMemberAccountService; - } - - @Autowired - public void setCuMemberService(ICuMemberService cuMemberService) { - this.cuMemberService = cuMemberService; - } - - @Autowired - public void setCuMemberRegisterService(ICuMemberRegisterService cuMemberRegisterService) { - this.cuMemberRegisterService = cuMemberRegisterService; - } - - @Autowired - public void setCuMemberChangeLogService(ICuMemberChangeLogService cuMemberChangeLogService) { - this.cuMemberChangeLogService = cuMemberChangeLogService; - } @Override @Transactional(rollbackFor = Exception.class) @@ -211,9 +154,9 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { @Transactional(rollbackFor = Exception.class) public Boolean saveMember(CuMember cuMember, SaOrderExt saOrder, CuMemberAccountExt cuMemberAccountExt) { try { - // 当cuMember为空时，代表为复购订单，不更新会员表 + // 当cuMember为空时，不更新会员表 if (cuMember != null) { - // 验证等级是否发生了变化，海外存在累计升级的国家 + // 验证等级是否发生了变化 CuMember member = cuMemberService.getMember(cuMember.getPkId()); if (!cuMember.getPkSettleGrade().equals(member.getPkSettleGrade())) { saveLevelUpgrade(cuMember, EUpgradeType.BUY_UPGRADE.getValue(), saOrder, member.getPkSettleGrade()); @@ -236,15 +179,16 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { if (EOrderType.PICK_ORDER.getValue() == saOrder.getOrderType()) { // 提货订单处理成功后，需要更新提货数量 - if (!acPickServiceApi.handlePickOrder(saOrder.getPkMember(), saOrder.getOrderCode()).isSuccess()) { + if (!iAcPickServiceApi.handlePickOrder(saOrder.getPkMember(), saOrder.getOrderCode()).isSuccess()) { throw new RuntimeException("提货数量更新失败"); } } else if (EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == saOrder.getOrderType()) { - if (cuMemberAccountExt.getPayAccount12() != null && ComputeUtil.compareValue(cuMemberAccountExt.getPayAccount12()) && - CollectionUtil.isNotEmpty(cuMemberAccountExt.getPickExtList())) { + if (cuMemberAccountExt.getPayAccount12() != null + && ComputeUtil.compareValue(cuMemberAccountExt.getPayAccount12()) + && CollectionUtil.isNotEmpty(cuMemberAccountExt.getPickExtList())) { List pickExtList = new ArrayList<>(); // 获取专区币种，从redis中获得 - BdAccount bdAccount = accountServiceApi.getBdAccountByFieldValue(saOrder.getPkCountry(), EAccount.CASH_COUPON.getValue()).getData(); + BdAccount bdAccount = iAccountServiceApi.getBdAccountByFieldValue(saOrder.getPkCountry(), EAccount.CASH_COUPON.getValue()).getData(); if (bdAccount != null) { List cuMemberTradeList = new ArrayList<>(); for (AcPickExt acPickExt : cuMemberAccountExt.getPickExtList()) { @@ -254,7 +198,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { pickExtList.add(acPickExt); } cuMemberTradeService.saveBatch(cuMemberTradeList); - if (pickExtList.size() > 0 && !acPickServiceApi.updatePickUse(pickExtList, ESignSource.MANAGE.getValue(), null).getData()) { + if (pickExtList.size() > 0 && !iAcPickServiceApi.updatePickUse(pickExtList, ESignSource.MANAGE.getValue(), null).getData()) { throw new RuntimeException("更新提货单失败"); } } @@ -278,6 +222,17 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { * @Date: 2023/3/25 17:20 */ private Boolean saveLevelUpgrade(CuMember cuMember, Integer levelType, SaOrder saOrder, Integer pkOldLevel) { + // new V3可以买一单升V4，这个位置需要添加校验，如果是购买升级 并且 原等级大于新等级，不添加升级记录 + if (EUpgradeType.BUY_UPGRADE.getValue() == levelType) { + // 购买升级 + GradeDTO oldGrade = iGradeServiceApi.getGrade(pkOldLevel).getData(); + GradeDTO newGrade = iGradeServiceApi.getGrade(cuMember.getPkSettleGrade()).getData(); + if (oldGrade.getGradeValue() >= newGrade.getGradeValue()) { + // 旧等级大于等于新等级，则不需要添加升级记录 + return true; + } + } + // 记录升级历史 CuMemberLevel cuMemberLevel = CuMemberLevel.builder() .pkMember(cuMember.getPkId()) @@ -392,7 +347,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { // 记录等级 saveLevelUpgrade(cuMember, EUpgradeType.BUY_UPGRADE.getValue(), saOrder, 0); // 记录奖衔 需要判断奖项 - BdAwards bdAwards = awardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData(); + BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData(); if (bdAwards != null && !bdAwards.getAwardsValue().equals(EAwards.MEMBER.getValue())) { saveAwardsUpgrade(cuMember, EUpgradeType.PURCHASE_GIFT.getValue(), saOrder, 0); } @@ -426,7 +381,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { // 插入充值记录 if (cuMemberAccountExt == null) { // 更新会员账户 - BdAccount bdAccount = accountServiceApi.queryAccountByCondition(saOrder.getPkCountry()).getData(); + BdAccount bdAccount = iAccountServiceApi.queryAccountByCondition(saOrder.getPkCountry()).getData(); if (bdAccount == null) { return Boolean.FALSE; } @@ -446,8 +401,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { } updateCuMember(cuMember); } -// List cuMemberTradeList = getCuMemberTrade(saOrder, cuMemberAccountExt, new CuMemberAccount()); -// cuMemberTradeService.saveBatch(cuMemberTradeList); // 扣款信息，赠送积分 insertMemberTrade(saOrder, cuMemberAccountExt); return Boolean.TRUE; @@ -457,7 +410,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { @Transactional(rollbackFor = Exception.class) public CuMemberAccountExt insertMemberRecharge(SaOrder saOrder) { // 更新会员账户 - BdAccount bdAccount = accountServiceApi.queryAccountByCondition(saOrder.getPkCountry()).getData(); + BdAccount bdAccount = iAccountServiceApi.queryAccountByCondition(saOrder.getPkCountry()).getData(); if (bdAccount == null) { return null; } @@ -527,7 +480,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { private List getCuMemberTrade(SaOrder saOrder, CuMemberAccountExt cuMemberAccount, CuMemberAccount updateMemberAccount) { List cuMemberTradeList = new ArrayList<>(); // 获取专区币种，从redis中获得 - List currencyDTOList = areaCurrencyServiceApi.queryAreaCurrencyByPkCountry(cuMemberAccount.getPkCountry()).getData(); + List currencyDTOList = iAreaCurrencyServiceApi.queryAreaCurrencyByPkCountry(cuMemberAccount.getPkCountry()).getData(); updateMemberAccount.setPkMember(cuMemberAccount.getPkMember()); updateMemberAccount.setPkCountry(cuMemberAccount.getPkCountry()); Set currencyType = new HashSet<>(); @@ -813,8 +766,8 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { private void packageActivityTrade(Long pkMember, Integer pkCountry, Integer accountValue, BigDecimal rewardMoney, BigDecimal tradeBeforeBalance, ETradeType tradeType, Integer tradeClassify) { - BdAccount bdAccount = accountServiceApi.getBdAccountByFieldValue(pkCountry, accountValue).getData(); - CurrencyDTO currencyDTO = currencyServiceApi.getCurrency(pkCountry).getData(); + BdAccount bdAccount = iAccountServiceApi.getBdAccountByFieldValue(pkCountry, accountValue).getData(); + CurrencyDTO currencyDTO = iCurrencyServiceApi.getCurrency(pkCountry).getData(); CuMemberTrade cuMemberTrade = CuMemberTrade.builder().tradeCode(memberToolsHandler.createTradeCode(EOrderPrefix.TRADE_CODE.getValue())) .tradeClassify(tradeClassify) .pkMember(pkMember) @@ -913,7 +866,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { pkCountry = cuMemberTrades.get(0).getPkCountry(); } - List currencyDTOList = areaCurrencyServiceApi.queryAreaCurrencyByPkCountry(pkCountry).getData(); + List currencyDTOList = iAreaCurrencyServiceApi.queryAreaCurrencyByPkCountry(pkCountry).getData(); Map areaCurrencyMap = new HashMap<>(); currencyDTOList.forEach(areaCurrencyDTO -> areaCurrencyMap.put(areaCurrencyDTO.getPkAccount(), areaCurrencyDTO)); @@ -1070,7 +1023,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { // 部分退，回退金额按照 币种扣除的倒叙扣除 现金->消费->奖金 奖金->消费->现金 // 查询到必须扣除的币种 // 查询专区所属币种 - List areaCurrencyDTOList = areaCurrencyServiceApi.queryAreaCurrencyByCondition(saOrder.getOrderType(), saOrder.getPkCountry()).getData(); + List areaCurrencyDTOList = iAreaCurrencyServiceApi.queryAreaCurrencyByCondition(saOrder.getOrderType(), saOrder.getPkCountry()).getData(); Map mustPayMoneyMap = new HashMap<>(); for (AreaCurrencyDTO areaCurrencyDTO : areaCurrencyDTOList) { BigDecimal mustPayMoney = BigDecimal.ZERO; @@ -1149,7 +1102,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { CuMemberAccountExt tmpCuMemberAccount = cuMemberAccountService.queryMemberAccountByCondition(cuMemberAccount).get(0); if (CollectionUtil.isNotEmpty(cuMemberTrades)) { - List currencyDTOList = areaCurrencyServiceApi.queryAreaCurrencyByPkCountry(saOrder.getPkCountry()).getData(); + List currencyDTOList = iAreaCurrencyServiceApi.queryAreaCurrencyByPkCountry(saOrder.getPkCountry()).getData(); Map areaCurrencyMap = new HashMap<>(); currencyDTOList.forEach(areaCurrencyDTO -> areaCurrencyMap.put(areaCurrencyDTO.getPkAccount(), areaCurrencyDTO)); @@ -1252,7 +1205,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { // 查询订单创建人账户 CuMemberAccount cuMemberAccount = cuMemberAccountService.queryCuMemberAccountByPkMember(pkMember); // 订单所属专区扣币的第一位配置 - AreaCurrencyDTO areaCurrencyDTO = areaCurrencyServiceApi.queryAreaCurrencyByCondition(saOrder.getOrderType(), pkCountry).getData().get(0); + AreaCurrencyDTO areaCurrencyDTO = iAreaCurrencyServiceApi.queryAreaCurrencyByCondition(saOrder.getOrderType(), pkCountry).getData().get(0); // 专区扣币的第一位配置所用字段 String accountField = MemberFieldConstants.ACCOUNT + areaCurrencyDTO.getFieldValue(); @@ -1264,7 +1217,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { // 获取所有账户配置ID List pkAccountList = memberTradeList.stream().map(CuMemberTrade::getPkAccount).collect(Collectors.toList()); // 账户对应账户配置map - Map accountMap = accountServiceApi.getAccountMap(pkAccountList).getData(); + Map accountMap = iAccountServiceApi.getAccountMap(pkAccountList).getData(); // 根据之前交易明细，生成红冲交易数据 for (CuMemberTrade cuMemberTrade : memberTradeList) { @@ -1450,7 +1403,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { @Override public String orderSelfDeliver(Long pkMember, Integer pkRate, Integer pkCountry, BigDecimal postage, Long userId) { // 查询退邮费对应币种 - BdAccount bdAccount = accountServiceApi.queryPostageAccount(pkCountry).getData(); + BdAccount bdAccount = iAccountServiceApi.queryPostageAccount(pkCountry).getData(); if (null == bdAccount) { log.error("订单自提邮费返还失败，未配置对应币种。 pkMember: {}, postage: {}", pkMember, postage); return "订单自提邮费返还失败，未配置对应币种"; diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/bean/mapper/AcBeanRuleConfigMapper.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/bean/mapper/AcBeanRuleConfigMapper.java deleted file mode 100644 index c3d1a242..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/bean/mapper/AcBeanRuleConfigMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hzs.activity.bean.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.activity.bean.AcBeanRuleConfig; - -/** - * 海豆赠送活动规则 Mapper 接口 - * - * @author hzs - * @since 2023-10-17 - */ -public interface AcBeanRuleConfigMapper extends BaseMapper { - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/bean/provider/SeaBeanServiceApi.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/bean/provider/SeaBeanServiceApi.java deleted file mode 100644 index 589a5b9a..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/bean/provider/SeaBeanServiceApi.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.hzs.activity.bean.provider; - -import com.hzs.activity.bean.ISeaBeanServiceApi; -import com.hzs.activity.bean.service.IAcBeanRuleConfigService; -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.activity.bean.AcBeanRuleConfig; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - -/** - * @Description: 海豆赠送dubbo服务接口 - * @Author: jiang chao - * @Time: 2023/10/19 9:32 - * @Classname: SeaBeanServiceApi - * @PackageName: com.hzs.activity.bean.provider - */ -@DubboService -public class SeaBeanServiceApi implements ISeaBeanServiceApi { - -// @Autowired -// private IAcBeanRuleConfigService iAcBeanRuleConfigService; -// -// @Override -// public R queryLastBeanRuleConfig(Integer actType, Integer pkGrade, Integer pkCountry) { -// return R.ok(iAcBeanRuleConfigService.queryLastBeanRuleConfig(actType, pkGrade, pkCountry)); -// } - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/bean/service/IAcBeanRuleConfigService.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/bean/service/IAcBeanRuleConfigService.java deleted file mode 100644 index 9e20594f..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/bean/service/IAcBeanRuleConfigService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hzs.activity.bean.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.activity.bean.AcBeanRuleConfig; - -/** - * 海豆赠送活动规则 服务类 - * - * @author hzs - * @since 2023-10-17 - */ -public interface IAcBeanRuleConfigService extends IService { - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/bean/service/impl/AcBeanRuleConfigServiceImpl.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/bean/service/impl/AcBeanRuleConfigServiceImpl.java deleted file mode 100644 index d31c43e0..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/bean/service/impl/AcBeanRuleConfigServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hzs.activity.bean.service.impl; - -import com.hzs.activity.bean.mapper.AcBeanRuleConfigMapper; -import com.hzs.activity.bean.service.IAcBeanRuleConfigService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.activity.bean.AcBeanRuleConfig; -import org.springframework.stereotype.Service; - -/** - * 海豆赠送活动规则 服务实现类 - * - * @author hzs - * @since 2023-10-17 - */ -@Service -public class AcBeanRuleConfigServiceImpl extends ServiceImpl implements IAcBeanRuleConfigService { - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/bean/vo/AcBeanRuleConfigVO.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/bean/vo/AcBeanRuleConfigVO.java deleted file mode 100644 index 57cf147d..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/bean/vo/AcBeanRuleConfigVO.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.hzs.activity.bean.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.BigDecimalFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - *

- * 海豆赠送活动规则VO - *

- * - * @author hzs - * @since 2023-10-17 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class AcBeanRuleConfigVO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Long pkId; - - /** - * 活动基本配置主键 - */ - private Long pkBaseId; - - /** - * 等级ID - */ - private Integer pkGrade; - /** - * 业绩 - */ - @BigDecimalFormat() - private BigDecimal startValue; - - /** - * 比率类型 (1=按比率, 2=按金额) ECalType merits - */ - private Integer ratioType; - - /** - * 比率值 - */ - @BigDecimalFormat() - private BigDecimal ratioValue; - - - - @Transaction(transactionKey = EnumsPrefixConstants.KEY_GRADE) - private Long pkGradeKey; - /** - * 等级id - */ - private String pkGradeKeyVal; - - /** - * 创建人ID - */ - private Long pkCreator; - - /** - * 创建时间 - */ - private Date creationTime; - - /** - * 修改人ID - */ - private Long pkModified; - - /** - * 修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date modifiedTime; - - /** - * 逻辑删除 (0=未删除，1已删除) - */ - private Integer delFlag; - - /** - * 国家 - */ - private Integer pkCountry; - - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/fest/controller/manage/AcFestivalRuleConfigController.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/fest/controller/manage/AcFestivalRuleConfigController.java deleted file mode 100644 index 57db1994..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/fest/controller/manage/AcFestivalRuleConfigController.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hzs.activity.fest.controller.manage; - - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 节日赠送规则表 前端控制器 - * - * @author hzs - * @since 2023-04-21 - */ -@RestController -@RequestMapping("/manage/festival") -public class AcFestivalRuleConfigController { - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/fest/mapper/AcFestivalRuleConfigMapper.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/fest/mapper/AcFestivalRuleConfigMapper.java deleted file mode 100644 index b317bfe2..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/fest/mapper/AcFestivalRuleConfigMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hzs.activity.fest.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.activity.fest.AcFestivalRuleConfig; - -/** - * 节日赠送规则表 Mapper 接口 - * - * @author hzs - * @since 2023-04-21 - */ -public interface AcFestivalRuleConfigMapper extends BaseMapper { - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/fest/service/IAcFestivalRuleConfigService.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/fest/service/IAcFestivalRuleConfigService.java deleted file mode 100644 index 7fbc6005..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/fest/service/IAcFestivalRuleConfigService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hzs.activity.fest.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.activity.fest.AcFestivalRuleConfig; - -/** - * 节日赠送规则表 服务类 - * - * @author hzs - * @since 2023-04-21 - */ -public interface IAcFestivalRuleConfigService extends IService { - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/fest/service/impl/AcFestivalRuleConfigServiceImpl.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/fest/service/impl/AcFestivalRuleConfigServiceImpl.java deleted file mode 100644 index c4f632d1..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/fest/service/impl/AcFestivalRuleConfigServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hzs.activity.fest.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.activity.fest.mapper.AcFestivalRuleConfigMapper; -import com.hzs.activity.fest.service.IAcFestivalRuleConfigService; -import com.hzs.common.domain.activity.fest.AcFestivalRuleConfig; -import org.springframework.stereotype.Service; - -/** - * 节日赠送规则表 服务实现类 - * - * @author hzs - * @since 2023-04-21 - */ -@Service -public class AcFestivalRuleConfigServiceImpl extends ServiceImpl implements IAcFestivalRuleConfigService { - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/fest/vo/AcFestivalRuleConfigVO.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/fest/vo/AcFestivalRuleConfigVO.java deleted file mode 100644 index da2d5284..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/fest/vo/AcFestivalRuleConfigVO.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.hzs.activity.fest.vo; - -import com.hzs.common.domain.activity.base.AcGiftConfig; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * 节日赠送规则表VO - * - * @author hzs - * @since 2023-04-21 - */ -@Data -public class AcFestivalRuleConfigVO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Long pkId; - - /** - * 活动基本配置主键 - */ - private Long pkBaseId; - - /** - * 真实奖衔 - */ - private Long pkAwards; - - /** - * 国家 - */ - private Integer pkCountry; - /** - * 赠品配置 - */ - private List agcList; - - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/controller/api/ApiAcPeopleServiceController.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/controller/api/ApiAcPeopleServiceController.java deleted file mode 100644 index 1436c8de..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/controller/api/ApiAcPeopleServiceController.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.hzs.activity.people.controller.api; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import com.hzs.activity.people.service.IAcPeopleServiceService; -import com.hzs.activity.people.vo.AcPeopleGiftPackVO; -import com.hzs.activity.people.vo.AcPeopleGiftProductVO; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.member.base.IMemberServiceApi; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * 新人礼包活动业务表 前端控制器 - * - * @author hzs - * @since 2023-04-26 - */ -@RestController -@RequestMapping("/api/people-service") -public class ApiAcPeopleServiceController { - - @Autowired - private IAcPeopleServiceService iAcPeopleServiceService; - - @DubboReference - IMemberServiceApi iMemberServiceApi; - - /** - * @description: 查询新人礼包活动方案 - * @author: zhang jing - * @date: 2023/5/9 20:54 - * @param: [plsVO] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @PostMapping("/getGiftPack") - public AjaxResult getGiftPack(@RequestBody AcPeopleGiftPackVO giftPackVO) { - if (ObjectUtil.emptyCount( - giftPackVO.getPkBaseId()) > 0) { - return AjaxResult.error("缺少参数"); - } - Long userId = SecurityUtils.getUserId(); - R cumember = iMemberServiceApi.getMember(userId); - giftPackVO.setPkGrade(cumember.getData().getPkSettleGrade()); - List giftPackList = iAcPeopleServiceService.getGiftPackList(giftPackVO); - if (CollectionUtil.isNotEmpty(giftPackList)) { - giftPackList.forEach(itm -> { - List pgpList = iAcPeopleServiceService.getGiftPackProductList(itm.getPkNewPeople()); - itm.setPgpList(pgpList); - }); - } - return AjaxResult.success(giftPackList); - } - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/controller/manage/AcPeopleServiceController.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/controller/manage/AcPeopleServiceController.java deleted file mode 100644 index 144b91f9..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/controller/manage/AcPeopleServiceController.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hzs.activity.people.controller.manage; - -import cn.hutool.core.bean.BeanUtil; -import com.hzs.activity.base.param.QueryActivityParam; -import com.hzs.activity.base.service.IActivityService; -import com.hzs.activity.base.vo.BaseConfigVo; -import com.hzs.activity.people.vo.AcPeopleServiceVO; -import com.hzs.common.core.constant.msg.ActivityMsgConstants; -import com.hzs.common.core.utils.poi.ExcelUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.List; - -/** - * 新人礼包活动业务表 前端控制器 - * - * @author hzs - * @since 2023-04-26 - */ -@RestController -@RequestMapping("/manage/people-service") -public class AcPeopleServiceController { - - @Autowired - private IActivityService iActivityService; - - /** - * @description: 导出新人礼包活动 - * @author: zhang jing - * @date: 2023/7/26 16:07 - * @param: [queryActivityParam, response] - * @return: void - **/ - @PostMapping("/export") - public void export(QueryActivityParam queryActivityParam, HttpServletResponse response) { - List resultList = iActivityService.activityList(queryActivityParam); - List list = new ArrayList<>(); - resultList.forEach(item -> list.add(BeanUtil.copyProperties(item, AcPeopleServiceVO.class))); - ExcelUtil util = new ExcelUtil<>(AcPeopleServiceVO.class); - util.exportExcel(response, list, ActivityMsgConstants.NEWCOMER_GIFT_PACKAGE); - } - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/mapper/AcNewPeopleRuleConfigMapper.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/mapper/AcNewPeopleRuleConfigMapper.java deleted file mode 100644 index c9886f9a..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/mapper/AcNewPeopleRuleConfigMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.hzs.activity.people.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.activity.people.vo.AcNewPeopleRuleConfigVO; -import com.hzs.common.domain.activity.people.AcNewPeopleRuleConfig; - -import java.util.List; - -/** - *

- * 新人礼包规则表 Mapper 接口 - *

- * - * @author hzs - * @since 2023-04-24 - */ -public interface AcNewPeopleRuleConfigMapper extends BaseMapper { - - /** - * @description: 查询新人礼包规则 - * @author: zhang jing - * @date: 2023/4/25 15:41 - * @param: [nplVO] - * @return: java.util.List - **/ - List queryNplList(AcNewPeopleRuleConfigVO nplVO); -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/mapper/AcPeopleServiceMapper.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/mapper/AcPeopleServiceMapper.java deleted file mode 100644 index d9589f4e..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/mapper/AcPeopleServiceMapper.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hzs.activity.people.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.activity.people.vo.AcPeopleGiftPackVO; -import com.hzs.activity.people.vo.AcPeopleGiftProductVO; -import com.hzs.activity.people.vo.AcPeopleServiceVO; -import com.hzs.common.domain.activity.people.AcPeopleService; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 新人礼包活动业务表 Mapper 接口 - * - * @author hzs - * @since 2023-04-26 - */ -public interface AcPeopleServiceMapper extends BaseMapper { - - /** - * @description: 查询当前新人礼包活动 - * @author: zhang jing - * @date: 2023/4/26 18:14 - * @param: [acPeopleServiceVO] - * @return: java.util.List - **/ - List peopleActivityList(AcPeopleServiceVO acPeopleServiceVO); - - /** - * @description: 查询新人礼包活动方案 - * @author: zhang jing - * @date: 2023/5/9 20:52 - * @param: [giftPackVO] - * @return: java.util.List - **/ - List getGiftPackList(AcPeopleGiftPackVO giftPackVO); - - /** - * @description: 礼包查询信息 - * @author: zhang jing - * @date: 2023/5/10 9:40 - * @param: [acPeopleGiftProductVO] - * @return: java.util.List - **/ - List getGiftPackProductList(@Param("pkNewPeople") Long pkNewPeople); -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/param/AcBaseConfigParam.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/param/AcBaseConfigParam.java index a4defd00..512864fa 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/param/AcBaseConfigParam.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/param/AcBaseConfigParam.java @@ -1,11 +1,8 @@ package com.hzs.activity.people.param; import com.hzs.activity.base.param.ActivityParam; -import com.hzs.activity.bean.vo.AcBeanRuleConfigVO; import com.hzs.activity.benefits.vo.AcGiftBenefitsRuleConfigVO; import com.hzs.activity.benefits.vo.UpgradeGiveConfigVO; -import com.hzs.activity.fest.vo.AcFestivalRuleConfigVO; -import com.hzs.activity.people.vo.AcNewPeopleRuleConfigVO; import com.hzs.activity.work.vo.AcSuperWorkRuleConfigVO; import com.hzs.common.core.annotation.Transaction; import com.hzs.common.core.constant.EnumsPrefixConstants; @@ -73,22 +70,10 @@ public class AcBaseConfigParam extends BaseApprovalEntity implements Serializabl */ private ActivityParam activityParam; - /** - * 新人礼包规则集合 - */ - private List anpList; - /** - * 海豆赠送规则集合 - */ - private List beanList; /** * 超级工作室赠送规则集合 */ private List aswList; - /** - * 节日赠送规则集合 - */ - private List afrList; /** * 权益赠送规则集合 */ @@ -98,5 +83,4 @@ public class AcBaseConfigParam extends BaseApprovalEntity implements Serializabl */ private List ugcList; - } diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/provider/AcPeopleServiceServiceProvider.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/provider/AcPeopleServiceServiceProvider.java deleted file mode 100644 index 084c0482..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/provider/AcPeopleServiceServiceProvider.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.hzs.activity.people.provider; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.hzs.activity.dto.AcPeopleGiftProductDTO; -import com.hzs.activity.people.IAcPeopleServiceServiceApi; -import com.hzs.activity.people.service.IAcPeopleServiceService; -import com.hzs.activity.people.vo.AcPeopleGiftProductVO; -import com.hzs.common.core.domain.R; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.ArrayList; -import java.util.List; - -/** - * 会员涉及dubbo服务 - * - * @author jiangchao - */ -@DubboService -public class AcPeopleServiceServiceProvider implements IAcPeopleServiceServiceApi { - - @Autowired - private IAcPeopleServiceService iAcPeopleServiceService; - - /** - * @description: 根据活动查询礼包产品信息 - * @author: zhang jing - * @date: 2023/5/10 15:16 - * @param: [pkNewPeople] - * @return: com.hzs.common.core.domain.R> - **/ - @Override - public R> getGiftPackProductList(Long pkNewPeople) { - List pgplist = iAcPeopleServiceService.getGiftPackProductList(pkNewPeople); - List list = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(pgplist)) { - pgplist.forEach(item -> list.add(BeanUtil.copyProperties(item, AcPeopleGiftProductDTO.class))); - } - return R.ok(list); - } - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/service/IAcNewPeopleRuleConfigService.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/service/IAcNewPeopleRuleConfigService.java deleted file mode 100644 index b2210d3b..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/service/IAcNewPeopleRuleConfigService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hzs.activity.people.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.activity.people.AcNewPeopleRuleConfig; - -/** - * 新人礼包规则表 服务类 - * - * @author hzs - * @since 2023-04-24 - */ -public interface IAcNewPeopleRuleConfigService extends IService { - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/service/IAcPeopleServiceService.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/service/IAcPeopleServiceService.java deleted file mode 100644 index abc5e651..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/service/IAcPeopleServiceService.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.hzs.activity.people.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.activity.people.vo.AcPeopleGiftPackVO; -import com.hzs.activity.people.vo.AcPeopleGiftProductVO; -import com.hzs.activity.people.vo.AcPeopleServiceVO; -import com.hzs.common.domain.activity.people.AcPeopleService; -import com.hzs.common.domain.sale.ext.SaOrderExt; - -import java.util.List; - -/** - * 新人礼包活动业务表 服务类 - * - * @author hzs - * @since 2023-04-26 - */ -public interface IAcPeopleServiceService extends IService { - - /** - * @description: 匹配活动规则，保存业务数据 - * @author: zhang jing - * @date: 2023/4/26 19:25 - * @param: [aplsVO] - * pkMember 会员id - * payTime 支付时间 - * orderType 订单类型 - * @return: boolean - **/ - Boolean mateRule(SaOrderExt saOrderExt); - - /** - * @description: 查询当前新人礼包活动 - * @author: zhang jing - * @date: 2023/4/26 18:15 - * @param: [acPeopleServiceVO] - * @return: java.util.List - **/ - List peopleActivityList(AcPeopleServiceVO acPeopleServiceVO); - - /** - * @description: 查询新人礼包活动方案 - * @author: zhang jing - * @date: 2023/5/9 20:53 - * @param: [giftPackVO] - * @return: java.util.List - **/ - List getGiftPackList(AcPeopleGiftPackVO giftPackVO); - - /** - * @description: 礼包查询信息 - * @author: zhang jing - * @date: 2023/5/10 9:41 - * @param: [acPeopleGiftProductVO] - * @return: java.util.List - **/ - List getGiftPackProductList(Long pkNewPeople); - - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/service/impl/AcNewPeopleRuleConfigServiceImpl.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/service/impl/AcNewPeopleRuleConfigServiceImpl.java deleted file mode 100644 index 422d3a09..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/service/impl/AcNewPeopleRuleConfigServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hzs.activity.people.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.activity.people.mapper.AcNewPeopleRuleConfigMapper; -import com.hzs.activity.people.service.IAcNewPeopleRuleConfigService; -import com.hzs.common.domain.activity.people.AcNewPeopleRuleConfig; -import org.springframework.stereotype.Service; - -/** - * 新人礼包规则表 服务实现类 - * - * @author hzs - * @since 2023-04-24 - */ -@Service -public class AcNewPeopleRuleConfigServiceImpl extends ServiceImpl implements IAcNewPeopleRuleConfigService { - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/service/impl/AcPeopleServiceServiceImpl.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/service/impl/AcPeopleServiceServiceImpl.java deleted file mode 100644 index 814985c4..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/service/impl/AcPeopleServiceServiceImpl.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.hzs.activity.people.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.activity.people.mapper.AcPeopleServiceMapper; -import com.hzs.activity.people.service.IAcPeopleServiceService; -import com.hzs.activity.people.vo.AcPeopleGiftPackVO; -import com.hzs.activity.people.vo.AcPeopleGiftProductVO; -import com.hzs.activity.people.vo.AcPeopleServiceVO; -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EPlanState; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.domain.activity.people.AcPeopleService; -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.member.base.IMemberServiceApi; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - -/** - * 新人礼包活动业务表 服务实现类 - * - * @author hzs - * @since 2023-04-26 - */ -@Service -public class AcPeopleServiceServiceImpl extends ServiceImpl implements IAcPeopleServiceService { - - @DubboReference - IMemberServiceApi iMemberServiceApi; - - /** - * @description: 匹配活动规则 - * @author: zhang jing - * @date: 2023/4/26 19:25 - * @param: [aplsVO] - * pkMember 会员id - * payTime 支付时间 - * orderType 订单类型 - * @return: boolean - **/ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean mateRule(SaOrderExt saOrderExt) { - Date date = new Date(); - R member = iMemberServiceApi.getMember(saOrderExt.getPkMember()); - AcPeopleServiceVO apl = new AcPeopleServiceVO(); - if (StringUtils.isNotNull(member.getData())) { - apl.setPayTime(saOrderExt.getPayTime()); - apl.setPkCountry(member.getData().getPkCountry()); - apl.setPkRegisterGrade(member.getData().getPkSettleGrade()); - //校验规则 - List peopleActivityList = peopleActivityList(apl); - if (CollectionUtil.isNotEmpty(peopleActivityList)) { - for (AcPeopleServiceVO aplo : peopleActivityList) { - AcPeopleService aps = BeanUtil.copyProperties(aplo, AcPeopleService.class); - aps.setPkMember(saOrderExt.getPkMember()); - aps.setCreationTime(date); - aps.setPkCountry(saOrderExt.getPkCountry()); - aps.setPlanState(EPlanState.NOT_SELECTED.getValue()); - aps.setPkCreator(saOrderExt.getPkMember()); - baseMapper.insert(aps); - } - } - } - return true; - } - - /** - * @description: 查询当前新人礼包活动 - * @author: zhang jing - * @date: 2023/4/26 18:15 - * @param: [acPeopleServiceVO] - * @return: java.util.List - **/ - @Override - public List peopleActivityList(AcPeopleServiceVO acPeopleServiceVO) { - return baseMapper.peopleActivityList(acPeopleServiceVO); - } - - /** - * @description: 查询新人礼包活动方案 - * @author: zhang jing - * @date: 2023/5/9 20:53 - * @param: [giftPackVO] - * @return: java.util.List - **/ - @Override - public List getGiftPackList(AcPeopleGiftPackVO giftPackVO) { - return baseMapper.getGiftPackList(giftPackVO); - } - - /** - * @description: 礼包查询信息 - * @author: zhang jing - * @date: 2023/5/10 9:40 - * @param: [acPeopleGiftProductVO] - * @return: java.util.List - **/ - @Override - public List getGiftPackProductList(Long pkNewPeople) { - return baseMapper.getGiftPackProductList(pkNewPeople); - } - - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/vo/AcBaseConfigVO.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/vo/AcBaseConfigVO.java index 82b11e6e..700c4cae 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/vo/AcBaseConfigVO.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/vo/AcBaseConfigVO.java @@ -1,10 +1,8 @@ package com.hzs.activity.people.vo; import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.activity.bean.vo.AcBeanRuleConfigVO; import com.hzs.activity.benefits.vo.AcGiftBenefitsRuleConfigVO; import com.hzs.activity.benefits.vo.UpgradeGiveConfigVO; -import com.hzs.activity.fest.vo.AcFestivalRuleConfigVO; import com.hzs.activity.work.vo.AcSuperWorkRuleConfigVO; import com.hzs.common.core.annotation.Excel; import com.hzs.common.core.annotation.Transaction; @@ -149,22 +147,10 @@ public class AcBaseConfigVO extends BaseApprovalEntity implements Serializable { */ private LoginUser loginUser; - /** - * 新人礼包规则集合 - */ - private List anpList; - /** - * 海豆赠送规则集合 - */ - private List beanList; /** * 超级工作室赠送规则集合 */ private List aswList; - /** - * 节日赠送规则集合 - */ - private List afrList; /** * 权益赠送规则集合 */ diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/vo/AcNewPeopleRuleConfigVO.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/vo/AcNewPeopleRuleConfigVO.java deleted file mode 100644 index 83f480cd..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/vo/AcNewPeopleRuleConfigVO.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.hzs.activity.people.vo; - -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.domain.activity.base.AcGiftConfig; -import com.hzs.common.domain.activity.base.ext.AcGiftConfigExt; -import lombok.*; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.List; - -/** - * 新人礼包规则表VO - * - * @author hzs - * @since 2023-04-24 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class AcNewPeopleRuleConfigVO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Long pkId; - - /** - * 国家 - */ - private Integer pkCountry; - - /** - * 活动基本配置主键 - */ - private Long pkBaseId; - - /** - * 等级id - */ - private Long pkGrade; - - @Transaction(transactionKey = EnumsPrefixConstants.KEY_GRADE) - private Long pkGradeKey; - /** - * 等级id - */ - private String pkGradeKeyVal; - - /** - * 方案名称 - */ - private String plan; - - /** - * 价格 - */ - private BigDecimal price; - /** - * 订单类型 所属专区 - */ - private Integer orderType; - /** - * 有限期 10天 20天 30天.... - */ - private Integer term; - /** - * 必选商品ID - */ - private Integer mustWares; - /** - * 屏蔽商品ID - */ - private Integer shieldWares; - /** - * 赠品配置 - */ - private List agcList; - - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/vo/AcPeopleGiftPackVO.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/vo/AcPeopleGiftPackVO.java deleted file mode 100644 index 4aa30c3d..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/vo/AcPeopleGiftPackVO.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.hzs.activity.people.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.BigDecimalFormat; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * 新人礼包活动配置VO - * - * @author hzs - * @since 2023-04-26 - */ -@Data -public class AcPeopleGiftPackVO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 会员主键 - */ - private Long pkMember; - /** - * 等级 - */ - private Integer pkGrade; - - /** - * 活动基本配置主键 - */ - private Long pkBaseId; - - /** - * 方案名 - */ - private String plan; - - /** - * 活动规则主键 - */ - private Long pkNewPeople; - /** - * 方案状态 0 未选择 1 已选择 EPlanState - */ - private Integer planState; - - /** - * 创建人ID - */ - private Long pkCreator; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 国家 - */ - private Integer pkCountry; - /** - * 订单类型 所属专区 - */ - private Integer orderType; - /** - * 支付时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date payTime; - - /** - * 活动名称 - */ - private String actName; - /** - * 价格 - */ - @BigDecimalFormat() - private BigDecimal price; - /** - * 新人礼包活动礼包产品信息 - */ - List pgpList; - - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/vo/AcPeopleGiftProductVO.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/vo/AcPeopleGiftProductVO.java deleted file mode 100644 index b38a0fa9..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/vo/AcPeopleGiftProductVO.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.hzs.activity.people.vo; - -import com.hzs.common.core.annotation.BigDecimalFormat; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * 新人礼包活动礼包产品信息VO - * - * @author hzs - * @since 2023-04-26 - */ -@Data -public class AcPeopleGiftProductVO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 领取价格 - */ - @BigDecimalFormat() - private BigDecimal receivePrice; - - /** - * 活动基本主键 - */ - private Long pkBaseId; - - /** - * 活动规则主键 - */ - private Long pkNewPeople; - - /** - * 产品图 - */ - private String cover; - /** - * 数量 - */ - private Integer quantity; - - /** - * 产品价格 - */ - @BigDecimalFormat() - private BigDecimal price; - /** - * 产品名称 - */ - private String productName; - - /** - * 订单主键 - */ - private Integer pkProductId; - - - /** - * 产品规格（冗余显示） - */ - private String specsName; - - - /** - * 产品规格主键（冗余显示） - */ - private String specsNameId; -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/vo/AcPeopleServiceVO.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/vo/AcPeopleServiceVO.java deleted file mode 100644 index 20d62e0f..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/activity/people/vo/AcPeopleServiceVO.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.hzs.activity.people.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 新人礼包活动业务表VO - * - * @author hzs - * @since 2023-04-26 - */ -@Data -public class AcPeopleServiceVO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Long pkId; - - /** - * 会员主键 - */ - private Long pkMember; - - /** - * 活动基本配置主键 - */ - private Long pkBaseId; - - /** - * 活动规则主键 - */ - private Long pkNewPeople; - /** - * 方案状态 0 未选择 1 已选择 EPlanState - */ - private Integer planState; - - /** - * 创建人ID - */ - private Long pkCreator; - - - /** - * 修改人ID - */ - private Long pkModified; - - /** - * 修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date modifiedTime; - - /** - * 逻辑删除 (0=未删除，1已删除) - */ - private Integer delFlag; - - /** - * 国家 - */ - private Integer pkCountry; - /** - * 订单类型 所属专区 - */ - private Integer orderType; - /** - * 支付时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date payTime; - - - /** - * 注册等级 - */ - private Integer pkRegisterGrade; - /** - * 活动名称 - */ - @Excel(name = "活动名称") - private String actName; - /** - * 活动开始时间 - */ - @Excel(name = "开始时间", dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date actStartDate; - /** - * 活动结束时间 - */ - @Excel(name = "结束时间", dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date actEndDate; - /** - * 活动状态 - */ - @Excel(name = "活动状态") - private String status; - /** - * 创建时间 - */ - @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - /** - * 活动封面 - */ - private String actCover; - /** - * 活动类型（1=商品赠送 2=消费赠送 3=直推赠送 4=超级工作室赠送 5=节日赠送 6=新人礼包 7=抽奖 8=红包） - */ - private Integer actType; - /** - * 活动说明 - */ - private String actExplain; - - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiGiftSaOrderController.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiGiftSaOrderController.java deleted file mode 100644 index 0b0d1b79..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiGiftSaOrderController.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hzs.sale.order.controller.api; - -import com.hzs.common.core.annotation.RepeatSubmit; -import com.hzs.common.core.constant.msg.MemberMsgConstants; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.sale.order.controller.ParentOrderController; -import com.hzs.sale.order.param.OrderParam; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -/** - * @description: 新人礼包领取礼包 - * @author: sui q - * @time: 2023/5/10 13:46 - * @classname: ApiGiftSaOrderController - * @package_name: com.hzs.sale.order.controller.api - * version 1.0.0 - */ -@RestController -@RequestMapping("/api/order") -@Slf4j -public class ApiGiftSaOrderController extends ParentOrderController { - - /** - * @param orderParam 订单参数 - * @Description: 确认注册订单，生成待支付订单,只有注册订单有待支付订单 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 - */ - @PostMapping("/confirm-gift-order") - @RepeatSubmit - public AjaxResult confirmRegisterOrder(@RequestBody OrderParam orderParam) { - initSecurityOrderParam(orderParam); - // 查询新人礼包方案 - if(!checkPeopleRecMsgBoolean(orderParam)){ - return AjaxResult.error(MemberMsgConstants.REQUIRED_NOT_EMPTY); - } - getOrderService().confirmNewPeopleGift(orderParam); - return AjaxResult.success(orderParam); - } - - private Boolean checkPeopleRecMsgBoolean(OrderParam orderParam) { - return orderParam.getPkNewPeople() != null && orderParam.getRecPhone() != null && orderParam.getRecName() != null - &&orderParam.getRecName() != null && orderParam.getRecPhone() != null - && orderParam.getRecProvince() != null && orderParam.getRecCity() != null; - } -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java index 178688f2..913aaffd 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java @@ -104,7 +104,7 @@ public class ApiOthSaOrderController extends ParentOrderController { orderParam.setUpgradeMemberCodeTmp(orderParam.getUpgradeMemberCode()); OrderReturn orderReturn = getOrderService().computeLevel(orderParam); if (!orderReturn.getIsEnough()) { - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.LEVEL_NOT_ENOUGH)); + return AjaxResult.error(MemberMsgConstants.LEVEL_NOT_ENOUGH); } } } @@ -168,7 +168,7 @@ public class ApiOthSaOrderController extends ParentOrderController { } if (orderParam.getSpecialArea() == EOrderType.REGISTER_ORDER.getValue() || orderParam.getSpecialArea() == EOrderType.SPECIAL_REGISTER_ORDER.getValue()) { - return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_EMPTY)); + return AjaxResult.error(SaOrderMsgConstants.ORDER_EMPTY); } // 验证账户余额 // 查询报单会员账户信息 @@ -186,7 +186,7 @@ public class ApiOthSaOrderController extends ParentOrderController { saOrderExt = getOrderService().querySaleOrderExtByOrderCode(saOrderQueryParam, null); } if (saOrderExt == null) { - return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_EMPTY)); + return AjaxResult.error(SaOrderMsgConstants.ORDER_EMPTY); } OrderParam oldOrderParam = redisService.getCacheObject(CacheConstants.TEMP_PARAM + SecurityUtils.getUserId() + orderParam.getOrderCode()); if (oldOrderParam == null) { @@ -206,11 +206,12 @@ public class ApiOthSaOrderController extends ParentOrderController { // 升级订单 if (EOrderType.UPGRADE_ORDER.getValue() == orderParam.getSpecialArea() || EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == orderParam.getSpecialArea()) { + // 升级类订单 if (getOrderService().payUpgradeSaOrder(saOrderExt, cuMemberAccountExt)) { getOrderService().convertAvailableNumMsg(oldOrderParam.getAvailableNumList()); return AjaxResult.success(saOrderExt); } else { - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.LEVEL_NOT_ENOUGH)); + return AjaxResult.error(MemberMsgConstants.LEVEL_NOT_ENOUGH); } } else { // 复购订单 @@ -222,10 +223,9 @@ public class ApiOthSaOrderController extends ParentOrderController { } if (cuMemberAccountExt.getErrorMsg() == null) { - cuMemberAccountExt.setErrorMsg(TransactionUtils.getContent(MemberMsgConstants.MEMBER_ACCOUNT_BALANCE_NOT_ENOUGH)); + cuMemberAccountExt.setErrorMsg(MemberMsgConstants.MEMBER_ACCOUNT_BALANCE_NOT_ENOUGH); } - return AjaxResult.error(cuMemberAccountExt.getErrorMsg()); } diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java index 6e8be07e..969d5575 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java @@ -146,7 +146,7 @@ public class ApiRegSaOrderController extends ParentOrderController { } saOrderExt = getOrderService().querySaleOrderExtByOrderCode(getSaOrderQueryParam(orderParam), null); if (saOrderExt == null) { - return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_EMPTY)); + return AjaxResult.error(SaOrderMsgConstants.ORDER_EMPTY); } newCuMember = getOrderService().getCuMemberByKey(saOrderExt.getPkMember()); } else { @@ -242,12 +242,19 @@ public class ApiRegSaOrderController extends ParentOrderController { } SaOrder saOrder; boolean isToBePay = getOrderService().getIsToBePayByOrderType(orderParam.getPkSettleCountry(), orderParam.getSpecialArea()); - - SaOrderExt saOrderExt = redisService.getCacheObject(CacheConstants.TEMP_ORDER + SecurityUtils.getUserId() + orderParam.getOrderCode()); - if (saOrderExt == null) { - return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_EMPTY)); + if (isToBePay) { + // 从数据库中获取 + saOrder = getOrderService().querySaleOrderByOrderCode(getSaOrderQueryParam(orderParam)); + if (saOrder == null) { + return AjaxResult.error(SaOrderMsgConstants.ORDER_EMPTY); + } + } else { + SaOrderExt saOrderExt = redisService.getCacheObject(CacheConstants.TEMP_ORDER + SecurityUtils.getUserId() + orderParam.getOrderCode()); + if (saOrderExt == null) { + return AjaxResult.error(SaOrderMsgConstants.ORDER_EMPTY); + } + saOrder = BeanUtil.copyProperties(saOrderExt, SaOrder.class); } - saOrder = BeanUtil.copyProperties(saOrderExt, SaOrder.class); OrderReturn orderReturn = getOrderReturn(saOrder, orderParam); if (isToBePay) { @@ -382,10 +389,14 @@ public class ApiRegSaOrderController extends ParentOrderController { return result; } boolean isToBePay = getOrderService().getIsToBePayByOrderType(orderParam.getPkSettleCountry(), orderParam.getSpecialArea()); - - // 直接支付，从redis中获取 - SaOrderExt saOrderExt = redisService.getCacheObject(CacheConstants.TEMP_ORDER + SecurityUtils.getUserId() + orderParam.getOrderCode()); - SaOrderExt saOrder = BeanUtil.copyProperties(saOrderExt, SaOrderExt.class); + SaOrderExt saOrder; + if (isToBePay) { + saOrder = getOrderService().querySaleOrderExtByOrderCode(getSaOrderQueryParam(orderParam), null); + } else { + // 直接支付，从redis中获取 + SaOrderExt saOrderExt = redisService.getCacheObject(CacheConstants.TEMP_ORDER + SecurityUtils.getUserId() + orderParam.getOrderCode()); + saOrder = BeanUtil.copyProperties(saOrderExt, SaOrderExt.class); + } if (saOrder == null || StringUtils.isEmpty(saOrder.getOrderCode())) { return AjaxResult.error(SaOrderMsgConstants.ORDER_MEMBER_CACHE); diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiTargetPerformanceController.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiTargetPerformanceController.java deleted file mode 100644 index ad8a08c4..00000000 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiTargetPerformanceController.java +++ /dev/null @@ -1,185 +0,0 @@ -package com.hzs.sale.order.controller.api; - -import cn.hutool.core.date.DateUtil; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.sale.order.vo.ProgressQueryVo; -import com.hzs.sale.order.service.ISaOrderService; -import com.hzs.sale.order.vo.TargetPerformanceVo; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * @BelongsProject: hzs_cloud - * @BelongsPackage: com.hzs.sale.order.controller.api - * @Author: yh - * @CreateTime: 2023-04-12 18:25 - * @Description: TODO - * @Version: 1.0 - */ -@RestController -@RequestMapping("/api/target-performance") -@Slf4j -public class ApiTargetPerformanceController { - - @Autowired - private ISaOrderService orderService; - - /** - * 目标业绩进度 - */ - @GetMapping("target-performance-progress") - public AjaxResult targetPerformanceProgress() { - /** - * 当前业绩 - */ - Date startPayDate = DateUtils.getStartTime(DateUtils.currentDate()); - Date endPayDate = DateUtils.getEndTime(DateUtils.currentDate()); - Long memberId = SecurityUtils.getUserId(); - BigDecimal targetPerformance = orderService.selectBySumPv(startPayDate, endPayDate, memberId); - /** - * 目标基数 TODO 目标基数后台配置 - */ - List resultList = new ArrayList<>(); - int baseNumber = 200000; - // 取值余数 - BigDecimal remainder = new BigDecimal(targetPerformance.doubleValue() / baseNumber); - // 余数 - if (remainder.compareTo(new BigDecimal(0)) == 0) { - // 表示没有余数 - for (int i = 0; i < 5; i++) { - TargetPerformanceVo targetPerformanceVo = new TargetPerformanceVo(); - if (i == 0) { - targetPerformanceVo.setTargetPerformance(targetPerformance); - targetPerformanceVo.setTargetPerformanceLeaveOut(decimalToStr(targetPerformance)); - targetPerformanceVo.setPercentage("100%"); - resultList.add(targetPerformanceVo); - } else { - BigDecimal rd = remainder.add(new BigDecimal(i)); - BigDecimal remainderBase = targetPerformance.add(new BigDecimal(baseNumber).multiply(rd)); - BigDecimal divide = targetPerformance.multiply(new BigDecimal(100)).divide(remainderBase, 2, BigDecimal.ROUND_HALF_UP); - targetPerformanceVo.setTargetPerformance(remainderBase); - targetPerformanceVo.setTargetPerformanceLeaveOut(decimalToStr(targetPerformanceVo.getTargetPerformance())); - targetPerformanceVo.setPercentage(divide + "%"); - resultList.add(targetPerformanceVo); - } - } - } else { - // 有余数 - for (int i = 0; i < 5; i++) { - TargetPerformanceVo targetPerformanceVo = new TargetPerformanceVo(); - if (i == 0) { - targetPerformanceVo.setTargetPerformance(new BigDecimal(baseNumber).multiply(remainder)); - targetPerformanceVo.setTargetPerformanceLeaveOut(decimalToStr(targetPerformanceVo.getTargetPerformance())); - targetPerformanceVo.setPercentage("100%"); - resultList.add(targetPerformanceVo); - } else { - BigDecimal rd = remainder.add(new BigDecimal(i)); - BigDecimal remainderBase = new BigDecimal(baseNumber).multiply(rd); - BigDecimal multiply = targetPerformance.multiply(new BigDecimal(100)); - BigDecimal divide = multiply.divide(remainderBase, 2, BigDecimal.ROUND_HALF_UP); - targetPerformanceVo.setTargetPerformance(remainderBase); - targetPerformanceVo.setTargetPerformanceLeaveOut(decimalToStr(targetPerformanceVo.getTargetPerformance())); - targetPerformanceVo.setPercentage(divide + "%"); - resultList.add(targetPerformanceVo); - } - } - } - ProgressQueryVo progressQueryVo = new ProgressQueryVo(); - - progressQueryVo.setStartDate(DateUtil.formatDate(startPayDate)); - progressQueryVo.setEndDate(DateUtil.formatDate(endPayDate)); - progressQueryVo.setTargetPerformanceList(resultList); - return AjaxResult.success(progressQueryVo); - } - - /** - * 目标金额进度 - * - * @return - */ - @GetMapping("target-performance-amount-progress") - public AjaxResult targetPerformanceAmountProgress() { - /** - * 当前业绩 - */ - Date startPayDate = DateUtils.getStartTime(DateUtils.currentDate()); - Date endPayDate = DateUtils.getEndTime(DateUtils.currentDate()); - Long memberId = SecurityUtils.getUserId(); - BigDecimal targetPerformance = orderService.selectBySumAmount(startPayDate, endPayDate, memberId); - /** - * 目标基数 TODO 目标基数后台配置 - */ - List resultList = new ArrayList<>(); - int baseNumber = 200000; - // 取值余数 - BigDecimal remainder = new BigDecimal(targetPerformance.doubleValue() / baseNumber); - // 余数 - if (remainder.compareTo(new BigDecimal(0)) == 0) { - // 表示没有余数 - for (int i = 0; i < 5; i++) { - TargetPerformanceVo targetPerformanceVo = new TargetPerformanceVo(); - if (i == 0) { - targetPerformanceVo.setTargetPerformance(targetPerformance); - targetPerformanceVo.setTargetPerformanceLeaveOut(decimalToStr(targetPerformance)); - targetPerformanceVo.setPercentage("100%"); - resultList.add(targetPerformanceVo); - } else { - BigDecimal rd = remainder.add(new BigDecimal(i)); - BigDecimal remainderBase = targetPerformance.add(new BigDecimal(baseNumber).multiply(rd)); - BigDecimal divide = targetPerformance.multiply(new BigDecimal(100)).divide(remainderBase, 2, BigDecimal.ROUND_HALF_UP); - targetPerformanceVo.setTargetPerformance(remainderBase); - targetPerformanceVo.setTargetPerformanceLeaveOut(decimalToStr(targetPerformanceVo.getTargetPerformance())); - targetPerformanceVo.setPercentage(divide + "%"); - resultList.add(targetPerformanceVo); - } - } - } else { - // 有余数 - for (int i = 0; i < 5; i++) { - TargetPerformanceVo targetPerformanceVo = new TargetPerformanceVo(); - if (i == 0) { - targetPerformanceVo.setTargetPerformance(new BigDecimal(baseNumber).multiply(remainder)); - targetPerformanceVo.setTargetPerformanceLeaveOut(decimalToStr(targetPerformanceVo.getTargetPerformance())); - targetPerformanceVo.setPercentage("100%"); - resultList.add(targetPerformanceVo); - } else { - BigDecimal rd = remainder.add(new BigDecimal(i)); - BigDecimal remainderBase = new BigDecimal(baseNumber).multiply(rd); - BigDecimal multiply = targetPerformance.multiply(new BigDecimal(100)); - BigDecimal divide = multiply.divide(remainderBase, 2, BigDecimal.ROUND_HALF_UP); - - targetPerformanceVo.setTargetPerformance(remainderBase); - targetPerformanceVo.setTargetPerformanceLeaveOut(decimalToStr(targetPerformanceVo.getTargetPerformance())); - targetPerformanceVo.setPercentage(divide + "%"); - resultList.add(targetPerformanceVo); - } - } - } - ProgressQueryVo progressQueryVo = new ProgressQueryVo(); - progressQueryVo.setStartDate(DateUtil.formatDate(startPayDate)); - progressQueryVo.setEndDate(DateUtil.formatDate(endPayDate)); - progressQueryVo.setTargetPerformanceList(resultList); - return AjaxResult.success(progressQueryVo); - } - - /** - * decimal转str 0000转万 - * - * @param pv - * @return - */ - public String decimalToStr(BigDecimal pv) { - return pv.divide(new BigDecimal(10000)) + "万"; - } - -} diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java index 2064863c..d1472bed 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java @@ -740,12 +740,6 @@ public class SaOrderBusinessController extends BaseController { return AjaxResult.error(TransactionUtils.getContent(CommonMsgConstants.SETTLEMENT_COUNTRY_NOT_OPERATE)); } - // 2023-09-06 00:00:00 之前的订单不能进行退单 - long dateLong = 1693929600000L; - if (saOrder.getCreationTime().getTime() < dateLong) { - return AjaxResult.error("历史订单撤单请联系管理员"); - } - return AjaxResult.success(saOrder); } @@ -804,37 +798,15 @@ public class SaOrderBusinessController extends BaseController { return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_UNPAID_NOT_RETURN)); } -// if (EOrderType.REGISTER_ORDER.getValue() != saOrder.getOrderType() -// && EOrderType.FANS_ORDER.getValue() != saOrder.getOrderType()) { -// // 非 注册订单、嗨粉注册订单 不能进行合并退单 -// return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_NOT_RETURN)); -// } - // 如果已经转结算国，之前订单不能操作 if (!saOrder.getPkCountry().equals(saOrder.getPkSettleCountry())) { // 用户已转结算国，不能进行操作 return AjaxResult.error(TransactionUtils.getContent(CommonMsgConstants.SETTLEMENT_COUNTRY_NOT_OPERATE)); } - // 2023-09-06 00:00:00 之前的订单不能进行退单 - long dateLong = 1693929600000L; - if (saOrder.getCreationTime().getTime() < dateLong) { - return AjaxResult.error("历史订单撤单请联系超级管理员"); - } - List resultList = new ArrayList<>(); resultList.add(saOrder); -// if (EOrderType.REGISTER_ORDER.getValue() == saOrder.getOrderType() -// || EOrderType.FANS_ORDER.getValue() == saOrder.getOrderType() -// || EOrderType.SPECIAL_REGISTER_ORDER.getValue() == saOrder.getOrderType() -// ) { -// // 注册类订单，需要拉取所有订单 -// resultList.addAll(iSaOrderService.queryAllOrderByMember(saOrder.getPkMember(), pkCountry)); -// } - -// iSaOrderService.queryPlaceParentOrderList(saOrder.getPkMember()); - return AjaxResult.success(resultList); } @@ -974,7 +946,7 @@ public class SaOrderBusinessController extends BaseController { } } ValidateCancelOrderVO validateCancelOrderVO = iOrderBusinessService.validateCancelOrder(orderCancelParam); - AjaxResult validateCancelOrder = validateCancelOrderVO(orderCancelParam, validateCancelOrderVO); + AjaxResult validateCancelOrder = validateCancelOrder(orderCancelParam, validateCancelOrderVO); if (validateCancelOrder != null) { return validateCancelOrder; } @@ -1000,7 +972,7 @@ public class SaOrderBusinessController extends BaseController { return AjaxResult.error(MemberMsgConstants.REQUIRED_NOT_EMPTY); } ValidateCancelOrderVO validateCancelOrderVO = iOrderBusinessService.validateCancelOrder(orderCancelParam); - AjaxResult validateCancelOrder = validateCancelOrderVO(orderCancelParam, validateCancelOrderVO); + AjaxResult validateCancelOrder = validateCancelOrder(orderCancelParam, validateCancelOrderVO); if (validateCancelOrder != null) { return validateCancelOrder; } @@ -1009,7 +981,7 @@ public class SaOrderBusinessController extends BaseController { return AjaxResult.success(); } - private AjaxResult validateCancelOrderVO(OrderCancelParam orderCancelParam, ValidateCancelOrderVO validateCancelOrderVO) { + private AjaxResult validateCancelOrder(OrderCancelParam orderCancelParam, ValidateCancelOrderVO validateCancelOrderVO) { if (validateCancelOrderVO.getSaOrderExt() == null) { return AjaxResult.error(validateCancelOrderVO.getMsg()); } @@ -1043,9 +1015,6 @@ public class SaOrderBusinessController extends BaseController { public TableDataInfo selfOrderList(@RequestBody SelfPickUpParam selfPickUpParam) { startPage(); selfPickUpParam.setPkSettleCountry(SecurityUtils.getPkCountry()); -// if (selfPickUpParam.getApproveStatus() == null) { -// selfPickUpParam.setApproveStatus(EApproveRechargeStatus.SUBMIT.getValue()); -// } if (selfPickUpParam.getEndDate() != null) { selfPickUpParam.setEndDate(DateUtils.afterDate(1, ChronoUnit.DAYS, selfPickUpParam.getEndDate())); } diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRelationItemsMapper.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRelationItemsMapper.java index 9de5b9c0..73e6036a 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRelationItemsMapper.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRelationItemsMapper.java @@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.sale.order.SaOrderRelationItems; /** - *

* Mapper 接口 - *

* * @author hzs * @since 2023-03-17 diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRelationMapper.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRelationMapper.java index 5d3cf456..549afdaa 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRelationMapper.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRelationMapper.java @@ -4,21 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.sale.order.SaOrderRelation; /** - *

* 订单与虚拟订单关联表 Mapper 接口 - *

* * @author hzs * @since 2023-03-17 */ public interface SaOrderRelationMapper extends BaseMapper { - /** - * 根据订单编号查询订单关系，用于复购订单、福利订单支付页面，在线支付 - * @param orderCode 订单编号 - * @return: SaOrderRelation - * @Author: sui q - * @Date: 2023/3/17 17:49 - */ - SaOrderRelation querySaOrderRelationBySaOrder(String orderCode); } diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRelationItemsService.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRelationItemsService.java index b723be42..3887437c 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRelationItemsService.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRelationItemsService.java @@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.sale.order.SaOrderRelationItems; /** - *

- * 服务类 - *

+ * 服务类 * * @author hzs * @since 2023-03-17 diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRelationService.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRelationService.java index b336e5ef..6954ce62 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRelationService.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRelationService.java @@ -4,21 +4,11 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.sale.order.SaOrderRelation; /** - *

* 订单与虚拟订单关联表 服务类 - *

* * @author hzs * @since 2023-03-17 */ public interface ISaOrderRelationService extends IService { - /** - * 根据订单编号查询订单关系，用于复购订单、福利订单支付页面，在线支付 - * @param orderCode 订单编号 - * @return: SaOrderRelation - * @Author: sui q - * @Date: 2023/3/17 17:49 - */ - SaOrderRelation querySaOrderRelationBySaOrder(String orderCode); } diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java index 2341c69e..e6cbac5e 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java @@ -296,14 +296,6 @@ public interface ISaOrderService extends IService { */ Boolean confirmRepurchaseSaOrder(OrderParam orderParam); - /* - * @description: 生成新人礼包 - * @author: sui q - * @date: 2023/5/10 13:58 - * @param: null null - **/ - Boolean confirmNewPeopleGift(OrderParam orderParam); - /** * 支付复购订单 * diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java index a1256cbe..31e1f09a 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java @@ -1360,11 +1360,6 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService { approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue(); SaOrder orderQuery = SaOrder.builder().orderStatus(EOrderStatus.PAY.getValue()).orderCode(orderCancelParam.getOrderCode()).build(); orderQuery.setPkCountry(orderCancelParam.getPkCountry()); -// List itemIdList = new ArrayList<>(); -// if (orderCancelParam.getOrderCancelDetailParamList() != null && orderCancelParam.getOrderCancelDetailParamList().size() > 0) { -// orderCancelParam.getOrderCancelDetailParamList().forEach(orderCancelDetailParam -> -// itemIdList.add(orderCancelDetailParam.getPkId())); -// } saOrderExt = iSaOrderService.querySaleOrderExtByOrderCode(orderQuery, new ArrayList<>()); CuMember cuMember = iSaOrderService.getCuMemberByKey(saOrderExt.getPkMember()); saOrderExt.setMemberCode(cuMember.getMemberCode()); @@ -1373,7 +1368,7 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService { saOrderExt = iSaOrderService.queryOrderByCode(orderCancelParam.getOrderCode(), orderCancelParam.getPkCountry()); } if (saOrderExt == null || EOrderStatus.WAIT_PAY.getValue() == saOrderExt.getOrderStatus()) { - validateCancelOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_EMPTY)); + validateCancelOrderVO.setMsg(SaOrderMsgConstants.ORDER_EMPTY); return validateCancelOrderVO; } if (orderCancelParam.getCancelType().equals(ECancelOrderType.SINGLE_CANCEL_ORDER.getValue()) || @@ -1522,13 +1517,15 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService { } } else if (orderCancelParam.getCancelType().equals(ECancelOrderType.OTHER_CANCEL_ORDER.getValue())) { // 其他撤单 - if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) { + if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType() + || EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == saOrderExt.getOrderType() + ) { // 升级订单需要验证是否从最后一单升级订单撤销 List saOrderList = iSaOrderService.querySaleOrderByPkMember(cuMember.getPkSettleCountry(), cuMember.getPkId(), - Arrays.asList(EOrderType.REGISTER_ORDER.getValue(), EOrderType.UPGRADE_ORDER.getValue()), + Arrays.asList(EOrderType.REGISTER_ORDER.getValue(), EOrderType.UPGRADE_ORDER.getValue(), EOrderType.SPECIAL_REGISTER_ORDER.getValue(), EOrderType.SPECIAL_UPGRADE_ORDER.getValue()), Collections.singletonList(EOrderType.RENEWAL_ORDER.getValue())); if (!saOrderList.get(0).getOrderCode().equals(saOrderExt.getOrderCode())) { - validateCancelOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.MEMBER_CANCEL_UPGRADE_ORDER, saOrderList.get(0).getOrderCode())); + validateCancelOrderVO.setMsg(String.format(SaOrderMsgConstants.MEMBER_CANCEL_UPGRADE_ORDER, saOrderList.get(0).getOrderCode())); return validateCancelOrderVO; } if (saOrderList.size() > 1) { @@ -1654,10 +1651,6 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService { EApprovalBusiness approveBusiness = EApprovalBusiness.ORDER_CANCEL; if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT; -// List orderCancelDetailParamList = new ArrayList<>(); -// orderCancelParam.getOrderCancelDetailParamList().forEach(orderCancelDetailParam -> -// orderCancelDetailParamList.add(BeanUtil.copyProperties(orderCancelDetailParam, OrderCancelDetailParam.class))); -// orderCancelParam.setOrderCancelDetailParamList(orderCancelDetailParamList); } // 本次业务修改费用 Map queryChargeMap = null; @@ -2462,7 +2455,7 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService { int approveBusiness = EApprovalBusiness.ORDER_CANCEL.getValue(); SaOrderExt saOrderExt = iSaOrderService.queryOrderByCode(myOrderVO.getOrderCode(), myOrderVO.getPkCountry()); if (saOrderExt == null || EOrderStatus.WAIT_PAY.getValue() == saOrderExt.getOrderStatus()) { - myOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_EMPTY)); + myOrderVO.setMsg(SaOrderMsgConstants.ORDER_EMPTY); return myOrderVO; } diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRelationItemsServiceImpl.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRelationItemsServiceImpl.java index ee0d7485..2be69eea 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRelationItemsServiceImpl.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRelationItemsServiceImpl.java @@ -7,9 +7,7 @@ import com.hzs.sale.order.service.ISaOrderRelationItemsService; import org.springframework.stereotype.Service; /** - *

* 服务实现类 - *

* * @author hzs * @since 2023-03-17 diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRelationServiceImpl.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRelationServiceImpl.java index f71e24e7..467382a7 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRelationServiceImpl.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRelationServiceImpl.java @@ -7,9 +7,7 @@ import com.hzs.sale.order.service.ISaOrderRelationService; import org.springframework.stereotype.Service; /** - *

* 订单与虚拟订单关联表 服务实现类 - *

* * @author hzs * @since 2023-03-17 @@ -17,8 +15,4 @@ import org.springframework.stereotype.Service; @Service public class SaOrderRelationServiceImpl extends ServiceImpl implements ISaOrderRelationService { - @Override - public SaOrderRelation querySaOrderRelationBySaOrder(String orderCode) { - return baseMapper.querySaOrderRelationBySaOrder(orderCode); - } } diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 0673e067..c5f41341 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -9,8 +9,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.activity.dto.AcPeopleGiftProductDTO; -import com.hzs.activity.people.IAcPeopleServiceServiceApi; import com.hzs.activity.pick.param.AcPickQueryParam; import com.hzs.activity.pick.service.IAcPickService; import com.hzs.common.core.config.HzsConfig; @@ -30,6 +28,7 @@ import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.member.base.CuMemberRegister; import com.hzs.common.domain.member.base.CuMemberShare; import com.hzs.common.domain.member.business.UpPolicyCurrency; +import com.hzs.common.domain.member.detail.CuMemberLevel; import com.hzs.common.domain.member.detail.CuMemberServiceLog; import com.hzs.common.domain.member.detail.ext.CuMemberAwardsExt; import com.hzs.common.domain.member.ext.CuMemberAccountExt; @@ -87,7 +86,6 @@ import com.hzs.system.sys.IApprovalServiceApi; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; import com.hzs.system.sys.dto.ApprovalSubmitDTO; import com.hzs.system.sys.dto.LoginUser; -import com.hzs.third.sms.IMailServiceApi; import com.hzs.third.sms.ISmsServiceApi; import com.hzs.third.sms.dto.SmsServiceDTO; import lombok.extern.slf4j.Slf4j; @@ -143,12 +141,8 @@ public class SaOrderServiceImpl extends ServiceImpl impl @DubboReference ISmsServiceApi smsServiceApi; @DubboReference - IMailServiceApi mailServiceApi; - @DubboReference ICuMemberServiceLogServiceApi cuMemberServiceLogServiceApi; @DubboReference - IAcPeopleServiceServiceApi peopleServiceServiceApi; - @DubboReference IMemberTradeServiceApi memberTradeServiceApi; @DubboReference ICuMemberDetailServiceApi iCuMemberDetailServiceApi; @@ -172,12 +166,8 @@ public class SaOrderServiceImpl extends ServiceImpl impl @Autowired private RabbitTemplate rabbitTemplate; @Autowired - private ISaOrderRelationService saOrderRelationService; - @Autowired private IBdWaresSpecsRelationService waresSpecsRelationService; @Autowired - private ISaOrderRelationItemsService saOrderRelationItemsService; - @Autowired private IBdProductService iBdProductService; @Autowired private ISaDeliverItemsService saDeliverItemsService; @@ -187,16 +177,11 @@ public class SaOrderServiceImpl extends ServiceImpl impl private IOrderBusinessService orderBusinessService; @Autowired private ISaOrderChargeLogService saOrderChargeLogService; - + @Autowired private RedisService redisService; - @Autowired private IBdWaresDetailService bdWaresDetailService; - @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } @Override public List queryMemberExtByCondition(CuMember cuMember) { @@ -349,33 +334,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl @Override public CuMemberAccountExt queryOrderSpendDetails(CuMemberAccountExt cuMemberAccount, SaOrder saOrder, List orderItemList) { BigDecimal payMoney = saOrder.getOrderAmount(); - // 验证是否是跨国保单，登录结算国！=结算国，跨国报单修改支付金额 - if (!Objects.equals(cuMemberAccount.getPkCountry(), saOrder.getPkCountry())) { - // 结算国当地币 转美金 美金登录当地币 - CurrencyDTO loginCountryCurrency = currencyServiceApi.getCurrency(cuMemberAccount.getPkCountry()).getData(); - CurrencyDTO settleCountryCurrency = currencyServiceApi.getCurrency(saOrder.getPkCountry()).getData(); - if (settleCountryCurrency.getInExchangeRate().compareTo(loginCountryCurrency.getInExchangeRate()) != 0) { - // 订单结算国与登录结算国汇率不相同才进行处理 - payMoney = ComputeUtil.computeMultiply(ComputeUtil.computeDivide(payMoney, settleCountryCurrency.getInExchangeRate()), loginCountryCurrency.getInExchangeRate()); - } - } - -// // 海粉只有升级可以用奖金币，其他专区只能用现金币，验证会员等级，会员是海粉的话除现金账户，其他账户置为0 -// CuMember cuMember = getCuMemberByKey(saOrder.getPkMember()); -// if (EOrderType.UPGRADE_ORDER.getValue() != saOrder.getOrderType() -// && cuMember != null -// && Objects.equals(MagicNumberConstants.CHINA_HA_FUN, cuMember.getPkSettleGrade()) -// && Objects.equals(CountryConstants.CHINA_COUNTRY, cuMember.getPkSettleCountry())) { -// cuMemberAccount.setAccount1(BigDecimal.ZERO); -// cuMemberAccount.setAccount3(BigDecimal.ZERO); -// cuMemberAccount.setAccount4(BigDecimal.ZERO); -// cuMemberAccount.setAccount5(BigDecimal.ZERO); -// cuMemberAccount.setAccount6(BigDecimal.ZERO); -// cuMemberAccount.setAccount7(BigDecimal.ZERO); -// cuMemberAccount.setAccount8(BigDecimal.ZERO); -// cuMemberAccount.setAccount9(BigDecimal.ZERO); -// cuMemberAccount.setAccount10(BigDecimal.ZERO); -// } // 订单创建人 CuMember creator = getCuMemberByKey(saOrder.getPkCreator()); @@ -396,16 +354,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl } } - // 验证是否是跨国保单，登录结算国！=结算国，跨国报单修改支付金额 - if (!Objects.equals(cuMemberAccount.getPkCountry(), saOrder.getPkCountry())) { - // 结算国当地币 转美金 美金登录当地币 - CurrencyDTO loginCountryCurrency = currencyServiceApi.getCurrency(cuMemberAccount.getPkCountry()).getData(); - CurrencyDTO settleCountryCurrency = currencyServiceApi.getCurrency(saOrder.getPkCountry()).getData(); - if (settleCountryCurrency.getInExchangeRate().compareTo(loginCountryCurrency.getInExchangeRate()) != 0) { - // 订单结算国与登录结算国汇率不相同才进行处理 - payMoney = ComputeUtil.computeMultiply(ComputeUtil.computeDivide(payMoney, settleCountryCurrency.getInExchangeRate()), loginCountryCurrency.getInExchangeRate()); - } - } BigDecimal postage = saOrder.getPostage(); // 处理乐学易考代金券 payMoney = handleLeXueYiKaoCoupon(cuMemberAccount, saOrder, payMoney, orderItemList); @@ -413,7 +361,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl cuMemberAccount.setIsPayment(Boolean.TRUE); } - // 验证商品是否存在特殊消费配置 if (CollectionUtil.isNotEmpty(orderItemList)) { for (SaOrderItems saOrderItems : orderItemList) { @@ -579,8 +526,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl } productIdSet.add(saOrderItems.getPkProduct()); } -// List cuMemberExtList = memberServiceApi.querySponsorOnUmbrella(saOrder.getPkMember(), SysConstants.CHINA_LEX_REPURCHASE_LIST).getData(); -// if (cuMemberExtList.size() > 0) { + List acPickExtList = iAcPickService.queryList(AcPickQueryParam.builder().pkMember(saOrder.getPkMember()).pickType(EPickType.COUPON.getValue()).build(), saOrder.getPkCountry()); // 查询提货专区是否有代金券 if (CollectionUtil.isNotEmpty(acPickExtList)) { @@ -621,7 +567,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl } } } -// } } return payMoney; } @@ -741,13 +686,9 @@ public class SaOrderServiceImpl extends ServiceImpl impl GradeDTO gradeDTO = calculateGradeDTO(saOrderExt.getOrderType(), cuMember.getPkSettleCountry(), cuMember.getPkId(), saOrderExt, orderReturn); // 第二次封装用户 封装等级 -// GradeDTO gradeDTO = saOrderHandle.getMemberGradeAndAwardByCountry(saOrderExt.getOrderType(), saOrderExt.getOrderAmount(), saOrderExt.getOrderAchieve(), -// saOrderExt.getPkCountry()); if (gradeDTO == null) { return true; } -// // new 订单冗余等级套数 -// saOrderExt.setBoxNum(gradeDTO.getBoxNumber()); // 验证推荐等级，判断什么级别可以推荐什么级别 if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) { @@ -764,7 +705,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl } } - // 2023.11.29 奖衔处理提出，必有默认，防止出现奖衔为0的情况 Integer pkAwards = cuMember.getPkAwards(); cuMember.setPkRegisterGrade(gradeDTO.getPkId()); cuMember.setPkSettleGrade(gradeDTO.getPkId()); @@ -781,7 +721,9 @@ public class SaOrderServiceImpl extends ServiceImpl impl } // 等级对应的结算值 cuMember.setConsumeMoney(saOrderExt.getOrderAmount()); - cuMember.setConsumeAchieve(gradeDTO.getStartValue()); + cuMember.setConsumeAchieve(saOrderExt.getOrderAchieve()); + // new 注册业绩改为跟着订单走，V3 V4不能直接购买升级 +// cuMember.setConsumeAchieve(gradeDTO.getStartValue()); if (cuMember.getRegisterAuthority() == null || cuMember.getRegisterAuthority() < gradeDTO.getRegisterAuthority()) { cuMember.setRegisterAuthority(gradeDTO.getRegisterAuthority()); } @@ -898,7 +840,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl saOrderExt.setOrderStatus(EOrderStatus.PAY.getValue()); // 乐学注册、乐学升级订单处理法宝券 - this.handleLxPick(saOrderExt, true); + this.handleLxPick(saOrderExt); if (isToBePay && !isHaiFun) { // 根据业绩判断自动上树 -- 目前使用 @@ -1112,16 +1054,22 @@ public class SaOrderServiceImpl extends ServiceImpl impl if (setLastCuMemberGrade(cuMember, saOrderExt)) { return false; } - // 验证等级，原等级<新等级，才可以进行升级 或者事累计升级 - String upgradeWay = querySystemConfigByKey(saOrderExt.getPkCountry(), ESystemConfig.UPGRADE_WAY.getKey()); - if (oldGradeDTO.getGradeValue() >= cuMember.getPkSettleGradeValue() && !Objects.equals(Integer.toString(EUpgradeWay.TOTAL.getValue()), upgradeWay)) { - return false; + // 验证等级，原等级<新等级 + if (oldGradeDTO.getGradeValue() >= cuMember.getPkSettleGradeValue()) { + if (saOrderExt.getOrderType().equals(EOrderType.SPECIAL_UPGRADE_ORDER.getValue())) { + // new 乐学升级，如果V2可以购买订单金额大于36000的，如果V3可以购买订单金额大于128000的 + if (!((EGrade.MAKER.getValue() == cuMember.getPkSettleGradeValue() && saOrderExt.getOrderAmount().compareTo(MagicNumberConstants.V3_AMOUNT) >= 0) + || (EGrade.VIP.getValue() == cuMember.getPkSettleGradeValue() && saOrderExt.getOrderAmount().compareTo(MagicNumberConstants.V4_AMOUNT) >= 0)) + ) { + return false; + } + } } - // 保存订单 + // 封闭保存订单数据 encapsulationSaOrder(saOrderExt); // 乐学注册、乐学升级订单处理法宝券 - this.handleLxPick(saOrderExt, true); + this.handleLxPick(saOrderExt); // 更新订单信息 updateSaOrder(saOrderExt); @@ -1192,87 +1140,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return true; } - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean confirmNewPeopleGift(OrderParam orderParam) { - // 获取订单编号 - String orderCode = saOrderHandle.createOrderCode(EOrderPrefix.ORDER_CODE.getValue()); - CuMember cuMember = getCuMemberByKey(orderParam.getCenterCodeId()); - SaOrderExt saOrderExt = saOrderHandle.packageSaveSaOrder(orderParam, cuMember, orderCode); - List saOrderItemsList = new ArrayList<>(); - List peopleGiftProductDtoList = peopleServiceServiceApi.getGiftPackProductList(orderParam.getPkNewPeople()).getData(); - // 获取汇率 - CurrencyDTO currency = currencyServiceApi.getCurrency(orderParam.getPkSettleCountry()).getData(); - for (AcPeopleGiftProductDTO acPeopleGiftProductDTO : peopleGiftProductDtoList) { - SaOrderItems saOrderItems = SaOrderItems.builder() - .pkProduct(acPeopleGiftProductDTO.getPkProductId()) - .price(acPeopleGiftProductDTO.getPrice()) - .achievement(BigDecimal.ZERO) - .quantity(acPeopleGiftProductDTO.getQuantity()) - .pkRate(currency.getPkId()) - .pkGrade(cuMember.getPkSettleGrade()) - .pkAwards(cuMember.getPkAwards()) - .orderStatus(EOrderStatus.WAIT_PAY.getValue()) - .specsName(acPeopleGiftProductDTO.getSpecsName()) - .specsNameId(acPeopleGiftProductDTO.getSpecsNameId()) - .build(); - saOrderItems.setPkCountry(saOrderExt.getPkCountry()); - saOrderItems.setPkCreator(saOrderExt.getPkCreator()); - saOrderItems.setCreationTime(saOrderExt.getCreationTime()); - saOrderItemsList.add(saOrderItems); - } - saOrderExt.setPkRate(currency.getPkId()); - saOrderExt.setOrderAmount(peopleGiftProductDtoList.get(0).getReceivePrice()); - saOrderExt.setOrderAchieve(BigDecimal.ZERO); - saOrderExt.setOrderAssAchieve(BigDecimal.ZERO); - saOrderExt.setPostage(BigDecimal.ZERO); - saOrderExt.setPkOriginalOrder(peopleGiftProductDtoList.get(0).getPkBaseId()); - // 计算邮费 - saOrderExt.setOrderItemsList(saOrderItemsList); - if (saOrderExt.getOrderItemsList().size() == 0) { - return false; - } - processOrder(saOrderExt); -// redisService.setCacheObject(CacheConstants.TEMP_ORDER + orderParam.getCenterCodeId() + orderParam.getOrderCode(), saOrderExt, CacheConstants.MEMBER_REFRESH_TIME, TimeUnit.MINUTES); -// redisService.setCacheObject(CacheConstants.TEMP_PARAM + orderParam.getCenterCodeId() + orderParam.getOrderCode(), orderParam, CacheConstants.MEMBER_REFRESH_TIME, TimeUnit.MINUTES); - return true; - } - - /** - * @param orderAmount 订单金额 - * @param postage 邮费 - * @param saOrderExtList 订单列表 - * @Description: 复购订单、福利订单插入 订单跟虚拟订单关系 - * @return: void - * @Author: sui q - * @Date: 2023/3/17 17:46 - */ - private void saveSaOrderRelation(BigDecimal orderAmount, BigDecimal postage, List saOrderExtList) { - if (saOrderExtList.size() > 0) { - SaOrderExt saOrderExt = saOrderExtList.get(0); - SaOrderRelation saOrderRelation = SaOrderRelation.builder() - .orderCode(saOrderHandle.createOrderCode(EOrderPrefix.ORDER_CODE.getValue())) - .orderType(saOrderExt.getOrderType()) - .pkRate(saOrderExt.getPkRate()) - .orderAmount(orderAmount) - .postage(postage) - .build(); - saOrderRelation.setPkCreator(saOrderExt.getPkCreator()); - saOrderRelation.setPkCountry(saOrderExt.getPkCountry()); - saOrderRelationService.save(saOrderRelation); - List saOrderRelationItemsList = new ArrayList<>(); - for (SaOrderExt saOrder : saOrderExtList) { - SaOrderRelationItems saOrderRelationItems = SaOrderRelationItems.builder() - .pkOrder(saOrder.getPkId()) - .build(); - saOrderRelationItems.setPkCountry(saOrder.getPkCountry()); - saOrderRelationItems.setPkCreator(saOrder.getPkCreator()); - saOrderRelationItemsList.add(saOrderRelationItems); - } - saOrderRelationItemsService.saveBatch(saOrderRelationItemsList); - } - } - /** * 支付复购订单 * @@ -1365,7 +1232,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl if (EYesNo.YES.getIntValue() == saOrderItems.getIsGift()) { return; } - // 总价; + // 总价 saOrderExt.setOrderAmount(ComputeUtil.computeAddMultiply(saOrderExt.getOrderAmount(), saOrderItems.getPrice(), saOrderItems.getQuantity())); // 总业绩 saOrderExt.setOrderAchieve(ComputeUtil.computeAddMultiply(saOrderExt.getOrderAchieve(), saOrderItems.getAchievement(), saOrderItems.getQuantity())); @@ -1414,10 +1281,11 @@ public class SaOrderServiceImpl extends ServiceImpl impl GradeDTO gradeDTO = calculateGradeDTO(orderParam.getSpecialArea(), orderParam.getPkSettleCountry(), orderParam.getCenterCodeId(), saOrder, orderReturn); // 注册类型订单直接查询出会员等级 - if (orderParam.getSpecialArea().equals(EOrderType.REGISTER_ORDER.getValue()) || - orderParam.getSpecialArea().equals(EOrderType.SPECIAL_REGISTER_ORDER.getValue())) { + if (orderParam.getSpecialArea().equals(EOrderType.REGISTER_ORDER.getValue()) + || orderParam.getSpecialArea().equals(EOrderType.SPECIAL_REGISTER_ORDER.getValue())) { orderReturn.setIsEnough(Boolean.TRUE); } + if (orderParam.getIsEnough() != null && orderParam.getIsEnough()) { orderReturn.setIsEnough(Boolean.TRUE); CuMember member = getCuMemberByKey(orderParam.getCenterCodeId()); @@ -1438,6 +1306,16 @@ public class SaOrderServiceImpl extends ServiceImpl impl if (grade.getGradeValue() < gradeDTO.getGradeValue()) { orderReturn.setIsEnough(Boolean.TRUE); } else { + if (orderParam.getSpecialArea().equals(EOrderType.SPECIAL_UPGRADE_ORDER.getValue())) { + // new 乐学升级，如果V2可以购买订单金额大于36000的，如果V3可以购买订单金额大于128000的 + if (EGrade.MAKER.getValue() == grade.getGradeValue() + && saOrder.getOrderAmount().compareTo(MagicNumberConstants.V3_AMOUNT) >= 0) { + orderReturn.setIsEnough(Boolean.TRUE); + } else if (EGrade.VIP.getValue() == grade.getGradeValue() + && saOrder.getOrderAmount().compareTo(MagicNumberConstants.V4_AMOUNT) >= 0) { + orderReturn.setIsEnough(Boolean.TRUE); + } + } gradeDTO.setGradeName(null); } } @@ -1454,30 +1332,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl BigDecimal orderAchieve = saOrder.getOrderAchieve(); // 判断专区 升级方式不一样 String upgradeWay = querySystemConfigByKey(pkCountry, ESystemConfig.UPGRADE_WAY.getKey()); - - // new 只有乐学升级，原来升级单逻辑暂时先去掉 -// if (specialArea.equals(EOrderType.UPGRADE_ORDER.getValue())) { -// if (EUpgradeWay.COVER.getValue() != Integer.parseInt(upgradeWay)) { -// // 获得历史订单pv -// QueryWrapper queryWrapper = new QueryWrapper<>(); -// queryWrapper.select(" pk_member,sum(order_amount) order_amount,sum(order_achieve) order_achieve "); -// queryWrapper.eq(SaOrderFieldConstants.ORDER_STATUS, EOrderStatus.PAY.getValue()) -// .eq(MemberFieldConstants.PK_MEMBER, pkMember) -// .groupBy("pk_member"); -// if (StringUtils.isNotEmpty(saOrder.getOrderCode())) { -// queryWrapper.ne(SaOrderFieldConstants.ORDER_CODE, saOrder.getOrderCode()); -// } -// SaOrder hisSaOrder = baseMapper.selectOne(queryWrapper); -// if (hisSaOrder != null) { -// orderAmount = orderAmount.add(hisSaOrder.getOrderAmount()); -// orderAchieve = orderAchieve.add(hisSaOrder.getOrderAchieve()); -// } -// // 累计升级无论是否升级都满足条件 -// if (EUpgradeWay.TOTAL.getValue() == Integer.parseInt(upgradeWay)) { -// orderReturn.setIsEnough(Boolean.TRUE); -// } -// } -// } return saOrderHandle.getMemberGradeAndAwardByCountry(orderAmount, orderAchieve, pkCountry, upgradeWay); } @@ -1741,7 +1595,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl .build(); } } - } if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { @@ -1834,13 +1687,12 @@ public class SaOrderServiceImpl extends ServiceImpl impl cuMember.setConsumeMoney(BigDecimal.ZERO); cuMember.setConsumeAchieve(cuMemberRegister.getConsumeAchieve()); -// // 查询最新一条手动升级记录 -// CuMemberLevel cuMemberLevel = iCuMemberDetailServiceApi.queryLastManualUpgrade(cuMember.getPkId()).getData(); -// if (null != cuMemberLevel) { -// // 存在手动升级 -// cuMember.setPkRegisterGrade(cuMemberLevel.getNewLevel()); -// cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel()); -// } + // 查询最新一条手动升级记录 + CuMemberLevel cuMemberLevel = iCuMemberDetailServiceApi.queryLastManualUpgrade(cuMember.getPkId()).getData(); + if (null != cuMemberLevel) { + // 存在手动升级 + cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel()); + } } else { OrderReturn orderReturn = OrderReturn.builder().isEnough(false).build(); GradeDTO gradeDTO = calculateGradeDTO(EOrderType.UPGRADE_ORDER.getValue(), cuMember.getPkSettleCountry(), cuMember.getPkId(), @@ -1848,24 +1700,11 @@ public class SaOrderServiceImpl extends ServiceImpl impl cuMember.setPkRegisterGrade(gradeDTO.getPkId()); cuMember.setPkSettleGrade(gradeDTO.getPkId()); - // 记录原奖衔与新奖衔 - BdAwards tmpAwards; - // 判断奖衔，原奖衔>新奖衔 不进行变奖衔 - BdAwards oldAwards = awardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData(); - BdAwards newAwards = awardsServiceApi.getAwardsOne(gradeDTO.getPkAwards()).getData(); - if (oldAwards.getAwardsValue() > newAwards.getAwardsValue()) { - cuMember.setPkAwards(gradeDTO.getPkAwards()); - tmpAwards = newAwards; - } else { - tmpAwards = oldAwards; - } - // 查询最新一条手动开通奖衔记录 - CuMemberAwardsExt cuMemberAwardsExt = iCuMemberDetailServiceApi.queryLastManualAwards(cuMember.getPkId()).getData(); - if (null != cuMemberAwardsExt) { - // 存在手动开奖衔 - if (cuMemberAwardsExt.getAwardsValue() > tmpAwards.getAwardsValue()) { - cuMember.setPkAwards(cuMemberAwardsExt.getNewLevel()); - } + // 查询最新一条手动升级记录 + CuMemberLevel cuMemberLevel = iCuMemberDetailServiceApi.queryLastManualUpgrade(cuMember.getPkId()).getData(); + if (null != cuMemberLevel) { + // 存在手动升级 + cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel()); } // 查询最新的手动开通注册权限的记录 @@ -1888,7 +1727,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl // 没有注册或者升级单，则直接扣减升级单的订单金额 cuMember.setConsumeMoney(ComputeUtil.computeSubtract(cuMember.getConsumeMoney(), saOrderExt.getOrderAmount())); } - cuMember.setConsumeAchieve(gradeDTO.getStartValue()); } @@ -3133,9 +2971,10 @@ public class SaOrderServiceImpl extends ServiceImpl impl /** * 注册、升级处理乐学法宝券 + * * @param saOrderExt */ - private void handleLxPick(SaOrderExt saOrderExt, boolean saveData) { + private void handleLxPick(SaOrderExt saOrderExt) { Set productIdList = saOrderExt.getOrderItemsList().stream().map(SaOrderItems::getPkProduct).collect(Collectors.toSet()); List productExtList = iBdProductService.queryProductById(productIdList, saOrderExt.getPkCountry(), ERepurchaseType.LE_XUE_REGISTER.getValue()); if (CollectionUtil.isNotEmpty(productExtList)) { @@ -3146,12 +2985,10 @@ public class SaOrderServiceImpl extends ServiceImpl impl for (SaOrderItems saOrderItems : saOrderExt.getOrderItemsList()) { if (productDtoMap.containsKey(saOrderItems.getPkProduct())) { BdProductExt productDTO = productDtoMap.get(saOrderItems.getPkProduct()); - if (saveData) { - // 加入提货单 - iAcPickService.addPickByActivity(saOrderExt.getPkMember(), EPickType.COUPON.getValue(), 0L, saOrderItems.getPkProduct().longValue(), - saOrderItems.getQuantity(), productDTO.getCover(), null, null, - saOrderExt.getPkCreator(), saOrderExt.getPkCountry(), null); - } + // 加入提货单 + iAcPickService.addPickByActivity(saOrderExt.getPkMember(), EPickType.COUPON.getValue(), 0L, saOrderItems.getPkProduct().longValue(), + saOrderItems.getQuantity(), productDTO.getCover(), null, null, + saOrderExt.getPkCreator(), saOrderExt.getPkCountry(), null); // 法宝券数量冗余在订单主表 saOrderExt.setBoxNum(saOrderItems.getQuantity()); diff --git a/hzs-business/hzs-business-sale/src/main/resources/mapper/activity/bean/AcBeanRuleConfigMapper.xml b/hzs-business/hzs-business-sale/src/main/resources/mapper/activity/bean/AcBeanRuleConfigMapper.xml deleted file mode 100644 index 995e420f..00000000 --- a/hzs-business/hzs-business-sale/src/main/resources/mapper/activity/bean/AcBeanRuleConfigMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/hzs-business/hzs-business-sale/src/main/resources/mapper/activity/fest/AcFestivalRuleConfigMapper.xml b/hzs-business/hzs-business-sale/src/main/resources/mapper/activity/fest/AcFestivalRuleConfigMapper.xml deleted file mode 100644 index 298aece4..00000000 --- a/hzs-business/hzs-business-sale/src/main/resources/mapper/activity/fest/AcFestivalRuleConfigMapper.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/hzs-business/hzs-business-sale/src/main/resources/mapper/activity/people/AcNewPeopleRuleConfigMapper.xml b/hzs-business/hzs-business-sale/src/main/resources/mapper/activity/people/AcNewPeopleRuleConfigMapper.xml deleted file mode 100644 index e569a115..00000000 --- a/hzs-business/hzs-business-sale/src/main/resources/mapper/activity/people/AcNewPeopleRuleConfigMapper.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEL_FLAG, - CREATION_TIME, - PK_CREATOR, - MODIFIED_TIME, - PK_MODIFIED, - PK_COUNTRY, - PK_ID, PK_BASE_ID, PK_GRADE, PLAN, PK_GIFT - - - - - - - diff --git a/hzs-business/hzs-business-sale/src/main/resources/mapper/activity/people/AcPeopleServiceMapper.xml b/hzs-business/hzs-business-sale/src/main/resources/mapper/activity/people/AcPeopleServiceMapper.xml deleted file mode 100644 index 641b741d..00000000 --- a/hzs-business/hzs-business-sale/src/main/resources/mapper/activity/people/AcPeopleServiceMapper.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hzs-business/hzs-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml b/hzs-business/hzs-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml index 0b397937..75ef4585 100644 --- a/hzs-business/hzs-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml +++ b/hzs-business/hzs-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml @@ -1858,7 +1858,7 @@ from sa_order so where so.pk_member = #{pkMember} and so.pk_country = #{pkCountry} - and so.order_type in (1, 2, 7, 25, 26) + and so.order_type in (1, 2, 7, 24, 25) and so.del_flag = 0 order by so.pay_time desc) so where rownum = 1 diff --git a/hzs-business/hzs-business-sale/src/main/resources/mapper/sale/order/SaOrderRelationMapper.xml b/hzs-business/hzs-business-sale/src/main/resources/mapper/sale/order/SaOrderRelationMapper.xml index 75b0f2c8..baee2a1d 100644 --- a/hzs-business/hzs-business-sale/src/main/resources/mapper/sale/order/SaOrderRelationMapper.xml +++ b/hzs-business/hzs-business-sale/src/main/resources/mapper/sale/order/SaOrderRelationMapper.xml @@ -2,23 +2,4 @@ - - - - - - - - - - - - - - - - - diff --git a/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/service/impl/BdGradeServiceImpl.java b/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/service/impl/BdGradeServiceImpl.java index 9e24861d..bcb8d4ba 100644 --- a/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/service/impl/BdGradeServiceImpl.java +++ b/hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/service/impl/BdGradeServiceImpl.java @@ -42,17 +42,12 @@ public class BdGradeServiceImpl extends ServiceImpl impl private IBdGradeScopeService gradeScopeService; @Autowired private IBdBonusExpandService bonusExpandService; + @Autowired + private RedisService redisService; @DubboReference ITransactionServiceApi iTransactionServiceApi; - private RedisService redisService; - - @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } - @Override public BdGrade getBdGrade(Integer pkId) { BdGrade bdGrade = redisService.getCacheObject(CacheConstants.BD_GRADE + pkId); diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/MagicNumberConstants.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/MagicNumberConstants.java index b3e00a00..e2c8f738 100644 --- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/MagicNumberConstants.java +++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/MagicNumberConstants.java @@ -116,4 +116,52 @@ public class MagicNumberConstants { */ public static final BigDecimal LXYK_V1 = new BigDecimal("3280"); + + /** + * 乐学V4注册金额 + */ + public static final BigDecimal V4_AMOUNT = new BigDecimal("128000"); + /** + * 乐学V3注册金额 + */ + public static final BigDecimal V3_AMOUNT = new BigDecimal("36000"); + /** + * 乐学V2注册金额 + */ + public static final BigDecimal V2_AMOUNT = new BigDecimal("6000"); + /** + * 乐学V1注册金额 + */ + public static final BigDecimal V1_AMOUNT = new BigDecimal("2000"); + + // 级差 V4-V4 给的奖金 + public static final BigDecimal V4_V4_BONUS = new BigDecimal("43000"); + // 级差 V4-V3 给的奖金 + public static final BigDecimal V4_V3_BONUS = new BigDecimal("18000"); + // 级差 V4-V2 给的奖金 + public static final BigDecimal V4_V2_BONUS = new BigDecimal("3000"); + // 级差 V4-V1 给的奖金 + public static final BigDecimal V4_V1_BONUS = new BigDecimal("1000"); + + // 级差 V3-V4 给的奖金 + public static final BigDecimal V3_V4_BONUS = new BigDecimal("10800"); + // 级差 V3-V3 给的奖金 + public static final BigDecimal V3_V3_BONUS = new BigDecimal("10800"); + // 级差 V3-V2 给的奖金 + public static final BigDecimal V3_V2_BONUS = new BigDecimal("2400"); + // 级差 V3-V1 给的奖金 + public static final BigDecimal V3_V1_BONUS = new BigDecimal("800"); + + // 级差 V2-V4 给的奖金 + public static final BigDecimal V2_V4_BONUS = new BigDecimal("1800"); + // 级差 V2-V3 给的奖金 + public static final BigDecimal V2_V3_BONUS = new BigDecimal("1800"); + // 级差 V2-V2 给的奖金 + public static final BigDecimal V2_V2_BONUS = new BigDecimal("1800"); + // 级差 V2-V1 给的奖金 + public static final BigDecimal V2_V1_BONUS = new BigDecimal("600"); + + // 级差 V1-V1-4 给的奖金 + public static final BigDecimal V1_V_BONUS = new BigDecimal("400"); + } diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/msg/ActivityMsgConstants.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/msg/ActivityMsgConstants.java index 5e92da40..f636b870 100644 --- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/msg/ActivityMsgConstants.java +++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/msg/ActivityMsgConstants.java @@ -13,22 +13,22 @@ public class ActivityMsgConstants { /** * 会员点击抽奖按钮，验证抽奖次数 -- 购买次数不能为空！ */ - public static final String PAY_DRAW_NUMBER = "MSG_ACTIVITY_001"; + public static final String PAY_DRAW_NUMBER = "购买次数不能为空！"; /** * 会员点击抽奖按钮，验证抽奖次数 -- 抽奖次数不足！ */ - public static final String DRAW_AVAILABLE_NUMBER = "MSG_ACTIVITY_002"; + public static final String DRAW_AVAILABLE_NUMBER = "抽奖次数不足！"; /** * 会员点击抽奖按钮，验证抽奖次数 -- 抽奖活动已经结束，不能抽奖！ */ - public static final String DRAW_OVER = "MSG_ACTIVITY_003"; + public static final String DRAW_OVER = "抽奖活动已经结束，不能抽奖！"; /** * 同一产品信息，重复添加提货数据 -- 当前提货商品已存在不能重复添加 */ - public static final String PICK_PRODUCT_NOT_REPEAT = "MSG_ACTIVITY_004"; + public static final String PICK_PRODUCT_NOT_REPEAT = "当前提货商品已存在不能重复添加"; /** * 修改或者提货时，提货相关数据已经不存在 -- 会员提货商品不存在 @@ -64,13 +64,4 @@ public class ActivityMsgConstants { */ public static final String DRAW_RULE_COMPLETE_INFO = "MSG_ACTIVITY_011"; - /** - * 新人礼包配置 -- 新人礼包配置 - */ - public static final String NEWCOMER_GIFT_PACKAGE = "MSG_ACTIVITY_012"; - /** - * 升级权限赠送 -- 修改姓名、手机号、户籍锁提醒 - */ - public static final String UPGRADE_GIVE_MEMBER = "该会员信息正在被其他人操作，请稍后再试"; - } diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java index fa913e98..559964a9 100644 --- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java +++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java @@ -159,7 +159,7 @@ public class MemberMsgConstants { /** * 升级-是否满足升级条件 -- 不满足升级条件！ */ - public static final String LEVEL_NOT_ENOUGH = "MSG_MEMBER_032"; + public static final String LEVEL_NOT_ENOUGH = "不满足升级条件！"; /** * 注册-是否满足升级条件 -- 不满足升级条件！ diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java index 613a8543..7a6a4019 100644 --- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java +++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java @@ -87,7 +87,7 @@ public class SaOrderMsgConstants { /** * 撤销升级订单，只能从最新的升级订单开始撤销 -- 撤销升级订单，只能从最新的订单开始撤销，最新的升级订单编号：%s！ */ - public static final String MEMBER_CANCEL_UPGRADE_ORDER = "MSG_ORDER_021"; + public static final String MEMBER_CANCEL_UPGRADE_ORDER = "撤销升级订单，只能从最新的订单开始撤销，最新的升级订单编号：%s！"; /** * 撤销订单，验证该订单是否存在其他的签呈 -- 订单存在进行中审批，不能再次发起！ diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EActType.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EActType.java index c2a81540..8ff765d9 100644 --- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EActType.java +++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EActType.java @@ -32,56 +32,21 @@ public enum EActType { */ DIRECT_PUSH_GIFT(13, "直推赠送", 0, EnumsPrefixConstants.ACT_TYPE + "13"), - /** - * 超级工作室赠送 - */ - SUPER_STUDIO_GIFT(14, "超级工作室赠送", 0, EnumsPrefixConstants.ACT_TYPE + "14"), - - /** - * 节日赠送 - */ - HOLIDAY_GIFT(15, "节日赠送", 0, EnumsPrefixConstants.ACT_TYPE + "15"), - - /** - * 新人礼包 - */ - NEW_GIFT(16, "新人礼包", 0, EnumsPrefixConstants.ACT_TYPE + "16"), - /** * 抽奖 */ LOTTERY_DRAW(17, "抽奖", 0, EnumsPrefixConstants.ACT_TYPE + "17"), - /** - * 红包 - */ - RED_PACKET(18, "红包", 0, EnumsPrefixConstants.ACT_TYPE + "18"), - /** * 种植工艺配置（植树） */ TREE(19, "植树", 0, EnumsPrefixConstants.ACT_TYPE + "19"), - /** - * 海豆赠送 - */ - SEA_BEAN(20, "海豆赠送", 0, EnumsPrefixConstants.ACT_TYPE + "20"), - /** - * 权益赠送 - */ - BENEFITS_GIVE(21, "权益赠送", 0, EnumsPrefixConstants.ACT_TYPE + "21"), /** * 旅游活动 */ TOURISM(22, "旅游活动", 0, EnumsPrefixConstants.ACT_TYPE + "22"), - /** - * 沙棘权益赠送 活动 - */ - EQUITY_CONFIG(23, "沙棘权益赠送", 0, EnumsPrefixConstants.ACT_TYPE + "23"), - /** - * 升级权益赠送 活动 - */ - UPGRADE_CONFIG(24, "升级权益赠送", 0, EnumsPrefixConstants.ACT_TYPE + "24"), + /** * 会员消费赠送 活动 */ diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EPickType.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EPickType.java index 32ca5d35..0ee0e099 100644 --- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EPickType.java +++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EPickType.java @@ -25,34 +25,6 @@ public enum EPickType { */ PRIZE(1, "抽奖", EnumsPrefixConstants.ACT_TYPE + "1"), - /** - * 关联 AC_NEW_PEOPLE_RULE_CONFIG、AC_GIFT_CONFIG 表（一次全部提走），目前1.0没有数据，暂时不处理 - */ -// GIFT(2, "新人礼包"), - /** - * 目前1.0没有数据，暂时不处理 - */ -// PRODUCT(3, "商品礼包"), - /** - * 目前1.0没有数据，暂时不处理 - */ -// SEA_BUCKTHORN(4, "沙棘提货"), - - /** - * 关联 BS_PRODUCT 表（指定基数3） - */ -// MAKER_SEA_BUCKTHORN(5, "创客沙棘提货", EnumsPrefixConstants.ACT_TYPE + "5"), - - /** - * 目前1.0没有数据，暂时不处理 - */ -// FANS_SEA_BUCKTHORN(6, "宠粉沙棘果汁"), - - /** - * 关联 BS_PRODUCT 表（指定基数3） - */ -// REPURCHASE_PICK(7, "复购提货", EnumsPrefixConstants.ACT_TYPE + "7"), - /** * 关联 BS_PRODUCT 表, 用于乐学易考 */ @@ -68,16 +40,6 @@ public enum EPickType { */ DIRECT_PUSH_GIFT(13, "直推赠送", EnumsPrefixConstants.ACT_TYPE + "13"), - /** - * 关联 AC_GIFT_CONFIG 表 -- 未对接 - */ -// SUPER_STUDIO_GIFT(14, "超级工作室赠送", EnumsPrefixConstants.ACT_TYPE + "14"), - - /** - * 关联 AC_GIFT_CONFIG 表 -- 未对接 - */ -// HOLIDAY_GIFT(15, "节日赠送", EnumsPrefixConstants.ACT_TYPE + "15"), - /** * 关联 AC_GIFT_CONFIG 表 */ diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/utils/ComputeUtil.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/utils/ComputeUtil.java index 0ca941fc..4b8c609d 100644 --- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/utils/ComputeUtil.java +++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/utils/ComputeUtil.java @@ -62,7 +62,7 @@ public class ComputeUtil { /** * @param subtract 值1 * @param subtract1 值2 - * 统一的减法计算方法 + * 统一的减法计算方法，前面减后面 * @return: BigDecimal * @Author: sui q * @Date: 2022/9/20 21:09 @@ -166,7 +166,7 @@ public class ComputeUtil { /** * @param value1 值1 - * @Description: 比较大小，前面的值大于等于后面的值 + * @Description: 值大于0则返回true * @return: Boolean * @Author: sui q * @Date: 2022/9/20 21:23 diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/utils/UploadFileUtil.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/utils/UploadFileUtil.java index 86936ce4..234d12d6 100644 --- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/utils/UploadFileUtil.java +++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/utils/UploadFileUtil.java @@ -142,7 +142,6 @@ public class UploadFileUtil { // 设置通用编码格式10 // 设置最大值：比特率越高，清晰度/音质越好 // 设置音频比特率,单位:b (比特率越高，清晰度/音质越好，当然文件也就越大 128000 = 182kb) -// System.out.println("============ audioInfo.getBitRate : " + audioInfo.getBitRate()); if (audioInfo.getBitRate() > maxBitRate) { audioAttributes.setBitRate(maxBitRate); } @@ -152,7 +151,6 @@ public class UploadFileUtil { // 设置音频采样率，单位：赫兹 hz // 设置编码时候的音量值，未设置为0,如果256，则音量值不会改变 audioAttributes.setVolume(256); -// System.out.println("============ audioInfo.getSamplingRate : " + audioInfo.getSamplingRate()); if (audioInfo.getSamplingRate() > maxSamplingRate) { audioAttributes.setSamplingRate(maxSamplingRate); } @@ -165,14 +163,12 @@ public class UploadFileUtil { VideoAttributes video = new VideoAttributes(); video.setCodec("h264"); //设置视频比特率,单位:b (比特率越高，清晰度/音质越好，当然文件也就越大 800000 = 800kb) -// System.out.println("============ videoInfo.getBitRate : " + videoInfo.getBitRate()); if (videoInfo.getBitRate() > bitRate) { video.setBitRate(bitRate); } // 视频帧率：15 f / s 帧率越低，效果越差 // 设置视频帧率（帧率越低，视频会出现断层，越高让人感觉越连续），视频帧率（Frame rate）是用于测量显示帧数的量度。所谓的测量单位为每秒显示帧数(Frames per Second，简：FPS）或“赫兹”（Hz）。 -// System.out.println("============ videoInfo.getFrameRate : " + videoInfo.getFrameRate()); if (videoInfo.getFrameRate() > maxFrameRate) { video.setFrameRate(maxFrameRate); } diff --git a/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/activity/fest/AcFestivalRuleConfig.java b/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/activity/fest/AcFestivalRuleConfig.java deleted file mode 100644 index a4faaab9..00000000 --- a/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/activity/fest/AcFestivalRuleConfig.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.hzs.common.domain.activity.fest; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 节日赠送规则表 - *

- * - * @author hzs - * @since 2023-04-21 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("AC_FESTIVAL_RULE_CONFIG") -@KeySequence("AC_RULE_CONFIG_SEQ") -public class AcFestivalRuleConfig extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 活动基本配置主键 - */ - @TableField("PK_BASE_ID") - private Long pkBaseId; - - /** - * 真实奖衔 - */ - @TableField("PK_AWARDS") - private Long pkAwards; - - /** - * 订单类型 所属专区 - */ - @TableField("ORDER_TYPE") - private Integer orderType; - - -} diff --git a/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/activity/people/AcNewPeopleRuleConfig.java b/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/activity/people/AcNewPeopleRuleConfig.java deleted file mode 100644 index 13ba19c5..00000000 --- a/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/activity/people/AcNewPeopleRuleConfig.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.hzs.common.domain.activity.people; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - *

- * 新人礼包规则表 - *

- * - * @author hzs - * @since 2023-04-24 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("AC_NEW_PEOPLE_RULE_CONFIG") -@KeySequence("AC_RULE_CONFIG_SEQ") -public class AcNewPeopleRuleConfig extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 活动基本配置主键 - */ - @TableField("PK_BASE_ID") - private Long pkBaseId; - - /** - * 等级id - */ - @TableField("PK_GRADE") - private Integer pkGrade; - - /** - * 方案名称 - */ - @TableField("PLAN") - private String plan; - - - /** - * 价格 - */ - @TableField("PRICE") - private BigDecimal price; - - - /** - * 有限期 10天 20天 30天.... - */ - @TableField("TERM") - private Integer term; - /** - * 必选商品ID - */ - @TableField("MUST_WARES") - private Integer mustWares; - /** - * 屏蔽商品ID - */ - @TableField("SHIELD_WARES") - private Integer shieldWares; - - - - - - - - -} diff --git a/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/activity/people/AcPeopleService.java b/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/activity/people/AcPeopleService.java deleted file mode 100644 index 93496605..00000000 --- a/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/activity/people/AcPeopleService.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.hzs.common.domain.activity.people; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 新人礼包活动业务表 - *

- * - * @author hzs - * @since 2023-04-26 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) -@TableName("AC_PEOPLE_SERVICE") -@KeySequence("AC_PEOPLE_SERVICE_SEQ") -public class AcPeopleService extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId("PK_ID") - private Long pkId; - - /** - * 会员主键 - */ - @TableField("PK_MEMBER") - private Long pkMember; - - /** - * 活动基本配置主键 - */ - @TableField("PK_BASE_ID") - private Long pkBaseId; - - /** - * 活动规则主键 - */ - @TableField("PK_NEW_PEOPLE") - private Long pkNewPeople; - /** - * 方案状态 0 未选择 1 已选择 EPlanState - */ - @TableField("PLAN_STATE") - private Integer planState; - - - -}