From a1c22dc7beef7beee4e6bb702ac254cf9f172f8e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 12 Sep 2025 15:08:40 +0800
Subject: [PATCH] 订单备货接单并行

---
 oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderOperationLogServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderOperationLogServiceImpl.java b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderOperationLogServiceImpl.java
index c599d6c..9e40a23 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderOperationLogServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderOperationLogServiceImpl.java
@@ -2,7 +2,6 @@
 
 import com.alibaba.fastjson2.JSON;
 import com.oying.exception.BadRequestException;
-import com.oying.modules.message.common.MesTypeEnum;
 import com.oying.modules.message.common.MsgStatusEnum;
 import com.oying.modules.message.service.MesMsgRecordService;
 import com.oying.modules.sh.domain.OrderOperationLog;
@@ -92,6 +91,9 @@
                 userType = ConstantsKey.BUYER;
                 break;
             case THREE:
+                if (response.getOrder().getOrderStatus() > statusEnum.getKey()) {
+                    statusEnum = OrderStatusEnum.find(response.getOrder().getOrderStatus());
+                }
                 msgStatusEnum = MsgStatusEnum.MERCHANT_PREPARED;
                 userType = ConstantsKey.BUYER;
                 break;
@@ -182,8 +184,8 @@
         resources.setSnapshotData(JSON.toJSONString(map));
         resources.setOperationTime(time);
         orderOperationLogMapper.insert(resources);
-        if (msgStatusEnum != null){
-            mesMsgRecordService.insertOrderMsg(response.getOrder(), msgStatusEnum, MesTypeEnum.ORDER);
+        if (msgStatusEnum != null) {
+//            mesMsgRecordService.insertOrderMsg(response.getOrder(), msgStatusEnum, MesTypeEnum.ORDER);
         }
         orderMapper.updateOrderStatus(response.getOrder().getOrderNum(), statusEnum.getKey(), statusEnum.getValue());
     }

--
Gitblit v1.9.3