|
@@ -3105,16 +3105,16 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
return BaseController.succeed();
|
|
|
}
|
|
|
|
|
|
- sysUserCashAccountService.updateBalance(studentId, amount);
|
|
|
- SysUserCashAccount sysUserCashAccount = sysUserCashAccountService.get(studentId);
|
|
|
- SysUserCashAccountDetail sysUserCashAccountDetail = new SysUserCashAccountDetail();
|
|
|
- sysUserCashAccountDetail.setUserId(studentId);
|
|
|
- sysUserCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.REFUNDS);
|
|
|
- sysUserCashAccountDetail.setStatus(DealStatusEnum.SUCCESS);
|
|
|
- sysUserCashAccountDetail.setAmount(amount);
|
|
|
- sysUserCashAccountDetail.setBalance(sysUserCashAccount.getBalance());
|
|
|
- sysUserCashAccountDetail.setAttribute(studentId.toString());
|
|
|
- sysUserCashAccountDetailDao.insert(sysUserCashAccountDetail);
|
|
|
+// sysUserCashAccountService.updateBalance(studentId, amount);
|
|
|
+// SysUserCashAccount sysUserCashAccount = sysUserCashAccountService.get(studentId);
|
|
|
+// SysUserCashAccountDetail sysUserCashAccountDetail = new SysUserCashAccountDetail();
|
|
|
+// sysUserCashAccountDetail.setUserId(studentId);
|
|
|
+// sysUserCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.REFUNDS);
|
|
|
+// sysUserCashAccountDetail.setStatus(DealStatusEnum.SUCCESS);
|
|
|
+// sysUserCashAccountDetail.setAmount(amount);
|
|
|
+// sysUserCashAccountDetail.setBalance(sysUserCashAccount.getBalance());
|
|
|
+// sysUserCashAccountDetail.setAttribute(studentId.toString());
|
|
|
+// sysUserCashAccountDetailDao.insert(sysUserCashAccountDetail);
|
|
|
|
|
|
classStudentMapperByUserIdAndClassGroupId.setStatus(ClassGroupStudentStatusEnum.QUIT);
|
|
|
classGroupStudentMapperDao.update(classStudentMapperByUserIdAndClassGroupId);
|
|
@@ -3513,11 +3513,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
allPrice = allPrice.add(userCourseInfo.getExpectPrice());
|
|
|
if(now.after(userCourseInfo.getStartClassTime())){
|
|
|
overNum++;
|
|
|
- if(VIP == userCourseInfo.getGroupType()){
|
|
|
- historyPrice = historyPrice.add(userCourseInfo.getTeachMode().equals(TeachModeEnum.ONLINE)?vipGroup.getOnlineClassesUnitPrice():vipGroup.getOfflineClassesUnitPrice());
|
|
|
- }else {
|
|
|
- historyPrice = historyPrice.add(userCourseInfo.getOriginalPrice());
|
|
|
- }
|
|
|
+ historyPrice = historyPrice.add(userCourseInfo.getOriginalPrice());
|
|
|
}
|
|
|
}
|
|
|
bigDecimal = allPrice.subtract(historyPrice);
|