|
|
|
@@ -360,13 +360,8 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
throw new MallinkException(ErrorCode.COUPON_IS_EMPTY); |
|
|
|
} |
|
|
|
|
|
|
|
WxCoupon updateRecord = new WxCoupon(); |
|
|
|
updateRecord.setId(coupon.getId()); |
|
|
|
updateRecord.setRemainInventory(coupon.getRemainInventory() + 1); |
|
|
|
updateRecord.setUpdateDate(new Date()); |
|
|
|
|
|
|
|
try { |
|
|
|
wxCouponMapper.updateByPrimaryKeySelective(updateRecord); |
|
|
|
wxCouponMapper.backInventory(coupon.getId(), coupon.getRemainInventory(), 1); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("数据库更新失败,库存+1失败, e:" + e.getMessage()); |
|
|
|
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "库存恢复失败"); |
|
|
|
@@ -839,8 +834,8 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
public int updateOrderStatus(WxOrder updateOrder, EnumOrderStatus enumOrderStatus) { |
|
|
|
Date currentDate = new Date(); |
|
|
|
switch (enumOrderStatus) { |
|
|
|
case ORDER_STATUS_OVERTIME_CANCEL: |
|
|
|
case ORDER_STATUS_REFUND_SUCCESS: { |
|
|
|
case ORDER_STATUS_OVERTIME_CANCEL: // 支付取消,库存退回 |
|
|
|
case ORDER_STATUS_REFUND_SUCCESS: { // 退款成功,库存退回 |
|
|
|
try { |
|
|
|
stockBack(updateOrder); |
|
|
|
} catch (Exception e) { |
|
|
|
@@ -849,7 +844,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
} |
|
|
|
break; |
|
|
|
} |
|
|
|
case ORDER_STATUS_COOPERATING_OVERTIME: { |
|
|
|
case ORDER_STATUS_COOPERATING_OVERTIME: { // 拼团超时,退库存 |
|
|
|
try { |
|
|
|
stockBack(updateOrder); |
|
|
|
} catch (Exception e) { |
|
|
|
@@ -858,7 +853,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
} |
|
|
|
break; |
|
|
|
} |
|
|
|
case ORDER_STATUS_COOPERATING_CANCEL: { |
|
|
|
case ORDER_STATUS_COOPERATING_CANCEL: { // 拼团取消,退库存 |
|
|
|
try { |
|
|
|
stockBack(updateOrder); |
|
|
|
} catch (Exception e) { |
|
|
|
@@ -867,7 +862,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
} |
|
|
|
break; |
|
|
|
} |
|
|
|
case ORDER_STATUS_COOPERATING_COMPLETE: { |
|
|
|
case ORDER_STATUS_COOPERATING_COMPLETE: { // 拼团完成,退库存 |
|
|
|
try { |
|
|
|
stockBack(updateOrder); |
|
|
|
} catch (Exception e) { |
|
|
|
|