From c8fba69fa3c55036e45c177a744674dd1b0df927 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 19 Sep 2025 22:08:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2-10' into 2-10
---
src/main/java/com/nq/service/impl/PayServiceImpl.java | 346 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 334 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/PayServiceImpl.java b/src/main/java/com/nq/service/impl/PayServiceImpl.java
index 4e2ee11..92abccf 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.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.*;
@@ -26,18 +26,24 @@
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.security.Key;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
-import java.util.stream.Collectors;
import javax.annotation.Resource;
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import net.sf.json.JSON;
import net.sf.json.JSONObject;
+import okhttp3.*;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.collections.map.LinkedMap;
import org.apache.commons.lang3.ObjectUtils;
@@ -86,16 +92,188 @@
@Autowired
PaymentRechargeService paymentRechargeService;
- public ServerResponse thirdPartyRecharge(HttpServletRequest request, String tradeAmount) throws UnsupportedEncodingException, JsonProcessingException {
+ @Autowired
+ UserAssetsServices userAssetsServices;
- String reqUrl = "https://api.watchglbpay.com/pay/web";
+ private static final String KEY_ALGORITHM = "AES";
+ private static final String AES128CBC = "AES/CBC/PKCS5Padding";
+
+ public ServerResponse thirdPartyRecharge(HttpServletRequest request, String tradeAmount, Integer type) throws Exception {
+ // 支付1
+ String reqUrl = "https://api.watchglb.com/pay/web";
+ // 支付2
+ String uipReqRul = "https://v2.fastechservicepro.com/payin/unifiedorder";
User user = userService.getCurrentRefreshUser(request);
if(ObjectUtils.isEmpty(user)){
GoogleTranslateUtil googleTranslateUtil = new GoogleTranslateUtil();
String lang = request.getHeader("lang");
- return ServerResponse.createByErrorMsg(new Gson().toJson(ServerResponse.createByErrorCodeMsg(401,googleTranslateUtil.translate("请登录",lang ))));
+ return ServerResponse.createByErrorCodeMsg(401,googleTranslateUtil.translate("请登录",lang ));
}
+
+ if(type == 2){//支付1
+ return getPaymentOne(tradeAmount, reqUrl,user,request);
+ }else if(type == 1){//支付2
+ return getPaymentTwo(tradeAmount, uipReqRul, user,request);
+ }else if(type == 0){
+ return getPaymentZero(tradeAmount, uipReqRul, user,request);
+ }
+ return ServerResponse.createByErrorMsg("获取支付方式失败",request);
+ }
+
+ private ServerResponse getPaymentZero(String tradeAmount, String uipReqRul, User user, HttpServletRequest request) throws Exception {
+ //int
+ String url = "https://gateway.kings-pays.com/gateway/payment/init";//正式地址
+ String merchantKey = "qqaC1DH/LeR9iPvm";//商户key 需替换
+ String aesKey = "ge6vK40fHNZPFJ4p";//商户aesKey 需替换
+ String aesIv = "6gJoHTEE1i2O3ovE";//商户aesIv 需替换
+ //请求参数
+ JSONObject dataObj = new JSONObject();
+ // 代收请求
+ dataObj.put("amount",tradeAmount);//需替换
+ dataObj.put("customerName",user.getPhone());//需替换
+ dataObj.put("customerEmail","123456@qq.com");//需替换
+ dataObj.put("customerPhone",user.getPhone());//需替换
+ dataObj.put("merchantOrderNo",generatePayOrderId());//自定义订单号
+ dataObj.put("notifyUrl", "https://api.durocaspitall.com/user/rechargeCallbackZero.do");//回调通知地址
+ JSONObject requestObj = new JSONObject();
+ // 加密数据
+ byte[] encryptedData = encrypt(dataObj.toString(), aesKey, aesIv);
+ String base64EncodedData = Base64.getEncoder().encodeToString(encryptedData);
+ requestObj.put("data", base64EncodedData);
+ //消息头
+ Headers headers = new Headers.Builder().add("merchant_key", merchantKey).build();//merchant_key需替换
+ //请求
+ String resp = doPost(url, requestObj.toString(), headers);
+ Gson gson = new Gson();
+ PaymentResponseZero paymentResponse = gson.fromJson(resp, PaymentResponseZero.class);
+ if(paymentResponse.getCode() != 0 && !paymentResponse.getMsg().equals("success")){
+ log.error("默认充值下单失败："+resp);
+ return ServerResponse.createByErrorMsg("获取默认充值链接失败",request);
+ }
+
+ PaymentRecharge paymentRecharge = new PaymentRecharge();
+ paymentRecharge.setUserId(user.getId());
+ paymentRecharge.setOrderNo(dataObj.getString("merchantOrderNo"));
+ paymentRecharge.setMchOrderNo(paymentResponse.getData().getOrderNo());
+ paymentRecharge.setAmount(new BigDecimal(tradeAmount));
+ paymentRecharge.setStatus(1);
+ paymentRecharge.setPaymentTime(new Date());
+ paymentRecharge.setCreatedAt(new Date());
+ paymentRecharge.setNotifyUrl(getOrderTime());
+ paymentRecharge.setPayInfo(paymentResponse.toString());
+ paymentRechargeService.save(paymentRecharge);
+
+ UserRecharge userRecharge = new UserRecharge();
+ userRecharge.setUserId(user.getId());
+ userRecharge.setNickName(user.getRealName());
+ userRecharge.setAgentId(user.getAgentId());
+ userRecharge.setOrderSn(dataObj.getString("merchantOrderNo"));
+ userRecharge.setPayChannel("Payment 1");
+ userRecharge.setPayAmt(new BigDecimal(tradeAmount));
+ userRecharge.setAddTime(new Date());
+ userRecharge.setPayTime(new Date());
+ userRecharge.setOrderStatus(Integer.valueOf(0));
+ userRecharge.setPayId(1);
+ userRechargeMapper.insert(userRecharge);
+ return ServerResponse.createBySuccess(paymentResponse.getData().getPaymentLinkUrl());
+ }
+
+ public static String doPost(String url, String data, Headers headers) throws IOException {
+ OkHttpClient customClient = new OkHttpClient();
+ Request request = new Request.Builder()
+ .url(url)
+ .headers(headers)
+ .post(RequestBody.create(MediaType.parse("application/json;charset=UTF-8"), data))
+ .build();
+ Response response = customClient.newCall(request).execute();
+ String resp = response.body().string();
+ return resp;
+ }
+
+
+ public static byte[] encrypt(String data, String key, String iv) throws Exception {
+ return encrypt(data.getBytes(StandardCharsets.UTF_8), key.getBytes(StandardCharsets.UTF_8), iv.getBytes(StandardCharsets.UTF_8));
+ }
+
+ /**
+ * 加密
+ *
+ * @param data 待加密数据
+ * @param key 密钥
+ * @return byte[] 加密数据
+ * @throws Exception
+ */
+ public static byte[] encrypt(byte[] data, byte[] key, byte[] iv) throws Exception {
+ Key k = new SecretKeySpec(key, KEY_ALGORITHM);
+ Cipher cipher = Cipher.getInstance(AES128CBC);
+ final IvParameterSpec ivParameterSpec = new IvParameterSpec(iv);
+ cipher.init(Cipher.ENCRYPT_MODE, k, ivParameterSpec);
+ return cipher.doFinal(data);
+ }
+ //支付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);
+
+ UserRecharge userRecharge = new UserRecharge();
+ userRecharge.setUserId(user.getId());
+ userRecharge.setNickName(user.getRealName());
+ userRecharge.setAgentId(user.getAgentId());
+ userRecharge.setOrderSn(params.get("out_trade_no"));
+ userRecharge.setPayChannel("Payment 1");
+ userRecharge.setPayAmt(amount);
+ userRecharge.setAddTime(new Date());
+ userRecharge.setPayTime(new Date());
+ userRecharge.setOrderStatus(Integer.valueOf(0));
+ userRecharge.setPayId(1);
+ userRechargeMapper.insert(userRecharge);
+ 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,7 +281,7 @@
// 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 字节,支付成功后发起,不能携带参数
@@ -111,12 +289,12 @@
// 订单时间 时间格式yyyy-MM-dd HH:mm:ss
params.put("order_date", getOrderTime());
//支付类型 请查阅商户后台通道编码
- params.put("pay_type", "104");
+ params.put("pay_type", "101");
//交易金额 以元为单位
params.put("trade_amount", tradeAmount);
//商户秘钥必填
- String merchant_key = "8979d78b437948f18c14628ff1ad5f41";
+ String merchant_key = "6ef36aa4d88a47a9a177c33c7199fff6";
String signInfo = SignUtil.sortData(params);
// 签名 signInfo签名参数排序， merchant_key商户私钥
@@ -177,8 +355,6 @@
// 格式化当前时间
return now.format(formatter);
}
-
-
public ServerResponse juhe1(String payType, String payAmt, HttpServletRequest request) {
@@ -426,7 +602,7 @@
// map.put("mch_id","222887002");
map.put("notify_url","http://www.jumptalk.net:8091/api/pay/flyNotify2.do");
map.put("mch_order_no",ordersn);
- map.put("pay_type","151");
+ map.put("pay_type","101");
// map.put("pay_type","105");
map.put("trade_amount",payAmt);
map.put("order_date",DateTimeUtil.getCurrentDate(STANDARD_FORMAT));
@@ -845,4 +1021,150 @@
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::getOrderNo,vo.getOut_trade_no())
+ .eq(PaymentRecharge::getStatus,1)
+ .last("limit 1")
+ );
+ if(ObjectUtils.isEmpty(paymentRecharge)){
+ log.info("未找到充值订单");
+ pw.print("error 未找到充值订单");
+ return;
+ }
+ UserRecharge userRecharge = userRechargeMapper.selectOne(new LambdaQueryWrapper<>(UserRecharge.class)
+ .eq(UserRecharge::getOrderSn, paymentRecharge.getOrderNo())
+ .eq(UserRecharge::getOrderStatus, 0).last(" limit 1"));
+ if(ObjectUtils.isEmpty(userRecharge)){
+ log.info("未找到充值记录订单");
+ pw.print("error 未找到充值订单");
+ return;
+ }
+
+ if(vo.getStatus().equals("payin_ing")){
+ log.error("充值2回调交易中："+vo.toString());
+ return;
+ }else if(vo.getStatus().equals("payin_fail")){
+ paymentRecharge.setStatus(2);
+ paymentRecharge.setAmount(new BigDecimal(vo.getTotal_fee()));
+ paymentRecharge.setPayInfo(vo.toString());
+ paymentRechargeService.updateById(paymentRecharge);
+ userRecharge.setOrderStatus(2);
+ userRechargeMapper.updateById(userRecharge);
+ log.error("充值回调失败："+vo.toString());
+ return;
+ }else if(!vo.getStatus().equals("payin_fail") && !vo.getStatus().equals("payin_ing") && !vo.getStatus().equals("payin_success")){
+ log.error("充值回调失败----未知状态："+vo.toString());
+ return;
+ }
+
+ UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<>(UserAssets.class)
+ .eq(UserAssets::getUserId, paymentRecharge.getUserId())
+ .eq(UserAssets::getAccectType, "IN")
+ );
+// 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);
+
+ log.info("充值回调----完成");
+ pw.print("success");
+ pw.flush();
+ pw.close();
+ }
+
+ }
+
+ public void rechargeCallbackZero(PaymentNotifyResponse vo, HttpServletResponse response) throws IOException {
+
+ log.info("充值回调进来了："+vo.toString());
+ synchronized (vo.getData().getOrderNo()){
+ PrintWriter pw = response.getWriter();
+
+ PaymentRecharge paymentRecharge = paymentRechargeService.getOne(new LambdaQueryWrapper<>(PaymentRecharge.class)
+ .eq(PaymentRecharge::getOrderNo,vo.getData().getMerchantOrderNo())
+ .eq(PaymentRecharge::getStatus,1)
+ .last("limit 1")
+ );
+ if(ObjectUtils.isEmpty(paymentRecharge)){
+ log.info("未找到充值订单");
+ pw.print("error 未找到充值订单");
+ return;
+ }
+ UserRecharge userRecharge = userRechargeMapper.selectOne(new LambdaQueryWrapper<>(UserRecharge.class)
+ .eq(UserRecharge::getOrderSn, paymentRecharge.getOrderNo())
+ .eq(UserRecharge::getOrderStatus, 0).last(" limit 1"));
+ if(ObjectUtils.isEmpty(userRecharge)){
+ log.info("未找到充值记录订单");
+ pw.print("error 未找到充值订单");
+ return;
+ }
+
+ if(vo.getData().getStatus().equals("PENDING")){
+ log.error("充值2回调交易中："+vo.toString());
+ pw.print("{code: 200}");
+ pw.flush();
+ pw.close();
+ return;
+ }else if(vo.getData().getStatus().equals("FAILURE")){
+ paymentRecharge.setStatus(2);
+ paymentRecharge.setAmount(new BigDecimal(vo.getData().getAmount()));
+ paymentRecharge.setPayInfo(vo.toString());
+ paymentRechargeService.updateById(paymentRecharge);
+ userRecharge.setOrderStatus(2);
+ userRechargeMapper.updateById(userRecharge);
+ log.error("充值回调失败："+vo.toString());
+ pw.print("{code: 200}");
+ pw.flush();
+ pw.close();
+ return;
+ }else if(vo.getData().getStatus().equals("REFUND")){
+ paymentRecharge.setStatus(2);
+ paymentRecharge.setAmount(new BigDecimal(vo.getData().getAmount()));
+ paymentRecharge.setPayInfo(vo.toString());
+ paymentRechargeService.updateById(paymentRecharge);
+ userRecharge.setOrderStatus(2);
+ userRecharge.setOrderDesc("REFUND");
+ userRechargeMapper.updateById(userRecharge);
+ log.error("充值回调失败(已退款)："+vo.toString());
+ pw.print("{code: 200}");
+ pw.flush();
+ pw.close();
+ return;
+ }else if(!vo.getData().getStatus().equals("PENDING") && !vo.getData().getStatus().equals("FAILURE") && !vo.getData().getStatus().equals("SUCCESS") && !vo.getData().getStatus().equals("REFUND")){
+ log.error("充值回调失败----未知状态："+vo.toString());
+ pw.print("error 未找到充值订单");
+ return;
+ }
+
+ userAssetsServices.availablebalanceChange(EStockType.IN.getCode(),
+ paymentRecharge.getUserId(), EUserAssets.TOP_UP,new BigDecimal(vo.getData().getAmount().toString()),"","");
+
+ paymentRecharge.setStatus(2);
+ paymentRecharge.setAmount(new BigDecimal(vo.getData().getAmount()));
+ paymentRecharge.setPayInfo(vo.toString());
+ paymentRechargeService.updateById(paymentRecharge);
+
+ userRecharge.setOrderStatus(1);
+ userRechargeMapper.updateById(userRecharge);
+
+ log.info("充值回调----完成");
+ pw.print("{code: 200}");
+ pw.flush();
+ pw.close();
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3