## 奖金明细显示补全；

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java

@@ -113,6 +113,9 @@ public class ApiCuMemberBonusController extends BaseController {
             // 拓展收益 = 首购拓展 + 复购拓展 + 复购推荐
             memberBonusFirstPurchaseVO.setExpandIncome(ComputeUtil.computeAddNum(memberBonusFirstPurchaseVO.getExpandIncome(),
                     memberBonusFirstPurchaseVO.getRepurExpandIncome(), memberBonusFirstPurchaseVO.getRepurPushIncome()));
+            // 辅导收益 = 首购辅导 + 复购辅导
+            memberBonusFirstPurchaseVO.setCoachIncome(ComputeUtil.computeAddNum(memberBonusFirstPurchaseVO.getCoachIncome(),
+                    memberBonusFirstPurchaseVO.getRepurCoachIncome()));
             // 首购实发小计 = 首购实发小计 + 复购实发小计
             memberBonusFirstPurchaseVO.setPurRealSubtotal(ComputeUtil.computeAdd(memberBonusFirstPurchaseVO.getPurRealSubtotal(), memberBonusFirstPurchaseVO.getRepurRealSubtotal()));
 

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

@@ -154,6 +154,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
                     cuMemberBonusExt.setRepurPushIncome(BigDecimal.ZERO);
                     cuMemberBonusExt.setRepurRangeIncome(BigDecimal.ZERO);
                     cuMemberBonusExt.setRepurExpandIncome(BigDecimal.ZERO);
+                    cuMemberBonusExt.setRepurCoachIncome(BigDecimal.ZERO);
                     cuMemberBonusExt.setRepurRealSubtotal(BigDecimal.ZERO);
                     cuMemberBonusExt.setCloudDirectIncome(BigDecimal.ZERO);
                     cuMemberBonusExt.setCloudPurIncome(BigDecimal.ZERO);
@@ -210,6 +211,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
             cuMemberBonusExt.setRepurPushIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurPushIncome(), inExchangeRate));
             cuMemberBonusExt.setRepurRangeIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurRangeIncome(), inExchangeRate));
             cuMemberBonusExt.setRepurExpandIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurExpandIncome(), inExchangeRate));
+            cuMemberBonusExt.setRepurCoachIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurCoachIncome(), inExchangeRate));
             cuMemberBonusExt.setRepurRealSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurRealSubtotal(), inExchangeRate));
             cuMemberBonusExt.setCloudDirectIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getCloudDirectIncome(), inExchangeRate));
             cuMemberBonusExt.setCloudPurIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getCloudPurIncome(), inExchangeRate));

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

