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

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

@@ -241,7 +241,6 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
     public void calculateBonusTotal(CuMemberBonusExt cuMemberBonusExt, CuMemberBonusExt memberBonusExt) {
         cuMemberBonusExt.setDirectIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getDirectIncome(), memberBonusExt.getDirectIncome()));
         cuMemberBonusExt.setExpandIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getExpandIncome(), memberBonusExt.getExpandIncome()));
-        cuMemberBonusExt.setCoachIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getCoachIncome(), memberBonusExt.getCoachIncome()));
         cuMemberBonusExt.setShareIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getShareIncome(), memberBonusExt.getShareIncome()));
         cuMemberBonusExt.setServiceIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getServiceIncome(), memberBonusExt.getServiceIncome()));
         cuMemberBonusExt.setBackPoints(ComputeUtil.computeAdd(cuMemberBonusExt.getBackPoints(), memberBonusExt.getBackPoints()));
@@ -258,6 +257,16 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
         cuMemberBonusExt.setCarAwardPoints(ComputeUtil.computeAdd(cuMemberBonusExt.getCarAwardPoints(), memberBonusExt.getCarAwardPoints()));
         cuMemberBonusExt.setRealIncomeTotal(ComputeUtil.computeAdd(cuMemberBonusExt.getRealIncomeTotal(), memberBonusExt.getRealIncomeTotal()));
         cuMemberBonusExt.setStoreIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getStoreIncome(), memberBonusExt.getStoreIncome()));
+
+        cuMemberBonusExt.setRetailRangeIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailRangeIncome(), memberBonusExt.getRetailRangeIncome()));
+        cuMemberBonusExt.setRetailSameLevelIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailSameLevelIncome(), memberBonusExt.getRetailSameLevelIncome()));
+        cuMemberBonusExt.setRetailAreaIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailAreaIncome(), memberBonusExt.getRetailAreaIncome()));
+        cuMemberBonusExt.setRetailBenefitRangeIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailBenefitRangeIncome(), memberBonusExt.getRetailBenefitRangeIncome()));
+        cuMemberBonusExt.setRetailMonthRepurchaseIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailMonthRepurchaseIncome(), memberBonusExt.getRetailMonthRepurchaseIncome()));
+        cuMemberBonusExt.setCoachIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getCoachIncome(), memberBonusExt.getCoachIncome()));
+        cuMemberBonusExt.setRetailBenefitAvgIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailBenefitAvgIncome(), memberBonusExt.getRetailBenefitAvgIncome()));
+        cuMemberBonusExt.setRetailBenefitIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailBenefitIncome(), memberBonusExt.getRetailBenefitIncome()));
+        cuMemberBonusExt.setRetailRealSubtotal(ComputeUtil.computeAdd(cuMemberBonusExt.getRetailRealSubtotal(), memberBonusExt.getRetailRealSubtotal()));
     }
 
     @Override
@@ -272,7 +281,6 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
         cuMemberBonusExt.setExpandIncome(BigDecimal.ZERO);
         cuMemberBonusExt.setExpandNoCapping(BigDecimal.ZERO);
         cuMemberBonusExt.setExpandCapping(BigDecimal.ZERO);
-        cuMemberBonusExt.setCoachIncome(BigDecimal.ZERO);
         cuMemberBonusExt.setShareIncome(BigDecimal.ZERO);
         cuMemberBonusExt.setServiceIncome(BigDecimal.ZERO);
         cuMemberBonusExt.setBackPoints(BigDecimal.ZERO);
@@ -282,22 +290,23 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
         cuMemberBonusExt.setRepurRangeIncome(BigDecimal.ZERO);
         cuMemberBonusExt.setRepurExpandIncome(BigDecimal.ZERO);
         cuMemberBonusExt.setRepurRealSubtotal(BigDecimal.ZERO);
-        cuMemberBonusExt.setCloudDirectIncome(BigDecimal.ZERO);
-        cuMemberBonusExt.setCloudPurIncome(BigDecimal.ZERO);
-        cuMemberBonusExt.setCloudRepurIncome(BigDecimal.ZERO);
-        cuMemberBonusExt.setCloudRealSubtotal(BigDecimal.ZERO);
         cuMemberBonusExt.setRepurCoupon(BigDecimal.ZERO);
         cuMemberBonusExt.setRepurCouponShare(BigDecimal.ZERO);
         cuMemberBonusExt.setRepurCouponSubtotal(BigDecimal.ZERO);
