1、陪练课调整

2、付费陪练课可预约时间调整

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

@@ -3001,20 +3001,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         Map<DealStatusEnum, Long> statusOrderNumMap = userGroupOrders.stream().collect(Collectors.groupingBy(StudentPaymentOrder::getStatus, Collectors.counting()));
         Long successOrderNum=statusOrderNumMap.get(DealStatusEnum.SUCCESS);
         if(Objects.nonNull(successOrderNum)&&successOrderNum>0){
-            if(order.getStatus().equals(DealStatusEnum.FAILED)&&Objects.nonNull(order.getBalancePaymentAmount())){
-                sysUserCashAccountService.updateBalance(order.getUserId(), order.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "网管课购买失败");
-                SysUserCashAccountDetail sysUserIncomeCashAccountDetail = new SysUserCashAccountDetail();
-                sysUserIncomeCashAccountDetail.setUserId(order.getUserId());
-                sysUserIncomeCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.RECHARGE);
-                sysUserIncomeCashAccountDetail.setStatus(DealStatusEnum.SUCCESS);
-                sysUserIncomeCashAccountDetail.setAmount(order.getBalancePaymentAmount());
-                sysUserIncomeCashAccountDetail.setBalance(sysUserCashAccount.getBalance().add(order.getBalancePaymentAmount()));
-                sysUserIncomeCashAccountDetail.setAttribute(order.getTransNo());
-                sysUserIncomeCashAccountDetail.setChannel(studentPaymentOrder.getPaymentChannel());
-                sysUserIncomeCashAccountDetail.setComAmount(studentPaymentOrder.getComAmount());
-                sysUserIncomeCashAccountDetail.setPerAmount(studentPaymentOrder.getPerAmount());
-                sysUserIncomeCashAccountDetail.setDescription("网管课支付失败，退还余额");
-                sysUserCashAccountDetailService.insert(sysUserIncomeCashAccountDetail);
+            if(order.getStatus().equals(DealStatusEnum.FAILED)&&Objects.nonNull(order.getBalancePaymentAmount())&&order.getBalancePaymentAmount().compareTo(BigDecimal.ZERO)>0){
+                sysUserCashAccountService.updateBalance(order.getUserId(), order.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "网管课支付失败，退还余额");
             }
             studentPaymentOrderDao.update(order);
             return;
@@ -3022,20 +3010,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
         Long ingOrderNum=statusOrderNumMap.get(DealStatusEnum.ING);
         if(Objects.nonNull(ingOrderNum)&&ingOrderNum>1&&order.getStatus().equals(DealStatusEnum.FAILED)){
-            if(Objects.nonNull(order.getBalancePaymentAmount())){
-                sysUserCashAccountService.updateBalance(order.getUserId(), order.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "网管课购买失败");
-                SysUserCashAccountDetail sysUserIncomeCashAccountDetail = new SysUserCashAccountDetail();
-                sysUserIncomeCashAccountDetail.setUserId(order.getUserId());
-                sysUserIncomeCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.RECHARGE);
-                sysUserIncomeCashAccountDetail.setStatus(DealStatusEnum.SUCCESS);
-                sysUserIncomeCashAccountDetail.setAmount(order.getBalancePaymentAmount());
-                sysUserIncomeCashAccountDetail.setBalance(sysUserCashAccount.getBalance().add(order.getBalancePaymentAmount()));
-                sysUserIncomeCashAccountDetail.setAttribute(order.getTransNo());
-                sysUserIncomeCashAccountDetail.setChannel(studentPaymentOrder.getPaymentChannel());
-                sysUserIncomeCashAccountDetail.setComAmount(studentPaymentOrder.getComAmount());
-                sysUserIncomeCashAccountDetail.setPerAmount(studentPaymentOrder.getPerAmount());
-                sysUserIncomeCashAccountDetail.setDescription("网管课支付失败，退还余额");
-                sysUserCashAccountDetailService.insert(sysUserIncomeCashAccountDetail);
+            if(Objects.nonNull(order.getBalancePaymentAmount())&&order.getBalancePaymentAmount().compareTo(BigDecimal.ZERO)>0){
+                sysUserCashAccountService.updateBalance(order.getUserId(), order.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "网管课支付失败，退还余额");
             }
             studentPaymentOrderDao.update(order);
             return;
@@ -3044,20 +3020,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         if(order.getStatus().equals(DealStatusEnum.SUCCESS)){
             courseScheduleDao.updateGroupCourseLock(order.getMusicGroupId(),GroupType.PRACTICE,0);
         }else{
-            if(Objects.nonNull(order.getBalancePaymentAmount())){
-                sysUserCashAccountService.updateBalance(order.getUserId(), order.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "网管课购买失败");
-                SysUserCashAccountDetail sysUserIncomeCashAccountDetail = new SysUserCashAccountDetail();
-                sysUserIncomeCashAccountDetail.setUserId(order.getUserId());
-                sysUserIncomeCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.RECHARGE);
-                sysUserIncomeCashAccountDetail.setStatus(DealStatusEnum.SUCCESS);
-                sysUserIncomeCashAccountDetail.setAmount(order.getBalancePaymentAmount());
-                sysUserIncomeCashAccountDetail.setBalance(sysUserCashAccount.getBalance().add(order.getBalancePaymentAmount()));
-                sysUserIncomeCashAccountDetail.setAttribute(order.getTransNo());
-                sysUserIncomeCashAccountDetail.setChannel(studentPaymentOrder.getPaymentChannel());
-                sysUserIncomeCashAccountDetail.setComAmount(studentPaymentOrder.getComAmount());
-                sysUserIncomeCashAccountDetail.setPerAmount(studentPaymentOrder.getPerAmount());
-                sysUserIncomeCashAccountDetail.setDescription("网管课支付失败，退还余额");
-                sysUserCashAccountDetailService.insert(sysUserIncomeCashAccountDetail);
+            if(Objects.nonNull(order.getBalancePaymentAmount())&&order.getBalancePaymentAmount().compareTo(BigDecimal.ZERO)>0){
+                sysUserCashAccountService.updateBalance(order.getUserId(), order.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "网管课支付失败，退还余额");
             }
             studentPaymentOrderDao.update(order);
             PracticeGroup practiceGroup = practiceGroupDao.get(Long.valueOf(order.getMusicGroupId()));