From 5d53df12333528473db512e36679d82e1548cc33 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Sat, 20 Dec 2025 09:24:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E8=B0=83=E5=A4=B1=E8=B4=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/GbOrderServiceImpl.java        | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java
index 7bd6ff062..e1ab54190 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java
@@ -137,6 +137,7 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
             ware.setShopName(shopInfo.getShopName());
             ware.setShopAddress(shopInfo.getAddress());
         }
+        ware.setShopId(shopId);
         List<GbWareOrderVO> orderIngResult = new ArrayList<>();
         List<GbWareOrderVO> orderIng = listAs(query().eq(GbOrder::getWareId, wareId)
                         .eq(GbOrder::getShopId, shopId)
@@ -262,8 +263,10 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
         record.setVerifyCode(CzgRandomUtils.randomNumber(12, true));
         wareService.upGbWareGroupedNum(record.getWareId(), record.getNum());
         GbWare ware = wareService.getById(record.getWareId());
-
-        if (StrUtil.isBlank(record.getGroupOrderNo())) {
+        if (ware == null) {
+            log.error("拼团回调 失败，商品不存在，record:{}", JSONObject.toJSONString(record));
+        }
+        if (ware != null && StrUtil.isBlank(record.getGroupOrderNo())) {
             GbOrder order = new GbOrder();
             order.setShopId(record.getShopId());
             String groupOrderNo = CzgRandomUtils.randomNumber(OrderNoPrefixEnum.GBO, 12, false);
@@ -284,7 +287,7 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
             order.setGroupEndTime(LocalDateTime.now().plusHours(ware.getGroupTimeoutHour()));
             order.setCreateTime(LocalDateTime.now());
             order.setStatus("ing");
-            if (ware == null || ware.getOnlineStatus() == 0 || ware.getIsDel()) {
+            if (ware.getOnlineStatus() == 0 || ware.getIsDel()) {
                 order.setStatus("fail");
                 order.setGroupEndTime(LocalDateTime.now());
             } else if (ware.getGroupPeopleNum() == 1) {
@@ -297,7 +300,7 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
                 //推送 拼团成功
                 sendMessage(order.getShopId(), order.getGroupOrderNo());
             }
-        } else {
+        } else if(StrUtil.isNotBlank(record.getGroupOrderNo())){
             GbOrder order = getOne(query().eq(GbOrder::getGroupOrderNo, record.getGroupOrderNo())
                     .eq(GbOrder::getShopId, record.getShopId()));
             order.setCurrentPeopleNum(order.getCurrentPeopleNum() + 1);