From 3be328ff3f0194cab50f361a9abd3db856a76821 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 13 Aug 2025 14:07:40 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/PayServiceImpl.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/PayServiceImpl.java b/src/main/java/com/nq/service/impl/PayServiceImpl.java
index 4fbab25..c169f61 100644
--- a/src/main/java/com/nq/service/impl/PayServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/PayServiceImpl.java
@@ -8,6 +8,8 @@
import com.nq.common.CmcPayConfig;
import com.nq.common.ServerResponse;
import com.nq.dao.*;
+import com.nq.enums.EStockType;
+import com.nq.enums.EUserAssets;
import com.nq.pay.PayUtil;
import com.nq.pojo.*;
import com.nq.service.*;
@@ -83,6 +85,9 @@
@Autowired
PaymentRechargeService paymentRechargeService;
+ @Autowired
+ UserAssetsServices userAssetsServices;
+
public ServerResponse thirdPartyRecharge(HttpServletRequest request, String tradeAmount, Integer type) throws UnsupportedEncodingException, JsonProcessingException, NoSuchAlgorithmException {
// 支付1
String reqUrl = "https://api.watchglb.com/pay/web";
@@ -96,9 +101,9 @@
return ServerResponse.createByErrorCodeMsg(401,googleTranslateUtil.translate("请登录",lang ));
}
- if(type == 1){//支付1
+ if(type == 2){//支付1
return getPaymentOne(tradeAmount, reqUrl,user,request);
- }else if(type == 2){//支付2
+ }else if(type == 1){//支付2
return getPaymentTwo(tradeAmount, uipReqRul, user,request);
}
return ServerResponse.createByErrorMsg("获取支付方式失败",request);
@@ -946,7 +951,7 @@
return;
}else if(vo.getStatus().equals("payin_fail")){
paymentRecharge.setStatus(2);
- paymentRecharge.setAmount(new BigDecimal(vo.getAccount_fee()));
+ paymentRecharge.setAmount(new BigDecimal(vo.getTotal_fee()));
paymentRecharge.setPayInfo(vo.toString());
paymentRechargeService.updateById(paymentRecharge);
userRecharge.setOrderStatus(2);
@@ -962,13 +967,14 @@
.eq(UserAssets::getUserId, paymentRecharge.getUserId())
.eq(UserAssets::getAccectType, "IN")
);
- ServerResponse serverResponse = iUserAssetsServices.updateUserAssets(userAssets.getId(), vo.getAccount_fee().toString(), "2");
- if(serverResponse.getStatus() == 0){
- paymentRecharge.setStatus(2);
- paymentRecharge.setAmount(new BigDecimal(vo.getAccount_fee()));
- paymentRecharge.setPayInfo(vo.toString());
- paymentRechargeService.updateById(paymentRecharge);
- }
+// ServerResponse serverResponse = iUserAssetsServices.updateUserAssets(userAssets.getId(), vo.getTotal_fee().toString(), "2");
+ userAssetsServices.availablebalanceChange(EStockType.IN.getCode(),
+ paymentRecharge.getUserId(), EUserAssets.TOP_UP,new BigDecimal(vo.getTotal_fee().toString()),"","");
+
+ paymentRecharge.setStatus(2);
+ paymentRecharge.setAmount(new BigDecimal(vo.getTotal_fee()));
+ paymentRecharge.setPayInfo(vo.toString());
+ paymentRechargeService.updateById(paymentRecharge);
userRecharge.setOrderStatus(1);
userRechargeMapper.updateById(userRecharge);
--
Gitblit v1.9.3