## 指定体系比例1440:1440；

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<Long, CuMemberAssess> cuMemberAssessMap = new HashMap<>();
 
-            // TODO new 新逻辑没有复购考核，根据上月结余判断大小区，然后判断本月小区新増业绩来判断拿几代
+            // 新逻辑没有复购考核，根据上月结余判断大小区，然后判断本月小区新増业绩来判断拿几代
             // 奖衔会员能拿几代领导奖（key:会员ID，value:奖衔值+上月结余+本月新増）
             Map<Long, CuMemberSettleExt> cuMemberBonusNumMap = getCoachAwardsMemberMap(settleTableName, settleDateStr, cuMemberSettleExtList);
 

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);

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<CuMemberBonusCoach> cuMemberBonusCoachList = bonusSettleFirstPurchaseHandle.calculateCoachBonus(cuMemberSettleExtMap, settleTableName, settleDate, bonusConfigDTO, expandOrderList,
+        List<CuMemberBonusCoach> cuMemberBonusCoachList = bonusSettleFirstPurchaseHandle.calculateCoachBonus(cuMemberSettleExtMap, settleTableName, settleDate,
-                cuMemberBonusExpandList, period, cuMemberBonusMap, cuAwardsControlMap, riskControlMap, awardsList, true, true);
+                bonusConfigDTO, expandOrderList, cuMemberBonusExpandList, period, cuMemberBonusMap, cuAwardsControlMap, riskControlMap, awardsList, true, true);
         if (cuMemberBonusCoachList.size() > 0) {
             if (CollectionUtil.isNotEmpty(bonusRecordDetailVO.getCuMemberBonusCoachList())) {
                 bonusRecordDetailVO.getCuMemberBonusCoachList().addAll(cuMemberBonusCoachList);

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 (
         <include refid="QueryMemberParent"></include>
         ) 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

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;
+
 }