|
|
|
@@ -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(),"参团失败,将稍后退款."); |
|
|
|
|