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

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java

@@ -132,6 +132,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
         sourceMemberRangeExt.setNewConsumePv(ComputeUtil.computeAdd(sourceMemberRangeExt.getNewConsumePv(), orderAchieve));
         sourceMemberRangeExt.setConsumePv(ComputeUtil.computeAdd(sourceMemberRangeExt.getConsumePv(), orderAchieve));
         sourceMemberRangeExt.setMonthConsumePv(ComputeUtil.computeAdd(sourceMemberRangeExt.getMonthConsumePv(), orderAchieve));
+        // 累计盒数、业绩，不管激活不激活都处理，兼容不激活判断显示有问题
+        sourceMemberRangeExt.setAllNewBoxNum(sourceMemberRangeExt.getAllNewBoxNum().add(boxNum));
+        sourceMemberRangeExt.setAllNewConsumePv(sourceMemberRangeExt.getAllNewConsumePv().add(orderAchieve));
 
         // 会员等级升级记录
         List<CuMemberGrade> cuMemberGradeList = new ArrayList<>();
@@ -271,6 +274,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
         sourceMemberRangeExt.setNewConsumePv(ComputeUtil.computeSubtract(sourceMemberRangeExt.getNewConsumePv(), orderAchieve));
         sourceMemberRangeExt.setConsumePv(ComputeUtil.computeSubtract(sourceMemberRangeExt.getConsumePv(), orderAchieve));
         sourceMemberRangeExt.setMonthConsumePv(ComputeUtil.computeSubtract(sourceMemberRangeExt.getMonthConsumePv(), orderAchieve));
+        // 累计盒数、业绩，不管激活不激活都处理，兼容不激活判断显示有问题
+        sourceMemberRangeExt.setAllNewBoxNum(sourceMemberRangeExt.getAllNewBoxNum().subtract(boxNum));
+        sourceMemberRangeExt.setAllNewConsumePv(sourceMemberRangeExt.getAllNewConsumePv().subtract(orderAchieve));
 
         // 会员等级map
         Map<String, CuMemberGrade> cuMemberGradeMap = new HashMap<>();
@@ -624,20 +630,24 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
                 targetMemberRangeExt.setEnableStatus(EYesNo.YES.getIntValue());
             }
 
+            // 累计盒数、业绩，不管激活不激活都处理，兼容不激活判断显示有问题
+            targetMemberRangeExt.setAllTeamNewBoxNum(targetMemberRangeExt.getAllTeamNewBoxNum().add(boxNum));
+            targetMemberRangeExt.setAllTeamNewPv(targetMemberRangeExt.getAllTeamNewPv().add(orderAchieve));
+
             // 激活的账号才能累计业绩和盒数（有注册、升级订单）
             if (targetMemberRangeExt.getEnableStatus() == EYesNo.YES.getIntValue()) {
-                // 累计金额
-                targetMemberRangeExt.setTeamNewAmount(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamNewAmount(), orderAmount));
-                targetMemberRangeExt.setTeamConsumeAmount(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamConsumeAmount(), orderAmount));
-                targetMemberRangeExt.setTeamMonthAmount(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamMonthAmount(), orderAmount));
-                // 累计业绩
-                targetMemberRangeExt.setTeamNewPv(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamNewPv(), orderAchieve));
-                targetMemberRangeExt.setTeamConsumePv(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamConsumePv(), orderAchieve));
-                targetMemberRangeExt.setTeamMonthPv(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamMonthPv(), orderAchieve));
                 // 累计盒数
                 targetMemberRangeExt.setTeamNewBoxNum(targetMemberRangeExt.getTeamNewBoxNum().add(boxNum));
                 targetMemberRangeExt.setTeamBoxNum(targetMemberRangeExt.getTeamBoxNum().add(boxNum));
                 targetMemberRangeExt.setTeamMonthBoxNum(targetMemberRangeExt.getTeamMonthBoxNum().add(boxNum));
+                // 累计业绩
+                targetMemberRangeExt.setTeamNewPv(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamNewPv(), orderAchieve));
+                targetMemberRangeExt.setTeamConsumePv(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamConsumePv(), orderAchieve));
+                targetMemberRangeExt.setTeamMonthPv(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamMonthPv(), orderAchieve));
+                // 累计金额
+                targetMemberRangeExt.setTeamNewAmount(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamNewAmount(), orderAmount));
+                targetMemberRangeExt.setTeamConsumeAmount(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamConsumeAmount(), orderAmount));
+                targetMemberRangeExt.setTeamMonthAmount(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamMonthAmount(), orderAmount));
                 // 计算等级
                 calculateGradeAwards(period, memberRangeExtMap, rangeTableName, saOrderExt, retailTeamGradeMap, retailAwardsMap,
                         secondRangeTableName, cuMemberGradeList, cuMemberAwardsList, targetMemberRangeExt, activateMap);
