From 539f733f62f4a368eb90a07a729b5d948378a705 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sat, 19 Jul 2025 18:29:07 +0800
Subject: [PATCH] 后台新增建仓列表 新股列表新增购买状态
---
src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java | 81 ++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
index 280d90e..26c3b6c 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;
@@ -149,7 +151,7 @@
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public ServerResponse chargeSuccess(UserRecharge userRecharge) throws Exception {
log.info("充值订单 确认成功操作 id = {}", userRecharge.getId());
@@ -221,13 +223,8 @@
for (int i = 0; i <userRecharges.size() ; i++) {
SitePay s = sitePayMapper.selectById(userRecharges.get(i).getPayId());
- if(s.getAssetsType().equals("US")){
- userRecharges.get(i).setAssetsType("$");
- userRecharges.get(i).setChannelName("USD");
- }else{
- userRecharges.get(i).setAssetsType("RM");
- userRecharges.get(i).setChannelName("MYR");
- }
+ userRecharges.get(i).setAssetsType(EStockType.MX.getSymbol1());
+ userRecharges.get(i).setChannelName(EStockType.MX.getSymbol());
}
return ServerResponse.createBySuccess(pageInfo);
@@ -278,13 +275,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);
@@ -319,43 +325,36 @@
return ServerResponse.createByErrorMsg("参数不能为空");
}
- User user = this.userMapper.selectById(userId);
- if (user == null) {
- return ServerResponse.createByErrorMsg("找不到用户");
- }
+ 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);
+ userAssetsServices.availablebalanceChange(EStockType.MX.getCode(),
+ 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("生成订单失败，请重试");
}
--
Gitblit v1.9.3