From a9033e4cc9462913937c7e08d90775b858ea1393 Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Wed, 22 Jan 2025 11:18:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scmspecialrebate/ScmSpecialRebateService.java   | 12 +++++++++---
 .../ScmSpecialrebateCheckapplyRest.java             | 13 ++++++++++---
 .../scm/biz/scmvehrebate/ScmVehRebateService.java   |  9 +++++++--
 .../ScmVehrebateCheckapplyRest.java                 | 10 ++++++++--
 4 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
index 84e08a3853..ae517d30f4 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
@@ -1658,9 +1658,15 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 scmSpecialRebateExcelVo.setOnceCheckState("一次核对中");
             }
             scmSpecialRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmSpecialRebateExcelVo.getCreateTime())));
-            scmSpecialRebateExcelVo.setItureAdjustmentMoney(scmSpecialRebateExcelVo.getOnceItureCost().add(scmSpecialRebateExcelVo.getSecondItureCost()).subtract(scmSpecialRebateExcelVo.getExpectItureCost()));
-            scmSpecialRebateExcelVo.setTreatAdjustmentMoney(scmSpecialRebateExcelVo.getOnceTreatCost().add(scmSpecialRebateExcelVo.getSecondTreatCost()).subtract(scmSpecialRebateExcelVo.getExpectTreatCost()));
-            scmSpecialRebateExcelVo.setSuppAdjustmentMoney(scmSpecialRebateExcelVo.getOnceSuppCost().add(scmSpecialRebateExcelVo.getSecondSuppCost()).subtract(scmSpecialRebateExcelVo.getExpectSuppCost()));
+            if ("是".equals(scmSpecialRebateExcelVo.getIsAdjustment())){
+                scmSpecialRebateExcelVo.setItureAdjustmentMoney(scmSpecialRebateExcelVo.getOnceItureCost().add(scmSpecialRebateExcelVo.getSecondItureCost()).subtract(scmSpecialRebateExcelVo.getExpectItureCost()));
+                scmSpecialRebateExcelVo.setTreatAdjustmentMoney(scmSpecialRebateExcelVo.getOnceTreatCost().add(scmSpecialRebateExcelVo.getSecondTreatCost()).subtract(scmSpecialRebateExcelVo.getExpectTreatCost()));
+                scmSpecialRebateExcelVo.setSuppAdjustmentMoney(scmSpecialRebateExcelVo.getOnceSuppCost().add(scmSpecialRebateExcelVo.getSecondSuppCost()).subtract(scmSpecialRebateExcelVo.getExpectSuppCost()));
+            }else {
+                scmSpecialRebateExcelVo.setItureAdjustmentMoney(BigDecimal.ZERO);
+                scmSpecialRebateExcelVo.setTreatAdjustmentMoney(BigDecimal.ZERO);
+                scmSpecialRebateExcelVo.setSuppAdjustmentMoney(BigDecimal.ZERO);
+            }
         }
         return scmSpecialRebateExcelVos;
     }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java
index a17e0bdcd2..1391275e94 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java
@@ -44,6 +44,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -123,9 +124,15 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl
             BeanUtil.copyProperties(datum,excelVo);
             excelVo.setRankNo(i);
             excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime()));
