|
@@ -277,11 +277,11 @@ public class SysUserCashAccountServiceImpl extends BaseServiceImpl<Integer, SysU
|
|
|
if(changeMoney.compareTo(cashAccount.getCourseBalance())>0){
|
|
|
changeMoney = changeMoney.subtract(cashAccount.getCourseBalance());
|
|
|
cashAccount.setCourseBalance(BigDecimal.ZERO);
|
|
|
- sysUserCoursesAccountDetail.setAmount(cashAccount.getCourseBalance());
|
|
|
+ sysUserCoursesAccountDetail.setAmount(changeMoney);
|
|
|
}else{
|
|
|
- changeMoney = BigDecimal.ZERO;
|
|
|
cashAccount.setCourseBalance(cashAccount.getCourseBalance().subtract(changeMoney));
|
|
|
sysUserCoursesAccountDetail.setAmount(changeMoney);
|
|
|
+ changeMoney = BigDecimal.ZERO;
|
|
|
}
|
|
|
cashAccount.setUpdateTime(date);
|
|
|
|
|
@@ -291,7 +291,7 @@ public class SysUserCashAccountServiceImpl extends BaseServiceImpl<Integer, SysU
|
|
|
comment += "-" + sysUser.getId();
|
|
|
}
|
|
|
sysUserCoursesAccountDetail.setUserId(userId);
|
|
|
- sysUserCoursesAccountDetail.setBalance(cashAccount.getBalance());
|
|
|
+ sysUserCoursesAccountDetail.setBalance(cashAccount.getCourseBalance());
|
|
|
sysUserCoursesAccountDetail.setComment(comment);
|
|
|
sysUserCoursesAccountDetail.setDescription("总扣费金额:"+decimal);
|
|
|
sysUserCoursesAccountDetail.setStatus(DealStatusEnum.SUCCESS);
|