diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 06f49cf..ef070c0 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -263,7 +263,7 @@ wx: app-id: wxefe4087f9c1e0fd7 mch-id: 1673939172 partner-key: dhsajidua9sd8sahdj1h289dhjkashd8 - notify-url: "http://xq.mubai8888.com" + notify-url: "https://xq.mubai8888.com" mp: app-id: wxefe4087f9c1e0fd7 secret: f11d09d4024c0ca18e895eabe99df549 diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/PayController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/PayController.java index c7d9cfc..9957d7f 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/PayController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/PayController.java @@ -64,7 +64,7 @@ public class PayController { .mch_id(wxPayProperties.getMchId()) .nonce_str(WxPayKit.generateStr()) .body(payOrderInfo.getBody()) - .out_trade_no(WxPayKit.generateStr()) + .out_trade_no(payOrderInfo.getOrderNo()) .total_fee(payOrderInfo.getPriceFenStr()) .spbill_create_ip(ip) .notify_url(wxPayProperties.getNotifyUrl()+NOTIFY_WX_URL) @@ -113,7 +113,7 @@ public class PayController { } // 注意重复通知的情况,同一订单号可能收到多次通知,请注意一定先判断订单状态 // 注意此处签名方式需与统一下单的签名类型一致 - if (WxPayKit.verifyNotify(params, wxPayProperties.getPartnerKey(), SignType.MD5)) { + if (WxPayKit.verifyNotify(params, wxPayProperties.getPartnerKey(), SignType.HMACSHA256)) { if (WxPayKit.codeIsOk(returnCode)) { String outTradeNo = params.get("out_trade_no"); String transactionId = params.get("transaction_id");