-            excelVo.setItureAdjustmentMoney(excelVo.getOnceItureCost().add(excelVo.getSecondItureCost()).subtract(excelVo.getExpectItureCost()));
-            excelVo.setTreatAdjustmentMoney(excelVo.getOnceTreatCost().add(excelVo.getSecondTreatCost()).subtract(excelVo.getExpectTreatCost()));
-            excelVo.setSuppAdjustmentMoney(excelVo.getOnceSuppCost().add(excelVo.getSecondSuppCost()).subtract(excelVo.getExpectSuppCost()));
+            if ("是".equals(excelVo.getIsAdjustment())){
+                excelVo.setItureAdjustmentMoney(excelVo.getOnceItureCost().add(excelVo.getSecondItureCost()).subtract(excelVo.getExpectItureCost()));
+                excelVo.setTreatAdjustmentMoney(excelVo.getOnceTreatCost().add(excelVo.getSecondTreatCost()).subtract(excelVo.getExpectTreatCost()));
+                excelVo.setSuppAdjustmentMoney(excelVo.getOnceSuppCost().add(excelVo.getSecondSuppCost()).subtract(excelVo.getExpectSuppCost()));
+            }else {
+                excelVo.setItureAdjustmentMoney(BigDecimal.ZERO);
+                excelVo.setTreatAdjustmentMoney(BigDecimal.ZERO);
+                excelVo.setSuppAdjustmentMoney(BigDecimal.ZERO);
+            }
             if (excelVo.getState().equals("0")){
                 excelVo.setState("未预提");
             }else if (excelVo.getState().equals("1")){
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
index b56b430885..d5bbf2ff77 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
@@ -2053,8 +2053,13 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 scmVehRebateExcelVo.setOnceCheckState("一次核对中");
             }
             scmVehRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmVehRebateExcelVo.getCreateTime())));
-            scmVehRebateExcelVo.setTreatAdjustmentMoney(scmVehRebateExcelVo.getOnceTreatCost().add(scmVehRebateExcelVo.getSecondTreatCost()).subtract(scmVehRebateExcelVo.getExpectTreatCost()));
-            scmVehRebateExcelVo.setSuppAdjustmentMoney(scmVehRebateExcelVo.getOnceSuppCost().add(scmVehRebateExcelVo.getSecondSuppCost()).subtract(scmVehRebateExcelVo.getExpectSuppCost()));
+            if ("是".equals(scmVehRebateExcelVo.getIsAdjustment())){
+                scmVehRebateExcelVo.setTreatAdjustmentMoney(scmVehRebateExcelVo.getOnceTreatCost().add(scmVehRebateExcelVo.getSecondTreatCost()).subtract(scmVehRebateExcelVo.getExpectTreatCost()));
+                scmVehRebateExcelVo.setSuppAdjustmentMoney(scmVehRebateExcelVo.getOnceSuppCost().add(scmVehRebateExcelVo.getSecondSuppCost()).subtract(scmVehRebateExcelVo.getExpectSuppCost()));
+            }else {
+                scmVehRebateExcelVo.setTreatAdjustmentMoney(BigDecimal.ZERO);
+                scmVehRebateExcelVo.setSuppAdjustmentMoney(BigDecimal.ZERO);
+            }
         }
         return scmVehRebateExcelVos;
     }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java
index 91c103afc6..346ed92c6b 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java
@@ -44,6 +44,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -134,8 +135,13 @@ public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign {
             BeanUtil.copyProperties(datum,excelVo);
             excelVo.setRankNo(i);
             excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime()));
-            excelVo.setTreatAdjustmentMoney(excelVo.getOnceTreatCost().add(excelVo.getSecondTreatCost()).subtract(excelVo.getExpectTreatCost()));
-            excelVo.setSuppAdjustmentMoney(excelVo.getOnceSuppCost().add(excelVo.getSecondSuppCost()).subtract(excelVo.getExpectSuppCost()));
+            if ("是".equals(excelVo.getIsAdjustment())){
+                excelVo.setTreatAdjustmentMoney(excelVo.getOnceTreatCost().add(excelVo.getSecondTreatCost()).subtract(excelVo.getExpectTreatCost()));
+                excelVo.setSuppAdjustmentMoney(excelVo.getOnceSuppCost().add(excelVo.getSecondSuppCost()).subtract(excelVo.getExpectSuppCost()));
+            }else {
+                excelVo.setTreatAdjustmentMoney(BigDecimal.ZERO);
+                excelVo.setSuppAdjustmentMoney(BigDecimal.ZERO);
+            }
             if (excelVo.getState().equals("0")){
                 excelVo.setState("未预提");
             }else if (excelVo.getState().equals("1")){