Merge remote-tracking branch 'origin/master'

xuhy

2025-12-10 b96705d1597c3ec1df4322b68e8b97b465c22ef8

 ruoyi-system/src/main/java/com/ruoyi/system/wxPay/utils/WxV3Pay.java

@@ -31,6 +31,7 @@
    private WeixinPayProperties config;
    @Getter
    private Verifier verifier;

    private WechatPayHttpClientBuilder builder;
    @Getter
    private CloseableHttpClient httpClient;
@@ -122,7 +123,7 @@
        request.outTradeNo = tradeNo;
//        request.timeExpire = "2018-06-08T10:34:56+08:00";
        request.attach = attach;
        request.notifyUrl = this.config.getCallBackUrl();
        request.notifyUrl = this.config.getV3().getNotifyPayUrl();
        request.goodsTag = "WXG";
        request.supportFapiao = false;
        request.amount = new JsapiPrepay.CommonAmountInfo();
@@ -188,7 +189,7 @@
     */
    @Override
    public <T> T verifyNotify(HttpServletRequest request, TypeReference<T> valueTypeRef) throws Exception {
        return verifyNotify(request, this.verifier, this.config.getV3().getApiKey(), valueTypeRef);
        return verifyNotify(request,verifier, this.config.getV3().getApiKey(), valueTypeRef);
    }

    /**
@@ -215,8 +216,8 @@
     */
    @Override
    public Map<String, Object> refund(WxPaymentRefundModel refundModel) {
        refundModel.setNotify_url(this.config.getV3().getNotifyRefundUrl() + refundModel.getNotify_url());
        return refund(this.httpClient, "/v3/refund/domestic/refunds", this.config.getHttpReadTimeoutMs(), this.config.getHttpConnectTimeoutMs(), refundModel);
        refundModel.setNotify_url(this.config.getV3().getNotifyRefundUrl());
        return  refund(this.httpClient, "/v3/refund/domestic/refunds", this.config.getHttpReadTimeoutMs(), this.config.getHttpConnectTimeoutMs(), refundModel);
    }