From f25b39e0d5fcae415a8824fc03d42fe681e96bf8 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 21 Jul 2025 17:17:48 +0800
Subject: [PATCH] 移除多余引用
---
src/main/java/com/nq/service/impl/PayServiceImpl.java | 190 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 154 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/PayServiceImpl.java b/src/main/java/com/nq/service/impl/PayServiceImpl.java
index 701758b..4a0063a 100644
--- a/src/main/java/com/nq/service/impl/PayServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/PayServiceImpl.java
@@ -1,15 +1,15 @@
package com.nq.service.impl;
import cn.hutool.core.date.DateUtil;
-import cn.hutool.cron.timingwheel.SystemTimer;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.nq.common.CmcPayConfig;
+import com.nq.common.ResponseCode;
import com.nq.common.ServerResponse;
import com.nq.dao.*;
+import com.nq.enums.EStockType;
import com.nq.pay.PayUtil;
import com.nq.pojo.*;
import com.nq.service.*;
@@ -32,7 +32,6 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
-import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -86,16 +85,78 @@
@Autowired
PaymentRechargeService paymentRechargeService;
- public ServerResponse thirdPartyRecharge(HttpServletRequest request, String tradeAmount) throws UnsupportedEncodingException, JsonProcessingException {
+ public ServerResponse thirdPartyRecharge(HttpServletRequest request, String tradeAmount, Integer type) throws UnsupportedEncodingException, JsonProcessingException, NoSuchAlgorithmException {
+ // 支付1
+ String reqUrl = "https://api.watchglb.com/pay/web";
+ // 支付2
+ String uipReqRul = "https://v2.fastechservicepro.com/payin/unifiedorder";
- String reqUrl = "https://api.watchglbpay.com/pay/web";
+ User user = userService.getCurrentRefreshUser(request);
+ if(ObjectUtils.isEmpty(user)){
+ GoogleTranslateUtil googleTranslateUtil = new GoogleTranslateUtil();
+ String lang = request.getHeader("lang");
+ return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),googleTranslateUtil.translate("请登录",lang ));
+ }
-// User user = userService.getCurrentRefreshUser(request);
-// if(ObjectUtils.isNotEmpty(user)){
-// GoogleTranslateUtil googleTranslateUtil = new GoogleTranslateUtil();
-// String lang = request.getHeader("lang");
-// return ServerResponse.createByErrorMsg(new Gson().toJson(ServerResponse.createByErrorCodeMsg(401,googleTranslateUtil.translate("请登录",lang ))));
-// }
+ if(type == 1){//支付1
+ return getPaymentOne(tradeAmount, reqUrl,user,request);
+ }else if(type == 2){//支付2
+ return getPaymentTwo(tradeAmount, uipReqRul, user,request);
+ }
+ return ServerResponse.createByErrorMsg("获取支付方式失败",request);
+ }
+
+
+ //支付2
+ private ServerResponse getPaymentTwo(String tradeAmount, String uipReqRul, User user, HttpServletRequest request) throws UnsupportedEncodingException, NoSuchAlgorithmException, JsonProcessingException {
+ // 示例参数
+ Map<String, String> params = new HashMap<>();
+ params.put("merchantid", "T805673557385213"); // 商户号
+ params.put("out_trade_no", generatePayOrderId()); // 商户订单号
+ // 转换为 BigDecimal
+ BigDecimal amount = new BigDecimal(tradeAmount);
+
+ // 保留两位小数，四舍五入
+ amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
+ params.put("total_fee", String.valueOf(amount)); // 交易金额（保留两位小数）
+ params.put("notify_url", "https://api.durocaspitall.com/user/rechargeCallbackTwo.do"); // 异步通知地址
+ params.put("reply_type", "URL"); // 执行方式
+ params.put("timestamp", String.valueOf(System.currentTimeMillis())); // 时间戳
+ params.put("customer_name", StringUtils.isEmpty(UserNameUtil.formatCustomerName(user.getNickName())) ? "IsNotSet" : UserNameUtil.formatCustomerName(user.getNickName())); // 客户姓名
+ params.put("customer_mobile", user.getPhone()); // 客户手机号
+ params.put("customer_email", "test@gmail.com"); // 客户手机号
+ // 生成签名
+ String sign = SignatureGeneratorUtil.generateSign(params,"0cfc8e1a446a1e5214b4032f2d6007e2");
+ params.put("sign", sign); // 客户邮箱
+ // 打印生成的签名
+ System.out.println("Generated Sign: " + sign);
+ log.info("-------支付2-----："+params.toString());
+ String result = HttpClientUtil.doPost(uipReqRul, params, "utf-8");
+ log.info("-------支付2返回参数-----"+result.toString());
+
+ ObjectMapper objectMapper = new ObjectMapper();
+ ApiResponse payResponse = objectMapper.readValue(result, ApiResponse.class);
+ if(payResponse.getCode() != 0 && !payResponse.getMessage().equals("success")){
+ log.error("充值2下单失败："+params);
+ return ServerResponse.createByErrorMsg("获取充值2链接失败",request);
+ }
+
+ PaymentRecharge paymentRecharge = new PaymentRecharge();
+ paymentRecharge.setUserId(user.getId());
+ paymentRecharge.setOrderNo(params.get("out_trade_no"));
+ paymentRecharge.setMchOrderNo(payResponse.getData().getOrder_number());
+ paymentRecharge.setAmount(new BigDecimal(payResponse.getData().getReal_fee()));
+ paymentRecharge.setStatus(1);
+ paymentRecharge.setPaymentTime(new Date());
+ paymentRecharge.setCreatedAt(new Date());
+ paymentRecharge.setNotifyUrl(getOrderTime());
+ paymentRecharge.setPayInfo(payResponse.toString());
+ paymentRechargeService.save(paymentRecharge);
+ return ServerResponse.createBySuccess(payResponse.getData().getUrl());
+ }
+
+ //支付1
+ private ServerResponse getPaymentOne(String tradeAmount, String reqUrl, User user, HttpServletRequest request) throws JsonProcessingException {
Map<String, String> params = new TreeMap<String, String>();
//版本号 需同步返回JSON 必填，固定值 1.0
params.put("version", "1.0");
@@ -103,20 +164,20 @@
// params.put("goods_name", "用户："+user.getId()+",充值");
params.put("goods_name", "用户充值");
//商户号 平台分配唯一
- params.put("mch_id", "222887002");
+ params.put("mch_id", "100789033");
//商家订单号 保证每笔订单唯一
params.put("mch_order_no", generatePayOrderId());
//异步通知地址 不超过 200 字节,支付成功后发起,不能携带参数
- params.put("notify_url", "http://api.durocaspitall.com/user/rechargeCallback.do");
+ params.put("notify_url", "https://api.durocaspitall.com/user/rechargeCallback.do");
// 订单时间 时间格式yyyy-MM-dd HH:mm:ss
params.put("order_date", getOrderTime());
//支付类型 请查阅商户后台通道编码
- params.put("pay_type", "104");
+ params.put("pay_type", "151");
//交易金额 以元为单位
params.put("trade_amount", tradeAmount);
//商户秘钥必填
- String merchant_key = "8979d78b437948f18c14628ff1ad5f41";
+ String merchant_key = "6ef36aa4d88a47a9a177c33c7199fff6";
String signInfo = SignUtil.sortData(params);
// 签名 signInfo签名参数排序， merchant_key商户私钥
@@ -133,9 +194,6 @@
System.out.println("result值：" + result);
- if(StringUtils.isEmpty(result)){
- return ServerResponse.createByErrorMsg("获取充值链接失败",request);
- }
// 创建 ObjectMapper 实例
ObjectMapper objectMapper = new ObjectMapper();
@@ -146,7 +204,7 @@
return ServerResponse.createByErrorMsg("获取充值链接失败",request);
}
PaymentRecharge paymentRecharge = new PaymentRecharge();
- paymentRecharge.setUserId(1);
+ paymentRecharge.setUserId(user.getId());
paymentRecharge.setOrderNo(payResponse.getOrderNo());
paymentRecharge.setMchOrderNo(payResponse.getMchOrderNo());
paymentRecharge.setAmount(new BigDecimal(payResponse.getOriAmount()));
@@ -156,7 +214,7 @@
paymentRecharge.setNotifyUrl(payResponse.getPayInfo());
paymentRecharge.setPayInfo(payResponse.toString());
paymentRechargeService.save(paymentRecharge);
- return ServerResponse.createBySuccessMsg(result);
+ return ServerResponse.createBySuccess(payResponse.getPayInfo());
}
public String generatePayOrderId() {
@@ -180,8 +238,6 @@
// 格式化当前时间
return now.format(formatter);
}
-
-
public ServerResponse juhe1(String payType, String payAmt, HttpServletRequest request) {
@@ -335,7 +391,7 @@
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public ServerResponse flyPay(Integer payType, String payAmt, String currency, HttpServletRequest request) {
User user = iUserService.getCurrentUser(request);
SitePay sitePay = sitePayMapper.selectById(payType);
@@ -642,35 +698,47 @@
}
@Override
- public void rechargeCallback(HttpServletResponse response,RechargeCallbackVo rechargeCallbackVo) throws IOException {
- synchronized (rechargeCallbackVo.getOrderNo()){
+ public void rechargeCallback(PaymentResponse vo,HttpServletResponse response) throws IOException {
+ log.info("充值回调进来了："+vo.toString());
+ synchronized (vo.getOrderNo()){
PrintWriter pw = response.getWriter();
- if(!rechargeCallbackVo.getTradeResult().equals("1")){
- log.error("充值回调失败："+rechargeCallbackVo.toString());
- return;
- }
+
PaymentRecharge paymentRecharge = paymentRechargeService.getOne(new LambdaQueryWrapper<>(PaymentRecharge.class)
- .eq(PaymentRecharge::getOrderNo, rechargeCallbackVo.getOrderNo())
- .eq(PaymentRecharge::getMchOrderNo, rechargeCallbackVo.getMchOrderNo())
+ .eq(PaymentRecharge::getOrderNo, vo.getOrderNo())
+ .eq(PaymentRecharge::getMchOrderNo, vo.getMchOrderNo())
.eq(PaymentRecharge::getStatus,1)
.last("limit 1")
);
+
+ if(!vo.getTradeResult().equals("1")){
+ paymentRecharge.setStatus(2);
+ paymentRecharge.setAmount(new BigDecimal(vo.getOriAmount()));
+ paymentRecharge.setPayInfo(vo.toString());
+ paymentRechargeService.updateById(paymentRecharge);
+ log.error("充值回调失败："+vo.toString());
+ return;
+ }
+
if(ObjectUtils.isEmpty(paymentRecharge)){
- pw.print("未找到充值订单");
+ log.info("未找到充值订单");
+ pw.print("error 未找到充值订单");
return;
}
UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<>(UserAssets.class)
.eq(UserAssets::getUserId, paymentRecharge.getUserId())
- .eq(UserAssets::getAccectType, "IN")
+ .eq(UserAssets::getAccectType, EStockType.MX.getCode())
);
- ServerResponse serverResponse = iUserAssetsServices.updateUserAssets(userAssets.getId(), rechargeCallbackVo.getAmount().toString(), "2");
+ ServerResponse serverResponse = iUserAssetsServices.updateUserAssets(userAssets.getId(), vo.getOriAmount().toString(), "2");
if(serverResponse.getStatus() == 0){
paymentRecharge.setStatus(2);
- paymentRecharge.setAmount(new BigDecimal(rechargeCallbackVo.getAmount()));
- paymentRecharge.setPayInfo(rechargeCallbackVo.toString());
+ paymentRecharge.setAmount(new BigDecimal(vo.getOriAmount()));
+ paymentRecharge.setPayInfo(vo.toString());
paymentRechargeService.updateById(paymentRecharge);
}
+ log.info("充值回调----完成");
pw.print("success");
+ pw.flush();
+ pw.close();
}
}
@@ -836,4 +904,54 @@
return retMap;
}
+
+ public void rechargeCallbackTwo(TransactionStatusVo vo, HttpServletResponse response) throws IOException {
+
+ log.info("充值回调进来了："+vo.toString());
+ synchronized (vo.getOut_trade_no()){
+ PrintWriter pw = response.getWriter();
+
+ PaymentRecharge paymentRecharge = paymentRechargeService.getOne(new LambdaQueryWrapper<>(PaymentRecharge.class)
+ .eq(PaymentRecharge::getMchOrderNo, vo.getOut_trade_no())
+ .eq(PaymentRecharge::getStatus,1)
+ .last("limit 1")
+ );
+
+ if(!vo.getStatus().equals("payin_ing")){
+ log.error("充值2回调交易中："+vo.toString());
+ return;
+ }
+
+ if(!vo.getStatus().equals("payin_fail")){
+ paymentRecharge.setStatus(2);
+ paymentRecharge.setAmount(new BigDecimal(vo.getAccount_fee()));
+ paymentRecharge.setPayInfo(vo.toString());
+ paymentRechargeService.updateById(paymentRecharge);
+ log.error("充值回调失败："+vo.toString());
+ return;
+ }
+
+ if(ObjectUtils.isEmpty(paymentRecharge)){
+ log.info("未找到充值订单");
+ pw.print("error 未找到充值订单");
+ return;
+ }
+ UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<>(UserAssets.class)
+ .eq(UserAssets::getUserId, paymentRecharge.getUserId())
+ .eq(UserAssets::getAccectType, EStockType.MX.getCode())
+ );
+ 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);
+ }
+ log.info("充值回调----完成");
+ pw.print("success");
+ pw.flush();
+ pw.close();
+ }
+
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3