From ff64d8c9c27b28863021db5cfa4b4c5db2a72b06 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 17 Jun 2020 12:30:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8B=BC=E5=9B=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxOrderGroupServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java index 5a1d269ab..eb4e5047f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java @@ -75,14 +75,14 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { // 参与拼团 WxOrderGroup wxOrderGroup = wxOrderGroupMapper.selectById(orderGroupId); if (null == wxOrderGroup) { - //错误,更新状态,定时任务会发起退款 - order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_FAILD.getCode()); + //错误,更新状态,定时任务会发起退款,回滚库存 + order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); wxOrderMapper.updateById(order); throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FAILD.getCode(),"WxOrderGroup is null."+orderGroupId); } if(wxOrderGroup.getRemainPeople()<1) { - //错误,更新状态,定时任务会发起退款 - order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_FAILD.getCode()); + //错误,更新状态,定时任务会发起退款,回滚库存 + order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); wxOrderMapper.updateById(order); throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FAILD.getCode(),"参团人数已满,将稍后退款。"); } @@ -102,8 +102,8 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { logger.info("非首次拼团,更新拼团信息, 剩余人数-1"); int row = wxOrderGroupMapper.updateOrderGroup(wxOrderGroup); if (row != 1) { - //这个时候应该要发起异步退款。 - order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_FAILD.getCode()); + //错误,更新状态,定时任务会发起退款,回滚库存 + order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); wxOrderMapper.updateById(order); redisLock.unlock("grouppeopleLock_"+orderGroupId, String.valueOf(orderGroupId)); throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FAILD.getCode(),"参团失败,将稍后退款.");