## 见点收益处理补全数据；

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

@@ -746,7 +746,7 @@ public abstract class BonusSettleHandle {
     protected void repurchasePointRemark(SaOrderExt saOrderExt, CuMemberBonusCoach cuMemberBonusCoach,
                                          CuMemberSettleExt sourceMemberRangeExt, CuMemberSettleExt targetMemberRangeExt,
                                          int algebra) {
-        String remark = String.format(BonusMsgConstants.REPURCHASE_POINT, algebra, 1, saOrderExt.getOrderCode(),
+        String remark = String.format(BonusMsgConstants.REPURCHASE_POINT, algebra, saOrderExt.getOrderCode(),
                 sourceMemberRangeExt.getMemberCode() + sourceMemberRangeExt.getMemberName(),
                 targetMemberRangeExt.getMemberCode() + targetMemberRangeExt.getMemberName(),
                 cuMemberBonusCoach.getCalAchieve(), cuMemberBonusCoach.getCalValue());

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

@@ -789,6 +789,7 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle {
                         cuMemberBonusCoach.setCalAchieve(saOrderExt.getOrderAchieve());
                         cuMemberBonusCoach.setCalValue(pointRatio);
                         cuMemberBonusCoach.setPretaxIncome(pretaxIncome);
+                        cuMemberBonusCoach.setCurrentGeneration(pointAlgebra);
                         repurchasePointRemark(saOrderExt, cuMemberBonusCoach, sourceMemberSettleExt, targetMemberSettleExt, pointAlgebra);
                         // 奖金扣项
                         BdBonusDeduct bdBonusDeduct = setBonusDetailDeduct(bonusConfigDTO, cuMemberBonusCoach,
@@ -837,6 +838,10 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle {
                 .incomeRatio(BigDecimal.ZERO)
                 .incomeDialRatio(BigDecimal.ZERO)
                 .orderDialRatio(BigDecimal.ZERO)
+                .coachNoCapping(BigDecimal.ZERO)
+                .coachCapping(BigDecimal.ZERO)
+                .coachNormalHalf(BigDecimal.ZERO)
+                .coachNormalReal(BigDecimal.ZERO)
                 .build();
         cuMemberBonusCoach.setPkCountry(cuMemberSettleExt.getPkSettleCountry());
         cuMemberBonusCoach.setPkCreator(MagicNumberConstants.PK_ADMIN);

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

@@ -1308,6 +1308,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService {
                     .repRangeIncome(BigDecimal.ZERO)
                     .hiFunIncome(BigDecimal.ZERO)
                     .haiFunIncome(BigDecimal.ZERO)
+                    .globalPoints(BigDecimal.ZERO)
                     .build();
             memberBonusDetailVoMap.put(pkOrder, memberBonusDetailCalVO);
         }

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAssessMapper.java

@@ -204,13 +204,15 @@ public interface CuMemberAssessMapper extends BaseMapper<CuMemberAssess> {
      * 创建免考会员数据
      *
      * @param accessTableName
-     * @param startDate
+     * @param monthStartDate
      * @param endDate
+     * @param startDate
      * @return
      */
     int createPassMemberAssess(@Param("accessTableName") String accessTableName,
-                               @Param("startDate") Date startDate,
+                               @Param("monthStartDate") Date monthStartDate,
-                               @Param("endDate") Date endDate);
+                               @Param("endDate") Date endDate,
+                               @Param("startDate") Date startDate);
 
     /**
      * 处理考试通过会员

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

@@ -408,15 +408,15 @@ public class CuMemberAssessServiceImpl extends ServiceImpl<CuMemberAssessMapper,
         // 当月时间
         Date monthDate = DateUtils.parseDateOne(settleDate, DateUtils.YYYY_MM_DD);
         // 上月第一天
-        Date startDate = DateUtils.getFirstDayOfMonth(DateUtils.addMonths(monthDate, -1));
+        Date monthStartDate = DateUtils.getFirstDayOfMonth(DateUtils.addMonths(monthDate, -1));
+        // 当月第一天
+        Date startDate = DateUtils.getFirstDayOfMonth(monthDate);
         // 当月最后一天
         Date endDate = DateUtils.getLastDayOfMonth(monthDate);
         // 上月新会员本月免考
-        baseMapper.createPassMemberAssess(assessTableName, startDate, endDate);
+        baseMapper.createPassMemberAssess(assessTableName, monthStartDate, endDate, startDate);
 
         // 会员复购订单首月免考
-        // 当月第一天
-        startDate = DateUtils.getFirstDayOfMonth(monthDate);
         // 当月会员复购考核
         baseMapper.updatePassMemberAssess(assessTableName, startDate, endDate);
 

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

@@ -1165,11 +1165,11 @@
             using (select cma.pk_member
                    from ${assessTableName} cma
                    where cma.del_flag = 0
-                     and cma.assess_type = 0
+                     and cma.assess_type = 5
                      and cma.assess_status in (1, 2)) tmp
             on (tmp.pk_member = cms.pk_member)
             when matched then
-                update set cms.is_maker_gift = 0
+                update set cms.is_maker_space = 0
     </update>
 
 </mapper>

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

@@ -469,7 +469,7 @@
                 from cu_member cm
                 where cm.del_flag = 0
                   and cm.pay_status = 1
-                  and cm.pay_time >= #{startDate}
+                  and cm.pay_time >= #{monthStartDate}
                   and #{endDate} >= cm.pay_time
             ) tmp
             on (cma.pk_member = tmp.pk_id and assess_type = 0 and cma.del_flag = 0)
@@ -483,7 +483,7 @@
                      start_date,
                      end_date)
                     values (tmp.pk_id,
-                            0,
+                            5,
                             0,
                             1,
                             tmp.pk_id,
@@ -522,7 +522,7 @@
                      pk_creator,
                      start_date,
                      end_date)
-                    values (tmp.pk_member, 0, 1, 0, tmp.pk_member, tmp.pay_time, #{endDate})
+                    values (tmp.pk_member, 5, 1, 0, tmp.pk_member, trunc(tmp.pay_time), #{endDate})
     </update>
 
 </mapper>

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

@@ -11,7 +11,7 @@ import lombok.Getter;
 public enum EAssessmentType {
 
     /**
-     * 0=复购考核（见点收益考核）
+     * 0=复购考核
      */
     REPURCHASE_ASSESS(0, "复购考核", 0),
 
@@ -25,6 +25,11 @@ public enum EAssessmentType {
      */
     NO_ASSESSMENT(2, "不考核", 0),
 
+    /**
+     * 5=见点收益考核
+     */
+    POINT_ASSESS(5, "见点收益考核", 0),
+
     ;
 
     /**