From 5bef937a1fb3964c825a0fb567d4462be0624e26 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Wed, 25 Jun 2025 16:54:39 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=A4=8D=E8=B4=AD=E7=BA=A7=E5=B7=AE?= =?UTF-8?q?=E6=94=B6=E7=9B=8A=E5=A4=84=E7=90=86=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../achieve/controller/manage/CuMemberSettleController.java | 3 +-- .../com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java | 2 +- .../main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/controller/manage/CuMemberSettleController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/controller/manage/CuMemberSettleController.java index daa7abe4..e9a6f9f5 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/controller/manage/CuMemberSettleController.java +++ b/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)); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java index a711ec19..cc3443e1 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java +++ b/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); diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml index bc60ea2d..1c65b99f 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml @@ -149,7 +149,7 @@ #{item.retailRealSubtotal} retail_real_subtotal from dual ) )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)