| @@ -925,10 +925,10 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { | |||
| logger.error("已退款: couponOrder-" + wxCouponOrder.getCouponId()); | |||
| throw new MallinkException(ErrorCode.COUPON_ORDER_IS_OVER_TIME); | |||
| } | |||
| if (wxCouponOrder.getCouponOrderStatus().equals(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode())) { | |||
| logger.error("已经核销过的券: couponOrder-" + wxCouponOrder.getCouponId()); | |||
| throw new MallinkException(ErrorCode.COUPON_ORDER_IS_USED); | |||
| } | |||
| // if (wxCouponOrder.getCouponOrderStatus().equals(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode())) { | |||
| // logger.error("已经核销过的券: couponOrder-" + wxCouponOrder.getCouponId()); | |||
| // throw new MallinkException(ErrorCode.COUPON_ORDER_IS_USED); | |||
| // } | |||
| } | |||
| EnumRefundSource refundSource = EnumRefundSource.getEnum(refundOrderCallback.getRefundSource()); | |||
| @@ -953,6 +953,10 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { | |||
| } | |||
| for (WxCouponOrder wxCouponOrder:couponOrderList) { | |||
| if (wxCouponOrder.getCouponOrderStatus().equals(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode())) { | |||
| logger.error("已经核销过的券: couponOrder-" + wxCouponOrder.getCouponId()); | |||
| continue; | |||
| } | |||
| // 更改 couponOrder 状态 | |||
| if (wxCouponOrder.getCouponType().equals(EnumCouponType.CARD_MULTIMCH.getCode())) { | |||
| wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.CARD_RETURNED.getCode()); // 卡线下退款 | |||
| @@ -978,17 +982,17 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { | |||
| } | |||
| // 卡退款,把卡余额设为0 | |||
| if (wxCouponOrder.getCouponType().equals(EnumCouponType.CARD_MULTIMCH.getCode())) { | |||
| WxCardInfo updateCardInfo = new WxCardInfo(); | |||
| updateCardInfo.setId(wxCouponOrder.getId()); | |||
| updateCardInfo.setRemainingAmount(0); | |||
| try { | |||
| wxCardInfoMapper.updateById(updateCardInfo); | |||
| } catch (Exception e) { | |||
| logger.error("db failed: wxCardInfo-" + wxCouponOrder.getId() + ", e:" + e.getMessage()); | |||
| throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); | |||
| } | |||
| } | |||
| // if (wxCouponOrder.getCouponType().equals(EnumCouponType.CARD_MULTIMCH.getCode())) { | |||
| // WxCardInfo updateCardInfo = new WxCardInfo(); | |||
| // updateCardInfo.setId(wxCouponOrder.getId()); | |||
| // updateCardInfo.setRemainingAmount(0); | |||
| // try { | |||
| // wxCardInfoMapper.updateById(updateCardInfo); | |||
| // } catch (Exception e) { | |||
| // logger.error("db failed: wxCardInfo-" + wxCouponOrder.getId() + ", e:" + e.getMessage()); | |||
| // throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); | |||
| // } | |||
| // } | |||
| } | |||
| // WxPayOrder payOrderQ = new WxPayOrder(); | |||