From fec33ad92aa4a92aaa657a6f17339bfd98c5969d Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 25 Nov 2025 19:01:24 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
index 850dc93..ea2e2ff 100644
--- a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
@@ -2,6 +2,7 @@
import com.nq.dao.*;
+import com.nq.enums.EStockType;
import com.nq.enums.EUserAssets;
import com.nq.pojo.*;
import com.nq.service.*;
@@ -19,6 +20,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,6 +60,8 @@
@Autowired
ISiteInfoService iSiteInfoService;
+ @Resource
+ UserAssetsMapper userAssetsMapper;
public ServerResponse checkInMoney(int maxOrder, Integer userId) {
int count = this.userRechargeMapper.checkInMoney(0, userId);
@@ -215,8 +219,13 @@
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);
+
+ for (int i = 0; i <userRecharges.size() ; i++) {
+ SitePay s = sitePayMapper.selectById(userRecharges.get(i).getPayId());
+ userRecharges.get(i).setAssetsType(EStockType.IN.getSymbol1());
+ userRecharges.get(i).setChannelName(EStockType.IN.getSymbol());
+ }
return ServerResponse.createBySuccess(pageInfo);
}
@@ -266,6 +275,15 @@
List<UserRecharge> userRecharges = this.userRechargeMapper.listByAdmin(agentId, userId, realName, state, begin_time, end_time);
+ for (int i = 0; i < userRecharges.size(); i++) {
+ UserRecharge u =userRecharges.get(i);
+ User user = userMapper.selectById(u.getUserId());
+ if(user != null){
+ u.setUserPhone(user.getPhone());
+ u.setNickName(user.getRealName());
+ }
+
+ }
PageInfo pageInfo = new PageInfo(userRecharges);
return ServerResponse.createBySuccess(pageInfo);
@@ -324,21 +342,10 @@
userRecharge.setPayAmt(new BigDecimal(amt.intValue()));
userRecharge.setAddTime(new Date());
userRecharge.setPayTime(new Date());
-
- if (state.intValue() == 0) {
- userRecharge.setOrderStatus(Integer.valueOf(0));
- } else if (state.intValue() == 1) {
- userRecharge.setOrderSn(payChannel);
- userRecharge.setPayChannel("2");
- userRecharge.setOrderStatus(Integer.valueOf(1));
-
- this.userMapper.updateById(user);
- } else if (state.intValue() == 2) {
- userRecharge.setOrderStatus(Integer.valueOf(2));
- } else {
- return ServerResponse.createByErrorMsg("订单状态不正确");
- }
-
+ userRecharge.setOrderStatus(Integer.valueOf(1));
+ userRecharge.setPayId(1);
+ userAssetsServices.availablebalanceChange(EStockType.IN.getCode(),
+ userId,EUserAssets.TOP_UP,new BigDecimal(amt),"","");
int insertCount = this.userRechargeMapper.insert(userRecharge);
if (insertCount > 0) {
return ServerResponse.createBySuccessMsg("生成订单成功！");
--
Gitblit v1.9.3