From 09206aedcfdf30050123e99f2af0a192ebad1de4 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 03 Jun 2024 18:08:33 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java | 61 +++++++++---------------------
1 files changed, 19 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
index f7624b5..508966a 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,7 +20,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import com.nq.vo.user.UserRechargePayInfoVo;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,6 +59,8 @@
@Autowired
ISiteInfoService iSiteInfoService;
+ @Resource
+ UserAssetsMapper userAssetsMapper;
public ServerResponse checkInMoney(int maxOrder, Integer userId) {
int count = this.userRechargeMapper.checkInMoney(0, userId);
@@ -216,8 +218,14 @@
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.getEStockTypeByCode(s.getAssetsType()).getSymbol1());
+ userRecharges.get(i).setChannelName(EStockType.getEStockTypeByCode(s.getAssetsType()).getSymbol());
+ }
return ServerResponse.createBySuccess(pageInfo);
}
@@ -267,6 +275,14 @@
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());
+ }
+
+ }
PageInfo pageInfo = new PageInfo(userRecharges);
return ServerResponse.createBySuccess(pageInfo);
@@ -277,7 +293,7 @@
public ServerResponse updateState(Integer chargeId, Integer state) throws Exception {
UserRecharge userRecharge = this.userRechargeMapper.selectById(chargeId);
- if (userRecharge == null) {
+ if (userRecharge == null) {
return ServerResponse.createByErrorMsg("充值订单不存在");
}
if (userRecharge.getOrderStatus().intValue() != 0) {
@@ -388,44 +404,5 @@
List<UserRecharge> userRecharges = this.userRechargeMapper.listByAdmin(agentId, userId, realName, state, begin_time, end_time);
return userRecharges;
- }
-
- @Override
- public ServerResponse chooseBank(UserRecharge userRecharge) {
- if (userRecharge.getId()==null||userRecharge.getPayId()==null){
- return ServerResponse.createByErrorMsg("param is null");
- }
- int result = userRechargeMapper.updateByPrimaryKeySelective(userRecharge);
- if (result>0){
- return ServerResponse.createBySuccessMsg("operate Success！");
- }
- return ServerResponse.createByErrorMsg("operate fail！");
- }
-
- @Override
- public ServerResponse getInfo(Integer id) {
- if (id==null||id==0){
- return ServerResponse.createByErrorMsg("param is null！");
- }
- UserRechargePayInfoVo userRechargePayInfoVo = new UserRechargePayInfoVo();
- UserRecharge dbUserRecharge = userRechargeMapper.selectById(id);
- userRechargePayInfoVo.setUserRecharge(dbUserRecharge);
- if (dbUserRecharge.getPayId()!=null&&dbUserRecharge.getPayId()>0){
- SitePay dbSitePay = sitePayMapper.selectById(dbUserRecharge.getPayId());
- userRechargePayInfoVo.setSitePay(dbSitePay);
- }
- return ServerResponse.createBySuccess(userRechargePayInfoVo);
- }
-
- @Override
- public ServerResponse editRecharge(UserRecharge userRecharge) {
- if (userRecharge.getId()==null||userRecharge.getId()==null){
- return ServerResponse.createByErrorMsg("param is null");
- }
- int result = userRechargeMapper.updateByPrimaryKeySelective(userRecharge);
- if (result>0){
- return ServerResponse.createBySuccessMsg("submit Success！");
- }
- return ServerResponse.createByErrorMsg("submit fail！");
}
}
--
Gitblit v1.9.3