|
@@ -186,6 +186,7 @@ public class SysUserCashAccountServiceImpl extends BaseServiceImpl<Integer, SysU
|
|
|
@Override
|
|
|
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
|
|
|
public boolean transferCourseBalanceToBalance(Integer userId, BigDecimal money) {
|
|
|
+ SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
SysUserCashAccount cashAccount = sysUserCashAccountDao.getLocked(userId);
|
|
|
if (money == null || money.compareTo(BigDecimal.ZERO) <= 0) {
|
|
|
throw new BizException("充值金额必须大于0");
|
|
@@ -207,7 +208,8 @@ public class SysUserCashAccountServiceImpl extends BaseServiceImpl<Integer, SysU
|
|
|
SysUserCashAccountDetail detail = new SysUserCashAccountDetail();
|
|
|
detail.setAmount(money);
|
|
|
detail.setBalance(cashAccount.getBalance().add(money));
|
|
|
- detail.setComment("课程余额转账");
|
|
|
+ detail.setDescription("课程余额转账");
|
|
|
+ detail.setComment("课程余额转账-"+sysUser.getId());
|
|
|
detail.setCreateTime(date);
|
|
|
detail.setStatus(DealStatusEnum.SUCCESS);
|
|
|
detail.setType(PlatformCashAccountDetailTypeEnum.FILL_ACCOUNT);
|
|
@@ -226,8 +228,9 @@ public class SysUserCashAccountServiceImpl extends BaseServiceImpl<Integer, SysU
|
|
|
sysUserCoursesAccountDetail.setUserId(userId);
|
|
|
sysUserCoursesAccountDetail.setType(PlatformCashAccountDetailTypeEnum.FILL_ACCOUNT);
|
|
|
sysUserCoursesAccountDetail.setAmount(money.negate());
|
|
|
- sysUserCoursesAccountDetail.setBalance(cashAccount.getCourseBalance().subtract(money));
|
|
|
+ sysUserCoursesAccountDetail.setBalance(cashAccount.getCourseBalance());
|
|
|
sysUserCoursesAccountDetail.setDescription("课程余额转账");
|
|
|
+ sysUserCoursesAccountDetail.setComment("课程余额转账"+sysUser.getId());
|
|
|
sysUserCoursesAccountDetail.setStatus(DealStatusEnum.SUCCESS);
|
|
|
sysUserCoursesAccountDetail.setUpdateTime(date);
|
|
|
sysUserCoursesAccountDetail.setCreateTime(date);
|