gxwebsoft/mp-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(order): 添加门店分红相关字段

Browse Source 
- 添加门店(一级)字段 firstDividendUser
- 添加分红(一级)字段 firstDividend
- 添加门店(二级)字段 secondDividendUser
- 添加分红(二级)字段 secondDividend
- 为新增字段添加 Swagger 文档注解
- 保持原有分销佣金字段结构不变
This commit is contained in:
赵忠林
2026-01-23 15:56:50 +08:00
parent 06c20b8418
commit 08ab8da7d9
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java
View File

@@ -85,6 +85,18 @@ public class ShopDealerOrder implements Serializable {
@Schema(description = "分销佣金(三级)")
private BigDecimal thirdMoney;
@Schema(description = "门店(一级)")
private Integer firstDividendUser;
@Schema(description = "分红(一级)")
private BigDecimal firstDividend;
@Schema(description = "门店(二级)")
private Integer secondDividendUser;
@Schema(description = "分红(二级)")
private BigDecimal secondDividend;
@Schema(description = "佣金比例")
private BigDecimal rate;

16
src/main/java/com/gxwebsoft/shop/task/DealerOrderSettlement10584Task.java
View File

@@ -323,9 +323,11 @@ public class DealerOrderSettlement10584Task {
dealerOrder.setSecondUserId(dealerRefereeCommission.simpleDealerId);
dealerOrder.setSecondMoney(dealerRefereeCommission.simpleMoney);
// 表结构只有三级，门店(角色shop)两级放入 third + comments（详细以 capital 为准）
dealerOrder.setThirdUserId(shopRoleCommission.storeDirectUserId);
dealerOrder.setThirdMoney(shopRoleCommission.storeDirectMoney);
// 门店(角色shop)两级分红单独落字段（详细以 ShopDealerCapital 为准）
dealerOrder.setFirstDividendUser(shopRoleCommission.storeDirectUserId);
dealerOrder.setFirstDividend(shopRoleCommission.storeDirectMoney);
dealerOrder.setSecondDividendUser(shopRoleCommission.storeSimpleUserId);
dealerOrder.setSecondDividend(shopRoleCommission.storeSimpleMoney);
dealerOrder.setIsSettled(1);
dealerOrder.setSettleTime(java.time.LocalDateTime.now());
@@ -334,16 +336,16 @@ public class DealerOrderSettlement10584Task {
dealerOrder.setComments(buildCommissionTraceComment(dealerRefereeCommission, shopRoleCommission));
shopDealerOrderService.save(dealerOrder);
log.info("写入ShopDealerOrder完成 - orderNo={}, firstUserId={}, secondUserId={}, thirdUserId={}",
order.getOrderNo(), dealerOrder.getFirstUserId(), dealerOrder.getSecondUserId(), dealerOrder.getThirdUserId());
log.info("写入ShopDealerOrder完成 - orderNo={}, firstUserId={}, secondUserId={}, firstDividendUser={}, secondDividendUser={}",
order.getOrderNo(), dealerOrder.getFirstUserId(), dealerOrder.getSecondUserId(), dealerOrder.getFirstDividendUser(), dealerOrder.getSecondDividendUser());
}
private String buildCommissionTraceComment(DealerRefereeCommission dealerRefereeCommission, ShopRoleCommission shopRoleCommission) {
// 轻量“过程”留痕，方便排查；详细分佣以 ShopDealerCapital 为准。
return "direct=" + dealerRefereeCommission.directDealerId + ":" + dealerRefereeCommission.directMoney
+ ",simple=" + dealerRefereeCommission.simpleDealerId + ":" + dealerRefereeCommission.simpleMoney
+ ",storeDirect=" + shopRoleCommission.storeDirectUserId + ":" + shopRoleCommission.storeDirectMoney
+ ",storeSimple=" + shopRoleCommission.storeSimpleUserId + ":" + shopRoleCommission.storeSimpleMoney;
+ ",dividend1=" + shopRoleCommission.storeDirectUserId + ":" + shopRoleCommission.storeDirectMoney
+ ",dividend2=" + shopRoleCommission.storeSimpleUserId + ":" + shopRoleCommission.storeSimpleMoney;
}
private BigDecimal getOrderBaseAmount(ShopOrder order) {