From b2a4188c1b3dde1f687bd90b013364b17243f935 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Tue, 12 Nov 2024 16:26:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A=E4=BB=85=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E4=BB=B7=E6=A0=BC=E5=8F=96=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sales/RefundOnlyPluginInitializer.java | 39 ++++++++++++------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializer.java index b8048199..5874726b 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializer.java @@ -363,7 +363,7 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { List allHeader = new ArrayList<>(); //分摊 for (RerturnGoodsOrderSearchData filterReturnGoodsOrder : filterReturnGoodsOrders) { - ofsOrderAfterSalesAmountAllocationUtil.tocSalesAmountAllocation(filterReturnGoodsOrder); +// ofsOrderAfterSalesAmountAllocationUtil.tocSalesAmountAllocation(filterReturnGoodsOrder); //查询部门 String refOrderCode = filterReturnGoodsOrder.getHeader().getRefOrderCode(); SaleOrderMessageDto ofsSaleOrder = getOfsOrder(refOrderCode); @@ -498,14 +498,14 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { BigDecimal sum_jfbbsj = new BigDecimal(0); //sum:wbfbbje jfybwsje 借方本币无税金额/借方原币无税金额 BigDecimal sum_wbfbbje = new BigDecimal(0); - //sum:zyx4 平台优惠 + //sum:zyx4 平台优惠 platformDiscounts BigDecimal sum_zyx4 = new BigDecimal(0); - //sum:zyx5 支付优惠 + //sum:zyx5 支付优惠 payDiscounts BigDecimal sum_zyx5 = new BigDecimal(0); - //sum:zyx6 达人优惠 + //sum:zyx6 达人优惠 expertDiscounts BigDecimal sum_zyx6 = new BigDecimal(0); //sum:zyx7 商家优惠 - BigDecimal sum_zyx7 = new BigDecimal(0); +// BigDecimal sum_zyx7 = new BigDecimal(0); //金额计算 for (RerturnGoodsOrderSearchDetails detail : vv) { @@ -517,17 +517,27 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { BigDecimal ws = new BigDecimal(detail.getTotalAmount()).subtract(sj); sum_wbfbbje = sum_wbfbbje.add(ws); - if (detail.getShareTargetPlatformDiscounts() != null) { - sum_zyx4 = sum_zyx4.add(detail.getShareTargetPlatformDiscounts()); +// if (detail.getShareTargetPlatformDiscounts() != null) { +// sum_zyx4 = sum_zyx4.add(detail.getShareTargetPlatformDiscounts()); +// } +// if (detail.getShareTargetMerchantDiscounts() != null) { +// sum_zyx5 = sum_zyx5.add(detail.getShareTargetMerchantDiscounts()); +// } +// if (detail.getShareTargetExpertDiscounts() != null) { +// sum_zyx6 = sum_zyx6.add(detail.getShareTargetExpertDiscounts()); +// } +// if (detail.getShareTargetPayDiscounts() != null) { +// sum_zyx7 = sum_zyx7.add(detail.getShareTargetPayDiscounts()); +// } + + if (detail.getPlatformDiscounts() != null) { + sum_zyx4 = sum_zyx4.add(new BigDecimal(detail.getPlatformDiscounts())); } - if (detail.getShareTargetMerchantDiscounts() != null) { - sum_zyx5 = sum_zyx5.add(detail.getShareTargetMerchantDiscounts()); + if (detail.getPayDiscounts() != null) { + sum_zyx5 = sum_zyx5.add(new BigDecimal(detail.getPayDiscounts())); } - if (detail.getShareTargetExpertDiscounts() != null) { - sum_zyx6 = sum_zyx6.add(detail.getShareTargetExpertDiscounts()); - } - if (detail.getShareTargetPayDiscounts() != null) { - sum_zyx7 = sum_zyx7.add(detail.getShareTargetPayDiscounts()); + if (detail.getExpertDiscounts() != null) { + sum_zyx6 = sum_zyx6.add(new BigDecimal(detail.getExpertDiscounts())); } } childrenn.setJfbbje("-" + sum_jfbbje); @@ -539,7 +549,6 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { childrenn.setZyx4(String.valueOf(sum_zyx4)); childrenn.setZyx5(String.valueOf(sum_zyx5)); childrenn.setZyx6(String.valueOf(sum_zyx6)); - childrenn.setZyx7(String.valueOf(sum_zyx7)); children.add(childrenn); //推送