@@ -9,12 +9,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * @description: 奖金明细表
+ * 奖金明细表
- * @author: sui q
- * @time: 2023/5/20 15:31
- * @classname: CuMemberBonusVO
- * @package_name: com.hzs.member.bonus.vo
- * version 1.0.0
  */
 @Data
 public class CuMemberBonusVO implements Serializable {

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

@@ -5,7 +5,7 @@ import lombok.*;
 import java.math.BigDecimal;
 
 /**
- * @description: 查询首购奖金
+ * 查询首购奖金
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
@@ -59,6 +59,11 @@ public class MemberBonusFirstPurchaseVO extends PubMemberBonusVO {
      */
     private BigDecimal repurExpandIncome;
 
+    /**
+     * 复购辅导收益
+     */
+    private BigDecimal repurCoachIncome;
+
     /**
      * 复购级差收益
      */

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

@@ -229,22 +229,23 @@
 
     <select id="queryMemberBonusByCondition" resultMap="CuMemberBonus">
         select
-        cp.settle_date,cb.direct_income,cb.expand_income,
+        cp.settle_date,
-        cb.expand_no_capping, cb.expand_capping,
+        cb.direct_income, cb.expand_income, cb.expand_no_capping, cb.expand_capping,
-        cb.coach_income,cb.share_income,cb.service_income,
+        cb.coach_income, cb.share_income, cb.service_income,
-        cb.back_points,cb.service_spend, cb.pur_real_subtotal,
+        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_push_income, cb.repur_range_income, cb.repur_expand_income, cb.repur_coach_income,
-        cb.cloud_direct_income,cb.cloud_pur_income,cb.cloud_repur_income,cb.cloud_real_subtotal,
+        cb.repur_real_subtotal, cb.store_income,
-        cb.repur_coupon,cb.repur_coupon_share,cb.repur_coupon_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.maker_direct_income, cb.maker_share_income, cb.maker_real_subtotal,
         cb.global_points, cb.car_award_points,
-        cb.hi_fun_income,cb.hai_fun_income,
+        cb.cloud_direct_income, cb.cloud_pur_income, cb.cloud_repur_income, cb.cloud_real_subtotal,
+        cb.hi_fun_income, cb.hai_fun_income,
         cb.real_income_total
         from cu_member_bonus cb
         inner join cu_member_settle_period cp
         on cb.period = cp.pk_id
-        where cb.del_flag=0 and cp.del_flag=0
+        where cb.del_flag = 0 and cp.del_flag = 0
-        and cb.pk_member=#{pkMember}
+        and cb.pk_member = #{pkMember}
         <if test="grantStatus != null">
             and cb.grant_status >= #{grantStatus}
         </if>

bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/param/MemberAchieveDisParam.java

@@ -7,11 +7,6 @@ import java.util.Date;
 
 /**
  * description: 会员业绩分布
- *
- * @author: sui q
- * @time: 2023/4/7 15:16
- * @classname: MemberAchieveDisParam
- * @package_name: com.hzs.member.achieve.param
  * version 1.0.0
  */
 @Data
@@ -41,4 +36,5 @@ public class MemberAchieveDisParam implements Serializable {
      * 国家
      */
     private Integer pkCountry;
+
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java

@@ -123,6 +123,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
         // 判断时间 当前时间查询cu_member
         CuMemberAchieveDisVO leftMemberAchieveDisVO = new CuMemberAchieveDisVO();
         CuMemberAchieveDisVO rightMemberAchieveDisVO = new CuMemberAchieveDisVO();
+        // 查询会员信息
         List<CuMemberExt> cuMemberExtList = iCuMemberService.queryMemberByCondition(CuMember.builder().pkId(memberAchieveDisParam.getPkMember()).build());
         CuMemberExt cuMember = cuMemberExtList.get(0);
         String image = setGradeImageUrl(cuMember.getCategory(), cuMember.getGradeValue());
@@ -147,6 +148,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
             String imageUrl = setGradeImageUrl(cuMember.getCategory(), cuMember.getGradeValue());
             leftMemberAchieveDisVO.setLastImageUrl(imageUrl);
         }
+        // 左区会员
         cuMemberDisVO.setLeftMember(leftMemberAchieveDisVO);
         if (StringUtils.isEmpty(rightMemberAchieveDisVO.getLastMemberCode())) {
             rightMemberAchieveDisVO.setLastMemberCode(cuMember.getMemberCode());
@@ -154,6 +156,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
             String imageUrl = setGradeImageUrl(cuMember.getCategory(), cuMember.getGradeValue());
             rightMemberAchieveDisVO.setLastImageUrl(imageUrl);
         }
+        // 右区会员
         cuMemberDisVO.setRightMember(rightMemberAchieveDisVO);
         return cuMemberDisVO;
     }
@@ -943,15 +946,11 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
 
     /**
      * @description: 业绩分布-新增业绩统计
-     * @author: zhang jing
-     * @date: 2023/5/19 10:33
-     * @param: []
-     * @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO
      **/
     @Override
     public PlaceNewAddAchieveVO placeNewAddAchieveStat(PlaceNewAddAchieveVO pna) {
         PlaceNewAddAchieveVO rtupna = new PlaceNewAddAchieveVO();
-        BigDecimal constant = new BigDecimal(10000);
+        BigDecimal constant = new BigDecimal("10000");
         //当前日期
         Date currentDate;
         LocalDate localDate;
@@ -971,7 +970,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
         String dStr = DateUtils.getMonth(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.currentDate()));
         Date systemDate = DateUtils.currentDate();
 
-
         // 获取下个月第一天
         LocalDate endDate = localDate.with(TemporalAdjusters.firstDayOfNextMonth());
         Date enddate = DateUtils.toDate(endDate);
@@ -1038,7 +1036,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
         pna.setStartDate(startDateStr);
         pna.setAchieveTableName(treeTableNameEnd);
 
-
         //查询最新期数
         int endperiod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
                 DateUtils.parseDateToStr(endDateStr)).getPkId();

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

@@ -6,8 +6,6 @@ import lombok.Getter;
 
 /**
  * 业绩类型
- *zhangjing
- * @author: hzs
  */
 @AllArgsConstructor
 @Getter

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

@@ -12,9 +12,6 @@ import lombok.experimental.Accessors;
 
 /**
  * 会员奖金-会员奖金汇总表
- *
- * @author hzs
- * @since 2022-11-11
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

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

@@ -8,11 +8,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * @Description:
+ * 会员奖金汇总扩展表
- * @Author: sui q
- * @Time: 2023/2/1 10:27
- * @Classname: CuMemberBonusExt
- * @PackageName: com.hzs.common.domain.member.ext
  */
 @EqualsAndHashCode(callSuper = true)
 @Data