Merge remote-tracking branch 'origin/sys_coupon' into sys_coupon

mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -3672,6 +3672,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 order.setMemo("重复支付,进入余额");
             }
             studentPaymentOrderDao.update(order);
+            sysCouponCodeService.quit(order.getCouponCodeId());
             return;
         }
 
@@ -3681,6 +3682,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 sysUserCashAccountService.updateBalance(order.getUserId(), order.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "网管课支付失败，退还余额");
             }
             studentPaymentOrderDao.update(order);
+            sysCouponCodeService.quit(order.getCouponCodeId());
             return;
         }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -2306,6 +2306,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				sysUserCashAccountService.updateBalance(userId, studentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS,
 						"VIP课购买失败");
 			}
+			sysCouponCodeService.quit(order.getCouponCodeId());
 			return;
 		}