From 22129dc5afb7fecb2e4b140201686f2d9033dd74 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Tue, 25 Feb 2025 10:31:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9Atob=E3=80=81toc?= =?UTF-8?q?=E4=BB=85=E9=80=80=E6=AC=BE=E4=BF=AE=E6=94=B9=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sales/RefundOnlyPluginInitializerToB.java | 15 +++++++- .../sales/RefundOnlyPluginInitializerToC.java | 38 +++++++------------ 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java index fb988ae5..6c045bb8 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java @@ -637,10 +637,23 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity { } } - if (sum_jfbbje.compareTo(BigDecimal.ZERO) == 0) { + if (sum_jfbbje.compareTo(BigDecimal.ZERO) == 0 + && sum_zyx4.compareTo(BigDecimal.ZERO) == 0 + && sum_zyx5.compareTo(BigDecimal.ZERO) == 0 + && sum_zyx6.compareTo(BigDecimal.ZERO) == 0) { continue; } + if (sum_jfbbje.compareTo(BigDecimal.ZERO) != 0) { + childrenn.setJfbbje("-" + sum_jfbbje); + childrenn.setJfybje("-" + sum_jfbbje); + childrenn.setJfbbsj("-" + sum_jfbbsj); + childrenn.setJfybsj("-" + sum_jfbbsj); + childrenn.setWbfbbje("-" + sum_wbfbbje); + childrenn.setJfybwsje("-" + sum_wbfbbje); + children.add(childrenn); + } + childrenn.setJfbbje("-" + sum_jfbbje); childrenn.setJfybje("-" + sum_jfbbje); childrenn.setJfbbsj("-" + sum_jfbbsj); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java index 0f4e43ce..3722f571 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java @@ -615,19 +615,6 @@ public class RefundOnlyPluginInitializerToC 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.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())); } @@ -640,20 +627,23 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { } } - if (sum_jfbbje.compareTo(BigDecimal.ZERO) == 0) { + if (sum_jfbbje.compareTo(BigDecimal.ZERO) == 0 + && sum_zyx4.compareTo(BigDecimal.ZERO) == 0 + && sum_zyx5.compareTo(BigDecimal.ZERO) == 0 + && sum_zyx6.compareTo(BigDecimal.ZERO) == 0) { continue; } - childrenn.setJfbbje("-" + sum_jfbbje); - childrenn.setJfybje("-" + sum_jfbbje); - childrenn.setJfbbsj("-" + sum_jfbbsj); - childrenn.setJfybsj("-" + sum_jfbbsj); - childrenn.setWbfbbje("-" + sum_wbfbbje); - childrenn.setJfybwsje("-" + sum_wbfbbje); -// childrenn.setZyx4(String.valueOf(sum_zyx4)); -// childrenn.setZyx5(String.valueOf(sum_zyx5)); -// childrenn.setZyx6(String.valueOf(sum_zyx6)); - children.add(childrenn); + if(sum_jfbbje.compareTo(BigDecimal.ZERO) != 0){ + childrenn.setJfbbje("-" + sum_jfbbje); + childrenn.setJfybje("-" + sum_jfbbje); + childrenn.setJfbbsj("-" + sum_jfbbsj); + childrenn.setJfybsj("-" + sum_jfbbsj); + childrenn.setWbfbbje("-" + sum_wbfbbje); + childrenn.setJfybwsje("-" + sum_wbfbbje); + children.add(childrenn); + } + //新增三个优惠为存货 if (sum_zyx4.compareTo(BigDecimal.ZERO) > 0) {//平台优惠