From 36d0ba629158f0ab1f35a30de0b5bfadda96f448 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 23 Oct 2023 15:31:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/bussalesorder/BusSalesOrderService.java   |  5 +++--
 .../AppBusAdvanceGinvoiceapplyService.java        | 15 ++++++++++++---
 .../biz/autoservice/invoiced/InvoicedService.java | 12 +++++++++---
 .../retrieval/AppBusDeliveredApplyService.java    |  5 ++++-
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index def739dc29..848959cacd 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -6967,9 +6967,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }*/
         if("1".equals(busSalesOrder.getPayTypeKey())){
             busSalesOrderIsDTKPJVo.setIsEdit(true);
-            if(busSalesOrder.getOneBillMoney() != null){
+           /* if(busSalesOrder.getOneBillMoney() != null){
                 busSalesOrderIsDTKPJVo.setOneBillMoney(busSalesOrder.getOneBillMoney().toString());
-            }
+            }*/
+
 
         }else{
             busSalesOrderIsDTKPJVo.setIsEdit(false);
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
index 9cf0b7e5e7..3e03eb4f4d 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
@@ -354,7 +354,10 @@ public class AppBusAdvanceGinvoiceapplyService {
             vo.setIsCanEdit(true);
         }*/
         vo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit());
-        vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
+        if(!busSalesOrderIsDTKPJVo.getIsEdit()){
+            vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
+        }
+
         return rb.success().setData(vo);
     }
 
@@ -483,7 +486,10 @@ public class AppBusAdvanceGinvoiceapplyService {
             vo.setIsCanEdit(true);
         }*/
         vo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit());
-        vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
+        if(!busSalesOrderIsDTKPJVo.getIsEdit()){
+            vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
+        }
+
         return rb.success().setData(vo);
     }
 
@@ -1158,7 +1164,10 @@ public class AppBusAdvanceGinvoiceapplyService {
             vo.setIsCanEdit(true);
         }*/
         vo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit());
-        vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
+        if(!busSalesOrderIsDTKPJVo.getIsEdit()){
+            vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
+        }
+
         return rb.success().setData(vo);
     }
 
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
index 49146228d1..f297cf3dd0 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
@@ -318,7 +318,10 @@ public class InvoicedService {
             vo.setIsCanEdit(true);
         }*/
         vo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit());
-        vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
+        if(!busSalesOrderIsDTKPJVo.getIsEdit()){
+            vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
+        }
+
         return rb.success().setData(vo);
     }
 
@@ -439,8 +442,11 @@ public class InvoicedService {
                 billApplicationIInfoVo.setIsCanEdit(true);
             }*/
             billApplicationIInfoVo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit());
-            billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
-            billApplicationIInfoVo.setInvoiceTotal(busSalesOrderIsDTKPJVo.getOneBillMoney());
+            if(!busSalesOrderIsDTKPJVo.getIsEdit()){
+                billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
+                billApplicationIInfoVo.setInvoiceTotal(busSalesOrderIsDTKPJVo.getOneBillMoney());
+            }
+
         } else {
             billApplicationIInfoVo.setModelSid(busDeliveredApply.getModelSid());
             billApplicationIInfoVo.setModelName(busDeliveredApply.getModelName());
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java
index eb92edcd85..a77921c843 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java
@@ -403,7 +403,10 @@ public class AppBusDeliveredApplyService {
                 billApplicationIInfoVo.setIsCanEdit(true);
             }*/
             billApplicationIInfoVo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit());
-            billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
+            if(!busSalesOrderIsDTKPJVo.getIsEdit()){
+                billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
+            }
+
         }
         return null;
     }