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-03 10:32:47 +08:00
parent 7de4bc6370
commit e2af0a6be8
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1410,7 +1410,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
benefitIncome = benefitIncome.add(saOrderWaresExt.getAreaIncome().multiply(new BigDecimal(saOrderWaresExt.getWaresQuantity()))); benefitIncome = benefitIncome.add(saOrderWaresExt.getAreaIncome().multiply(new BigDecimal(saOrderWaresExt.getWaresQuantity())));
} else { } else {
// 按比率处理 // 按比率处理
benefitIncome = benefitIncome.add(saOrderWaresExt.getWaresPrice().multiply(saOrderWaresExt.getAreaIncome()).divide(new BigDecimal("100"), 6, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(saOrderWaresExt.getWaresQuantity()))); benefitIncome = benefitIncome.add(saOrderWaresExt.getWaresAchievement().multiply(saOrderWaresExt.getAreaIncome()).divide(new BigDecimal("100"), 6, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(saOrderWaresExt.getWaresQuantity())));
} }
} }
} }

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

@ -60,6 +60,7 @@
<result column="PK_WARES" property="pkWares"/> <result column="PK_WARES" property="pkWares"/>
<result column="WARES_PRICE" property="waresPrice"/> <result column="WARES_PRICE" property="waresPrice"/>
<result column="WARES_CODE" property="waresCode"/> <result column="WARES_CODE" property="waresCode"/>
<result column="WARES_ACHIEVEMENT" property="waresAchievement"/>
<result column="AREA_INCOME" property="areaIncome"/> <result column="AREA_INCOME" property="areaIncome"/>
<result column="AREA_INCOME_TYPE" property="areaIncomeType"/> <result column="AREA_INCOME_TYPE" property="areaIncomeType"/>
<result column="WARES_BOX_NUM" property="waresBoxNum"/> <result column="WARES_BOX_NUM" property="waresBoxNum"/>
@ -156,6 +157,7 @@
nvl(st.pk_wares,0) pk_wares, nvl(st.pk_wares,0) pk_wares,
nvl(st.wares_price,0) wares_price, nvl(st.wares_price,0) wares_price,
nvl(st.wares_quantity,0) wares_quantity, nvl(st.wares_quantity,0) wares_quantity,
0 wares_achievement,
nvl(bw.wares_code,'~') wares_code, nvl(bw.wares_code,'~') wares_code,
nvl(bw.area_income, 0) area_income, nvl(bw.area_income, 0) area_income,
nvl(bw.area_income_type, 0) area_income_type, nvl(bw.area_income_type, 0) area_income_type,
@ -198,16 +200,19 @@
soi.pk_wares, soi.pk_wares,
soi.wares_price, soi.wares_price,
soi.wares_quantity, soi.wares_quantity,
soi.wares_achievement,
nvl(bw.wares_code, '~') wares_code, nvl(bw.wares_code, '~') wares_code,
nvl(bw.area_income, 0) area_income, nvl(bw.area_income, 0) area_income,
nvl(bw.area_income_type, 0) area_income_type, nvl(bw.area_income_type, 0) area_income_type,
nvl(bw.box_num, 0) wares_box_num nvl(bw.box_num, 0) wares_box_num
from sa_order so from sa_order so
left join (select max(soi.pk_id) items_id, left join (
select max(soi.pk_id) items_id,
nvl(soi.pk_order, 0) pk_order, nvl(soi.pk_order, 0) pk_order,
nvl(soi.pk_wares, 0) pk_wares, nvl(soi.pk_wares, 0) pk_wares,
sum(soi.achievement * soi.quantity) wares_price, sum(soi.achievement * soi.quantity) wares_price,
max(soi.wares_quantity) wares_quantity max(soi.wares_quantity) wares_quantity,
max(soi.achievement) wares_achievement
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
@ -220,7 +225,8 @@
</if> </if>
and so.pay_time >= #{startDate} and so.pay_time >= #{startDate}
and so.pay_time &lt; #{endDate} and so.pay_time &lt; #{endDate}
group by soi.pk_order, soi.pk_wares) soi group by soi.pk_order, soi.pk_wares
) soi
on soi.pk_order = so.pk_id on soi.pk_order = so.pk_id
left join bd_wares bw left join bd_wares bw
on bw.pk_id = soi.pk_wares on bw.pk_id = soi.pk_wares

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaOrderWaresExt.java
View File

@ -29,4 +29,9 @@ public class SaOrderWaresExt extends SaOrderWares {
*/ */
private BigDecimal waresBoxNum; private BigDecimal waresBoxNum;
/**
* 商品业绩
*/
private BigDecimal waresAchievement;
} }