From 4558c385d859decc47ba74617040ae3efd1cedb8 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 7 Aug 2025 11:45:24 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=8C=87=E5=AE=9A=E4=BD=93=E7=B3=BB?= =?UTF-8?q?=E6=AF=94=E4=BE=8B1440:1440=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BonusSettleFirstPurchaseHandle.java | 4 +--- .../service/impl/BonusSettleNewExpandHandle.java | 16 ++++++++++++++++ .../service/impl/BonusSettleServiceImpl.java | 4 ++-- .../mapper/bonus/achieve/CuMemberTreeMapper.xml | 6 +++--- .../hzs/common/core/constant/SysConstants.java | 11 +++++++++-- 5 files changed, 31 insertions(+), 10 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java index acfef178..d6ec792f 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java @@ -19,7 +19,6 @@ import com.hzs.common.domain.member.detail.CuMemberAssess; import com.hzs.common.domain.member.ext.CuBonusExpandExt; import com.hzs.common.domain.member.ext.CuMemberSettleExt; import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.sale.order.SaOrder; import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.domain.system.config.BdGrade; import com.hzs.system.config.IGradeServiceApi; @@ -30,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.math.BigDecimal; -import java.time.temporal.ChronoUnit; import java.util.*; import java.util.stream.Collectors; @@ -556,7 +554,7 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { Map cuMemberAssessMap = new HashMap<>(); - // TODO new 新逻辑没有复购考核，根据上月结余判断大小区，然后判断本月小区新増业绩来判断拿几代 + // 新逻辑没有复购考核，根据上月结余判断大小区，然后判断本月小区新増业绩来判断拿几代 // 奖衔会员能拿几代领导奖（key:会员ID，value:奖衔值+上月结余+本月新増） Map cuMemberBonusNumMap = getCoachAwardsMemberMap(settleTableName, settleDateStr, cuMemberSettleExtList); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleNewExpandHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleNewExpandHandle.java index 8ff91ac4..8c0d1711 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleNewExpandHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleNewExpandHandle.java @@ -2,6 +2,8 @@ package com.hzs.bonus.bonus.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; +import com.hzs.common.core.config.BdConfig; +import com.hzs.common.core.constant.SysConstants; import com.hzs.common.core.enums.*; import com.hzs.common.core.utils.ComputeUtil; import com.hzs.common.domain.bonus.BdBonusDeduct; @@ -237,6 +239,20 @@ public class BonusSettleNewExpandHandle extends BonusSettleHandle { small = bonusExpandDTO.getExpandSmall(); big = bonusExpandDTO.getExpandBig(); } + // 2025.08.07 指定体系1440:1440碰 + if (EEnv.TEST.getValue().equals(BdConfig.getEnv())) { + // 测试环境 + if (SysConstants.PK_VERTEX_1440_TEST.equals(targetMemberSettleExt.getPkVertex())) { + small = new BigDecimal("1440"); + big = new BigDecimal("1440"); + } + } else { + // 生产环境 + if (SysConstants.PK_VERTEX_1440_ONLINE.equals(targetMemberSettleExt.getPkVertex())) { + small = new BigDecimal("1440"); + big = new BigDecimal("1440"); + } + } targetMemberSettleExt.setAExpandPv(BigDecimal.ZERO); targetMemberSettleExt.setBExpandPv(BigDecimal.ZERO); 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 565ef418..0742fb25 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 @@ -1359,8 +1359,8 @@ public class BonusSettleServiceImpl implements IBonusSettleService { //*********************************计算领导奖（辅导收益）************************/ // 判断是否有量奖，有量奖有辅导奖 - List cuMemberBonusCoachList = bonusSettleFirstPurchaseHandle.calculateCoachBonus(cuMemberSettleExtMap, settleTableName, settleDate, bonusConfigDTO, expandOrderList, - cuMemberBonusExpandList, period, cuMemberBonusMap, cuAwardsControlMap, riskControlMap, awardsList, true, true); + List cuMemberBonusCoachList = bonusSettleFirstPurchaseHandle.calculateCoachBonus(cuMemberSettleExtMap, settleTableName, settleDate, + bonusConfigDTO, expandOrderList, cuMemberBonusExpandList, period, cuMemberBonusMap, cuAwardsControlMap, riskControlMap, awardsList, true, true); if (cuMemberBonusCoachList.size() > 0) { if (CollectionUtil.isNotEmpty(bonusRecordDetailVO.getCuMemberBonusCoachList())) { bonusRecordDetailVO.getCuMemberBonusCoachList().addAll(cuMemberBonusCoachList); diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml index 0413790c..8ffd3a45 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml @@ -216,7 +216,7 @@ register_amount, register_pv, upgrade_amount, upgrade_pv, repurchase_amount, repurchase_pv, hi_fun_amount, hi_fun_pv, mall_amount, mall_pv, category, pk_grade, pk_center_code, min_achieve, round, second, bg.grade_value, store_level, expire_status, - a_fir_balance, a_rep_balance, b_fir_balance, b_rep_balance + a_fir_balance, a_rep_balance, b_fir_balance, b_rep_balance, pk_vertex from ( ) a @@ -289,7 +289,7 @@ register_amount, register_pv, upgrade_amount, upgrade_pv, repurchase_amount, repurchase_pv, hi_fun_amount,hi_fun_pv,mall_amount,mall_pv, pk_center_code, category,pk_grade, min_achieve, round, second, store_level, expire_status, - a_fir_balance, a_rep_balance, b_fir_balance, b_rep_balance + a_fir_balance, a_rep_balance, b_fir_balance, b_rep_balance, pk_vertex from ${settleTableName} where pay_status = 1 start with pk_member = #{item} @@ -937,7 +937,7 @@ register_amount, register_pv, upgrade_amount, upgrade_pv, repurchase_amount, repurchase_pv, hi_fun_amount,hi_fun_pv,mall_amount,mall_pv, pk_center_code, category,pk_grade, min_achieve, round, second, store_level, expire_status, - a_fir_balance, a_rep_balance, b_fir_balance, b_rep_balance, bg.grade_value + a_fir_balance, a_rep_balance, b_fir_balance, b_rep_balance, bg.grade_value, pk_vertex from ${settleTableName} a inner join bd_grade bg on a.pk_grade = bg.pk_id diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java index a656e24b..8b4a795f 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java @@ -1,7 +1,5 @@ package com.hzs.common.core.constant; -import java.math.BigDecimal; - /** * 系统使用常量 */ @@ -27,4 +25,13 @@ public class SysConstants { */ public static final String SPECIAL_CODE = "BD68880628"; + /** + * 2025.08.07 德道生产环境体系ID，碰1440:1440 + */ + public static final Long PK_VERTEX_1440_ONLINE = 387L; + /** + * 2025.08.07 测试环境体系ID，碰1440:1440 + */ + public static final Long PK_VERTEX_1440_TEST = 347L; + }