From 87a73c3b49c9203ab3c797c575b9c2b9dea10e7a Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 18 Sep 2025 17:16:20 +0800
Subject: [PATCH] 印度时区
---
src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java | 75 +++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
index ea2e2ff..cd8100a 100644
--- a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
@@ -20,7 +20,6 @@
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;
@@ -47,8 +46,6 @@
AgentUserMapper agentUserMapper;
@Autowired
ISiteSettingService iSiteSettingService;
- @Resource
- UserCashDetailMapper userCashDetailMapper;
@Resource
SitePayMapper sitePayMapper;
@@ -60,8 +57,6 @@
@Autowired
ISiteInfoService iSiteInfoService;
- @Resource
- UserAssetsMapper userAssetsMapper;
public ServerResponse checkInMoney(int maxOrder, Integer userId) {
int count = this.userRechargeMapper.checkInMoney(0, userId);
@@ -151,7 +146,7 @@
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public ServerResponse chargeSuccess(UserRecharge userRecharge) throws Exception {
log.info("充值订单 确认成功操作 id = {}", userRecharge.getId());
@@ -222,9 +217,16 @@
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());
+ //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);
@@ -290,7 +292,7 @@
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public ServerResponse updateState(Integer chargeId, Integer state) throws Exception {
UserRecharge userRecharge = this.userRechargeMapper.selectById(chargeId);
@@ -320,37 +322,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());
- 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("生成订单成功！");
+ userRecharge.setPayChannel(payChannel);
+ userRecharge.setPayAmt(new BigDecimal(amt.intValue()));
+ userRecharge.setAddTime(new Date());
+ userRecharge.setPayTime(new Date());
+ userRecharge.setOrderStatus(Integer.valueOf(1));
+ 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());
}
- return ServerResponse.createByErrorMsg("生成订单失败，请重试");
}
--
Gitblit v1.9.3