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

## 新复购级差收益累计商品数量；

This commit is contained in:
cabbage 2025-07-10 13:55:37 +08:00
parent 19bee0f3b2
commit ed49bcf975
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java
View File

@ -2138,6 +2138,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
} else { } else {
bonusIncome = tmpPrice.subtract(targetRangePrice); bonusIncome = tmpPrice.subtract(targetRangePrice);
} }
// 单个级差 * 商品数量 = 实际奖金
bonusIncome = bonusIncome.multiply(new BigDecimal(saOrderItemsExt.getWaresQuantity()));
bonusIncomeMap.put(targetMemberRangeExt.getPkMember(), bonusIncome); bonusIncomeMap.put(targetMemberRangeExt.getPkMember(), bonusIncome);
// 临时价格更新 // 临时价格更新
tmpPrice = targetRangePrice; tmpPrice = targetRangePrice;

5
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml
View File

@ -333,6 +333,7 @@
<result column="PK_ORDER" property="pkOrder"/> <result column="PK_ORDER" property="pkOrder"/>
<result column="PK_ID" property="pkId"/> <result column="PK_ID" property="pkId"/>
<result column="PRICE" property="price"/> <result column="PRICE" property="price"/>
<result column="WARES_QUANTITY" property="waresQuantity"/>
<result column="PK_WARES" property="pkWares"/> <result column="PK_WARES" property="pkWares"/>
<result column="PK_PRODUCT" property="pkProduct"/> <result column="PK_PRODUCT" property="pkProduct"/>
<result column="PK_WARES_DETAIL" property="pkWaresDetail"/> <result column="PK_WARES_DETAIL" property="pkWaresDetail"/>
@ -348,6 +349,7 @@
select soi.pk_order, select soi.pk_order,
soi.pk_id, soi.pk_id,
soi.price, soi.price,
soi.wares_quantity,
bwr.pk_wares, bwr.pk_wares,
bwr.pk_product, bwr.pk_product,
bwr.pk_wares_detail, bwr.pk_wares_detail,
@ -360,7 +362,8 @@
soi.pk_product, soi.pk_product,
soi.pk_wares_detail, soi.pk_wares_detail,
soi.pk_wares_specs_sku, soi.pk_wares_specs_sku,
soi.price soi.price,
max(soi.wares_quantity) wares_quantity
from sa_order so from sa_order so
left join sa_order_items soi left join sa_order_items soi
on soi.pk_order = so.pk_id on soi.pk_order = so.pk_id