From 9b857ed9a9c6e07cc656622b0664109e61638041 Mon Sep 17 00:00:00 2001
From: jack <zengjieli93@163.com>
Date: Wed, 27 Mar 2024 19:34:10 +0800
Subject: [PATCH] 分支1
---
src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java | 87 +++++++------------------------------------
1 files changed, 15 insertions(+), 72 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
index daf22a0..850dc93 100644
--- a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
@@ -2,12 +2,13 @@
import com.nq.dao.*;
+import com.nq.enums.EUserAssets;
import com.nq.pojo.*;
import com.nq.service.*;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.nq.common.ServerResponse;
-import com.nq.utils.DateTimeUtil;
+import com.nq.utils.timeutil.DateTimeUtil;
import com.nq.utils.KeyUtils;
import com.nq.utils.redis.RedisShardedPoolUtils;
@@ -48,7 +49,10 @@
UserCashDetailMapper userCashDetailMapper;
@Resource
- PayChnnelMapper payChnnelMapper;
+ SitePayMapper sitePayMapper;
+
+ @Autowired
+ IUserAssetsServices userAssetsServices;
@Autowired
@@ -152,15 +156,11 @@
}
- User user = this.userMapper.selectByPrimaryKey(userRecharge.getUserId());
+ User user = this.userMapper.selectById(userRecharge.getUserId());
if (user == null) {
return ServerResponse.createByErrorMsg("用户不存在");
}
- BigDecimal userAmt_before = user.getUserAmt();
- BigDecimal enableAmt_before = user.getEnableAmt();
- user.setUserAmt(userAmt_before.add(userRecharge.getPayAmt()));
- user.setEnableAmt(enableAmt_before.add(userRecharge.getPayAmt()));
- int updateCount = this.userMapper.updateByPrimaryKeySelective(user);
+ int updateCount = this.userMapper.updateById(user);
if (updateCount > 0) {
log.info("1.修改用户资金成功");
} else {
@@ -178,22 +178,6 @@
}
- UserCashDetail ucd = new UserCashDetail();
- ucd.setAgentId(user.getAgentId());
- ucd.setAgentName(user.getAgentName());
- ucd.setUserId(user.getId());
- ucd.setUserName(user.getRealName());
- ucd.setDeType("用户充值");
- ucd.setDeAmt(userRecharge.getPayAmt());
- ucd.setDeSummary("用户充值成功，充值前总金额:" + userAmt_before + ",充值后总金额:" + user.getUserAmt() + ",充值前可用:" + enableAmt_before + ",充值后可用:" + user
- .getEnableAmt());
-
- ucd.setAddTime(new Date());
- ucd.setIsRead(Integer.valueOf(0));
- int insertCount = this.userCashDetailMapper.insert(ucd);
- if (insertCount > 0) {
- return ServerResponse.createBySuccessMsg("充值成功！");
- }
return ServerResponse.createByErrorMsg("充值失败");
}
@@ -230,12 +214,8 @@
PageHelper.startPage(pageNum, pageSize);
User user = this.iUserService.getCurrentUser(request);
-
-
List<UserRecharge> userRecharges = this.userRechargeMapper.findUserChargeList(user.getId(), payChannel, orderStatus);
-
log.info("充值列表，增加用户 {} ，payChannel = {} , orderStatus = {}， 数量 = {}", new Object[]{user.getId(), payChannel, orderStatus, userRecharges.size()});
-
PageInfo pageInfo = new PageInfo(userRecharges);
return ServerResponse.createBySuccess(pageInfo);
@@ -286,17 +266,6 @@
List<UserRecharge> userRecharges = this.userRechargeMapper.listByAdmin(agentId, userId, realName, state, begin_time, end_time);
-
- for (int i = 0; i < userRecharges.size(); i++) {
- UserRecharge userRecharge = userRecharges.get(i);
- PayChnnel payChnnel = payChnnelMapper.selectById(userRecharge.getPayChannel());
- userRecharge.setPayChannelType(payChnnel.getChannelDesc());
- User user = userMapper.selectById(userRecharge.getUserId());
- if (user != null) {
- userRecharge.setUserPhone(user.getPhone());
- }
- }
-
PageInfo pageInfo = new PageInfo(userRecharges);
return ServerResponse.createBySuccess(pageInfo);
@@ -305,7 +274,7 @@
@Transactional
public ServerResponse updateState(Integer chargeId, Integer state) throws Exception {
- UserRecharge userRecharge = this.userRechargeMapper.selectByPrimaryKey(chargeId);
+ UserRecharge userRecharge = this.userRechargeMapper.selectById(chargeId);
if (userRecharge == null) {
return ServerResponse.createByErrorMsg("充值订单不存在");
@@ -316,38 +285,14 @@
if (state.intValue() == 1) {
-
- User user = this.userMapper.selectByPrimaryKey(userRecharge.getUserId());
+ User user = this.userMapper.selectById(userRecharge.getUserId());
if (user == null) {
return ServerResponse.createByErrorMsg("用户不存在");
}
-
- PayChnnel payChnnel = payChnnelMapper.selectById(userRecharge.getPayChannel());
-
- if (!payChnnel.getChannelName().equals("USDT")) {
- BigDecimal user_amt = user.getUserAmt().add(userRecharge.getPayAmt());
- user.setUserAmt(user_amt);
- BigDecimal user_enable_amt = user.getEnableAmt().add(userRecharge.getPayAmt());
- user.setEnableAmt(user_enable_amt);
- } else {
- BigDecimal user_amt = user.getUserIndexAmt().add(userRecharge.getPayAmt());
- user.setUserIndexAmt(user_amt);
- BigDecimal user_enable_amt = user.getEnableIndexAmt().add(userRecharge.getPayAmt());
- user.setEnableIndexAmt(user_enable_amt);
- }
- int updateCount = this.userMapper.updateByPrimaryKeySelective(user);
- if (updateCount > 0) {
- log.info("修改用户资金成功！");
- } else {
- log.error("修改用户资金出错，抛出异常");
- throw new Exception("修改用户资金出错，抛出异常");
- }
+ SitePay payChnnel = sitePayMapper.selectById(userRecharge.getPayId());
+ userAssetsServices.availablebalanceChange(payChnnel.getAssetsType(),user.getId(), EUserAssets.TOP_UP,userRecharge.getPayAmt(),"","");
}
-
-
userRecharge.setOrderStatus(Integer.valueOf((state.intValue() == 1) ? 1 : 2));
-
-
userRecharge.setPayTime(new Date());
int updateCount = this.userRechargeMapper.updateByPrimaryKeySelective(userRecharge);
if (updateCount > 0) {
@@ -362,7 +307,7 @@
return ServerResponse.createByErrorMsg("参数不能为空");
}
- User user = this.userMapper.selectByPrimaryKey(userId);
+ User user = this.userMapper.selectById(userId);
if (user == null) {
return ServerResponse.createByErrorMsg("找不到用户");
}
@@ -387,9 +332,7 @@
userRecharge.setPayChannel("2");
userRecharge.setOrderStatus(Integer.valueOf(1));
- user.setUserAmt(user.getUserAmt().add(new BigDecimal(amt.intValue())));
- user.setEnableAmt(user.getEnableAmt().add(new BigDecimal(amt.intValue())));
- this.userMapper.updateByPrimaryKeySelective(user);
+ this.userMapper.updateById(user);
} else if (state.intValue() == 2) {
userRecharge.setOrderStatus(Integer.valueOf(2));
} else {
@@ -408,7 +351,7 @@
if (cId == null) {
return ServerResponse.createByErrorMsg("id不能为空");
}
- int updateCount = this.userRechargeMapper.deleteByPrimaryKey(cId);
+ int updateCount = this.userRechargeMapper.deleteById(cId);
if (updateCount > 0) {
return ServerResponse.createBySuccessMsg("删除成功");
}
--
Gitblit v1.9.3