From f0f719b7c9fa6cade95f3b5e82e6f5372a16d38f Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 19 Dec 2025 15:24:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=80=80=E6=AC=BE=E5=85=BC?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/GbOrderServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 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 55884a48e..61d2f25c9 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 @@ -262,11 +262,7 @@ public class GbOrderServiceImpl extends ServiceImpl impl record.setVerifyCode(CzgRandomUtils.randomNumber(12, true)); wareService.upGbWareGroupedNum(record.getWareId(), record.getNum()); GbWare ware = wareService.getById(record.getWareId()); - if (ware == null || ware.getOnlineStatus() == 0 || ware.getIsDel()) { - detailService.updateById(record); - refundByGbOrderDetail(record, "商品已下架 自动退款。"); - return; - } + if (StrUtil.isBlank(record.getGroupOrderNo())) { GbOrder order = new GbOrder(); order.setShopId(record.getShopId()); @@ -302,7 +298,10 @@ public class GbOrderServiceImpl extends ServiceImpl impl GbOrder order = getOne(query().eq(GbOrder::getGroupOrderNo, record.getGroupOrderNo()) .eq(GbOrder::getShopId, record.getShopId())); order.setCurrentPeopleNum(order.getCurrentPeopleNum() + 1); - if (order.getCurrentPeopleNum().equals(order.getGroupPeopleNum())) { + if (ware == null || ware.getOnlineStatus() == 0 || ware.getIsDel()) { + order.setStatus("fail"); + order.setGroupEndTime(LocalDateTime.now()); + } else if (order.getCurrentPeopleNum().equals(order.getGroupPeopleNum())) { order.setStatus("success"); order.setGroupEndTime(LocalDateTime.now()); record.setStatus("待核销"); @@ -320,6 +319,9 @@ public class GbOrderServiceImpl extends ServiceImpl impl updateById(order); } detailService.updateById(record); + if (ware == null || ware.getOnlineStatus() == 0 || ware.getIsDel()) { + refundByGbOrderDetail(record, "商品已下架 自动退款。"); + } } @Override