From 4130970dd61791e0a5cb0771a9b707084f1ed464 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 08 May 2025 00:39:05 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java | 73 +++++++++++++++++++++++++++---------
1 files changed, 54 insertions(+), 19 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..0567f1a 100644
--- a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
@@ -1,7 +1,10 @@
package com.nq.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.nq.dao.*;
+import com.nq.enums.EStockType;
import com.nq.enums.EUserAssets;
import com.nq.pojo.*;
import com.nq.service.*;
@@ -58,6 +61,8 @@
@Autowired
ISiteInfoService iSiteInfoService;
+ @Resource
+ UserAssetsMapper userAssetsMapper;
public ServerResponse checkInMoney(int maxOrder, Integer userId) {
int count = this.userRechargeMapper.checkInMoney(0, userId);
@@ -215,8 +220,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.ST.getSymbol1());
+ userRecharges.get(i).setChannelName(EStockType.ST.getSymbol());
+ }
return ServerResponse.createBySuccess(pageInfo);
}
@@ -266,6 +276,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);
@@ -289,8 +308,8 @@
if (user == null) {
return ServerResponse.createByErrorMsg("用户不存在");
}
- SitePay payChnnel = sitePayMapper.selectById(userRecharge.getPayId());
- userAssetsServices.availablebalanceChange(payChnnel.getAssetsType(),user.getId(), EUserAssets.TOP_UP,userRecharge.getPayAmt(),"","");
+// 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());
@@ -302,7 +321,7 @@
}
- public ServerResponse createOrder(Integer userId, Integer state, Integer amt, String payChannel) {
+ public ServerResponse createOrder(String accectType,Integer userId, Integer state, Integer amt, String payChannel) {
if (userId == null || state == null || amt == null) {
return ServerResponse.createByErrorMsg("参数不能为空");
}
@@ -324,21 +343,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(accectType,
+ userId,EUserAssets.TOP_UP,new BigDecimal(amt),"","");
int insertCount = this.userRechargeMapper.insert(userRecharge);
if (insertCount > 0) {
return ServerResponse.createBySuccessMsg("生成订单成功！");
@@ -388,4 +396,31 @@
return userRecharges;
}
+
+
+ public ServerResponse saveUserRecharge(Integer id, String amt, HttpServletRequest request){
+ User user = this.userMapper.selectById(id);
+ if (user == null) {
+ return ServerResponse.createByErrorMsg("请登录后操作",request);
+ }
+ List<UserRecharge> userRecharges = userRechargeMapper.selectList(new LambdaQueryWrapper<>(UserRecharge.class).eq(UserRecharge::getUserId, id).eq(UserRecharge::getOrderStatus, 0));
+ if(CollectionUtils.isNotEmpty(userRecharges)){
+ return ServerResponse.createByErrorMsg("当前有未处理充值订单，请联系客服完成充值！",request);
+ }
+ UserRecharge userRecharge = new UserRecharge();
+ userRecharge.setUserId(user.getId());
+ userRecharge.setNickName(user.getRealName());
+ userRecharge.setAgentId(user.getAgentId());
+
+ String ordersn = KeyUtils.getRechargeOrderSn();
+ userRecharge.setOrderSn(ordersn);
+ userRecharge.setPayChannel("1");
+ userRecharge.setPayAmt(new BigDecimal(amt));
+ userRecharge.setAddTime(new Date());
+ userRecharge.setPayTime(new Date());
+ userRecharge.setOrderStatus(Integer.valueOf(0));
+ userRecharge.setPayId(1);
+ userRechargeMapper.insert(userRecharge);
+ return ServerResponse.createBySuccess("提交成功！",request);
+ }
}
--
Gitblit v1.9.3