From d2013db891f239afe5b7b0b0ef8626e53a85d053 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 20 Dec 2024 11:19:35 +0800
Subject: [PATCH] =?UTF-8?q?12/20=20=E5=8F=91=E7=A5=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/inout/IoOrderDetailBizController.java     | 5 +++++
 .../com/glxp/api/res/inout/IoOrderDetailResultResponse.java  | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
index c91d209d5..fcb5dbed1 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
@@ -900,9 +900,14 @@ public class IoOrderDetailBizController extends BaseController {
                 orderDetailCodeEntity.setAmount(new BigDecimal(orderDetailCodeEntity.getReCount()).multiply(orderDetailCodeEntity.getPrice()));
             }
             String msg = "";
+            BigDecimal invoiceAmount = BigDecimal.ZERO;
             for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
                 if (StrUtil.trimToEmpty(orderInvoiceEntity.getBatchNo()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBatchNo()))
                         && StrUtil.trimToEmpty(orderInvoiceEntity.getBindRlFk()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBindRlFk() + ""))) {
+                    if (StrUtil.isNotEmpty(orderInvoiceEntity.getPrice())){
+                        BigDecimal price = new BigDecimal(orderInvoiceEntity.getPrice());
+                        invoiceAmount = invoiceAmount.add(price);
+                    }
                     orderDetailCodeEntity.setRegStatus(true);
                     if (StrUtil.isNotEmpty(orderInvoiceEntity.getInvoiceEncode())) {
                         msg += "," + orderInvoiceEntity.getInvoiceEncode();
diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
index 20c56e8e1..5c47ac70f 100644
--- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
@@ -236,6 +236,10 @@ public class IoOrderDetailResultResponse {
     private String zczbhhzbapzbh;
 
 
+    //发票价格
+    private BigDecimal invoicePrice;
+
+
     public String getFromName() {
         if (StrUtil.isNotEmpty(fromCorpName))
             return fromCorpName;