@@ -826,20 +836,24 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
         BigDecimal orderAchieve = saOrderExt.getOrderAchieve();
         BigDecimal orderAmount = saOrderExt.getOrderAmount();
         while (targetMemberRangeExt != null) {
+            // 累计盒数、业绩，不管激活不激活都处理，兼容不激活判断显示有问题
+            targetMemberRangeExt.setAllTeamNewBoxNum(targetMemberRangeExt.getAllTeamNewBoxNum().subtract(boxNum));
+            targetMemberRangeExt.setAllTeamNewPv(targetMemberRangeExt.getAllTeamNewPv().subtract(orderAchieve));
+
             // 激活的账号才能累计业绩和盒数（有注册、升级订单）
             if (targetMemberRangeExt.getEnableStatus() == EYesNo.YES.getIntValue()) {
-                // 累计业绩
-                targetMemberRangeExt.setTeamNewPv(ComputeUtil.computeSubtract(targetMemberRangeExt.getTeamNewPv(), orderAchieve));
-                targetMemberRangeExt.setTeamConsumePv(ComputeUtil.computeSubtract(targetMemberRangeExt.getTeamConsumePv(), orderAchieve));
-                targetMemberRangeExt.setTeamMonthPv(ComputeUtil.computeSubtract(targetMemberRangeExt.getTeamMonthPv(), orderAchieve));
-                // 累计金额
-                targetMemberRangeExt.setTeamNewAmount(ComputeUtil.computeSubtract(targetMemberRangeExt.getTeamNewAmount(), orderAmount));
-                targetMemberRangeExt.setTeamConsumeAmount(ComputeUtil.computeSubtract(targetMemberRangeExt.getTeamConsumeAmount(), orderAmount));
-                targetMemberRangeExt.setTeamMonthAmount(ComputeUtil.computeSubtract(targetMemberRangeExt.getTeamMonthAmount(), orderAmount));
                 // 累计盒数
                 targetMemberRangeExt.setTeamNewBoxNum(targetMemberRangeExt.getTeamNewBoxNum().subtract(boxNum));
                 targetMemberRangeExt.setTeamBoxNum(targetMemberRangeExt.getTeamBoxNum().subtract(boxNum));
                 targetMemberRangeExt.setTeamMonthBoxNum(targetMemberRangeExt.getTeamMonthBoxNum().subtract(boxNum));
+                // 累计金额
+                targetMemberRangeExt.setTeamNewAmount(ComputeUtil.computeSubtract(targetMemberRangeExt.getTeamNewAmount(), orderAmount));
+                targetMemberRangeExt.setTeamConsumeAmount(ComputeUtil.computeSubtract(targetMemberRangeExt.getTeamConsumeAmount(), orderAmount));
+                targetMemberRangeExt.setTeamMonthAmount(ComputeUtil.computeSubtract(targetMemberRangeExt.getTeamMonthAmount(), orderAmount));
+                // 累计业绩
+                targetMemberRangeExt.setTeamNewPv(ComputeUtil.computeSubtract(targetMemberRangeExt.getTeamNewPv(), orderAchieve));
+                targetMemberRangeExt.setTeamConsumePv(ComputeUtil.computeSubtract(targetMemberRangeExt.getTeamConsumePv(), orderAchieve));
+                targetMemberRangeExt.setTeamMonthPv(ComputeUtil.computeSubtract(targetMemberRangeExt.getTeamMonthPv(), orderAchieve));
                 // 计算等级
                 calculateBackGrade(period, memberRangeExtMap, rangeTableName, saOrderExt, retailTeamGradeMap, retailAwardsMap, secondRangeTableName,
                         cuMemberGradeMap, cuMemberAwardsMap, cuMemberShareAwardsMap, targetMemberRangeExt);

bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml

@@ -52,18 +52,21 @@
         <result column="SHARE_AWARDS_VALUE" property="shareAwardsValue"/>
         <result column="RANGE_RATIO" property="rangeRatio"/>
         <result column="MONTH_REPURCHASE_RATIO" property="monthRepurchaseRatio"/>
-
         <result column="BENEFIT_AVG_RATIO" property="benefitAvgRatio"/>
         <result column="BENEFIT_SHARE_RATIO" property="benefitShareRatio"/>
         <result column="coach_algebra" property="coachAlgebra"/>
         <result column="coach_ratio" property="coachRatio"/>
-
         <result column="COUNTRY_NAME" property="countryName"/>
         <result column="big_box_num" property="bigBoxNum"/>
         <result column="small_box_num" property="smallBoxNum"/>
         <result column="big_team_pv" property="bigTeamPv"/>
         <result column="small_team_pv" property="smallTeamPv"/>
         <result column="region_vertex_pk_id" property="regionVertexPkId"/>
+
+        <result column="all_new_box_num" property="allNewBoxNum"/>
+        <result column="all_new_consume_pv" property="allNewConsumePv"/>
+        <result column="all_team_new_box_num" property="allTeamNewBoxNum"/>
+        <result column="all_team_new_pv" property="allTeamNewPv"/>
     </resultMap>
 
     <update id="mergeMemberRetailRangeInit">
@@ -215,15 +218,20 @@
             #{item.pkAwards} pk_awards, #{item.pkShareAwards} pk_share_awards,
             #{item.newBoxNum} new_box_num, #{item.newConsumePv} new_consume_pv,
             #{item.teamNewBoxNum} team_new_box_num, #{item.teamNewPv} team_new_pv,
+            #{item.allNewBoxNum} all_new_box_num, #{item.allNewConsumePv} all_new_consume_pv,
+            #{item.allTeamNewBoxNum} all_team_new_box_num, #{item.allTeamNewPv} all_team_new_pv,
             #{item.teamNewAmount} team_new_amount, #{item.enableStatus} enable_status
             from dual
         </foreach>
         ) b
         on (a.pk_member = b.pk_member)
         when matched then
-        update set a.pk_grade = b.pk_grade, a.pk_awards = b.pk_awards, a.pk_share_awards = b.pk_share_awards,
+        update set
+        a.pk_grade = b.pk_grade, a.pk_awards = b.pk_awards, a.pk_share_awards = b.pk_share_awards,
         a.new_box_num = b.new_box_num, a.new_consume_pv = b.new_consume_pv,
         a.team_new_box_num = b.team_new_box_num, a.team_new_pv = b.team_new_pv,
+        a.all_new_box_num = b.all_new_box_num, a.all_new_consume_pv = b.all_new_consume_pv,
+        a.all_team_new_box_num = b.all_team_new_box_num, a.all_team_new_pv = b.all_team_new_pv,
         a.team_new_amount = b.team_new_amount, a.enable_status = b.enable_status
     </update>
 
@@ -663,6 +671,10 @@
                nvl(b.big_team_pv, 0)                             big_team_pv,
                nvl(b.small_team_pv, 0)                           small_team_pv,
                a.system_type,
+               a.all_new_box_num,
+               a.all_new_consume_pv,
+               a.all_team_new_box_num,
+               a.all_team_new_pv,
                bg.grade_value,
                bg.grade_name,
                bw.awards_value,

bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml

@@ -463,18 +463,22 @@
     <update id="createCuMemberRetailRangeSecondTable">
         create table ${tableName}
         (
-            pk_member        NUMBER(20) not null,
+            pk_member            NUMBER(20) not null,
-            pk_parent        NUMBER(20) not null,
+            pk_parent            NUMBER(20) not null,
-            pk_grade         NUMBER(4) not null,
+            pk_grade             NUMBER(4) not null,
-            pk_awards        number(4) default 10 not null,
+            pk_awards            number(4) default 10 not null,
-            pk_share_awards  number(4) default 10 not null,
+            pk_share_awards      number(4) default 10 not null,
-            enable_status    number(2) default 1 not null,
+            enable_status        number(2) default 1 not null,
-            system_type      NUMBER(2) default 2 not null,
+            system_type          NUMBER(2) default 2 not null,
-            new_box_num      number(10,2) default 0 not null,
+            new_box_num          number(10,2) default 0 not null,
-            new_consume_pv   number(17,6) default 0 not null,
+            new_consume_pv       number(17,6) default 0 not null,
-            team_new_box_num number(10,2) default 0 not null,
+            team_new_box_num     number(10,2) default 0 not null,
-            team_new_pv      number(17,6) default 0 not null,
+            team_new_pv          number(17,6) default 0 not null,
-            team_new_amount  number(17,6) default 0 not null
+            team_new_amount      number(17,6) default 0 not null,
+            all_new_box_num      number(10,2) default 0 not null,
+            all_new_consume_pv   number(17,6) default 0 not null,
+            all_team_new_box_num number(10,2) default 0 not null,
+            all_team_new_pv      number(17,6) default 0 not null,
         )
     </update>
 

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberRetailRangeExt.java

@@ -76,4 +76,25 @@ public class CuMemberRetailRangeExt extends CuMemberRetailRange {
      * 县级名称
      */
     private String countryName;
+
+    /**
+     * 新増盒数（不管激活，全累计）
+     */
+    private BigDecimal allNewBoxNum;
+
+    /**
+     * 新増业绩（不管激活，全累计）
+     */
+    private BigDecimal allNewConsumePv;
+
+    /**
+     * 团队新増盒数（不管激活，全累计）
+     */
+    private BigDecimal allTeamNewBoxNum;
+
+    /**
+     * 团队新増业绩（不管激活，全累计）
+     */
+    private BigDecimal allTeamNewPv;
+
 }