From b1e5d9e660bf0e7669d890d82853854c3b588bd8 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 18 May 2026 17:47:27 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java | 123 +++++++++++++++++++++++++----------------
1 files changed, 75 insertions(+), 48 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..9af5712 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.*;
@@ -45,8 +46,6 @@
AgentUserMapper agentUserMapper;
@Autowired
ISiteSettingService iSiteSettingService;
- @Resource
- UserCashDetailMapper userCashDetailMapper;
@Resource
SitePayMapper sitePayMapper;
@@ -68,17 +67,17 @@
}
- public ServerResponse inMoney(String amt, String payType, HttpServletRequest request) {
- if (StringUtils.isBlank(amt) || StringUtils.isBlank(payType)) {
+ public ServerResponse inMoney(String amt, String img, HttpServletRequest request) {
+ if (StringUtils.isBlank(amt) || StringUtils.isBlank(img)) {
return ServerResponse.createByErrorMsg("The parameter cannot be null");
}
- SiteSetting siteSetting = this.iSiteSettingService.getSiteSetting();
- if (siteSetting == null) {
+ SitePay payChnnel = sitePayMapper.selectById(1);
+ if (payChnnel == null) {
return ServerResponse.createByErrorMsg("set is not initialized");
}
- if ((new BigDecimal(siteSetting.getChargeMinAmt() + "")).compareTo(new BigDecimal(amt)) == 1) {
- return ServerResponse.createByErrorMsg("The top-up amount shall not be less than" + siteSetting.getChargeMinAmt());
+ if ((new BigDecimal(payChnnel.getChannelMinLimit() + "")).compareTo(new BigDecimal(amt)) == 1) {
+ return ServerResponse.createByErrorMsg("The top-up amount shall not be less than" + payChnnel.getChannelMinLimit());
}
@@ -95,9 +94,9 @@
}
User user = this.iUserService.getCurrentRefreshUser(request);
- if (user.getIsActive().intValue() != 2) {
+ /*if (user.getIsActive().intValue() != 2) {
return ServerResponse.createByErrorMsg("Recharge cannot be initiated without real-name authentication");
- }
+ }*/
ServerResponse serverResponse = checkInMoney(10, user.getId());
@@ -115,10 +114,14 @@
String ordersn = KeyUtils.getRechargeOrderSn();
userRecharge.setOrderSn(ordersn);
- userRecharge.setPayChannel(payType);
+ userRecharge.setPayChannel("1");
userRecharge.setPayAmt(new BigDecimal(amt));
userRecharge.setOrderStatus(Integer.valueOf(0));
userRecharge.setAddTime(new Date());
+ userRecharge.setAssetsType(EStockType.US.getCode());
+ userRecharge.setImg(img);
+ userRecharge.setPayId(1);
+ userRecharge.setPayTime(new Date());
int insertCount = this.userRechargeMapper.insert(userRecharge);
if (insertCount > 0) {
@@ -132,7 +135,7 @@
/*SendHTMLMail.send(user, userRecharge, email_token, siteInfo
.getSiteHost(), siteInfo.getSiteEmailTo());
log.info("用户充值，发送审核邮件成功");*/
- return ServerResponse.createBySuccessMsg("Creating a payment order succeeded！");
+ return ServerResponse.createBySuccessMsg("Creating a payment order succeeded");
}
return ServerResponse.createByErrorMsg("Failed to create a payment order");
}
@@ -147,7 +150,7 @@
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public ServerResponse chargeSuccess(UserRecharge userRecharge) throws Exception {
log.info("充值订单 确认成功操作 id = {}", userRecharge.getId());
@@ -215,8 +218,20 @@
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());
+ if (StringUtils.isNotBlank(userRecharges.get(i).getAssetsType())) {
+ EStockType eStockType = EStockType.getEStockTypeByCode(userRecharges.get(i).getAssetsType());
+ userRecharges.get(i).setAssetsType(eStockType.getSymbol1());
+ userRecharges.get(i).setChannelName(eStockType.getSymbol());
+ } else {
+ userRecharges.get(i).setAssetsType(EStockType.getDefault().getSymbol1());
+ userRecharges.get(i).setChannelName(EStockType.getDefault().getSymbol());
+ }
+
+ }
return ServerResponse.createBySuccess(pageInfo);
}
@@ -266,13 +281,22 @@
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);
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public ServerResponse updateState(Integer chargeId, Integer state) throws Exception {
UserRecharge userRecharge = this.userRechargeMapper.selectById(chargeId);
@@ -302,48 +326,44 @@
}
- public ServerResponse createOrder(Integer userId, Integer state, Integer amt, String payChannel) {
+ public ServerResponse createOrder(Integer userId, Integer state, Integer amt, String payChannel, String accectType) {
if (userId == null || state == null || amt == null) {
return ServerResponse.createByErrorMsg("参数不能为空");
}
-
- User user = this.userMapper.selectById(userId);
- if (user == null) {
- return ServerResponse.createByErrorMsg("找不到用户");
+ if (accectType == null || accectType.isEmpty()) {
+ accectType = EStockType.getDefault().getCode();
}
+ try {
+ User user = this.userMapper.selectById(userId);
+ if (user == null) {
+ return ServerResponse.createByErrorMsg("找不到用户");
+ }
- UserRecharge userRecharge = new UserRecharge();
- userRecharge.setUserId(user.getId());
- userRecharge.setNickName(user.getRealName());
- userRecharge.setAgentId(user.getAgentId());
+ UserRecharge userRecharge = new UserRecharge();
+ userRecharge.setUserId(user.getId());
+ userRecharge.setNickName(user.getRealName());
+ userRecharge.setAgentId(user.getAgentId());
- String ordersn = KeyUtils.getRechargeOrderSn();
- userRecharge.setOrderSn(ordersn);
+ String ordersn = KeyUtils.getRechargeOrderSn();
+ userRecharge.setOrderSn(ordersn);
- userRecharge.setPayChannel(payChannel);
- 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.setPayChannel(payChannel);
+ userRecharge.setPayAmt(new BigDecimal(amt.intValue()));
+ userRecharge.setAddTime(new Date());
+ userRecharge.setPayTime(new Date());
userRecharge.setOrderStatus(Integer.valueOf(1));
-
- this.userMapper.updateById(user);
- } else if (state.intValue() == 2) {
- userRecharge.setOrderStatus(Integer.valueOf(2));
- } else {
- return ServerResponse.createByErrorMsg("订单状态不正确");
+ userRecharge.setPayId(1);
+ userRecharge.setAssetsType(accectType);
+ userAssetsServices.availablebalanceChange(accectType,
+ userId,EUserAssets.TOP_UP,new BigDecimal(amt),"","");
+ int insertCount = this.userRechargeMapper.insert(userRecharge);
+ if (insertCount > 0) {
+ return ServerResponse.createBySuccessMsg("生成订单成功！");
+ }
+ return ServerResponse.createByErrorMsg("生成订单失败，请重试");
+ } catch (Exception e) {
+ return ServerResponse.createByErrorMsg(e.getMessage());
}
-
- int insertCount = this.userRechargeMapper.insert(userRecharge);
- if (insertCount > 0) {
- return ServerResponse.createBySuccessMsg("生成订单成功！");
- }
- return ServerResponse.createByErrorMsg("生成订单失败，请重试");
}
@@ -388,4 +408,11 @@
return userRecharges;
}
+
+ @Override
+ public int countPendingRecharge() {
+ com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<UserRecharge> queryWrapper = new com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<>();
+ queryWrapper.eq("order_status", 0);
+ return this.userRechargeMapper.selectCount(queryWrapper).intValue();
+ }
}
--
Gitblit v1.9.3