From ef23b61265d88fed9e65a61e9f2836db4ce9ba92 Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Thu, 22 May 2025 18:06:12 +0800
Subject: [PATCH] no message

---
 .../com/ghy/web/controller/order/OrderDetailController.java | 6 ++++++
 .../java/com/ghy/order/domain/OrderAttachmentRecord.java    | 3 +++
 .../resources/mapper/order/OrderAttachmentRecordMapper.xml  | 4 +++-
 .../java/com/ghy/payment/domain/FinancialChangeRecord.java  | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
index d0d55de4..07a8545e 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
@@ -469,6 +469,12 @@ public class OrderDetailController extends BaseController {
                 if (StringUtils.isNotEmpty(financialChangeRecord.getRemark())){
                     addMoneyRemark=financialChangeRecord.getRemark();
                 }
+                OrderAttachmentRecord param1 = new OrderAttachmentRecord();
+                param1.setFinancialChangeRecordId(financialChangeRecord.getId());
+                BigDecimal attachmentMoney= BigDecimal.ZERO;
+                List<OrderAttachmentRecord> orderAttachmentRecords=orderAttachmentRecordService.selectOrderAttachmentRecordList(param1);
+                attachmentMoney.add(orderAttachmentRecords.get(0).getAttachMoney());
+                financialChangeRecord.setAttachmentMoney(attachmentMoney);
             }
             for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){
                 addMoneyTotal=  addMoneyTotal.add(orderAttachmentRecord.getAttachMoney());
diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderAttachmentRecord.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderAttachmentRecord.java
index e6018d3e..ababa58a 100644
--- a/ghy-order/src/main/java/com/ghy/order/domain/OrderAttachmentRecord.java
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderAttachmentRecord.java
@@ -42,4 +42,7 @@ public class OrderAttachmentRecord {
      */
     private String paymentId;
 
+
+    private Long financialChangeRecordId;
+
 }
diff --git a/ghy-order/src/main/resources/mapper/order/OrderAttachmentRecordMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderAttachmentRecordMapper.xml
index 46a0d0b0..6d9865d2 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderAttachmentRecordMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderAttachmentRecordMapper.xml
@@ -11,10 +11,11 @@
         <result property="type"    column="type"    />
         <result property="attachMoney"    column="attach_money"    />
         <result property="paymentId" column="payment_id" />
+        <result property="financialChangeRecordId" column="financial_change_record_id" />
     </resultMap>
 
     <sql id="selectOrderAttachmentRecordVo">
-        select id, order_detail_id, order_master_id, type, attach_money,payment_id from order_attachment_record
+        select id, order_detail_id, order_master_id, type, attach_money,payment_id,financial_change_record_id from order_attachment_record
     </sql>
 
     <select id="selectOrderAttachmentRecordList" parameterType="OrderAttachmentRecord" resultMap="OrderAttachmentRecordResult">
@@ -24,6 +25,7 @@
             <if test="orderMasterId != null "> and order_master_id = #{orderMasterId}</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="attachMoney != null "> and attach_money = #{attachMoney}</if>
+            <if test="financialChangeRecordId != null "> and financial_change_record_id = #{financialChangeRecordId}</if>
         </where>
     </select>
 
diff --git a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialChangeRecord.java b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialChangeRecord.java
index 789eee5e..a625d1aa 100644
--- a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialChangeRecord.java
+++ b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialChangeRecord.java
@@ -95,4 +95,5 @@ public class FinancialChangeRecord extends BaseEntity {
 
     private String fileNames;
 
+    private BigDecimal attachmentMoney;
 }