支付回调调试

ruoyi-common/ruoyi-common-pay/src/main/java/org/dromara/common/pay/service/IWxPayService.java

@@ -48,11 +48,12 @@ public interface IWxPayService {
      *
      * @param timestamp 时间搓
      * @param nonce     nonce
+     * @param serialNo  serialNo
      * @param signature 签名
      * @param result    支付通知密文
      * @return 支付通知明文
      */
-    JsapiNotifyModel notify(String timestamp, String nonce, String signature, String result);
+    JsapiNotifyModel notify(String timestamp, String nonce, String serialNo, String signature, String result);
 
     /**
      * 退款

ruoyi-common/ruoyi-common-pay/src/main/java/org/dromara/common/pay/service/impl/WxPayServiceImpl.java

@@ -206,14 +206,13 @@ public class WxPayServiceImpl implements IWxPayService {
     }
 
     @Override
-    public JsapiNotifyModel notify(String timestamp, String nonce, String signature, String result) {
-        String serialNumber = getSerialNumber();
-        log.info("timestamp:{} nonce:{} serialNo:{} signature:{}", timestamp, nonce, serialNumber, signature);
+    public JsapiNotifyModel notify(String timestamp, String nonce,String serialNo, String signature, String result) {
+        log.info("timestamp:{} nonce:{} serialNo:{} signature:{}", timestamp, nonce, serialNo, signature);
         log.info("支付通知密文 {}", result);
         try {
             // 需要通过证书序列号查找对应的证书，verifyNotify 中有验证证书的序列号
             String plainText = WxPayKit.verifyNotify(
-                serialNumber,
+                serialNo,
                 result,
                 signature,
                 nonce,

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/WeChatOrderPayServiceImpl.java

@@ -55,6 +55,7 @@ public class WeChatOrderPayServiceImpl implements IOrderPayService {
             JsapiNotifyModel model = wxPayService.notify(
                 bodyJson.getString("timestamp"),
                 bodyJson.getString("nonce"),
+                bodyJson.getString("serialNo"),
                 bodyJson.getString("signature"),
                 bodyJson.getString("result")
             );