From ab94a6114e82635ecb42d55948bfd7ebd61dd48a Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 11 Nov 2025 16:49:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/order/service/OrderDetailService.java     |  4 ++++
 .../order/service/impl/OrderDetailServiceImpl.java    | 11 +++++++++++
 .../order/service/impl/OrderInfoServiceImpl.java      |  5 ++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderDetailService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderDetailService.java
index 81675256c..6e6869c62 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderDetailService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderDetailService.java
@@ -16,4 +16,8 @@ public interface OrderDetailService extends IService<OrderDetail> {
 
     void createOrderDetails(Long orderId, List<OrderDetail> orderDetails);
     List<OrderDetailPrintVo> getOrderDetailPrint(Long orderId);
+
+
+    // 更新订单详情状态 将订单详情的状态为wait-pay 更新为 payed
+    void updateOrderDetailStatus(Long orderId,String status);
 }
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderDetailServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderDetailServiceImpl.java
index 309e0f209..bf4afaee5 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderDetailServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderDetailServiceImpl.java
@@ -4,6 +4,7 @@ import com.czg.order.entity.OrderDetail;
 import com.czg.order.service.OrderDetailService;
 import com.czg.order.vo.OrderDetailPrintVo;
 import com.czg.service.order.mapper.OrderDetailMapper;
+import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import org.apache.dubbo.config.annotation.DubboService;
 
@@ -27,4 +28,14 @@ public class OrderDetailServiceImpl extends ServiceImpl<OrderDetailMapper, Order
     public List<OrderDetailPrintVo> getOrderDetailPrint(Long orderId) {
         return getMapper().getOrderDetailPrint(orderId);
     }
+
+    @Override
+    public void updateOrderDetailStatus(Long orderId,String status) {
+        OrderDetail orderDetail = getById(orderId);
+        orderDetail.setStatus(status);
+        update(orderDetail, QueryWrapper.create()
+                .eq(OrderDetail::getOrderId,orderId)
+                .eq(OrderDetail::getStatus,"wait-pay")
+        );
+    }
 }
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index a5e605903..38a2c3004 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -1103,6 +1103,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                             orderInfo1.setStatus(OrderStatusEnums.DONE.getCode());
                             orderInfo1.setPayAmount(BigDecimal.ZERO);
                             updateById(orderInfo1);
+                            orderDetailService.updateOrderDetailStatus(orderInfo.getId(), OrderStatusEnums.DONE.getCode());
                             redisService.del(RedisCst.classKeyExpired.EXPIRED_ORDER + orderInfo.getId());
                         }
                     } else {
@@ -1118,6 +1119,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                                     .set(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())
                                     .set(OrderInfo::getPayAmount, orderInfo.getOrderAmount())
                                     .update();
+                            orderDetailService.updateOrderDetailStatus(orderInfo.getId(), OrderStatusEnums.DONE.getCode());
                             ShopUserMoneyEditDTO shopUserMoneyEditDTO = new ShopUserMoneyEditDTO()
                                     .setId(shopUser.getId())
                                     .setType(0)
@@ -1242,6 +1244,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             orderInfo.setStatus(OrderStatusEnums.DONE.getCode());
             orderInfo.setPaidTime(payTime);
         }
+        orderDetailService.updateOrderDetailStatus(orderInfo.getId(), OrderStatusEnums.DONE.getCode());
         if (orderInfo.getUserId() != null) {
             ShopUser shopUser = shopUserService.getShopUserInfo(orderInfo.getShopId(), orderInfo.getUserId());
             if (shopUser == null) {
@@ -1609,7 +1612,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 .update();
         redisService.del(RedisCst.classKeyExpired.EXPIRED_ORDER + orderInfo.getId());
         rabbitPublisher.sendOrderCancelMsg(orderInfo.getId().toString());
-
+        orderDetailService.updateOrderDetailStatus(orderId, OrderStatusEnums.CANCELLED.getCode());
         // 还原台桌状态
         if (StrUtil.isNotBlank(orderInfo.getTableCode())) {
             ShopTable table = shopTableService.getOneByTableCode(orderInfo.getShopId(), orderInfo.getTableCode());