1、陪练课调整

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

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

@@ -2989,12 +2989,23 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         if(!studentPaymentOrder.getStatus().equals(DealStatusEnum.ING)){
             return;
         }
+        SysUserCashAccount sysUserCashAccount = sysUserCashAccountService.get(order.getUserId());
         List<StudentPaymentOrder> userGroupOrders = studentPaymentOrderDao.findUserGroupOrders(order.getUserId(), order.getMusicGroupId(), order.getGroupType(),null);
         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());
             }
             studentPaymentOrderDao.update(order);
             return;
@@ -3004,6 +3015,16 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         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());
             }
             studentPaymentOrderDao.update(order);
             return;
@@ -3014,6 +3035,16 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         }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());
             }
             studentPaymentOrderDao.update(order);
             PracticeGroup practiceGroup = practiceGroupDao.get(Long.valueOf(order.getMusicGroupId()));
@@ -3023,7 +3054,6 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             return;
         }
         studentPaymentOrderDao.update(order);
-        SysUserCashAccount sysUserCashAccount = sysUserCashAccountService.get(order.getUserId());
 
         //插入缴费明细
         //收入