From b79be212208ff5a271577babbedd56b749b94a0e Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 2 Sep 2025 09:20:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?##=20=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=93=E5=8C=BA=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java index d0083aae..532e9668 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java @@ -571,6 +571,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl Date: Tue, 2 Sep 2025 11:08:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?##=20=E5=85=BC=E5=AE=B9=E8=B0=83=E6=8D=A2?= =?UTF-8?q?=E8=B4=A7=E4=BA=A7=E5=93=81=E4=B9=8B=E5=90=8E=E7=9A=84=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E6=B8=85=E5=8D=95=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/manage/SaDeliverUnhandledController.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java index a736f3d8..f6e3acd2 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java @@ -108,6 +108,10 @@ public class SaDeliverUnhandledController extends BaseController { param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList()); param.setVertexIdList(userAuthorityDTO.getVertexIdList()); param.setTeamList(userAuthorityDTO.getUserTeamList()); + // 兼容调换货产品 + if (CollectionUtil.isEmpty(param.getPkWaresList())) { + param.setPkWaresList(Collections.singletonList(0)); + } startPage(); List resultList = iSaOrderItemsService.queryDeliverUnhandledList(param, pkCountry); @@ -151,6 +155,10 @@ public class SaDeliverUnhandledController extends BaseController { param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList()); param.setVertexIdList(userAuthorityDTO.getVertexIdList()); param.setTeamList(userAuthorityDTO.getUserTeamList()); + // 兼容调换货产品 + if (CollectionUtil.isEmpty(param.getPkWaresList())) { + param.setPkWaresList(Collections.singletonList(0)); + } List resultList = iSaOrderItemsService.queryDeliverUnhandledList(param, pkCountry); From a4c2b5c2c97bf9526097968974bd2c14056f96d5 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 2 Sep 2025 11:55:25 +0800 Subject: [PATCH 3/4] =?UTF-8?q?##=20=E6=92=A4=E5=8D=95=E7=A7=92=E7=BB=93?= =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/mapper/CuMemberBonusMapper.java | 5 +++ .../bonus/service/ICuMemberBonusService.java | 5 +++ .../service/impl/BonusSettleServiceImpl.java | 11 +----- .../impl/CuMemberBonusServiceImpl.java | 7 ++++ .../bonus/bonus/CuMemberBonusMapper.xml | 38 +++++++++++++++++++ .../service/impl/SaOrderServiceImpl.java | 25 ++++++++++++ .../api/ApiShoppingCartController.java | 6 +-- .../hzs/common/core/enums/EBonusItems.java | 6 +-- 8 files changed, 86 insertions(+), 17 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusMapper.java index 2811b425..290535e7 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusMapper.java @@ -85,4 +85,9 @@ public interface CuMemberBonusMapper extends BaseMapper { */ void insertOrUpdateCuMemberBonus(@Param("cuMemberBonusList") List cuMemberBonusList); + /** + * 回退奖金 + */ + void mergeBackRangeBonusIncome(@Param("pkOrder") Long pkOrder, @Param("bonusValue") Integer bonusValue); + } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusService.java index 1d3e3074..1ef6dfd5 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusService.java @@ -147,4 +147,9 @@ public interface ICuMemberBonusService extends IService { */ List queryMemberSecondBonusVoByCondition(BonusParam bonusParam); + /** + * 新零售撤单，回退奖金 + */ + void mergeBackMemberBonusIncome(Long pkOrder); + } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java index 371acc23..d88b9447 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java @@ -135,15 +135,8 @@ public class BonusSettleServiceImpl implements IBonusSettleService { } } else { // 订单撤单处理（逆向） -// if (!DateUtils.isSameDay(saOrderExt.getPayTime(), DateUtils.currentDate())) { -// settleDate = DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS)); -// currentPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(settleDate).getPkId(); -// } -// // 实时计算撤单数据（业绩、盒数、等级、奖衔、日奖） -// bonusSettleRangeHandle.calculateCuMemberBackRetailIncome(saOrderExt, bonusConfigDTO, -// secondRangeTableName, beforePeriod, currentPeriod); -// // 处理收益 -// iCuMemberBonusService.mergeBackMemberBonusIncome(saOrderExt.getPkId()); + // 处理收益 + iCuMemberBonusService.mergeBackMemberBonusIncome(saOrderExt.getPkId()); } } } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java index 9884e49c..e450f3a3 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java @@ -423,4 +423,11 @@ public class CuMemberBonusServiceImpl extends ServiceImpl + + + merge into cu_member_bonus a + using ( + select b.* from bd_bonus_items bt + inner join ( + select pk_bonus, pk_bonus_items, + sum(pretax_income) pretax_income, + sum(income_tax) income_tax, + sum(real_income) real_income + from + + cu_member_bonus_detail + cu_member_bonus_range + + where del_flag = 0 + and pk_order= #{pkOrder} + group by pk_bonus, pk_bonus_items + ) b + on bt.pk_id = b.pk_bonus_items + where bt.bonus_value = #{bonusValue} + ) b + on (a.pk_id = b.pk_bonus) + when matched then + update set a.retail_real_subtotal = a.retail_real_subtotal - b.real_income, + a.back_points = a.back_points - b.income_tax, + a.real_income_total = a.real_income_total - b.real_income + + ,a.retail_range_income = a.retail_range_income - b.pretax_income + + + ,a.repur_range_income = a.repur_range_income - b.pretax_income + + + ,a.retail_area_income = a.retail_area_income - b.pretax_income + + + diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index d50611bb..23b6dd18 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -1335,6 +1335,8 @@ public class SaOrderServiceImpl extends ServiceImpl impl } try { + // 撤单秒结处理 + this.pushCancelOrderMq(saOrderExt); // 推送MQ的列表 List mqList = new ArrayList<>(); mqList.add(saOrderExt); @@ -1766,6 +1768,8 @@ public class SaOrderServiceImpl extends ServiceImpl impl } try { + // 撤单秒结处理 + this.pushCancelOrderMq(saOrderExt); // 推送MQ，处理活动回退 rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_CANCEL_EXCHANGE, RabbitMqConstants.ORDER_CANCEL_KEY, Collections.singletonList(saOrderExt)); } catch (Exception e) { @@ -2224,4 +2228,25 @@ public class SaOrderServiceImpl extends ServiceImpl impl } } + /** + * 订单推送MQ处理 + * + * @param saOrderExt 会员订单 + */ + private void pushCancelOrderMq(SaOrderExt saOrderExt) { + try { + if (EOrderType.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType() + || EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType() + || EOrderType.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType()) { + // 撤单标记为 true + saOrderExt.setCancelBool(Boolean.TRUE); + // 计算奖金，通过mq分发消息，异步处理 + log.info("新零售秒结消息，order.second.exchange：{}", saOrderExt.getOrderCode()); + rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt); + } + } catch (Exception e) { + log.error("新零售 pushOrderMq 推送MQ失败. order: {}", saOrderExt, e); + } + } + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/controller/api/ApiShoppingCartController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/controller/api/ApiShoppingCartController.java index 4fb54840..5eaeb713 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/controller/api/ApiShoppingCartController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/controller/api/ApiShoppingCartController.java @@ -162,11 +162,7 @@ public class ApiShoppingCartController extends BaseController { } /** - * @description: 专区购物车数量 getAreaShoppingCount - * @author: zhang jing - * @date: 2024/3/28 10:27 - * @param: [shoppingCartVO] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 专区购物车数量 getAreaShoppingCount **/ @GetMapping("/getAreaShoppingCount") public AjaxResult getAreaShoppingCount(ShoppingCartVO shoppingCartVO) { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java index a8d60f24..8c1b8b99 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java @@ -58,15 +58,15 @@ public enum EBonusItems { ////////////////////////////////////////////////// 新奖项 ////////////////////////////////////////////////// /** - * 直推级差收益 -- 日奖 + * 直推级差收益 -- 日奖、秒奖 */ RETAIL_RANGE_INCOME(25, "直推级差收益", 0), /** - * 复购级差收益 -- 日奖 + * 复购级差收益 -- 日奖、秒奖 */ RETAIL_REPURCHASE_INCOME(35, "复购级差收益", 0), /** - * 复购配送收益 -- 日奖 + * 复购配送收益 -- 日奖、秒奖 */ RETAIL_REPURCHASE_DELIVERY_INCOME(36, "复购配送收益", 0), From 680421b5b72e63e17ca7a7cbe41cbf868881e7d3 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Tue, 2 Sep 2025 13:19:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E5=86=8C=E4=B8=9A=E7=BB=A9=E3=80=81?= =?UTF-8?q?=E5=9B=A2=E9=98=9F=E4=BA=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzs/retail/member/vo/RecommendListVO.java | 14 +++++- .../mapper/member/base/CuMemberMapper.xml | 47 ++++++++++++++----- .../common/domain/member/ext/CuMemberExt.java | 5 ++ 3 files changed, 52 insertions(+), 14 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/RecommendListVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/RecommendListVO.java index 739ea684..e3c7b53a 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/RecommendListVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/RecommendListVO.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -22,7 +23,7 @@ import java.util.Date; @NoArgsConstructor @Data public class RecommendListVO implements Serializable { - + //会员编号、会员姓名、会员等级、注册业绩、团队人数 /** * 会员编号 */ @@ -55,4 +56,15 @@ public class RecommendListVO implements Serializable { */ private String phone; + /** + * 注册业绩 + */ + + private BigDecimal consumeAchieve; + + /** + * 团队人数 + */ + private Integer teamCount; + } diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml index d1b1200c..fabe754d 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml @@ -2313,19 +2313,40 @@ diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberExt.java index 67bde007..afb824e7 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberExt.java @@ -183,6 +183,11 @@ public class CuMemberExt extends CuMember { */ private String teamName; + /** + * 团队人数 + */ + private Integer teamCount; + /** * 次数 */