From 671a9f225ee078586bc477f0bb80604f2e9291d0 Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Thu, 31 Jul 2025 10:39:56 +0800
Subject: [PATCH] no message

---
 .../order/OrderDetailController.java          |  2 ++
 .../order/OrderMasterController.java          | 20 ++++++++++---------
 .../ghy/web/pojo/vo/OrderListResponse.java    |  4 ++++
 3 files changed, 17 insertions(+), 9 deletions(-)

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 9afb726d..20e1eed9 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
@@ -766,6 +766,8 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setOrderImages(orderMaster.getOrderImages());
             orderListResponse.setIsInvoiced(orderMaster.getIsInvoiced());
             orderListResponse.setOriginalWorkerId(orderMaster.getOriginalWorkerId());
+            orderListResponse.setConfirmStartTime(detail.getConfirmStartTime());
+            orderListResponse.setDeliveryType(orderMaster.getDeliveryType());
 
             orderListResponse.setOrderType(orderMaster.getOrderType());
             orderListResponse.setHasServiceOrder(orderMaster.getHasServiceOrder());
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 14e1ba31..92438c93 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
@@ -284,7 +284,7 @@ public class OrderMasterController extends BaseController {
             }
 
             // 查询原财务主单
-            FinancialMaster financialMaster = financialMasterService.selectByOrderId(request.getOrderId());
+            FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(request.getOrderId());
             if (financialMaster == null) {
                 return AjaxResult.error("订单财务信息不存在");
             }
@@ -307,7 +307,6 @@ public class OrderMasterController extends BaseController {
                 
                 // 更新主单金额
                 financialMaster.setServerMoney(transferAmount);
-                financialMaster.setMoney(transferAmount);
                 financialMaster.setPayMoney(transferAmount);
                 financialMaster.setRemark("订单转单，原金额：" + originalAmount + "，新金额：" + transferAmount);
                 financialMasterService.updateFinancialMaster(financialMaster);
@@ -316,8 +315,8 @@ public class OrderMasterController extends BaseController {
                 if (differenceAmount.compareTo(BigDecimal.ZERO) > 0 && originalOrder.getWorkerId() != null) {
                     FinancialDetail differenceDetail = new FinancialDetail();
                     differenceDetail.setFinancialMasterId(financialMaster.getId());
-                    differenceDetail.setWorkerId(originalOrder.getWorkerId()); // 原师傅
-                    differenceDetail.setMoney(differenceAmount);
+                    differenceDetail.setPayeeId(originalOrder.getWorkerId()); // 原师傅
+                    differenceDetail.setPayMoney(differenceAmount);
                     differenceDetail.setFinancialDetailType(FinancialDetailType.TRANSFER_DIFFERENCE_FEE.getCode());
                     differenceDetail.setRemark("转单差价，原师傅获得");
                     financialDetailService.insertFinancialDetail(differenceDetail);
@@ -337,12 +336,16 @@ public class OrderMasterController extends BaseController {
             }
             
             // 设置新师傅ID（可以为null，表示进入接单大厅）
-            updateOrder.setWorkerId(request.getNewWorkerId());
-            updateOrder.setUpdateBy(getLoginName());
+            if(request.getNewWorkerId()==null){
+                updateOrder.setWorkerId(-1L);
+            }else{
+                updateOrder.setWorkerId(request.getNewWorkerId());
+            }
+//            updateOrder.setUpdateBy(getLoginName());
             
             // 构建转单备注
             String newRemark = originalOrder.getRemark() != null ? originalOrder.getRemark() : "";
-            String transferInfo = "【转单记录：" + getLoginName() + 
+            String transferInfo = "【转单记录：" +
                                 "于" + DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", new Date());
             
             if (request.getNewWorkerId() != null) {
@@ -370,8 +373,7 @@ public class OrderMasterController extends BaseController {
                            request.getOrderId(), 
                            originalOrder.getWorkerId(), 
                            request.getNewWorkerId(),
-                           request.getTransferAmount(),
-                           getLoginName());
+                           request.getTransferAmount());
                 
                 String message;
                 if (request.getNewWorkerId() != null) {
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 4c769d60..6eca0528 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
@@ -247,4 +247,8 @@ public class OrderListResponse {
 
 
     private Long serverGoodsId;
+
+    private Date confirmStartTime;
+
+    private Integer deliveryType;
 }