From 61b77ff6d290338a2bc759d8ce1124ee58fc7ef3 Mon Sep 17 00:00:00 2001
From: 777 <123@qwe.com>
Date: Tue, 8 Apr 2025 21:39:04 +0800
Subject: [PATCH] 33333333333

---
 .../ruoyi/cai/service/OrderLogsService.java    |  2 ++
 .../cai/service/impl/OrderLogsServiceImpl.java | 18 ++++++++++++++++++
 .../cai/trdpay/handle/PayTrdV12Service.java    |  6 +++++-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/OrderLogsService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/OrderLogsService.java
index f7db6690..3ce825f7 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/OrderLogsService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/OrderLogsService.java
@@ -22,4 +22,6 @@ public interface OrderLogsService extends IService<OrderLogs> {
     void createBaseSuccess(String orderNo, String stepName);
 
     void createAliPayLogs(String orderNo, String inParams, JSONObject jsonObject, boolean success,TrdPayTypeEnum typeEnum,String stepName);
+
+    void createAliPayLogs(String orderNo, String url, String params, String body, boolean success, TrdPayTypeEnum typeEnum, String stepName);
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/OrderLogsServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/OrderLogsServiceImpl.java
index ae340b72..ddeb8648 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/OrderLogsServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/OrderLogsServiceImpl.java
@@ -60,9 +60,22 @@ public class OrderLogsServiceImpl extends ServiceImpl<OrderLogsMapper, OrderLogs
         this.save(orderLogs);
     }
 
+    @Override
+    public void createAliPayLogs(String orderNo, String url, String params, String body, boolean success, TrdPayTypeEnum typeEnum, String stepName){
+        OrderLogs orderLogs = new OrderLogs();
+        orderLogs.setOrderNo(orderNo);
+        orderLogs.setStepName(stepName);
+        orderLogs.setInParams(JSON.toJSONString(new UrlJson(url,params)));
+        orderLogs.setOutParams(body);
+        orderLogs.setFlagName(typeEnum.name());
+        orderLogs.setSuccess(success?"成功":"失败");
+        this.save(orderLogs);
+    }
+
     @Data
     public static class UrlJson{
         private String url;
+        private String params;
 
         public UrlJson() {
         }
@@ -70,6 +83,11 @@ public class OrderLogsServiceImpl extends ServiceImpl<OrderLogsMapper, OrderLogs
         public UrlJson(String url) {
             this.url = url;
         }
+
+        public UrlJson(String url, String params) {
+            this.url = url;
+            this.params = params;
+        }
     }
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/trdpay/handle/PayTrdV12Service.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/trdpay/handle/PayTrdV12Service.java
index a2e951db..a0bb88f6 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/trdpay/handle/PayTrdV12Service.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/trdpay/handle/PayTrdV12Service.java
@@ -132,11 +132,13 @@ public class PayTrdV12Service implements PayTrdService {
         TradeResponse response = JacksonUtil.jsonToObj(responseJson, TradeResponse.class);
         if (!OutRespCodeEnum.SUCCESS.getCode().equals(response.getRespCode())) {
             log.info("第三方支付失败 V12 统一支付失败失败 url={} request={} body={}, payTrdConfig={}", createOrderUrl, bizRequestJson, responseJson, JSON.toJSONString(payTrdConfig));
+            orderLogsService.createAliPayLogs(payOrderInfoDTO.getOrderNo(), createOrderUrl, bizRequestJson, responseJson, false, type, getStepName(wx));
             throw new ServiceException("调用支付失败");
         }
         boolean verifySign = RSAUtil.verifySign(response.getBizData(), response.getSign(), sandPublicKey, response.getSignType()); // 杉德公钥-验签
         if (!verifySign) {
             log.info("第三方支付失败 V12 统一支付验签失败 url={} request={} body={}, payTrdConfig={}", createOrderUrl, bizRequestJson, responseJson, JSON.toJSONString(payTrdConfig));
+            orderLogsService.createAliPayLogs(payOrderInfoDTO.getOrderNo(), createOrderUrl, bizRequestJson, responseJson, false, type, getStepName(wx));
             throw new ServiceException("调用支付失败");
         }
         String responseKey = RSAUtil.decrypt(response.getEncryptKey(), merchantPrivateKey); // 商户私钥-解密AES-key
@@ -145,8 +147,10 @@ public class PayTrdV12Service implements PayTrdService {
         log.info("V12支付请求22222：url:{},request:{},body:{}", createOrderUrl,bizRequestJson,JSON.toJSONString(bizResponse));
         if (ResultStatusEnum.FAIL.getCode().equals(bizResponse.getResultStatus())) {
             log.info("第三方支付失败 V12 统一支付状态失败 url={} request={} body={}, payTrdConfig={}", createOrderUrl, bizRequestJson, responseJson, JSON.toJSONString(payTrdConfig));
+            orderLogsService.createAliPayLogs(payOrderInfoDTO.getOrderNo(), createOrderUrl, bizRequestJson, responseJson, false, type, getStepName(wx));
             throw new ServiceException("调用支付失败");
         }
+        orderLogsService.createAliPayLogs(payOrderInfoDTO.getOrderNo(), createOrderUrl, bizRequestJson, responseJson, true, type, getStepName(wx));
         return PayReturnResp.createDesan(bizResponse.getCashierUrl());
     }
 
@@ -155,7 +159,7 @@ public class PayTrdV12Service implements PayTrdService {
         String bizData = sourceData.get("bizData");
         String sign = sourceData.get("sign");
         boolean verifySign = RSAUtil.verifySign(bizData, sign, sandPublicKey, AsymmetricTypeEnum.RSA);
-        if(verifySign) {
+        if(!verifySign) {
             return null;
         }
         JSONObject bizDataJson = JSON.parseObject(bizData);