angelo
/
java-retail-app
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: angelo:abfa5b59682d10caeac9411689f1e22e3e79ccaf
Branches Tags
angelo:master
angelo:test
angelo:dev
angelo:online
angelo:feat_shared_reg
...
compare: angelo:03416320f4e6e59081165fd5cb20c60ce5649015
Branches Tags
angelo:test
angelo:dev
angelo:online
angelo:feat_shared_reg
angelo:master

2 Commits
abfa5b5968 ... 03416320f4

Author SHA1 Message Date
cabbage 03416320f4 Merge remote-tracking branch 'origin/dev' into dev 2025-06-25 16:54:43 +08:00
cabbage e7430e1bb9 ## 复购级差收益处理修改； 2025-06-25 16:54:39 +08:00
3 changed files with 4 additions and 5 deletions
Show Stats Expand all files Collapse all files

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

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

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

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

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

@ -149,7 +149,7 @@
#{item.retailRealSubtotal} retail_real_subtotal #{item.retailRealSubtotal} retail_real_subtotal
from dual from dual
</foreach>) )b </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 WHEN NOT MATCHED THEN
insert ( insert (
pk_id, pk_member, period, pk_rate, direct_income,expand_income,expand_no_capping, 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.store_income, b.real_income_total,
b.pk_country, b.pk_creator, b.grant_status, b.income_status, b.pk_country, b.pk_creator, b.grant_status, b.income_status,
b.retail_range_income, b.retail_same_level_income, 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) b.retail_benefit_avg_income, b.retail_benefit_income, b.retail_real_subtotal)
</insert> </insert>