Browse Source

乐理课活动

zouxuan 3 years ago
parent
commit
8621471ed4

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

@@ -4744,7 +4744,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             }
             }
             studentDao.updateStudentServiceTag(userId, null, YesOrNoEnum.YES.getCode());
             studentDao.updateStudentServiceTag(userId, null, YesOrNoEnum.YES.getCode());
         }
         }
-        if (studentPaymentOrder.getStatus().equals(DealStatusEnum.FAILED)) {
+        if (studentPaymentOrder.getStatus().equals(DealStatusEnum.FAILED) || studentPaymentOrder.getStatus().equals(DealStatusEnum.CLOSE)) {
             if (studentPaymentOrder.getBalancePaymentAmount() != null && studentPaymentOrder.getBalancePaymentAmount().compareTo(BigDecimal.ZERO) > 0) {
             if (studentPaymentOrder.getBalancePaymentAmount() != null && studentPaymentOrder.getBalancePaymentAmount().compareTo(BigDecimal.ZERO) > 0) {
                 sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(), studentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "报名缴费失败");
                 sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(), studentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "报名缴费失败");
             }
             }
@@ -4820,7 +4820,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
 
         studentPaymentOrder.setPaymentChannel("BALANCE");
         studentPaymentOrder.setPaymentChannel("BALANCE");
         studentPaymentOrder.setUserId(student.getUserId());
         studentPaymentOrder.setUserId(student.getUserId());
-        studentPaymentOrder.setGroupType(GroupType.VIP);
+        studentPaymentOrder.setGroupType(GroupType.ACTIVITY);
         studentPaymentOrder.setOrderNo(orderNo);
         studentPaymentOrder.setOrderNo(orderNo);
         studentPaymentOrder.setType(OrderTypeEnum.ACTIVITY);
         studentPaymentOrder.setType(OrderTypeEnum.ACTIVITY);
         studentPaymentOrder.setStatus(DealStatusEnum.ING);
         studentPaymentOrder.setStatus(DealStatusEnum.ING);