From 98ab2fc7accdfa1747b37de77c2fd7a0c0721f65 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 21 Aug 2024 20:46:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rb' into rb
---
src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
index 1d51fe0..09ecbaf 100644
--- a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
@@ -305,8 +305,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(EStockType.JP.getCode(),user.getId(), EUserAssets.TOP_UP,userRecharge.getPayAmt(),"","");
}
userRecharge.setOrderStatus(Integer.valueOf((state.intValue() == 1) ? 1 : 2));
userRecharge.setPayTime(new Date());
@@ -351,6 +351,40 @@
return ServerResponse.createByErrorMsg("生成订单失败，请重试");
}
+ @Override
+ public ServerResponse createUSDTOrder(Integer userId, Integer amt,String currency, HttpServletRequest request) {
+ if (userId == null || amt == null) {
+ return ServerResponse.createByErrorMsg("参数不能为空");
+ }
+
+ 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());
+
+ String ordersn = KeyUtils.getRechargeOrderSn();
+ userRecharge.setOrderSn(ordersn);
+
+ userRecharge.setPayChannel("1");
+ userRecharge.setPayAmt(new BigDecimal(amt.intValue()));
+ userRecharge.setAddTime(new Date());
+ userRecharge.setPayTime(new Date());
+ userRecharge.setOrderStatus(Integer.valueOf(0));
+ userRecharge.setPayId(1);
+ userRecharge.setRechargeType(1);
+ userRecharge.setImg(currency);
+ int insertCount = this.userRechargeMapper.insert(userRecharge);
+ if (insertCount > 0) {
+ return ServerResponse.createBySuccessMsg("提交成功",request);
+ }
+ return ServerResponse.createByErrorMsg("提交失败，请重试",request);
+ }
+
public ServerResponse del(Integer cId) {
if (cId == null) {
--
Gitblit v1.9.3