## 奖金明细、奖金来源新奖金字段；

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java

@@ -151,6 +151,7 @@ public class CuMemberBonusController extends BaseController {
             bonusParam.setEndDate(DateUtils.beforeDate(1, ChronoUnit.DAYS, date));
         }
         packageBonusParam(bonusParam);
+
         startPage();
         List<CuMemberBonusExt> cuMemberBonusExtList = cuMemberBonusService.queryMemberBonusVoByConditionForServer(bonusParam);
         CuMemberBonusExt cmb = cuMemberBonusService.queryMemberBonusByConditionForServerSum(bonusParam);

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

@@ -454,8 +454,9 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
                 MemberBonusDetailSerVO memberBonusDetailVO = BeanUtil.copyProperties(cuMemberBonusDetail, MemberBonusDetailSerVO.class);
                 memberBonusDetailSerVoS.add(memberBonusDetailVO);
             });
-        } else if (EBonusItems.BOOT_CARD.getValue() == bonusItemsValue || EBonusItems.DIRECT_INCOME.getValue() == bonusItemsValue ||
+        } else if (EBonusItems.BOOT_CARD.getValue() == bonusItemsValue
-                EBonusItems.HELP_EACH_INCOME.getValue() == bonusItemsValue) {
+                || EBonusItems.DIRECT_INCOME.getValue() == bonusItemsValue
+                || EBonusItems.HELP_EACH_INCOME.getValue() == bonusItemsValue) {
             // 启动卡直推 推荐收益
             List<CuMemberBonusPushExt> cuMemberBonusPushList = cuMemberBonusPushMapper.queryMemberBonusPushByBonusItemsFoServer(bonusParam);
             dataTable = getDataTable(cuMemberBonusPushList);
@@ -463,8 +464,8 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
                 MemberBonusDetailSerVO memberBonusDetailVO = BeanUtil.copyProperties(cuMemberBonusPush, MemberBonusDetailSerVO.class);
                 memberBonusDetailSerVoS.add(memberBonusDetailVO);
             });
