From 677997551f0de1a8efd754fab1485c02fe560e94 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 13 Mar 2026 17:22:30 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/PayServiceImpl.java | 475 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 469 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/PayServiceImpl.java b/src/main/java/com/nq/service/impl/PayServiceImpl.java
index ea35e71..986c2ec 100644
--- a/src/main/java/com/nq/service/impl/PayServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/PayServiceImpl.java
@@ -41,6 +41,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.nq.vo.pay.PayOutMD5Util;
+import com.nq.vo.pay.PayoutCallbackData;
+import com.nq.vo.pay.PayoutCallbackRequest;
import net.sf.json.JSON;
import net.sf.json.JSONObject;
import okhttp3.*;
@@ -95,6 +98,9 @@
@Autowired
UserAssetsServices userAssetsServices;
+ @Autowired
+ TransferResponseService transferResponseService;
+
private static final String KEY_ALGORITHM = "AES";
private static final String AES128CBC = "AES/CBC/PKCS5Padding";
@@ -103,6 +109,8 @@
String reqUrl = "https://api.watchglb.com/pay/web";
// 支付2
String uipReqRul = "https://v2.fastechservicepro.com/payin/unifiedorder";
+ // 支付3
+ String threeUrl = "https://www.copays.net/open-api/create-pay-order";
User user = userService.getCurrentRefreshUser(request);
if(ObjectUtils.isEmpty(user)){
@@ -112,11 +120,15 @@
}
if(type == 0){//支付1
- return getPaymentOne(tradeAmount, reqUrl,user,request);
+ return getPaymentZero(tradeAmount, uipReqRul, user,request);
}else if(type == 2){//支付2
- return getPaymentTwo(tradeAmount, uipReqRul, user,request);
+ return getPaymentZero(tradeAmount, uipReqRul, user,request);
+ } else if(type == 3){//支付2
+// return getPaymentTwo(tradeAmount, uipReqRul, user,request);
+ return ServerResponse.createByErrorMsg("未开启，请选择其他支付方式",request);
}else if(type == 1){
- return getPaymentZero(tradeAmount, uipReqRul, user,request);
+// return getPaymentThree(tradeAmount, threeUrl, user,request);
+ return getPaymentOne(tradeAmount, reqUrl,user,request);
}
return ServerResponse.createByErrorMsg("获取支付方式失败",request);
}
@@ -135,8 +147,9 @@
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");//回调通知地址
+ dataObj.put("notifyUrl", "https://api.greenbackcaps.top/user/rechargeCallbackZero.do");//回调通知地址
JSONObject requestObj = new JSONObject();
+ log.info("代收参数：{}", dataObj);
// 加密数据
byte[] encryptedData = encrypt(dataObj.toString(), aesKey, aesIv);
String base64EncodedData = Base64.getEncoder().encodeToString(encryptedData);
@@ -145,6 +158,7 @@
Headers headers = new Headers.Builder().add("merchant_key", merchantKey).build();//merchant_key需替换
//请求
String resp = doPost(url, requestObj.toString(), headers);
+ log.info("代收返回："+resp);
Gson gson = new Gson();
PaymentResponseZero paymentResponse = gson.fromJson(resp, PaymentResponseZero.class);
if(paymentResponse.getCode() != 0 && !paymentResponse.getMsg().equals("success")){
@@ -211,6 +225,109 @@
cipher.init(Cipher.ENCRYPT_MODE, k, ivParameterSpec);
return cipher.doFinal(data);
}
+
+ private ServerResponse getPaymentThree(String tradeAmount, String uipReqRul, User user, HttpServletRequest request) throws Exception {
+
+ // 配置参数（建议放到配置文件中）
+ String appId = "db270b73dc384c89ae7241d6465cee03"; // 从商户后台获取
+ String key = "PAXkm5ptBhvzNYBSpdm3p7ipwGUQOF8Fm3tYp0"; // 商户密钥
+ String payChannel = "INDIA_NATIVE"; // 支付通道，根据实际情况选择
+
+ // 生成商户订单号
+ String merchantOrderId = generatePayOrderId();
+
+ // 处理金额，保留两位小数
+ BigDecimal amount = new BigDecimal(tradeAmount);
+ amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
+
+ // 构建请求参数
+ Map<String, String> params = new HashMap<>();
+ params.put("app_id", appId);
+ 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"); // 前端返回地址
+
+ // 可选参数
+ if (user != null) {
+ String customerName = UserNameUtil.formatCustomerName(user.getNickName());
+ if (StringUtils.isNotEmpty(customerName)) {
+ params.put("customer_name", customerName);
+ }
+ if (StringUtils.isNotEmpty(user.getPhone())) {
+ params.put("customer_phone", user.getPhone());
+ }
+ params.put("customer_email", "test@gmail.com"); // 根据实际情况获取用户邮箱
+ }
+
+ // 生成签名（注意：签名生成时不需要包含sign参数本身）
+ String sign = PaymentSignUtil.generateSign(params, key);
+ params.put("sign", sign);
+
+ log.info("支付请求参数：{}", params);
+ log.info("生成的签名：{}", sign);
+
+ // 发送请求
+ String result = HttpClientUtil.doPost(uipReqRul, params, "utf-8");
+ log.info("支付返回参数：{}", result);
+
+ // 解析响应
+ ObjectMapper objectMapper = new ObjectMapper();
+ PaymentApiResponse response = objectMapper.readValue(result, PaymentApiResponse.class);
+
+ // 检查响应
+ if (!Integer.valueOf(200).equals(response.getCode())) {
+ log.error("支付下单失败，返回码：{}，消息：{}，请求参数：{}",
+ response.getCode(), response.getMessage(), params);
+ return ServerResponse.createByErrorMsg("获取支付链接失败：" + response.getMessage(), request);
+ }
+
+ // 可选：验证返回签名
+ PaymentApiResponse.PaymentData responseData = response.getData();
+ Map<String, String> responseSignParams = new HashMap<>();
+ responseSignParams.put("merchant_id", responseData.getMerchantId());
+ responseSignParams.put("app_id", responseData.getAppId());
+ responseSignParams.put("system_order_id", responseData.getSystemOrderId());
+ responseSignParams.put("merchant_order_id", responseData.getMerchantOrderId());
+ responseSignParams.put("pay_url", responseData.getPayUrl());
+
+ boolean signValid = PaymentSignUtil.verifySign(responseSignParams, key, responseData.getSign());
+ if (!signValid) {
+ log.warn("返回签名验证失败，可能存在安全风险");
+ }
+
+ // 保存支付记录
+ PaymentRecharge paymentRecharge = new PaymentRecharge();
+ paymentRecharge.setUserId(user.getId());
+ paymentRecharge.setOrderNo(merchantOrderId); // 商户订单号
+ paymentRecharge.setMchOrderNo(responseData.getSystemOrderId()); // 平台订单号
+ paymentRecharge.setAmount(amount);
+ paymentRecharge.setStatus(1); // 1:已获取
+ paymentRecharge.setPaymentTime(new Date());
+ paymentRecharge.setCreatedAt(new Date());
+ paymentRecharge.setNotifyUrl(params.get("notify_url"));
+ paymentRecharge.setPayInfo(result);
+ paymentRechargeService.save(paymentRecharge);
+
+ // 保存用户充值记录
+ UserRecharge userRecharge = new UserRecharge();
+ userRecharge.setUserId(user.getId());
+ userRecharge.setNickName(user.getRealName());
+ userRecharge.setAgentId(user.getAgentId());
+ userRecharge.setOrderSn(merchantOrderId);
+ userRecharge.setPayChannel(payChannel); // 使用实际的支付通道
+ userRecharge.setPayAmt(amount);
+ userRecharge.setAddTime(new Date());
+ userRecharge.setPayTime(new Date());
+ userRecharge.setOrderStatus(0); // 审核中
+ userRecharge.setPayId(3); // 支付通道ID，根据实际情况设置
+ userRechargeMapper.insert(userRecharge);
+
+ // 返回支付URL
+ return ServerResponse.createBySuccess(responseData.getPayUrl());
+ }
+
//支付2
private ServerResponse getPaymentTwo(String tradeAmount, String uipReqRul, User user, HttpServletRequest request) throws UnsupportedEncodingException, NoSuchAlgorithmException, JsonProcessingException {
// 示例参数
@@ -223,7 +340,7 @@
// 保留两位小数，四舍五入
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("notify_url", "https://api.greenbackcaps.top/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())); // 客户姓名
@@ -285,7 +402,7 @@
//商家订单号 保证每笔订单唯一
params.put("mch_order_no", generatePayOrderId());
//异步通知地址 不超过 200 字节,支付成功后发起,不能携带参数
- params.put("notify_url", "https://api.durocaspitall.com/user/rechargeCallback.do");
+ params.put("notify_url", "https://api.greenbackcaps.top/user/rechargeCallback.do");
// 订单时间 时间格式yyyy-MM-dd HH:mm:ss
params.put("order_date", getOrderTime());
//支付类型 请查阅商户后台通道编码
@@ -1167,4 +1284,350 @@
pw.close();
}
}
+
+ public void rechargeCallbackThree(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)
+ );
+ 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("PAY_ING")){
+ log.error("充值3回调交易中："+vo.toString());
+ return;
+ }else if(vo.getStatus().equals("PAY_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("PAY_ING") && !vo.getStatus().equals("PAY_FAIL") && !vo.getStatus().equals("PAY_SUCCESS")){
+ log.error("充值回调失败----未知状态："+vo.toString());
+ return;
+ }
+
+ 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();
+ }
+ }
+
+ /**
+ * 代付回调处理
+ */
+ @Override
+ public void payoutCallback(PayoutCallbackVo vo, HttpServletResponse response) throws IOException {
+ log.info("代付回调进来了：" + vo.toString());
+
+ 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;
+ }
+
+ // 根据商户订单号查找代付记录
+ TransferResponse transferResponse = transferResponseService.getOne(
+ new LambdaQueryWrapper<>(TransferResponse.class)
+ .eq(TransferResponse::getMerTransferId, vo.getMerchantOrderId())
+ .last("limit 1")
+ );
+
+ if (ObjectUtils.isEmpty(transferResponse)) {
+ log.info("未找到代付订单记录，商户订单号：{}", vo.getMerchantOrderId());
+ pw.print("error 未找到代付订单");
+ 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 未找到提现记录");
+ 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());
+ transferResponseService.updateById(transferResponse);
+
+ userWithdraw.setWithStatus(2); // 失败
+ userWithdraw.setWithMsg("Withdrawal failed：" + vo.getMsg());
+ 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;
+ }
+
+ } catch (Exception e) {
+ log.error("代付回调处理异常：", e);
+ pw.print("error 处理异常");
+ pw.flush();
+ pw.close();
+ }
+ }
+
+ public Map<String, Object> payoutCallbackTwo(PayoutCallbackRequest request, HttpServletResponse response) {
+
+
+ String merchantKey = "qqaC1DH/LeR9iPvm";//商户key 需替换
+ String aesKey = "ge6vK40fHNZPFJ4p";//商户aesKey 需替换
+
+ Map<String, Object> result = new HashMap<>();
+ result.put("code", 200); // 固定返回 200
+
+ try {
+ PayoutCallbackData data = request.getData();
+ String signature = request.getSignature_n();
+
+ // 1. 签名验证
+ String signStr = merchantKey
+ + nullToEmpty(data.getMessage())
+ + nullToEmpty(data.getAmount())
+ + nullToEmpty(data.getStatus())
+ + nullToEmpty(data.getMerchantOrderNo())
+ + nullToEmpty(data.getOrderNo())
+ + aesKey;
+
+ String calculatedSign = PayOutMD5Util.md5(signStr).toLowerCase();
+
+ if (!calculatedSign.equals(signature)) {
+ log.error("代付回调签名验证失败，merchantOrderNo={}，本地签名={}，回调签名={}",
+ data.getMerchantOrderNo(), calculatedSign, signature);
+ // 签名失败不处理业务，但依旧返回 200
+ return result;
+ }
+
+ // 2. 查询本地代付记录
+ TransferResponse transfer = transferResponseService.getOne(
+ new LambdaQueryWrapper<TransferResponse>()
+ .eq(TransferResponse::getMerTransferId, data.getMerchantOrderNo())
+ .last("limit 1")
+ );
+
+ if (transfer == null) {
+ log.error("代付回调未找到对应记录，merchantOrderNo={}", data.getMerchantOrderNo());
+ return result;
+ }
+
+ // 3. 防止重复回调
+ if (transfer.getCallbackState() != 0) {
+ log.info("代付回调已处理过，merchantOrderNo={}，状态={}", data.getMerchantOrderNo(), transfer.getCallbackState());
+ return result;
+ }
+
+ // 4. 查询提现记录
+ UserWithdraw withdraw = userWithdrawMapper.selectByPrimaryKey(transfer.getWithId());
+ if (withdraw == null) {
+ log.error("代付回调未找到提现记录，withId={}", transfer.getWithId());
+ return result;
+ }
+
+ // 5. 根据状态处理
+ String status = data.getStatus();
+ if ("SUCCESS".equals(status)) {
+ handleSuccess(transfer, withdraw, data, signature);
+ } else if ("FAILURE".equals(status)) {
+ handleFailure(transfer, withdraw, data, signature);
+ } else {
+ log.info("代付回调未知状态：{}，暂不处理，merchantOrderNo={}", status, data.getMerchantOrderNo());
+ }
+
+ } catch (Exception e) {
+ log.error("代付回调处理异常", e);
+ }
+
+ return result;
+ }
+
+ /**
+ * 处理成功回调
+ */
+ private void handleSuccess(TransferResponse transfer, UserWithdraw withdraw,
+ PayoutCallbackData data, String signature) {
+ // 更新代付记录
+ transfer.setTradeResult(1); // 成功
+ transfer.setCallbackState(1); // 已处理成功
+ transfer.setRespCode("SUCCESS");
+ transfer.setSignType("MD5");
+ transfer.setSign(signature);
+ 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);
+ }
+
+ log.info("代付成功处理完成，商户订单号={}，平台订单号={}", data.getMerchantOrderNo(), data.getOrderNo());
+ }
+
+ /**
+ * 处理失败回调
+ */
+ private void handleFailure(TransferResponse transfer, UserWithdraw withdraw,
+ PayoutCallbackData data, String signature) {
+ // 更新代付记录
+ transfer.setTradeResult(2); // 失败
+ transfer.setCallbackState(2); // 已处理失败
+ transfer.setRespCode("FAIL");
+ transfer.setErrorMsg(data.getMessage());
+ transfer.setSignType("MD5");
+ transfer.setSign(signature);
+ transfer.setUpdatedAt(new Date());
+ transferResponseService.updateById(transfer);
+
+ // 更新提现记录
+ withdraw.setWithStatus(2); // 失败
+ withdraw.setWithMsg("Withdrawal failed：" + data.getMessage());
+ 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);
+ }
+
+ log.info("代付失败处理完成，商户订单号={}，平台订单号={}，失败原因={}",
+ data.getMerchantOrderNo(), data.getOrderNo(), data.getMessage());
+ }
+
+ /**
+ * 将 null 转为空字符串，防止拼接 NPE
+ */
+ private String nullToEmpty(String str) {
+ return str == null ? "" : str;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3