From 662ae3929a78bc6ab44d12519c6d3d3910c8b5c0 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 08 Apr 2026 18:41:57 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/PayServiceImpl.java | 550 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 442 insertions(+), 108 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/PayServiceImpl.java b/src/main/java/com/nq/service/impl/PayServiceImpl.java
index c61efce..f1aec9f 100644
--- a/src/main/java/com/nq/service/impl/PayServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/PayServiceImpl.java
@@ -6,6 +6,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.nq.common.CmcPayConfig;
+import com.nq.common.PayV2GatewayKeys;
import com.nq.common.ServerResponse;
import com.nq.dao.*;
import com.nq.enums.EStockType;
@@ -14,7 +15,9 @@
import com.nq.pojo.*;
import com.nq.service.*;
import com.nq.utils.*;
+import com.nq.utils.http.HttpClientRequest;
import com.nq.utils.http.HttpClientUtil;
+import com.nq.utils.pay.PayV2RsaSignUtil;
import com.nq.utils.pay.CmcPayOuterRequestUtil;
import com.nq.utils.pay.CmcPayTool;
import com.nq.utils.timeutil.DateTimeUtil;
@@ -25,6 +28,7 @@
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.security.Key;
@@ -104,6 +108,11 @@
private static final String KEY_ALGORITHM = "AES";
private static final String AES128CBC = "AES/CBC/PKCS5Padding";
+ /** 代收 v2/payCreate 完整 URL（由商户后台提供域名与路径） */
+ private static final String PAY_V2_PAY_CREATE_URL = "https://pay.kkpay100.com/v2/payCreate";
+ /** 商户 id */
+ private static final int PAY_V2_MID = 10724;
+
public ServerResponse thirdPartyRecharge(HttpServletRequest request, String tradeAmount, Integer type) throws Exception {
// 支付1
String reqUrl = "https://api.watchglb.com/pay/web";
@@ -127,8 +136,127 @@
return getPaymentTwo(tradeAmount, uipReqRul, user,request);
}else if(type == 1){
return getPaymentThree(tradeAmount, threeUrl, user,request);
+ }else if(type == 4){
+ return getPaymentFour(tradeAmount, user, request);
}
return ServerResponse.createByErrorMsg("获取支付方式失败",request);
+ }
+
+ /**
+ * 支付4：代收 v2/payCreate（JSON）
+ */
+ private ServerResponse getPaymentFour(String tradeAmount, User user, HttpServletRequest request) throws Exception {
+ String orderId = generatePayOrderId();
+ BigDecimal amount = new BigDecimal(tradeAmount).setScale(2, RoundingMode.HALF_UP);
+
+ String notifyUrl = "https://api.nalandacapital.mom/user/rechargeCallbackFour.do";
+ String custId = "U" + user.getId();
+ String mobile = StringUtils.isNotBlank(user.getPhone()) ? user.getPhone() : "0000000000";
+ if (mobile.length() > 16) {
+ mobile = mobile.substring(0, 16);
+ }
+ String fn = UserNameUtil.formatCustomerName(user.getNickName());
+ if (StringUtils.isBlank(fn)) {
+ fn = "User";
+ }
+ if (fn.length() > 16) {
+ fn = fn.substring(0, 16);
+ }
+ String ln = String.valueOf(user.getId());
+ if (ln.length() > 16) {
+ ln = ln.substring(0, 16);
+ }
+ String email = custId + "@user.local";
+ if (email.length() > 64) {
+ email = email.substring(0, 64);
+ }
+
+ Map<String, String> signParams = new TreeMap<>();
+ signParams.put("amount", amount.toPlainString());
+ signParams.put("currency", "INR");
+ signParams.put("custId", custId);
+ signParams.put("email", email);
+ signParams.put("firstName", fn);
+ signParams.put("lastName", ln);
+ signParams.put("mid", String.valueOf(PAY_V2_MID));
+ signParams.put("mobile", mobile);
+ signParams.put("notifyUrl", notifyUrl);
+ signParams.put("orderId", orderId);
+ String signBaseString = PayV2RsaSignUtil.buildStringA(signParams);
+ String sign = PayV2RsaSignUtil.sign(signBaseString, PayV2GatewayKeys.MERCHANT_PRIVATE_KEY_PEM);
+ log.info("支付4代收签名串 stringA={}", signBaseString);
+
+ Map<String, Object> body = new LinkedHashMap<>();
+ body.put("mid", PAY_V2_MID);
+ body.put("orderId", orderId);
+ body.put("amount", amount.toPlainString());
+ body.put("currency", "INR");
+ body.put("custId", custId);
+ body.put("firstName", fn);
+ body.put("lastName", ln);
+ body.put("mobile", mobile);
+ body.put("email", email);
+ body.put("notifyUrl", notifyUrl);
+ body.put("sign", sign);
+
+ String json = new Gson().toJson(body);
+ log.info("支付4代收请求：{}", json);
+ String result = HttpClientRequest.doPostJsonBody(PAY_V2_PAY_CREATE_URL, json);
+ log.info("支付4代收返回：{}", result);
+
+ ObjectMapper objectMapper = new ObjectMapper();
+ PayV2PayCreateResponse resp = objectMapper.readValue(result, PayV2PayCreateResponse.class);
+ if (resp.getStatus() != 1 || resp.getData() == null) {
+ log.error("支付4下单失败：{}", result);
+ return ServerResponse.createByErrorMsg(
+ StringUtils.isNotBlank(resp.getMsg()) ? resp.getMsg() : "获取支付链接失败", request);
+ }
+
+ PayV2PayCreateResponse.Data data = resp.getData();
+ Map<String, String> respSignParams = new TreeMap<>();
+ if (StringUtils.isNotBlank(data.getAmount())) {
+ respSignParams.put("amount", data.getAmount());
+ }
+ if (StringUtils.isNotBlank(data.getMOrder())) {
+ respSignParams.put("m_order", data.getMOrder());
+ }
+ if (StringUtils.isNotBlank(data.getOrderId())) {
+ respSignParams.put("order_id", data.getOrderId());
+ }
+ if (StringUtils.isNotBlank(data.getUrl())) {
+ respSignParams.put("url", data.getUrl());
+ }
+ if (!PayV2RsaSignUtil.verify(respSignParams, data.getSign(), PayV2GatewayKeys.PLATFORM_PUBLIC_KEY)) {
+ log.warn("支付4返回签名验证未通过，stringA={}, sign={}",
+ PayV2RsaSignUtil.buildStringA(respSignParams), data.getSign());
+ }
+
+ PaymentRecharge paymentRecharge = new PaymentRecharge();
+ paymentRecharge.setUserId(user.getId());
+ paymentRecharge.setOrderNo(orderId);
+ paymentRecharge.setMchOrderNo(data.getOrderId());
+ paymentRecharge.setAmount(amount);
+ paymentRecharge.setStatus(1);
+ paymentRecharge.setPaymentTime(new Date());
+ paymentRecharge.setCreatedAt(new Date());
+ paymentRecharge.setNotifyUrl(notifyUrl);
+ paymentRecharge.setPayInfo(result);
+ paymentRechargeService.save(paymentRecharge);
+
+ UserRecharge userRecharge = new UserRecharge();
+ userRecharge.setUserId(user.getId());
+ userRecharge.setNickName(user.getRealName());
+ userRecharge.setAgentId(user.getAgentId());
+ userRecharge.setOrderSn(orderId);
+ userRecharge.setPayChannel("Payment 4");
+ userRecharge.setPayAmt(amount);
+ userRecharge.setAddTime(new Date());
+ userRecharge.setPayTime(new Date());
+ userRecharge.setOrderStatus(0);
+ userRecharge.setPayId(4);
+ userRechargeMapper.insert(userRecharge);
+
+ return ServerResponse.createBySuccess(data.getUrl());
}
private ServerResponse getPaymentZero(String tradeAmount, String uipReqRul, User user, HttpServletRequest request) throws Exception {
@@ -145,7 +273,7 @@
dataObj.put("customerEmail","123456@qq.com");//需替换
dataObj.put("customerPhone",user.getPhone());//需替换
dataObj.put("merchantOrderNo",generatePayOrderId());//自定义订单号
- dataObj.put("notifyUrl", "https://api.greenbackcaps.top/user/rechargeCallbackZero.do");//回调通知地址
+ dataObj.put("notifyUrl", "https://api.nalandacapital.mom/user/rechargeCallbackZero.do");//回调通知地址
JSONObject requestObj = new JSONObject();
log.info("代收参数：{}", dataObj);
// 加密数据
@@ -244,8 +372,8 @@
params.put("merchant_order_id", merchantOrderId);
params.put("amount", amount.toString());
params.put("pay_channel", payChannel);
- params.put("notify_url", "https://api.greenbackcaps.top/user/rechargeCallbackThree.do"); // 异步通知地址
- params.put("page_return_url", "https://stock.greenbackcaps.top/#/user"); // 前端返回地址
+ params.put("notify_url", "https://api.nalandacapital.mom/user/rechargeCallbackThree.do"); // 异步通知地址
+ params.put("page_return_url", "https://stock.nalandacapital.mom/#/user"); // 前端返回地址
// 可选参数
if (user != null) {
@@ -338,7 +466,7 @@
// 保留两位小数，四舍五入
amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
params.put("total_fee", String.valueOf(amount)); // 交易金额（保留两位小数）
- params.put("notify_url", "https://api.greenbackcaps.top/user/rechargeCallbackTwo.do"); // 异步通知地址
+ params.put("notify_url", "https://api.nalandacapital.mom/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())); // 客户姓名
@@ -400,7 +528,7 @@
//商家订单号 保证每笔订单唯一
params.put("mch_order_no", generatePayOrderId());
//异步通知地址 不超过 200 字节,支付成功后发起,不能携带参数
- params.put("notify_url", "https://api.greenbackcaps.top/user/rechargeCallback.do");
+ params.put("notify_url", "https://api.nalandacapital.mom/user/rechargeCallback.do");
// 订单时间 时间格式yyyy-MM-dd HH:mm:ss
params.put("order_date", getOrderTime());
//支付类型 请查阅商户后台通道编码
@@ -1342,145 +1470,233 @@
}
}
+ @Override
+ public void rechargeCallbackFour(PayV2NotifyRequest vo, HttpServletResponse response) throws IOException {
+ log.info("支付4充值回调：{}", vo);
+ PrintWriter pw = response.getWriter();
+ response.setStatus(200);
+ response.setContentType("text/plain;charset=UTF-8");
+ if (vo == null || StringUtils.isBlank(vo.getMOrder())) {
+ pw.print("FAIL");
+ pw.flush();
+ pw.close();
+ return;
+ }
+ synchronized (vo.getMOrder()) {
+ Map<String, String> signParams = new TreeMap<>();
+ if (vo.getMid() != null) {
+ signParams.put("mid", String.valueOf(vo.getMid()));
+ }
+ signParams.put("m_order", vo.getMOrder());
+ signParams.put("order_id", vo.getOrderId());
+ signParams.put("amount", vo.getAmount());
+ if (StringUtils.isNotBlank(vo.getUtr())) {
+ signParams.put("utr", vo.getUtr());
+ }
+ if (vo.getPayStatus() != null) {
+ signParams.put("pay_status", String.valueOf(vo.getPayStatus()));
+ }
+ if (vo.getRTime() != null) {
+ signParams.put("r_time", String.valueOf(vo.getRTime()));
+ }
+ if (!PayV2RsaSignUtil.verify(signParams, vo.getSign(), PayV2GatewayKeys.PLATFORM_PUBLIC_KEY)) {
+ log.error("支付4回调签名验证失败：{}, stringA={}", vo, PayV2RsaSignUtil.buildStringA(signParams));
+ pw.print("FAIL");
+ pw.flush();
+ pw.close();
+ return;
+ }
+
+ PaymentRecharge paymentRecharge = paymentRechargeService.getOne(new LambdaQueryWrapper<>(PaymentRecharge.class)
+ .eq(PaymentRecharge::getOrderNo, vo.getMOrder())
+ .eq(PaymentRecharge::getStatus, 1)
+ .last("limit 1"));
+ if (ObjectUtils.isEmpty(paymentRecharge)) {
+ log.info("支付4未找到充值订单");
+ pw.print("FAIL");
+ pw.flush();
+ pw.close();
+ 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("支付4未找到待支付充值记录");
+ pw.print("OK");
+ pw.flush();
+ pw.close();
+ return;
+ }
+
+ Integer ps = vo.getPayStatus();
+ if (ps != null && ps == 0) {
+ pw.print("OK");
+ pw.flush();
+ pw.close();
+ return;
+ }
+ if (ps != null && (ps == 3 || ps == 4)) {
+ paymentRecharge.setStatus(2);
+ paymentRecharge.setAmount(new BigDecimal(vo.getAmount()));
+ paymentRecharge.setPayInfo(vo.toString());
+ paymentRechargeService.updateById(paymentRecharge);
+ userRecharge.setOrderStatus(2);
+ userRechargeMapper.updateById(userRecharge);
+ log.warn("支付4回调失败状态 pay_status={}：{}", ps, vo);
+ pw.print("OK");
+ pw.flush();
+ pw.close();
+ return;
+ }
+ if (ps == null || ps != 1) {
+ log.error("支付4回调未知状态：{}", vo);
+ pw.print("OK");
+ pw.flush();
+ pw.close();
+ return;
+ }
+
+ userAssetsServices.availablebalanceChange(EStockType.IN.getCode(),
+ paymentRecharge.getUserId(), EUserAssets.TOP_UP, new BigDecimal(vo.getAmount()), "", "");
+
+ paymentRecharge.setStatus(2);
+ paymentRecharge.setAmount(new BigDecimal(vo.getAmount()));
+ paymentRecharge.setPayInfo(vo.toString());
+ paymentRechargeService.updateById(paymentRecharge);
+
+ userRecharge.setOrderStatus(1);
+ userRechargeMapper.updateById(userRecharge);
+
+ log.info("支付4充值回调完成");
+ pw.print("OK");
+ pw.flush();
+ pw.close();
+ }
+ }
+
/**
* 代付回调处理
*/
@Override
- public void payoutCallback(PayoutCallbackVo vo, HttpServletResponse response) throws IOException {
- log.info("代付回调进来了：" + vo.toString());
-
+ public void payoutCallback(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ response.setStatus(200);
+ response.setContentType("text/plain;charset=UTF-8");
PrintWriter pw = response.getWriter();
-
- try {
- // 验证签名
- String key = "PAXkm5ptBhvzNYBSpdm3p7ipwGUQOF8Fm3tYp0"; // 商户密钥
- Map<String, String> signParams = new HashMap<>();
- signParams.put("merchant_id", vo.getMerchantId());
- signParams.put("app_id", vo.getAppId());
- signParams.put("system_order_id", vo.getSystemOrderId());
- signParams.put("merchant_order_id", vo.getMerchantOrderId());
- signParams.put("amount", vo.getAmount());
- signParams.put("order_status", vo.getOrderStatus());
- signParams.put("msg", vo.getMsg());
-
- boolean signValid = PaymentSignUtil.verifySign(signParams, key, vo.getSign());
- if (!signValid) {
- log.error("代付回调签名验证失败");
- pw.print("error 签名验证失败");
- pw.flush();
- pw.close();
- return;
- }
-
- // 根据商户订单号查找代付记录
+
+ String tradeResult = request.getParameter("tradeResult");
+ String merTransferId = request.getParameter("merTransferId");
+ String merNo = request.getParameter("merNo");
+ String tradeNo = request.getParameter("tradeNo");
+ String transferAmount = request.getParameter("transferAmount");
+ String applyDate = request.getParameter("applyDate");
+ String version = request.getParameter("version");
+ String respCode = request.getParameter("respCode");
+ String sign = request.getParameter("sign");
+ String signType = request.getParameter("signType");
+ log.info("watchglb代付回调: tradeResult={}, merTransferId={}, merNo={}, tradeNo={}, transferAmount={}, applyDate={}, version={}, respCode={}, signType={}",
+ tradeResult, merTransferId, merNo, tradeNo, transferAmount, applyDate, version, respCode, signType);
+
+ if (StringUtils.isBlank(merTransferId) || StringUtils.isBlank(tradeResult)) {
+ pw.print("FAIL");
+ pw.flush();
+ pw.close();
+ return;
+ }
+
+ String key = "CZ5Q6NNI6D9YTCXZAIWIC8SAQCC35UZR";
+ Map<String, String> signParams = new TreeMap<>();
+ if (StringUtils.isNotBlank(tradeResult)) signParams.put("tradeResult", tradeResult);
+ if (StringUtils.isNotBlank(merTransferId)) signParams.put("merTransferId", merTransferId);
+ if (StringUtils.isNotBlank(merNo)) signParams.put("merNo", merNo);
+ if (StringUtils.isNotBlank(tradeNo)) signParams.put("tradeNo", tradeNo);
+ if (StringUtils.isNotBlank(transferAmount)) signParams.put("transferAmount", transferAmount);
+ if (StringUtils.isNotBlank(applyDate)) signParams.put("applyDate", applyDate);
+ if (StringUtils.isNotBlank(version)) signParams.put("version", version);
+ if (StringUtils.isNotBlank(respCode)) signParams.put("respCode", respCode);
+
+ if (!PaymentSignUtil.verifySign(signParams, key, sign)) {
+ log.error("watchglb代付回调验签失败, merTransferId={}, signParams={}", merTransferId, signParams);
+ pw.print("FAIL");
+ pw.flush();
+ pw.close();
+ return;
+ }
+
+ synchronized (merTransferId) {
TransferResponse transferResponse = transferResponseService.getOne(
new LambdaQueryWrapper<>(TransferResponse.class)
- .eq(TransferResponse::getMerTransferId, vo.getMerchantOrderId())
- .last("limit 1")
+ .eq(TransferResponse::getMerTransferId, merTransferId)
);
-
if (ObjectUtils.isEmpty(transferResponse)) {
- log.info("未找到代付订单记录，商户订单号：{}", vo.getMerchantOrderId());
- pw.print("error 未找到代付订单");
+ log.error("未找到代付记录，merTransferId={}", merTransferId);
+ pw.print("FAIL");
pw.flush();
pw.close();
return;
}
-
- // 检查是否已处理过
if (transferResponse.getCallbackState() != 0) {
- log.info("代付回调已处理过，商户订单号：{}", vo.getMerchantOrderId());
pw.print("success");
pw.flush();
pw.close();
return;
}
-
- // 查找提现记录
+
UserWithdraw userWithdraw = userWithdrawMapper.selectByPrimaryKey(transferResponse.getWithId());
if (ObjectUtils.isEmpty(userWithdraw)) {
- log.info("未找到提现记录，withId：{}", transferResponse.getWithId());
- pw.print("error 未找到提现记录");
+ log.error("未找到提现记录，withId={}", transferResponse.getWithId());
+ pw.print("FAIL");
pw.flush();
pw.close();
return;
}
-
- // 根据订单状态处理
- String orderStatus = vo.getOrderStatus();
- if ("WAIT_CONFIRM".equals(orderStatus) || "WAIT_PAY".equals(orderStatus) || "PAY_ING".equals(orderStatus)) {
- log.info("代付回调交易中，商户订单号：{}，状态：{}", vo.getMerchantOrderId(), orderStatus);
- pw.print("success");
- pw.flush();
- pw.close();
- return;
- } else if ("PAY_FAIL".equals(orderStatus)) {
- // 代付失败
- transferResponse.setTradeResult(2); // 失败
- transferResponse.setCallbackState(2); // 失败
- transferResponse.setRespCode("FAIL"); // 响应状态：失败
- transferResponse.setErrorMsg(vo.getMsg()); // 失败原因
- transferResponse.setSignType("MD5"); // 签名方式
- transferResponse.setSign(vo.getSign()); // 签名
- transferResponse.setUpdatedAt(new Date());
+
+ transferResponse.setTradeNo(StringUtils.defaultIfBlank(tradeNo, transferResponse.getTradeNo()));
+ transferResponse.setSignType(StringUtils.defaultIfBlank(signType, "MD5"));
+ transferResponse.setSign(sign);
+ transferResponse.setRespCode(StringUtils.defaultIfBlank(respCode, "SUCCESS"));
+ transferResponse.setApplyDate(StringUtils.defaultIfBlank(applyDate, transferResponse.getApplyDate()));
+ transferResponse.setUpdatedAt(new Date());
+
+ if ("1".equals(tradeResult)) {
+ transferResponse.setTradeResult(1);
+ transferResponse.setCallbackState(1);
transferResponseService.updateById(transferResponse);
-
- userWithdraw.setWithStatus(2); // 失败
- userWithdraw.setWithMsg("Withdrawal failed：" + vo.getMsg());
+
+ userWithdraw.setWithStatus(1);
+ userWithdraw.setWithMsg("代付成功");
userWithdraw.setTransTime(new Date());
userWithdrawMapper.updateByPrimaryKeySelective(userWithdraw);
-
- // 返还用户资金
+
+ UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", userWithdraw.getUserId());
+ if (userAssets != null) {
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
+ userAssetsMapper.updateById(userAssets);
+ }
+ pw.print("success");
+ } else if ("2".equals(tradeResult)) {
+ transferResponse.setTradeResult(2);
+ transferResponse.setCallbackState(2);
+ transferResponse.setErrorMsg("watchglb payout failed");
+ transferResponseService.updateById(transferResponse);
+
+ userWithdraw.setWithStatus(2);
+ userWithdraw.setWithMsg("Withdrawal failed：watchglb payout failed");
+ userWithdraw.setTransTime(new Date());
+ userWithdrawMapper.updateByPrimaryKeySelective(userWithdraw);
+
UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", userWithdraw.getUserId());
if (userAssets != null) {
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
userAssetsMapper.updateById(userAssets);
}
-
- log.info("代付回调失败，商户订单号：{}", vo.getMerchantOrderId());
pw.print("success");
- pw.flush();
- pw.close();
- return;
- } else if ("PAY_SUCCESS".equals(orderStatus)) {
- // 代付成功
- transferResponse.setTradeResult(1); // 成功
- transferResponse.setCallbackState(1); // 成功
- transferResponse.setRespCode("SUCCESS"); // 响应状态：成功
- transferResponse.setSignType("MD5"); // 签名方式
- transferResponse.setSign(vo.getSign()); // 签名
- transferResponse.setUpdatedAt(new Date());
- transferResponseService.updateById(transferResponse);
-
- userWithdraw.setWithStatus(1); // 成功
- userWithdraw.setWithMsg("代付成功");
- userWithdraw.setTransTime(new Date());
- userWithdrawMapper.updateByPrimaryKeySelective(userWithdraw);
-
- // 扣除冻结资金
- UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", userWithdraw.getUserId());
- if (userAssets != null) {
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
- userAssetsMapper.updateById(userAssets);
- }
-
- log.info("代付回调成功，商户订单号：{}", vo.getMerchantOrderId());
- pw.print("success");
- pw.flush();
- pw.close();
- return;
} else {
- log.error("代付回调未知状态，商户订单号：{}，状态：{}", vo.getMerchantOrderId(), orderStatus);
- pw.print("error 未知状态");
- pw.flush();
- pw.close();
- return;
+ log.warn("watchglb回调状态未知, merTransferId={}, tradeResult={}", merTransferId, tradeResult);
+ pw.print("success");
}
-
- } catch (Exception e) {
- log.error("代付回调处理异常：", e);
- pw.print("error 处理异常");
pw.flush();
pw.close();
}
@@ -1521,7 +1737,6 @@
TransferResponse transfer = transferResponseService.getOne(
new LambdaQueryWrapper<TransferResponse>()
.eq(TransferResponse::getMerTransferId, data.getMerchantOrderNo())
- .last("limit 1")
);
if (transfer == null) {
@@ -1560,6 +1775,125 @@
}
/**
+ * 代付 v2（payOutCreate）异步通知
+ */
+ @Override
+ public void payoutCallbackThree(PayV2PayoutNotifyRequest vo, HttpServletResponse response) throws IOException {
+ log.info("代付v2回调：{}", vo);
+ response.setStatus(200);
+ response.setContentType("text/plain;charset=UTF-8");
+ PrintWriter pw = response.getWriter();
+ if (vo == null || StringUtils.isBlank(vo.getMOrder()) || vo.getMid() == null
+ || vo.getPayStatus() == null || vo.getRTime() == null) {
+ pw.print("FAIL");
+ pw.flush();
+ pw.close();
+ return;
+ }
+ Map<String, String> signParams = new TreeMap<>();
+ if (StringUtils.isNotBlank(vo.getAmount())) {
+ signParams.put("amount", vo.getAmount());
+ }
+ if (StringUtils.isNotBlank(vo.getErrMsg())) {
+ signParams.put("err_msg", vo.getErrMsg());
+ }
+ signParams.put("mid", String.valueOf(vo.getMid()));
+ signParams.put("m_order", vo.getMOrder());
+ signParams.put("order_id", vo.getOrderId());
+ signParams.put("pay_status", String.valueOf(vo.getPayStatus()));
+ signParams.put("r_time", String.valueOf(vo.getRTime()));
+ if (StringUtils.isNotBlank(vo.getUtr())) {
+ signParams.put("utr", vo.getUtr());
+ }
+ if (!PayV2RsaSignUtil.verify(signParams, vo.getSign(), PayV2GatewayKeys.PLATFORM_PUBLIC_KEY)) {
+ log.error("代付v2回调签名验证失败, stringA={}", PayV2RsaSignUtil.buildStringA(signParams));
+ pw.print("FAIL");
+ pw.flush();
+ pw.close();
+ return;
+ }
+ synchronized (vo.getMOrder()) {
+ TransferResponse transfer = transferResponseService.getOne(
+ new LambdaQueryWrapper<>(TransferResponse.class)
+ .eq(TransferResponse::getMerTransferId, vo.getMOrder())
+ );
+ if (transfer == null) {
+ pw.print("FAIL");
+ pw.flush();
+ pw.close();
+ return;
+ }
+ if (transfer.getCallbackState() != 0) {
+ pw.print("OK");
+ pw.flush();
+ pw.close();
+ return;
+ }
+ UserWithdraw withdraw = userWithdrawMapper.selectByPrimaryKey(transfer.getWithId());
+ if (withdraw == null) {
+ pw.print("FAIL");
+ pw.flush();
+ pw.close();
+ return;
+ }
+ Integer ps = vo.getPayStatus();
+ if (ps != null && ps == 0) {
+ pw.print("OK");
+ pw.flush();
+ pw.close();
+ return;
+ }
+ if (ps != null && ps == 1) {
+ transfer.setTradeResult(1);
+ transfer.setCallbackState(1);
+ transfer.setRespCode("SUCCESS");
+ transfer.setSignType("MD5");
+ transfer.setSign(vo.getSign());
+ transfer.setUpdatedAt(new Date());
+ transferResponseService.updateById(transfer);
+
+ withdraw.setWithStatus(1);
+ withdraw.setWithMsg("代付成功");
+ withdraw.setTransTime(new Date());
+ userWithdrawMapper.updateByPrimaryKeySelective(withdraw);
+
+ UserAssets assets = iUserAssetsServices.assetsByTypeAndUserId("IN", withdraw.getUserId());
+ if (assets != null) {
+ assets.setFreezeMoney(assets.getFreezeMoney().subtract(withdraw.getWithAmt()));
+ userAssetsMapper.updateById(assets);
+ }
+ } else if (ps != null && (ps == 2 || ps == 3)) {
+ String err = StringUtils.defaultIfBlank(vo.getErrMsg(), "");
+ transfer.setTradeResult(2);
+ transfer.setCallbackState(2);
+ transfer.setRespCode("FAIL");
+ transfer.setErrorMsg(err);
+ transfer.setSignType("MD5");
+ transfer.setSign(vo.getSign());
+ transfer.setUpdatedAt(new Date());
+ transferResponseService.updateById(transfer);
+
+ withdraw.setWithStatus(2);
+ withdraw.setWithMsg("Withdrawal failed：" + err);
+ withdraw.setTransTime(new Date());
+ userWithdrawMapper.updateByPrimaryKeySelective(withdraw);
+
+ UserAssets assets = iUserAssetsServices.assetsByTypeAndUserId("IN", withdraw.getUserId());
+ if (assets != null) {
+ assets.setAvailableBalance(assets.getAvailableBalance().add(withdraw.getWithAmt()));
+ assets.setFreezeMoney(assets.getFreezeMoney().subtract(withdraw.getWithAmt()));
+ userAssetsMapper.updateById(assets);
+ }
+ } else {
+ log.warn("代付v2回调未知 pay_status={}", ps);
+ }
+ pw.print("OK");
+ pw.flush();
+ pw.close();
+ }
+ }
+
+ /**
* 处理成功回调
*/
private void handleSuccess(TransferResponse transfer, UserWithdraw withdraw,
--
Gitblit v1.9.3