-        cuMemberBonusExt.setMakerDirectIncome(BigDecimal.ZERO);
-        cuMemberBonusExt.setMakerShareIncome(BigDecimal.ZERO);
-        cuMemberBonusExt.setMakerRealSubtotal(BigDecimal.ZERO);
         cuMemberBonusExt.setStoreIncome(BigDecimal.ZERO);
         cuMemberBonusExt.setGlobalPoints(BigDecimal.ZERO);
         cuMemberBonusExt.setCarAwardPoints(BigDecimal.ZERO);
-        cuMemberBonusExt.setHiFunIncome(BigDecimal.ZERO);
-        cuMemberBonusExt.setHaiFunIncome(BigDecimal.ZERO);
         cuMemberBonusExt.setRealIncomeTotal(BigDecimal.ZERO);
+
+        cuMemberBonusExt.setRetailRangeIncome(BigDecimal.ZERO);
+        cuMemberBonusExt.setRetailSameLevelIncome(BigDecimal.ZERO);
+        cuMemberBonusExt.setRetailAreaIncome(BigDecimal.ZERO);
+        cuMemberBonusExt.setRetailBenefitRangeIncome(BigDecimal.ZERO);
+        cuMemberBonusExt.setRetailMonthRepurchaseIncome(BigDecimal.ZERO);
+        cuMemberBonusExt.setCoachIncome(BigDecimal.ZERO);
+        cuMemberBonusExt.setRetailBenefitAvgIncome(BigDecimal.ZERO);
+        cuMemberBonusExt.setRetailBenefitIncome(BigDecimal.ZERO);
+        cuMemberBonusExt.setRetailRealSubtotal(BigDecimal.ZERO);
         return cuMemberBonusExt;
     }
 
@@ -456,8 +465,8 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
                 MemberBonusDetailSerVO memberBonusDetailVO = BeanUtil.copyProperties(cuMemberBonusExpand, MemberBonusDetailSerVO.class);
                 memberBonusDetailSerVoS.add(memberBonusDetailVO);
             });
