系统用户钱包 拆分

This commit is contained in:
2025-01-06 14:32:42 +08:00
parent 33b350e7b6
commit 0e512bfc69
15 changed files with 183 additions and 74 deletions

View File

@@ -31,6 +31,9 @@ import com.sqx.modules.pay.entity.AliPayWithdrawModel;
import com.sqx.modules.pay.entity.CashOut;
import com.sqx.modules.pay.service.CashOutService;
import com.sqx.modules.pay.service.PayDetailsService;
import com.sqx.modules.sys.entity.SysUserMoneyDetails;
import com.sqx.modules.sys.service.SysUserMoneyDetailsService;
import com.sqx.modules.sys.service.SysUserMoneyService;
import com.sqx.modules.utils.AmountCalUtils;
import com.sqx.modules.utils.excel.ExcelData;
import com.sqx.modules.utils.excel.ExportExcelUtils;
@@ -86,6 +89,8 @@ public class CashController {
@Autowired
private UserMoneyDetailsService userMoneyDetailsService;
@Autowired
private SysUserMoneyDetailsService sysUserMoneyDetailsService;
@Autowired
private MessageService messageService;
@Autowired
private InviteMoneyDao inviteMoneyDao;
@@ -93,6 +98,8 @@ public class CashController {
private OrdersService ordersService;
@Autowired
private UserMoneyService userMoneyService;
@Autowired
private SysUserMoneyService sysUserMoneyService;
private ReentrantReadWriteLock reentrantReadWriteLock = new ReentrantReadWriteLock(true);
@RequestMapping(value = "/sendMsgByUserId", method = RequestMethod.GET)
@@ -460,18 +467,19 @@ public class CashController {
}
//将金币退还
if (one.getSysUserId() != null) {
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
userMoneyDetails.setSysUserId(one.getSysUserId());
userMoneyDetails.setTitle("[退款提醒]提现失败:" + one.getMoney() + ",退还手续费:" + one.getRate() + ",总退还:" + v);
userMoneyDetails.setContent(content);
userMoneyDetails.setType(1);
SysUserMoneyDetails sysUserMoneyDetails = new SysUserMoneyDetails();
sysUserMoneyDetails.setSysUserId(one.getSysUserId());
sysUserMoneyDetails.setUserId(one.getSysUserId());
sysUserMoneyDetails.setTitle("[退款提醒]提现失败:" + one.getMoney() + ",退还手续费:" + one.getRate() + ",总退还:" + v);
sysUserMoneyDetails.setContent(content);
sysUserMoneyDetails.setType(1);
// ✅
userMoneyDetails.setClassify(4);
userMoneyDetails.setMoney(new BigDecimal(v));
userMoneyDetails.setCreateTime(sdf.format(now));
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
userMoneyService.updateSysMoney(1, userId, v);
sysUserMoneyDetails.setClassify(4);
sysUserMoneyDetails.setMoney(new BigDecimal(v));
sysUserMoneyDetails.setCreateTime(sdf.format(now));
sysUserMoneyDetails.setMoneyType(2);
sysUserMoneyDetailsService.save(sysUserMoneyDetails);
sysUserMoneyService.updateSysMoney(1, userId, v);
} else {
UserEntity userInfo = userService.queryByUserId(userId);
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();