From 60c02a28ed06743031a5089b8292c4d8a9dd1ef9 Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Tue, 13 May 2025 09:51:25 +0800
Subject: [PATCH] no message

---
 .../com/ghy/web/controller/order/OrderMasterController.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
index d7502ae7..85029be7 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
@@ -1190,15 +1190,19 @@ public class OrderMasterController extends BaseController {
                 param.setOrderDetailId(orderDetail.getId());
                 List<OrderAttachmentRecord> orderAttachmentRecordList = orderAttachmentRecordService.selectOrderAttachmentRecordList(param);
                 BigDecimal addMoneyTotal= BigDecimal.ZERO;
-
+                String remark=null;
                 for (FinancialChangeRecord financialChangeRecord:financialChangeRecords){
                     addMoneyTotal=  addMoneyTotal.add(financialChangeRecord.getChangeMoney());
+                    if (StringUtils.isNotEmpty(financialChangeRecord.getRemark())){
+                        remark= financialChangeRecord.getRemark();
+                    }
                 }
                 for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){
                     addMoneyTotal=  addMoneyTotal.add(orderAttachmentRecord.getAttachMoney());
                 }
 
                 OrderStandardDetail orderStandardDetail = new OrderStandardDetail();
+                orderStandardDetail.setRemark(remark);
                 orderStandardDetail.setAddMoney(addMoneyTotal);
                 orderStandardDetail.setOrderDetailId(orderDetail.getId());
                 orderStandardDetail.setOrderDetailCode(orderDetail.getCode());