From 6a719cfdf8f07ef0214fbc2acb83feebc0af7094 Mon Sep 17 00:00:00 2001
From: "kuang.yifei@iwhalecloud.com" <kuang.yifei@iwhalecloud.com>
Date: Wed, 22 Jun 2022 18:12:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=BB=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=97=B6=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0=E5=AD=90?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/order/OrderMasterController.java   | 15 ++++++++++++++-
 .../service/impl/OrderMasterServiceImpl.java      |  4 ++++
 2 files changed, 18 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 9404a647..28f75822 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
@@ -412,7 +412,20 @@ public class OrderMasterController extends BaseController {
     @PostMapping("/editOrderMaster")
     @ResponseBody
     public AjaxResult editOrderMaster(@RequestBody OrderMaster orderMaster) {
-        return toAjax(orderMasterService.updateOrderMaster(orderMaster));
+        try {
+            int result = orderMasterService.updateOrderMaster(orderMaster);
+            if(result > 0){
+                List<OrderDetail> orderDetails = orderDetailService.selectByOrderMasterId(orderMaster.getId());
+                orderDetails.forEach(orderDetail -> {
+                    orderDetail.setOrderStatus(orderMaster.getOrderStatus());
+                    orderDetailService.updateOrderDetail(orderDetail);
+                });
+            }
+            return AjaxResult.success("");
+        }catch (Exception e){
+            e.printStackTrace();
+            return AjaxResult.error("");
+        }
     }
 
     /**
diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
index dd9a28f8..542fa00d 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
@@ -3,6 +3,7 @@ package com.ghy.order.service.impl;
 import com.ghy.common.constant.UserConstants;
 import com.ghy.common.core.text.Convert;
 import com.ghy.order.domain.OrderMaster;
+import com.ghy.order.mapper.OrderDetailMapper;
 import com.ghy.order.mapper.OrderMasterMapper;
 import com.ghy.order.request.AppOrderRequest;
 import com.ghy.order.service.OrderMasterService;
@@ -25,6 +26,9 @@ public class OrderMasterServiceImpl implements OrderMasterService {
     @Resource
     private OrderMasterMapper orderMasterMapper;
 
+    @Resource
+    private OrderDetailMapper orderDetailMapper;
+
     private static final AtomicLong INDEX = new AtomicLong(1L);
 
     private final static ThreadLocal<SimpleDateFormat> dateFormat = ThreadLocal.withInitial(() -> new SimpleDateFormat("yyyyMMddHHmmss"));