-        } else if (EBonusItems.COACHING_INCOME.getValue() == bonusItemsValue) {
+        } else if (EBonusItems.RETAIL_COACHING_INCOME.getValue() == bonusItemsValue) {
-            // 辅导收益
+            // 培育津贴
             List<CuMemberBonusCoachExt> cuMemberBonusCoachList = cuMemberBonusCoachMapper.queryMemberBonusCoachByBonusItemsForServer(bonusParam);
             dataTable = getDataTable(cuMemberBonusCoachList);
             cuMemberBonusCoachList.forEach(cuMemberBonusCoach -> {

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

@@ -69,6 +69,12 @@ public class BonusTotalVO implements Serializable {
     @Excel(name = "复购级差收益", scale = 2)
     private BigDecimal retailMonthRepurchaseIncome;
 
+    /**
+     * 培育津贴
+     */
+    @Excel(name = "培育津贴", scale = 2)
+    private BigDecimal coachIncome;
+
     /**
      * 福利分红平均收益
      */
@@ -233,10 +239,6 @@ public class BonusTotalVO implements Serializable {
      */
     private BigDecimal expandCapping;
 
-    /**
-     * 辅导收益
-     */
-    private BigDecimal coachIncome;
 
     /**
      * 分红收益

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

@@ -91,7 +91,7 @@ public class CuMemberBonusVO implements Serializable {
      */
     public static final String[] INCOME_ARRAY = new String[]{
             "backPoints", "retailRangeIncome", "retailSameLevelIncome", "retailAreaIncome",
-            "retailBenefitRangeIncome", "retailMonthRepurchaseIncome", "retailBenefitAvgIncome",
+            "retailBenefitRangeIncome", "retailMonthRepurchaseIncome", "coachIncome", "retailBenefitAvgIncome",
             "retailBenefitIncome", "retailRealSubtotal", "realIncomeTotal"};
 
 
@@ -130,6 +130,13 @@ public class CuMemberBonusVO implements Serializable {
     @Excel(name = "复购级差收益", scale = 2)
     private BigDecimal retailMonthRepurchaseIncomeOri;
 
+    /**
+     * 培育津贴
+     */
+    private BigDecimal coachIncome;
+    @Excel(name = "培育津贴", scale = 2)
+    private BigDecimal coachIncomeOri;
+
     /**
      * 新零售福利平均收益
      */
@@ -160,7 +167,7 @@ public class CuMemberBonusVO implements Serializable {
      */
     private BigDecimal retailRealSubtotal;
 
-    @Excel(name = "收益小计", scale = 2)
+//    @Excel(name = "收益小计", scale = 2)
     private BigDecimal retailRealSubtotalOri;
 
     /**

bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusCoachMapper.xml

@@ -153,20 +153,22 @@
         </where>
         order by b.period,b.pk_bonus_items,b.real_income desc
     </select>
+
     <select id="queryMemberBonusCoachByBonusItemsForServer" resultMap="CuMemberBonusCoach">
         select b.period,cp.settle_date,so.order_code,so.order_type,bt.short_name source_country_name,
         cu.member_code source_member_code,cu.member_name source_member_name,so.pk_rate,bc.out_exchange_rate,so.order_amount,
         so.order_achieve,b.pk_country,b.pk_bonus_items,b.pretax_income,b.income_tax,b.real_income,b.income_status,
         tar.member_code,tar.member_name,bg.pk_transaction pk_settle_grade,ba.pk_transaction pk_awards,bv.vertex_name,ct.team_name,
         b.remark,b.income_ratio,b.income_dial_ratio,b.order_dial_ratio,b.current_generation,b.coach_generation,
-        b.coach_no_capping,b.coach_capping,b.coach_normal_half,b.coach_normal_real,bct.short_name settle_country from sa_order so
+        b.coach_no_capping,b.coach_capping,b.coach_normal_half,b.coach_normal_real,bct.short_name settle_country
+        from sa_order so
         inner join (
         select cb.pk_member,cc.pk_order,cb.period,cb.pk_country,cc.pk_bonus_items,cc.income_status,cc.CAL_ACHIEVE,cc.pretax_income,cc.income_tax,cc.real_income,
         cc.remark,cc.income_ratio,cc.income_dial_ratio,cc.order_dial_ratio,cc.current_generation,cc.coach_generation,
         cc.coach_no_capping,cc.coach_capping,cc.coach_normal_half,cc.coach_normal_real from cu_member_bonus cb
         inner join cu_member_bonus_coach cc
         on cb.pk_id = cc.pk_bonus
-        where 1=1
+        where 1 = 1
         <if test="bonusParam.period != null">
             and cb.period =#{bonusParam.period}
         </if>
@@ -205,15 +207,15 @@
         left join cu_member_team ct
         on ct.pk_id = tar.pk_team_code
         left join bd_currency bc
-        on bc.pk_id=so.pk_rate
+        on bc.pk_id = so.pk_rate
         left join bd_grade bg
-        on bg.pk_id=tar.pk_settle_grade
+        on bg.pk_id = tar.pk_settle_grade
         left join bd_awards ba
-        on ba.pk_id=tar.pk_awards
+        on ba.pk_id = tar.pk_awards
         left join bd_country bt
-        on bt.pk_id=so.pk_country
+        on bt.pk_id = so.pk_country
         left join bd_country bct
-        on bct.pk_id=tar.pk_settle_country
+        on bct.pk_id = tar.pk_settle_country
         <where>
             1=1
             <if test="bonusParam.pkCountry != null">

bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml

@@ -328,10 +328,11 @@
         cm.pk_settle_grade, cm.pk_awards,
         bv.vertex_name, ct.team_name,
         cb.period,cp.settle_date,cb.direct_income,cb.expand_income,cb.expand_no_capping,
-        cb.expand_capping,cb.coach_income,cb.share_income,cb.service_income,cb.back_points,cb.service_spend,
+        cb.expand_capping,cb.share_income,cb.service_income,cb.back_points,cb.service_spend,
         cb.pur_real_subtotal,cb.repur_push_income,cb.repur_range_income,cb.repur_expand_income,cb.repur_real_subtotal,
         cb.repur_coupon,cb.repur_coupon_share,cb.repur_coupon_subtotal,cb.store_income,
         cb.global_points,cb.car_award_points,cb.pk_rate,bc.out_exchange_rate,
+        cb.coach_income,
         cb.retail_range_income, cb.retail_same_level_income, cb.retail_area_income,
         cb.retail_benefit_range_income, cb.retail_month_repurchase_income,
         cb.retail_benefit_avg_income, cb.retail_benefit_income,cb.retail_real_subtotal,

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonus.java

@@ -74,7 +74,7 @@ public class CuMemberBonus extends BaseEntity {
     private BigDecimal expandCapping;
 
     /**
-     * 辅导收益
+     * 培育津贴
      */
     @TableField("COACH_INCOME")
     private BigDecimal coachIncome;