Merge remote-tracking branch 'origin/dev' into dev

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusRecordDetailVO.java

@@ -31,4 +31,10 @@ public class BonusRecordDetailVO implements Serializable {
      * 阶段收益
      */
     private List<CuMemberBonusStage> cuMemberBonusStageList;
+
+    /**
+     * 赠品积分
+     */
+    private List<CuMemberBonusDetail> cuMemberBonusDetailList;
+
 }

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/constant/BonusConstants.java

@@ -23,14 +23,23 @@ public class BonusConstants {
     public static final BigDecimal RANGE_BONUS_ACHIEVE = RetailConstants.SPECIAL_AREA_41_MAX_ORDER_DIVIDEND_PV_VALUE;
 
     /**
-     * 赠送2个点位订单金额
+     * 赠送2个点位订单业绩（2025.10.13精品专区改为按业绩处理）
      */
     public static final BigDecimal GIFT_TWO_AMOUNT = new BigDecimal("20000");
     /**
-     * 赠送1个点位订单金额
+     * 赠送1个点位订单业绩（2025.10.13精品专区改为按业绩处理）
      */
     public static final BigDecimal GIFT_ONE_AMOUNT = new BigDecimal("10000");
 
+    /**
+     * 2万业绩赠送积分
+     */
+    public static final BigDecimal GIFT_TWO_POINT = new BigDecimal("7000");
+    /**
+     * 1万业绩赠送积分
+     */
+    public static final BigDecimal GIFT_ONE_POINT = new BigDecimal("2000");
+
     /**
      * 一阶段奖金 -- 满14，发35
      */

bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/BonusMsgConstants.java

@@ -34,6 +34,11 @@ public class BonusMsgConstants {
      */
     public static String SAME_LEVEL = "订单编号%s,%s为%s贡献了平级收益,计算业绩%f,奖衔名称名称%s。";
 
+    /**
+     * 赠品积分
+     */
+    public static String GIFT_POINT = "订单编号%s,为%s贡献了%f赠品积分。";
+
     /**
      * 奖金重算 -- 只能重算7天内的奖金！
      */

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java

@@ -40,6 +40,11 @@ public enum EBonusItems {
      */
     REPUR_DIRECT_INCOME(30, "见点收益", 0),
 
+    /**
+     * 赠品积分 -- 精品专区
+     */
+    GIFT_POINT(31, "赠品积分", 0),
+
     ;
 
     public static EBonusItems getEnumByValue(int value) {