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

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

@@ -72,14 +72,13 @@ public class CuMemberSettleController extends BaseController {
     }
 
     /**
-     * 结算业绩
+     * 奖金计算 - 重新结算
      *
      * @return AjaxResult
      */
     @GetMapping("/settle-bonus")
     @Log(module = EOperationModule.BONUS_SETTLE, business = EOperationBusiness.BONUS_SETTLE, method = EOperationMethod.INSERT)
     public AjaxResult settleBonus(String settleDate) {
-//        initTable(settleDate);
         Date startDate = DateUtils.parseStringToDate(settleDate);
         if (DateUtils.compareDateAfter(DateUtils.beforeDate(6, ChronoUnit.DAYS, DateUtils.currentDate()), startDate)) {
             return AjaxResult.error(TransactionUtils.getContent(BonusMsgConstants.SETTLE_VALIDATE_DATE));

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

@@ -689,10 +689,10 @@ public abstract class BonusSettleHandle {
                     .retailSameLevelIncome(BigDecimal.ZERO)
                     .retailAreaIncome(BigDecimal.ZERO)
                     .retailBenefitRangeIncome(BigDecimal.ZERO)
+                    .retailMonthRepurchaseIncome(BigDecimal.ZERO)
                     .retailBenefitAvgIncome(BigDecimal.ZERO)
                     .retailBenefitIncome(BigDecimal.ZERO)
                     .retailRealSubtotal(BigDecimal.ZERO)
-                    .retailMonthRepurchaseIncome(BigDecimal.ZERO)
                     .build();
             cuMemberBonus.setPkCreator(MagicNumberConstants.PK_ADMIN);
             cuMemberBonus.setPkCountry(pkCountry);

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

@@ -149,7 +149,7 @@
             #{item.retailRealSubtotal} retail_real_subtotal
             from dual
         </foreach>) )b
-        on (cb.pk_member=b.pk_member and cb.period=b.period)
+        on (cb.pk_member = b.pk_member and cb.period = b.period)
         WHEN NOT MATCHED THEN
         insert (
         pk_id, pk_member, period, pk_rate, direct_income,expand_income,expand_no_capping,
@@ -169,7 +169,7 @@
         b.store_income, b.real_income_total,
         b.pk_country, b.pk_creator, b.grant_status, b.income_status,
         b.retail_range_income, b.retail_same_level_income,
-        b.retail_area_income, b.retail_benefit_range_income, retail_month_repurchase_income,
+        b.retail_area_income, b.retail_benefit_range_income, b.retail_month_repurchase_income,
         b.retail_benefit_avg_income, b.retail_benefit_income, b.retail_real_subtotal)
     </insert>