From 700e7ca20ef9eaf3ed928dacdfbfec6f8e72ea1d Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 29 Apr 2025 15:57:24 +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=E5=8D=87=E7=BA=A7=E4=BB=A3=E9=87=91=E5=88=B8=E8=A1=A5?= =?UTF-8?q?=E5=85=A8=E8=A7=84=E6=A0=BC=E4=BF=A1=E6=81=AF=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ActivityServiceImpl.java | 25 ------------------- .../impl/AcDrawRewardRecordServiceImpl.java | 2 +- .../activity/pick/service/IAcPickService.java | 4 ++- .../pick/service/impl/AcPickServiceImpl.java | 8 +++++- .../AcRepurCouponsRuleConfigServiceImpl.java | 5 +--- .../service/impl/SaOrderServiceImpl.java | 2 +- 6 files changed, 13 insertions(+), 33 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java index 2748b20d..ee9a812b 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java @@ -918,31 +918,6 @@ public class ActivityServiceImpl implements IActivityService { pickUpConfigService.save(pickUpConfig); } } - - } - - private void specialRegisterOrder(SaOrderExt saOrderExt) { -// List cuMemberExtList = iMemberServiceApi.querySponsorOnUmbrella(saOrderExt.getPkMember(), SysConstants.CHINA_LEX_REPURCHASE_LIST).getData(); -// if (cuMemberExtList.size() > 0) { - // 查询订单的产品有没有 复购类型为乐学易考的，乐学易考的是赠送的代金券，价格是金额 - Set productIdList = saOrderExt.getOrderItemsList().stream().map(SaOrderItems::getPkProduct).collect(Collectors.toSet()); - List productExtList = productService.queryProductById(productIdList, saOrderExt.getPkCountry(), ERepurchaseType.LE_XUE_REGISTER.getValue()); - if (CollectionUtil.isNotEmpty(productExtList)) { - Map productDtoMap = new HashMap<>(ComputeUtil.mapInitCapacity(productExtList.size())); - productExtList.forEach(productDTO -> - productDtoMap.put(productDTO.getPkId(), productDTO)); - // 记录数量 - for (SaOrderItems saOrderItems : saOrderExt.getOrderItemsList()) { - if (productDtoMap.containsKey(saOrderItems.getPkProduct())) { - BdProductExt productDTO = productDtoMap.get(saOrderItems.getPkProduct()); - // 加入提货单 - iAcPickService.addPickByActivity(saOrderExt.getPkMember(), EPickType.COUPON.getValue(), 0L, saOrderItems.getPkProduct().longValue(), - saOrderItems.getQuantity(), productDTO.getCover(), null, null, - saOrderExt.getPkCreator(), saOrderExt.getPkCountry(), null); - } - } - } -// } } @Override diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardRecordServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardRecordServiceImpl.java index 613b7085..fe935dd6 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardRecordServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardRecordServiceImpl.java @@ -153,7 +153,7 @@ public class AcDrawRewardRecordServiceImpl extends ServiceImpl { * @param pkCreator 创建人 * @param pkCountry 所属国家 * @param pkBaseId 活动ID（活动必填，非活动可传null） + * @param specsNameId 规格ID + * @param specsName 规格名称 * @return */ boolean addPickByActivity(Long pkMember, Integer pickType, Long pkBaseConfig, Long pkDataId, Integer usableQuantity, String pickCover, Date receiveTime, Integer pkPostage, - Long pkCreator, Integer pkCountry, Long pkBaseId); + Long pkCreator, Integer pkCountry, Long pkBaseId, String specsNameId, String specsName); /** * 根据会员和类型回退使用数量 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickServiceImpl.java index 173faf31..84a9f115 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickServiceImpl.java @@ -89,7 +89,7 @@ public class AcPickServiceImpl extends ServiceImpl impleme @Override public boolean addPickByActivity(Long pkMember, Integer pickType, Long pkBaseConfig, Long pkDataId, Integer usableQuantity, String pickCover, Date receiveTime, Integer pkPostage, - Long pkCreator, Integer pkCountry, Long pkBaseId) { + Long pkCreator, Integer pkCountry, Long pkBaseId, String specsNameId, String specsName) { if (baseMapper.addQuantityByActivity(pickType, pkBaseConfig, pkDataId, pkMember, usableQuantity, pkPostage, receiveTime, pkCreator) == 0) { AcPick acPick = new AcPick(); acPick.setPkMember(pkMember); @@ -115,6 +115,12 @@ public class AcPickServiceImpl extends ServiceImpl impleme if (null != pkBaseId) { acPick.setPkBaseId(pkBaseId); } + if (null != specsNameId) { + acPick.setSpecsNameId(specsNameId); + } + if (null != specsName) { + acPick.setSpecsName(specsName); + } return baseMapper.insert(acPick) > 0; } return true; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurCouponsRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurCouponsRuleConfigServiceImpl.java index e7352a6e..dc2b2d7d 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurCouponsRuleConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurCouponsRuleConfigServiceImpl.java @@ -711,12 +711,10 @@ public class AcRepurCouponsRuleConfigServiceImpl extends ServiceImpl recomUpgradeRuleConfigList = recomUpgradeRuleConfigService.selectRuleConfig(recommendUpgradeVO); if (CollUtil.isNotEmpty(recomUpgradeRuleConfigList)) { - log.info("===插入业务表"); AcRecomUpgradeRuleConfig recomUpgradeRuleConfig = recomUpgradeRuleConfigList.get(0); //正常报单 Long pkRuleId = recomUpgradeRuleConfig.getPkId(); @@ -778,7 +775,7 @@ public class AcRepurCouponsRuleConfigServiceImpl extends ServiceImpl impl // 加入提货单 iAcPickService.addPickByActivity(saOrderExt.getPkMember(), EPickType.COUPON.getValue(), 0L, saOrderItems.getPkProduct().longValue(), saOrderItems.getQuantity(), productDTO.getCover(), null, null, - saOrderExt.getPkCreator(), saOrderExt.getPkCountry(), null); + saOrderExt.getPkCreator(), saOrderExt.getPkCountry(), null, saOrderItems.getSpecsNameId(), saOrderItems.getSpecsName()); // 法宝券数量冗余在订单主表 saOrderExt.setBoxNum(saOrderItems.getQuantity());