-        } else if (EBonusItems.EXPANSION_INCOME.getValue() == bonusItemsValue ||
+        } else if (EBonusItems.EXPANSION_INCOME.getValue() == bonusItemsValue
-                EBonusItems.CONSUMPTION_EXPANSION_INCOME.getValue() == bonusItemsValue) {
+                || EBonusItems.CONSUMPTION_EXPANSION_INCOME.getValue() == bonusItemsValue) {
             // 拓展收益、复购拓展收益
             List<CuMemberBonusExpandExt> cuMemberBonusExpandList = cuMemberBonusExpandMapper.queryMemberBonusExpandByBonusItemsForServer(bonusParam);
             dataTable = getDataTable(cuMemberBonusExpandList);
@@ -474,17 +475,18 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
             });
         } else if (EBonusItems.COACHING_INCOME.getValue() == bonusItemsValue) {
             // 辅导收益
-            // 拓展收益、复购拓展收益
             List<CuMemberBonusCoachExt> cuMemberBonusCoachList = cuMemberBonusCoachMapper.queryMemberBonusCoachByBonusItemsForServer(bonusParam);
             dataTable = getDataTable(cuMemberBonusCoachList);
             cuMemberBonusCoachList.forEach(cuMemberBonusCoach -> {
                 MemberBonusDetailSerVO memberBonusDetailVO = BeanUtil.copyProperties(cuMemberBonusCoach, MemberBonusDetailSerVO.class);
                 memberBonusDetailSerVoS.add(memberBonusDetailVO);
             });
-        } else if (EBonusItems.REPURCHASE_RANGE_INCOME.getValue() == bonusItemsValue || EBonusItems.RETAIL_RANGE_INCOME.getValue() == bonusItemsValue ||
+        } else if (EBonusItems.REPURCHASE_RANGE_INCOME.getValue() == bonusItemsValue
-                EBonusItems.RETAIL_SAME_LEVEL_INCOME.getValue() == bonusItemsValue || EBonusItems.RETAIL_BENEFIT_RANGE_INCOME.getValue() == bonusItemsValue) {
+                || EBonusItems.RETAIL_RANGE_INCOME.getValue() == bonusItemsValue
-            // 复购极差
+                || EBonusItems.RETAIL_SAME_LEVEL_INCOME.getValue() == bonusItemsValue
-            // 拓展收益、复购拓展收益
+                || EBonusItems.RETAIL_BENEFIT_RANGE_INCOME.getValue() == bonusItemsValue
+                || EBonusItems.RETAIL_MONTH_REPURCHASE_INCOME.getValue() == bonusItemsValue) {
+            // 直推收益、平级收益、福利级差、复购级差
             List<CuMemberBonusRangeExt> cuMemberBonusRangeList = cuMemberBonusRangeMapper.queryMemberBonusRangeByBonusItemsForServer(bonusParam);
             dataTable = getDataTable(cuMemberBonusRangeList);
             cuMemberBonusRangeList.forEach(cuMemberBonusRange -> {
@@ -492,8 +494,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
                 memberBonusDetailSerVoS.add(memberBonusDetailVO);
             });
         } else {
-            // 其他收益 服务补贴、分红收益、嗨粉直推
+            // 其他收益 区域分红、月度分红平均、月度分红加权
-            // 拓展收益、复购拓展收益
             List<CuMemberBonusDetailExt> cuMemberBonusDetailList = cuMemberBonusDetailMapper.queryMemberBonusDetailByBonusItemsForServer(bonusParam);
             dataTable = getDataTable(cuMemberBonusDetailList);
             cuMemberBonusDetailList.forEach(cuMemberBonusDetail -> {

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", "retailBenefitAvgIncome",
+            "retailBenefitRangeIncome", "retailMonthRepurchaseIncome", "retailBenefitAvgIncome",
             "retailBenefitIncome", "retailRealSubtotal", "realIncomeTotal"};
 
 
@@ -117,18 +117,23 @@ public class CuMemberBonusVO implements Serializable {
     private BigDecimal retailAreaIncomeOri;
 
     /**
-     * 新零售福利极差收益
+     * 新零售福利级差收益
      */
     private BigDecimal retailBenefitRangeIncome;
-
+    @Excel(name = " 福利级差收益", scale = 2)
-    @Excel(name = " 福利极差收益", scale = 2)
     private BigDecimal retailBenefitRangeIncomeOri;
 
+    /**
+     * 新零售复购级差收益
+     */
+    private BigDecimal retailMonthRepurchaseIncome;
+    @Excel(name = "复购级差收益", scale = 2)
+    private BigDecimal retailMonthRepurchaseIncomeOri;
+
     /**
      * 新零售福利平均收益
      */
     private BigDecimal retailBenefitAvgIncome;
-
     @Excel(name = " 福利平均收益", scale = 2)
     private BigDecimal retailBenefitAvgIncomeOri;
 
@@ -136,7 +141,6 @@ public class CuMemberBonusVO implements Serializable {
      * 新零售福利加权收益
      */
     private BigDecimal retailBenefitIncome;
-
     @Excel(name = " 福利加权收益", scale = 2)
     private BigDecimal retailBenefitIncomeOri;
 
@@ -156,7 +160,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/CuMemberBonusDetailMapper.xml

@@ -251,6 +251,7 @@
         </where>
         order by b.period,b.pk_bonus_items,b.real_income desc
     </select>
+
     <select id="queryMemberBonusDetailByConditionForServer" resultMap="CuMemberBonusDetail">
         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
@@ -267,7 +268,8 @@
         select * from (
         select
         cb.pk_member,cd.pk_order,cb.period,cb.pk_country,cd.pk_bonus_items,cd.income_status,cd.CAL_ACHIEVE,cd.pretax_income,cd.income_tax,cd.real_income,
-        cd.remark,cd.income_ratio,cd.income_dial_ratio,cd.order_dial_ratio from cu_member_bonus cb
+        cd.remark,cd.income_ratio,cd.income_dial_ratio,cd.order_dial_ratio
+        from cu_member_bonus cb
         inner join cu_member_bonus_detail cd
         on cb.pk_id = cd.pk_bonus
         where 1=1
@@ -280,8 +282,8 @@
         union all
         select
         cb.pk_member,cp.pk_order,cb.period,cb.pk_country,cp.pk_bonus_items,cp.income_status,cp.CAL_ACHIEVE,cp.pretax_income,cp.income_tax,cp.real_income,
-        cp.remark,cp.income_ratio,cp.income_dial_ratio,cp.order_dial_ratio from
+        cp.remark,cp.income_ratio,cp.income_dial_ratio,cp.order_dial_ratio
-        cu_member_bonus cb
+        from cu_member_bonus cb
         inner join cu_member_bonus_push cp
         on cb.pk_id = cp.pk_bonus
         where 1=1
@@ -294,8 +296,8 @@
         union all
         select
         cb.pk_member,ce.pk_order,cb.period,cb.pk_country,ce.pk_bonus_items,ce.income_status,ce.CAL_ACHIEVE,ce.pretax_income,ce.income_tax,ce.real_income,
-        ce.remark,ce.income_ratio,ce.income_dial_ratio,ce.order_dial_ratio from
+        ce.remark,ce.income_ratio,ce.income_dial_ratio,ce.order_dial_ratio
-        cu_member_bonus cb
+        from cu_member_bonus cb
         inner join cu_member_bonus_expand ce
         on cb.pk_id = ce.pk_bonus
         where 1=1
@@ -308,8 +310,8 @@
         union all
         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 from
+        cc.remark,cc.income_ratio,cc.income_dial_ratio,cc.order_dial_ratio
-        cu_member_bonus cb
+        from cu_member_bonus cb
         inner join cu_member_bonus_coach cc
         on cb.pk_id = cc.pk_bonus
         where 1=1
@@ -322,8 +324,8 @@
         union all
         select
         cb.pk_member,cr.pk_order,cb.period,cb.pk_country,cr.pk_bonus_items,cr.income_status,cr.CAL_ACHIEVE,cr.pretax_income,cr.income_tax,cr.real_income,
-        cr.remark,cr.income_ratio,cr.income_dial_ratio,cr.order_dial_ratio from
+        cr.remark,cr.income_ratio,cr.income_dial_ratio,cr.order_dial_ratio
-        cu_member_bonus cb
+        from cu_member_bonus cb
         inner join cu_member_bonus_range cr
         on cb.pk_id = cr.pk_bonus
         where 1=1
@@ -439,16 +441,19 @@
             <otherwise>order by tar.pk_teamcode</otherwise>
         </choose>
     </select>
+
     <select id="queryMemberBonusDetailByBonusItemsForServer" resultMap="CuMemberBonusDetail">
         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,nvl(so.pk_rate,b.pk_rate) pk_rate,
         nvl(bc.out_exchange_rate,0) out_exchange_rate,nvl(so.order_amount,0) order_amount,nvl(so.order_achieve,0) 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,bct.short_name settle_country from (
+        b.remark,b.income_ratio,b.income_dial_ratio,b.order_dial_ratio,bct.short_name settle_country
-        select cb.pk_member,cd.pk_order,cb.period,cb.pk_country,cd.pk_bonus_items,cd.income_status,cd.CAL_ACHIEVE,cd.pretax_income,cd.income_tax,cd.real_income,
+        from (
-        cd.remark,cd.income_ratio,cd.income_dial_ratio,cd.order_dial_ratio,cb.pk_rate from
+        select cb.pk_member,cd.pk_order,cb.period,cb.pk_country,cd.pk_bonus_items,cd.income_status,
-        cu_member_bonus cb
+        cd.CAL_ACHIEVE,cd.pretax_income,cd.income_tax,cd.real_income,
+        cd.remark,cd.income_ratio,cd.income_dial_ratio,cd.order_dial_ratio,cb.pk_rate
+        from cu_member_bonus cb
         inner join cu_member_bonus_detail cd
         on cb.pk_id = cd.pk_bonus
         where 1=1

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

@@ -317,28 +317,27 @@
         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.pur_real_subtotal,cb.repur_push_income,cb.repur_range_income,cb.repur_expand_income,cb.repur_real_subtotal,
-        cb.cloud_direct_income,cb.cloud_pur_income,cb.cloud_repur_income,cb.cloud_real_subtotal,
         cb.repur_coupon,cb.repur_coupon_share,cb.repur_coupon_subtotal,cb.store_income,
-        cb.maker_direct_income,cb.maker_share_income,cb.maker_real_subtotal,cb.hai_fun_income,
+        cb.global_points,cb.car_award_points,cb.pk_rate,bc.out_exchange_rate,
-        cb.global_points,cb.car_award_points,cb.hi_fun_income,cb.pk_rate,bc.out_exchange_rate,
+        cb.retail_range_income, cb.retail_same_level_income, cb.retail_area_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_range_income,cb.retail_benefit_avg_income,
+        cb.retail_benefit_avg_income, cb.retail_benefit_income,cb.retail_real_subtotal,
-        cb.retail_benefit_income,cb.retail_real_subtotal,
         cb.real_income_total,
         cm.pk_vertex, cm.service_code, cm.nick_name
         from cu_member_bonus cb
         inner join cu_member cm
         on cb.pk_member = cm.pk_id
+        and cm.del_flag = 0
         inner join cu_member_settle_period cp
         on cb.period = cp.pk_id
+        and cp.del_flag = 0
         left join bd_vertex bv
         on bv.pk_id = cm.pk_vertex
         left join cu_member_team ct
         on ct.pk_id = cm.pk_team_code
         left join bd_currency bc
         on bc.pk_country = cb.pk_country
-        where cb.del_flag = 0 and cm.del_flag = 0
+        where cb.del_flag = 0
-        and cp.del_flag=0
         <if test="bonusParam.pkCountry != null">
             and cm.pk_settle_country = #{bonusParam.pkCountry}
         </if>
@@ -413,22 +412,21 @@
         nvl(sum(cb.repur_range_income),0) repur_range_income,
         nvl(sum(cb.repur_expand_income),0) repur_expand_income,
         nvl(sum(cb.repur_real_subtotal),0) repur_real_subtotal,
-        nvl(sum(cb.cloud_direct_income),0) cloud_direct_income,
-        nvl(sum(cb.cloud_pur_income),0) cloud_pur_income,
-        nvl(sum(cb.cloud_repur_income),0) cloud_repur_income,
-        nvl(sum(cb.cloud_real_subtotal),0) cloud_real_subtotal,
         nvl(sum(cb.repur_coupon),0) repur_coupon,
         nvl(sum(cb.repur_coupon_share),0) repur_coupon_share,
         nvl(sum(cb.repur_coupon_subtotal),0) repur_coupon_subtotal,
         nvl(sum(cb.store_income),0) store_income,
-        nvl(sum(cb.maker_direct_income),0) maker_direct_income,
-        nvl(sum(cb.maker_share_income),0) maker_share_income,
-        nvl(sum(cb.maker_real_subtotal),0) maker_real_subtotal,
-        nvl(sum(cb.hai_fun_income),0) hai_fun_income,
         nvl(sum(cb.global_points),0) global_points,
         nvl(sum(cb.car_award_points),0) car_award_points,
-        nvl(sum(cb.hi_fun_income),0) hi_fun_income,
         bc.out_exchange_rate,
+        nvl(sum(cb.retail_range_income),0) retail_range_income,
+        nvl(sum(cb.retail_same_level_income),0) retail_same_level_income,
+        nvl(sum(cb.retail_area_income),0) retail_area_income,
+        nvl(sum(cb.retail_benefit_range_income),0) retail_benefit_range_income,
+        nvl(sum(cb.retail_month_repurchase_income),0) retail_month_repurchase_income,
+        nvl(sum(cb.retail_benefit_avg_income),0) retail_benefit_avg_income,
+        nvl(sum(cb.retail_benefit_income),0) retail_benefit_income,
+        nvl(sum(cb.retail_real_subtotal),0) retail_real_subtotal,
         nvl(sum(cb.real_income_total),0) real_income_total
         from cu_member_bonus cb
         inner join cu_member cm
@@ -441,8 +439,8 @@
         on ct.pk_id = cm.pk_team_code
         left join bd_currency bc
         on bc.pk_country = cb.pk_country
-        where cb.del_flag=0 and cm.del_flag=0
+        where cb.del_flag = 0 and cm.del_flag = 0
-        and cp.del_flag=0
+        and cp.del_flag = 0
         <if test="bonusParam.pkCountry != null">
             and cm.pk_settle_country = #{bonusParam.pkCountry}
         </if>

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

@@ -254,13 +254,13 @@ public class CuMemberBonus extends BaseEntity {
     private BigDecimal retailMonthRepurchaseIncome;
 
     /**
-     * 新零售福利分红平均收益
+     * 福利分红平均收益
      */
     @TableField("RETAIL_BENEFIT_AVG_INCOME")
     private BigDecimal retailBenefitAvgIncome;
 
     /**
-     * 新零售福利分红加权收益
+     * 福利分红加权收益
      */
     @TableField("RETAIL_BENEFIT_INCOME")
     private BigDecimal retailBenefitIncome;