From 71bb414f23a75b7e3ff872fa78456824b0438f54 Mon Sep 17 00:00:00 2001
From: cb <642514070@qq.com>
Date: Thu, 22 May 2025 20:53:55 +0800
Subject: [PATCH] 1

---
 .../java/com/ghy/web/controller/order/OrderController.java | 2 ++
 .../ghy/web/controller/order/OrderDetailController.java    | 7 +++++--
 .../resources/mapper/order/OrderAttachmentRecordMapper.xml | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index bc772113..f111a1e2 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -532,8 +532,10 @@ public class OrderController extends BaseController {
         Set<Long> goodsStandardIds = appGoodsList.stream().map(AppGoodsRequest::getGoodsStandardId).collect(Collectors.toSet());
         // 所有商品
         List<GoodsStandard> goodsList = goodsStandardService.selectByIds(goodsStandardIds);
+        logger.info("商品信息{}", goodsList);
         // 商品所属师傅
         Goods goods = goodsService.selectById(goodsList.get(0).getGoodsId());
+        logger.info("下单后的师傅信息{}", goods);
         // 师傅信息
         Worker worker = workerService.selectById(goods.getWorkerId());
         // 商户ID
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 07a8545e..7b14199d 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
@@ -473,8 +473,11 @@ public class OrderDetailController extends BaseController {
                 param1.setFinancialChangeRecordId(financialChangeRecord.getId());
                 BigDecimal attachmentMoney= BigDecimal.ZERO;
                 List<OrderAttachmentRecord> orderAttachmentRecords=orderAttachmentRecordService.selectOrderAttachmentRecordList(param1);
-                attachmentMoney.add(orderAttachmentRecords.get(0).getAttachMoney());
-                financialChangeRecord.setAttachmentMoney(attachmentMoney);
+                if(orderAttachmentRecords!=null&&orderAttachmentRecords.size()>0){
+                    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/resources/mapper/order/OrderAttachmentRecordMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderAttachmentRecordMapper.xml
index 6d9865d2..f86d2fce 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderAttachmentRecordMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderAttachmentRecordMapper.xml
@@ -41,12 +41,14 @@
             <if test="orderMasterId != null">order_master_id,</if>
             <if test="type != null">type,</if>
             <if test="attachMoney != null">attach_money,</if>
+            <if test="financialChangeRecordId != null">financial_change_record_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderDetailId != null">#{orderDetailId},</if>
             <if test="orderMasterId != null">#{orderMasterId},</if>
             <if test="type != null">#{type},</if>
             <if test="attachMoney != null">#{attachMoney},</if>
+            <if test="financialChangeRecordId != null">#{financial_change_record_id},</if>
         </trim>
     </insert>
 
@@ -58,6 +60,7 @@
             <if test="type != null">type = #{type},</if>
             <if test="attachMoney != null">attach_money = #{attachMoney},</if>
             <if test="paymentId != null">payment_id = #{paymentId},</if>
+            <if test="financialChangeRecordId != null">financial_change_record_id=#{financialChangeRecordId},</if>
         </trim>
         where id = #{id}
     </update>