|
|
|
@@ -950,6 +950,33 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
} |
|
|
|
break; |
|
|
|
} |
|
|
|
case ORDER_STATUS_COOPERATING_OVERTIME: { |
|
|
|
try { |
|
|
|
stockBack(updateOrder); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("库存+1失败, e:" + e.getMessage()); |
|
|
|
throw new MallinkException(ErrorCode.REMAIN_BACK_FAIL); |
|
|
|
} |
|
|
|
break; |
|
|
|
} |
|
|
|
case ORDER_STATUS_COOPERATING_CANCEL: { |
|
|
|
try { |
|
|
|
stockBack(updateOrder); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("库存+1失败, e:" + e.getMessage()); |
|
|
|
throw new MallinkException(ErrorCode.REMAIN_BACK_FAIL); |
|
|
|
} |
|
|
|
break; |
|
|
|
} |
|
|
|
case ORDER_STATUS_COOPERATING_COMPLETE: { |
|
|
|
try { |
|
|
|
stockBack(updateOrder); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("库存+1失败, e:" + e.getMessage()); |
|
|
|
throw new MallinkException(ErrorCode.REMAIN_BACK_FAIL); |
|
|
|
} |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
updateOrder.setOrderStatus(enumOrderStatus.getCode()); |
|
|
|
updateOrder.setUpdateDate(currentDate); |
|
|
|
@@ -963,6 +990,23 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
return ret; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) |
|
|
|
public void updateOrderStatus(WxOrder updateOrder) { |
|
|
|
if (updateOrder.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_OVERTIME.getCode()) || |
|
|
|
updateOrder.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()) || |
|
|
|
updateOrder.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode()) || |
|
|
|
updateOrder.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_FAILD.getCode())) { |
|
|
|
try { |
|
|
|
stockBack(updateOrder); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("拼团库存+1失败, e:" + e.getMessage()); |
|
|
|
throw new MallinkException(ErrorCode.REMAIN_BACK_FAIL); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 微信关闭订单 |
|
|
|
*/ |
|
|
|
|