diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java index bbe9b5d4..c1a9998a 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java @@ -1410,7 +1410,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { benefitIncome = benefitIncome.add(saOrderWaresExt.getAreaIncome().multiply(new BigDecimal(saOrderWaresExt.getWaresQuantity()))); } 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()))); } } } diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml index 1ea855a1..484caa1d 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml @@ -60,6 +60,7 @@ + @@ -156,6 +157,7 @@ nvl(st.pk_wares,0) pk_wares, nvl(st.wares_price,0) wares_price, nvl(st.wares_quantity,0) wares_quantity, + 0 wares_achievement, nvl(bw.wares_code,'~') wares_code, nvl(bw.area_income, 0) area_income, nvl(bw.area_income_type, 0) area_income_type, @@ -198,16 +200,19 @@ soi.pk_wares, soi.wares_price, soi.wares_quantity, + soi.wares_achievement, nvl(bw.wares_code, '~') wares_code, nvl(bw.area_income, 0) area_income, nvl(bw.area_income_type, 0) area_income_type, nvl(bw.box_num, 0) wares_box_num 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_wares, 0) pk_wares, 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 left join sa_order_items soi on soi.pk_order = so.pk_id @@ -220,7 +225,8 @@ and so.pay_time >= #{startDate} and so.pay_time < #{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 left join bd_wares bw on bw.pk_id = soi.pk_wares diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaOrderWaresExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaOrderWaresExt.java index 0ce59436..52d75b68 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaOrderWaresExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaOrderWaresExt.java @@ -29,4 +29,9 @@ public class SaOrderWaresExt extends SaOrderWares { */ private BigDecimal waresBoxNum; + /** + * 商品业绩 + */ + private BigDecimal waresAchievement; + }