From 60952f6b47ac937983559900fc78594cb3759e53 Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Tue, 13 May 2025 09:58:36 +0800
Subject: [PATCH] no message

---
 .../com/ghy/web/controller/order/OrderDetailController.java  | 5 +++++
 .../src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java | 2 ++
 2 files changed, 7 insertions(+)

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 0f182d18..08f5ca1d 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
@@ -462,9 +462,13 @@ public class OrderDetailController extends BaseController {
             param.setOrderDetailId(detail.getId());
             List<OrderAttachmentRecord> orderAttachmentRecordList = orderAttachmentRecordService.selectOrderAttachmentRecordList(param);
             BigDecimal addMoneyTotal= BigDecimal.ZERO;
+            String addMoneyRemark=null;
 
             for (FinancialChangeRecord financialChangeRecord:financialChangeRecords){
                 addMoneyTotal=  addMoneyTotal.add(financialChangeRecord.getChangeMoney());
+                if (StringUtils.isNotEmpty(financialChangeRecord.getRemark())){
+                    addMoneyRemark=financialChangeRecord.getRemark();
+                }
             }
             for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){
                 addMoneyTotal=  addMoneyTotal.add(orderAttachmentRecord.getAttachMoney());
@@ -472,6 +476,7 @@ public class OrderDetailController extends BaseController {
             logger.info("加价的金额总额为{}",addMoneyTotal);
 
             // 编辑返回属性
+            orderListResponse.setAddMoneyRemark(addMoneyRemark);
             orderListResponse.setAddMoney(addMoneyTotal);
             orderListResponse.setOrderDetailId(detail.getId());
             orderListResponse.setOrderDetailCode(detail.getCode());
diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
index 0a03c584..3fe97ffe 100644
--- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
+++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
@@ -204,4 +204,6 @@ public class OrderListResponse {
     private Boolean isMonitoredOrder;
 
     private  BigDecimal addMoney;
+
+    private  String  addMoneyRemark;
 }