From 2c38651928754ec46c6fb8e47acd1759c1603cd6 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Fri, 16 May 2025 13:45:28 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E8=B0=83=E6=95=B44-N=E6=8B=A8=E6=AF=94?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=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/CuBonusExpandMapper.java     |   4 +-
 .../bonus/bonus/param/BonusExpandParam.java   |   7 +-
 .../impl/CuBonusExpandServiceImpl.java        |   7 +-
 .../member/bonus/CuBonusExpandMapper.xml      | 154 +++++++++---------
 .../domain/member/bonus/CuBonusExpand.java    |  23 ++-
 5 files changed, 97 insertions(+), 98 deletions(-)

diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuBonusExpandMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuBonusExpandMapper.java
index f09003e4..8e610d9c 100644
--- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuBonusExpandMapper.java
+++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuBonusExpandMapper.java
@@ -32,12 +32,12 @@ public interface CuBonusExpandMapper extends BaseMapper<CuBonusExpand> {
     List<CuBonusExpand> queryZeroMemberByVertex();
 
     /*
-     * @description: 根基时间、期间计算波比
+     * @description: 时间、期间计算波比 -- 首购
      **/
     List<CuBonusExpand> calculateDayRatioByBonusExpandParam(@Param("bonusExpandParam") BonusExpandParam bonusExpandParam, @Param("tableName") String tableName);
 
     /*
-     * @description: 根基时间、期间计算波比
+     * @description: 时间、期间计算波比 -- 复购
      **/
     List<CuBonusExpand> calculateDayRepRatioByBonusExpandParam(@Param("bonusExpandParam") BonusExpandParam bonusExpandParam, @Param("tableName") String tableName);
 
diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BonusExpandParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BonusExpandParam.java
index 26a3e9a3..1a1190f1 100644
--- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BonusExpandParam.java
+++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BonusExpandParam.java
@@ -11,12 +11,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @description: 4-n 增加碰次
- * @author: sui q
- * @time: 2024/7/19 14:21
- * @classname: BonusExpandParam
- * @package_name: com.hzs.bonus.bonus.param
- * version 1.0.0
+ * 4-n 增加碰次
  */
 @Data
 @Builder
diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuBonusExpandServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuBonusExpandServiceImpl.java
index 1dd50a1b..4166b42f 100644
--- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuBonusExpandServiceImpl.java
+++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuBonusExpandServiceImpl.java
@@ -54,7 +54,7 @@ public class CuBonusExpandServiceImpl extends ServiceImpl<CuBonusExpandMapper, C
     @Transactional(rollbackFor = Exception.class)
     public void firstSaveCuBonusExpand(BonusExpandParam bonusExpandParam) {
         List<CuBonusExpand> bonusExpandList = queryCuBonusExpand(bonusExpandParam.getSettleDate(), bonusExpandParam.getPkCountry());
-        if (bonusExpandList == null || bonusExpandList.size() == 0) {
+        if (CollectionUtil.isEmpty(bonusExpandList)) {
             // 查询
             List<CuBonusExpand> cuBonusExpandList = queryCuBonusExpand(DateUtils.beforeDate(1, ChronoUnit.DAYS, bonusExpandParam.getSettleDate()), bonusExpandParam.getPkCountry());
             Map<Long, CuBonusExpand> cuBonusExpandMap = new HashMap<>();
@@ -96,6 +96,8 @@ public class CuBonusExpandServiceImpl extends ServiceImpl<CuBonusExpandMapper, C
             bonusExpandParam.setMemberIdList(memberIdList);
             // 计算所有体系日波比
             packageBonusExpandParam(bonusExpandParam, settleDate, settleDate);
+
+            // TODO new 当日首购拨比：奖金 除 订单金额
             List<CuBonusExpand> dayBonusExpandList = baseMapper.calculateDayRatioByBonusExpandParam(bonusExpandParam, tableName);
             if (CollectionUtil.isNotEmpty(dayBonusExpandList)) {
                 for (CuBonusExpand cuBonusExpand : dayBonusExpandList) {
@@ -110,6 +112,7 @@ public class CuBonusExpandServiceImpl extends ServiceImpl<CuBonusExpandMapper, C
                     }
                 }
             }
+            // TODO new 当日复购拨比：奖金 除 订单金额
             List<CuBonusExpand> dayRepBonusExpandList = baseMapper.calculateDayRepRatioByBonusExpandParam(bonusExpandParam, tableName);
             if (CollectionUtil.isNotEmpty(dayRepBonusExpandList)) {
                 for (CuBonusExpand cuBonusExpand : dayRepBonusExpandList) {
@@ -121,9 +124,11 @@ public class CuBonusExpandServiceImpl extends ServiceImpl<CuBonusExpandMapper, C
                     }
                 }
             }
+
             // 计算所有体系月波比
             // 获得当前月第一天，获得当前月最后一天
             packageBonusExpandParam(bonusExpandParam, DateUtils.currentMonthFirstDate(settleDate), settleDate);
+            // TODO new 当月首购拨比：奖金 除 订单金额
             List<CuBonusExpand> monthBonusExpandList = baseMapper.calculateDayRatioByBonusExpandParam(bonusExpandParam, tableName);
             if (CollectionUtil.isNotEmpty(monthBonusExpandList)) {
                 for (CuBonusExpand cuBonusExpand : monthBonusExpandList) {
diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuBonusExpandMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuBonusExpandMapper.xml
index 83069ade..4fa8d3ca 100644
--- a/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuBonusExpandMapper.xml
+++ b/bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuBonusExpandMapper.xml
@@ -43,7 +43,7 @@
             from dual
         </foreach>)
         ) b
-        on (ce.pk_id=b.pk_id)
+        on (ce.pk_id = b.pk_id)
         when matched then
         update set ce.day_achieve = b.day_achieve, ce.day_bonus = b.day_bonus, ce.yes_day_ratio = b.yes_day_ratio,
         ce.cur_day_ratio = b.cur_day_ratio, ce.month_achieve = b.month_achieve,
@@ -56,86 +56,88 @@
         truncate table cu_member_repeat_bonus
     </update>
 
-    <select id="calculateDayRepRatioByBonusExpandParam" resultMap="CuBonusExpandExt">
-        <foreach collection="bonusExpandParam.memberIdList" item="item" index="index" separator=" union ">
-            select a.pk_member,COALESCE(a.order_amount,0) day_rep_achieve,
-            COALESCE(b.pur_real_subtotal*bc.out_exchange_rate,0) day_rep_bonus,
-            COALESCE(ROUND(b.pur_real_subtotal*bc.out_exchange_rate/a.order_amount*100, 2),0) cur_day_rep_ratio from(
-            select #{item} pk_member,sum(order_amount) order_amount from(
-            select so.pk_member,order_achieve,(case when order_amount>=198000 then 49500 else order_amount end)
-            order_amount from sa_order so
-            inner join(
-            select * from cu_member
-            start with pk_id= #{item}
-            connect by pk_place_parent =prior pk_id
-            ) cu
-            on cu.pk_id=so.pk_member
-            where so.order_status = 1 and so.del_flag=0 and so.order_achieve>0 and so.pk_country=1
-            and so.order_type in(3,23,26)
-            and so.pay_time >= #{bonusExpandParam.startDate,jdbcType=DATE}
-            and so.pay_time &lt; #{bonusExpandParam.endDate,jdbcType=DATE})) a
-            inner join(
-            select #{item} pk_member,nvl(sum(repur_real_subtotal),0) pur_real_subtotal from ${tableName} cb
-            inner join(
-            select * from cu_member
-            start with pk_id=#{item}
-            connect by pk_place_parent =prior pk_id
-            ) cu
-            on cu.pk_id = cb.pk_member
-            where period between #{bonusExpandParam.startPeriod} and #{bonusExpandParam.endPeriod} and cb.del_flag=0 and
-            cb.pk_country=1
-            ) b
-            on a.pk_member=b.pk_member
-            join cu_member cm
-            on cm.pk_id=a.pk_member
-            join bd_currency bc
-            on bc.pk_country=cm.pk_settle_country and bc.del_flag=0
-        </foreach>
-    </select>
-
+    <!-- 时间、期间计算波比 首购 -->
     <select id="calculateDayRatioByBonusExpandParam" resultMap="CuBonusExpandExt">
         <foreach collection="bonusExpandParam.memberIdList" item="item" index="index" separator=" union ">
             select a.pk_member,
             COALESCE(a.order_amount, 0) day_achieve,
-            COALESCE(b.pur_real_subtotal * bc.out_exchange_rate, 0) day_bonus,
-            COALESCE(ROUND(b.pur_real_subtotal * bc.out_exchange_rate / a.order_amount * 100, 2),0) yes_day_ratio
+            COALESCE(b.pur_real_subtotal, 0) day_bonus,
+            COALESCE(ROUND(b.pur_real_subtotal / a.order_amount * 100, 2), 0) yes_day_ratio
             from (
-                select #{item} pk_member, sum(order_amount) order_amount
-                from (
-                select so.pk_member,order_achieve,
-                (case when order_amount >= 198000 then 49500 else order_amount end) order_amount
-                from sa_order so
-                inner join (
-                select * from cu_member
-                start with pk_id= #{item}
-                connect by pk_place_parent = prior pk_id
-                ) cu
-                on cu.pk_id = so.pk_member
-                where so.order_status = 1 and so.del_flag = 0
-                and so.order_type in (1, 2, 24, 25) and so.pk_country = 1
-                and so.pay_time >= #{bonusExpandParam.startDate,jdbcType=DATE}
-                and so.pay_time &lt; #{bonusExpandParam.endDate,jdbcType=DATE})
+            select #{item} pk_member, sum(order_amount) order_amount
+            from (
+            select so.pk_member, order_achieve, order_amount
+            from sa_order so
+            inner join (
+            select pk_id, del_flag from cu_member
+            start with pk_id= #{item}
+            connect by pk_place_parent = prior pk_id
+            ) cu
+            on cu.pk_id = so.pk_member
+            where so.del_flag = 0 and so.order_status = 1
+            and so.order_type in (1, 2, 24, 25) and so.pk_country = 1
+            and so.pay_time >= #{bonusExpandParam.startDate, jdbcType = DATE}
+            and so.pay_time &lt; #{bonusExpandParam.endDate, jdbcType = DATE} )
             ) a
-            inner join(
-                select #{item} pk_member, nvl(sum(pur_real_subtotal + maker_real_subtotal), 0) pur_real_subtotal
-                from ${tableName} cb
-                inner join(
-                select * from cu_member
-                start with pk_id = #{item}
-                connect by pk_place_parent =prior pk_id
-                ) cu
-                on cu.pk_id = cb.pk_member
-                where
-                period between #{bonusExpandParam.startPeriod} and #{bonusExpandParam.endPeriod}
-                and cb.del_flag = 0
-                and cb.pk_country = 1
+            inner join (
+            select #{item} pk_member, nvl(sum(pur_real_subtotal), 0) pur_real_subtotal
+            from ${tableName} cb
+            inner join (
+            select * from cu_member
+            start with pk_id = #{item}
+            connect by pk_place_parent =prior pk_id
+            ) cu
+            on cu.pk_id = cb.pk_member
+            where
+            period between #{bonusExpandParam.startPeriod} and #{bonusExpandParam.endPeriod}
+            and cb.del_flag = 0
+            and cb.pk_country = 1
+            ) b
+            on a.pk_member = b.pk_member
+            join cu_member cm
+            on cm.pk_id = a.pk_member
+        </foreach>
+    </select>
+
+    <!-- 时间、期间计算波比 复购 -->
+    <select id="calculateDayRepRatioByBonusExpandParam" resultMap="CuBonusExpandExt">
+        <foreach collection="bonusExpandParam.memberIdList" item="item" index="index" separator=" union ">
+            select a.pk_member,
+            COALESCE(a.order_amount, 0) day_rep_achieve,
+            COALESCE(b.pur_real_subtotal, 0) day_rep_bonus,
+            COALESCE(ROUND(b.pur_real_subtotal / a.order_amount * 100, 2), 0) cur_day_rep_ratio
+            from(
+            select #{item} pk_member, sum(order_amount) order_amount
+            from (
+            select so.pk_member, order_achieve, order_amount from sa_order so
+            inner join (
+            select * from cu_member
+            start with pk_id = #{item}
+            connect by pk_place_parent = prior pk_id
+            ) cu
+            on cu.pk_id = so.pk_member
+            where so.del_flag = 0 and so.order_status = 1
+            and so.order_achieve > 0
+            and so.order_type in (3, 26) and so.pk_country = 1
+            and so.pay_time >= #{bonusExpandParam.startDate,jdbcType=DATE}
+            and so.pay_time &lt; #{bonusExpandParam.endDate,jdbcType=DATE} )
+            ) a
+            inner join(
+            select #{item} pk_member, nvl(sum(repur_real_subtotal), 0) pur_real_subtotal
+            from ${tableName} cb
+            inner join (
+            select * from cu_member
+            start with pk_i = #{item}
+            connect by pk_place_parent =prior pk_id
+            ) cu
+            on cu.pk_id = cb.pk_member
+            where period between #{bonusExpandParam.startPeriod} and #{bonusExpandParam.endPeriod}
+            and cb.del_flag = 0
+            and cb.pk_country = 1
             ) b
             on a.pk_member = b.pk_member
             join cu_member cm
             on cm.pk_id = a.pk_member
-            join bd_currency bc
-            on bc.pk_country = cm.pk_settle_country
-            and bc.del_flag = 0
         </foreach>
     </select>
 
@@ -152,21 +154,21 @@
     </select>
 
     <select id="queryBonusExpand" resultMap="CuBonusExpandExt">
-        select ce.*,cm.member_code,cm.member_name,bv.vertex_name
+        select ce.*, cm.member_code, cm.member_name, bv.vertex_name
         from cu_bonus_expand ce
         inner join cu_member cm
         on ce.pk_member = cm.pk_id
         left join bd_vertex bv
-        on ce.pk_vertex=bv.pk_id and bv.del_flag=0
-        where ce.del_flag=0 and cm.del_flag=0
+        on ce.pk_vertex = bv.pk_id and bv.del_flag = 0
+        where ce.del_flag = 0 and cm.del_flag = 0
         <if test="pkCountry != null">
             and ce.pk_country = #{pkCountry}
         </if>
         <if test="settleDate != null">
-            and ce.settle_date=#{settleDate,jdbcType=DATE}
+            and ce.settle_date = #{settleDate,jdbcType=DATE}
         </if>
         <choose>
-            <when test="pkParent != null">and ce.pk_parent=#{pkParent}</when>
+            <when test="pkParent != null">and ce.pk_parent = #{pkParent}</when>
             <otherwise>and ce.pk_parent is null</otherwise>
         </choose>
         <if test="memberCode != null and memberCode != ''">
diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuBonusExpand.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuBonusExpand.java
index dc7002b1..64ebac9c 100644
--- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuBonusExpand.java
+++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuBonusExpand.java
@@ -16,9 +16,6 @@ import lombok.experimental.Accessors;
 
 /**
  * 4-n增加碰次设置
- *
- * @author hzs
- * @since 2024-07-19
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -70,61 +67,61 @@ public class CuBonusExpand extends BaseEntity {
     private Integer sort;
 
     /**
-     * 昨日业绩
+     * 当日业绩（目前取的订单金额）
      */
     @TableField("DAY_ACHIEVE")
     private BigDecimal dayAchieve;
 
     /**
-     * 昨日奖金
+     * 当日奖金
      */
     @TableField("DAY_BONUS")
     private BigDecimal dayBonus;
 
     /**
-     * 昨日波比
+     * 当日波比
      */
     @TableField("YES_DAY_RATIO")
     private BigDecimal yesDayRatio;
 
     /**
-     * 当前波比
+     * 重算波比（默认当日波比）
      */
     @TableField("CUR_DAY_RATIO")
     private BigDecimal curDayRatio;
 
     /**
-     * 昨日复购业绩
+     * 当日复购业绩（目前取的订单金额）
      */
     @TableField("DAY_REP_ACHIEVE")
     private BigDecimal dayRepAchieve;
 
     /**
-     * 昨日复购奖金
+     * 当日复购奖金
      */
     @TableField("DAY_REP_BONUS")
     private BigDecimal dayRepBonus;
 
     /**
-     * 当前复购波比
+     * 当日复购波比
      */
     @TableField("CUR_DAY_REP_RATIO")
     private BigDecimal curDayRepRatio;
 
     /**
-     * 当月业绩
+     * 当月业绩（首购）
      */
     @TableField("MONTH_ACHIEVE")
     private BigDecimal monthAchieve;
 
     /**
-     * 当月奖金
+     * 当月奖金（首购）
      */
     @TableField("MONTH_BONUS")
     private BigDecimal monthBonus;
 
     /**
-     * 当月波比
+     * 当月波比（首购）
      */
     @TableField("MONTH_RATIO")
     private BigDecimal monthRatio;