| @@ -357,13 +357,15 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| logger.error("商户不存在, couponId: " + couponIdStr); | logger.error("商户不存在, couponId: " + couponIdStr); | ||||
| throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); | throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); | ||||
| } | } | ||||
| if (!orderGroupId.equals(0L)) { | |||||
| // 拼团 | |||||
| /* | |||||
| if (orderGroupId != null && !orderGroupId.equals(0L)) { | |||||
| WxOrderGroup group = wxOrderGroupMapper.selectByPrimaryKey(orderGroupId); | WxOrderGroup group = wxOrderGroupMapper.selectByPrimaryKey(orderGroupId); | ||||
| if (group.getStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode())) { | if (group.getStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode())) { | ||||
| logger.error("下订单拼团人数已满>>>" + orderGroupId); | logger.error("下订单拼团人数已满>>>" + orderGroupId); | ||||
| throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FINISHED); | throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FINISHED); | ||||
| } | } | ||||
| } | |||||
| }*/ | |||||
| // 减库存操作 | // 减库存操作 | ||||
| stockReduce(user, coupon, couponIdStr); | stockReduce(user, coupon, couponIdStr); | ||||