## 去掉调试日志；统一拓展收益入库方法；

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

@@ -27,13 +27,6 @@ public interface CuMemberBonusExpandMapper extends BaseMapper<CuMemberBonusExpan
      */
     void batchInsertCuMemberBonusExpand(@Param("cuMemberBonusExpandList") List<?> cuMemberBonusExpandList);
 
-    /**
-     * 批量插入会员奖金,拓展
-     *
-     * @param cuMemberBonusExpandList 会员奖金
-     */
-    void insertCuMemberBonusExpand(List<CuMemberBonusExpand> cuMemberBonusExpandList);
-
     /**
      * 根据查询条件查询固定的奖金明细
      *

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

@@ -24,11 +24,4 @@ public interface ICuMemberBonusExpandService extends IService<CuMemberBonusExpan
      * @param cuMemberBonusExpandList 会员奖金
      */
     void batchInsertCuMemberBonusExpand(List<CuMemberBonusExpand> cuMemberBonusExpandList, Set<Long> memberIdSet);
-
-    /**
-     * 批量插入会员奖金主表
-     *
-     * @param cuMemberBonusExpandList 会员奖金
-     */
-    void insertCuMemberBonusExpand(List<CuMemberBonusExpand> cuMemberBonusExpandList);
 }

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

@@ -299,11 +299,6 @@ public class BonusSettleNewExpandHandle extends BonusSettleHandle {
         // 需要计算量碰的业绩
         BigDecimal calAchieve = calAAchieve.compareTo(calBAchieve) <= 0 ? calAAchieve : calBAchieve;
 
-        if (cuMemberBonus.getPkMember().equals(10748L)) {
-            log.info("=====calAchieve===== {}", calAchieve);
-        }
-
-        // TODO 拓展收益明细比例不对？？
         // 拓展收益明细
         CuMemberBonusExpand cuMemberBonusExpand = getCuMemberBonusExpand(saOrderExt, touchNum, i, targetMemberSettleExt, countryExpandRatio, cuMemberBonus, calAchieve, pkBonusItems, addTouch, bdGrade);
         // 扣减a、b区结余

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

@@ -18,12 +18,8 @@ import java.util.Set;
 @Service
 public class CuMemberBonusExpandServiceImpl extends ServiceImpl<CuMemberBonusExpandMapper, CuMemberBonusExpand> implements ICuMemberBonusExpandService {
 
-    private CuMemberBonusSettle cuMemberBonusSettle;
-
     @Autowired
-    public void setCuMemberBonusSettle(CuMemberBonusSettle cuMemberBonusSettle) {
+    private CuMemberBonusSettle cuMemberBonusSettle;
-        this.cuMemberBonusSettle = cuMemberBonusSettle;
-    }
 
     @Override
     public void deleteCuMemberBonusExpand(Integer period) {
@@ -49,9 +45,5 @@ public class CuMemberBonusExpandServiceImpl extends ServiceImpl<CuMemberBonusExp
                 baseMapper.batchInsertCuMemberBonusExpand(list));
     }
 
-    @Override
-    public void insertCuMemberBonusExpand(List<CuMemberBonusExpand> cuMemberBonusExpandList) {
-        baseMapper.insertCuMemberBonusExpand(cuMemberBonusExpandList);
-    }
 }
 

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

@@ -84,20 +84,6 @@
         SELECT 1 FROM dual
     </insert>
 
-    <insert id="insertCuMemberBonusExpand">
-        insert into cu_member_bonus_expand(pk_bonus, pk_order, pk_bonus_items, income_status,
-                                           cal_type, cal_achieve, cal_value, pretax_income,
-                                           income_tax, real_income, current_touch, expand_touch, expand_no_capping,
-                                           expand_capping, expand_normal_half, expand_normal_real, remark,
-                                           income_ratio, income_dial_ratio, order_dial_ratio, pk_country, pk_creator)
-        values (#{item.pkBonus}, #{item.pkOrder}, #{item.pkBonusItems}, #{item.incomeStatus},
-                #{item.calType}, #{item.calAchieve}, #{item.calValue}, #{item.pretaxIncome},
-                #{item.incomeTax}, #{item.realIncome}, #{item.currentTouch}, #{item.expandTouch},
-                #{item.expandNoCapping}, #{item.expandCapping}, #{item.expandNormalHalf}, #{item.expandNormalReal},
-                #{item.remark}, #{item.incomeRatio}, #{item.incomeDialRatio}, #{item.orderDialRatio},
-                #{item.pkCountry}, #{item.pkCreator})
-    </insert>
-
     <delete id="deleteCuMemberBonusExpand">
         delete
         from CU_MEMBER_BONUS_EXPAND