From 7bb22a32cf85b16dee6ac6acb6b1e0e241ab89f1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 30 八月 2024 17:04:37 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/utils/WxAbstractPay.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/utils/WxAbstractPay.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/utils/WxAbstractPay.java
index a17e3bd..8e040ac 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/utils/WxAbstractPay.java
+++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/utils/WxAbstractPay.java
@@ -2,8 +2,9 @@
import com.fasterxml.jackson.core.type.TypeReference;
import com.ruoyi.common.core.utils.WebUtils;
+import com.ruoyi.payment.wx.model.WxCloseOrderModel;
import com.ruoyi.payment.wx.model.WxPaymentInfoModel;
-import com.ruoyi.payment.wx.model.WxPaymentRefundModel;
+import com.ruoyi.payment.api.model.WxPaymentRefundModel;
import com.ruoyi.payment.wx.resp.NotifyV3PayDecodeRespBody;
import com.wechat.pay.contrib.apache.httpclient.auth.PrivateKeySigner;
import com.wechat.pay.contrib.apache.httpclient.auth.Verifier;
@@ -210,7 +211,7 @@
* @param mchid
* @return
*/
- public abstract NotifyV3PayDecodeRespBody query(String out_trade_no, String mchid);
+ public abstract NotifyV3PayDecodeRespBody query(String out_trade_no);
/**
@@ -220,6 +221,10 @@
* @return
*/
public abstract Map<String, Object> refund(WxPaymentRefundModel refundModel);
+
+
+
+ public abstract String close(String out_trade_no);
/**
* 订单退款
@@ -329,5 +334,30 @@
writer.close();
}
}
+
+
+ /**
+ * 关闭订单
+ * @param httpClient
+ * @param uri
+ * @param httpReadTimeoutMs
+ * @param httpConnectTimeoutMs
+ * @param closeModel
+ * @return
+ */
+ public String close(CloseableHttpClient httpClient,
+ String uri,
+ int httpReadTimeoutMs,
+ int httpConnectTimeoutMs,
+ WxCloseOrderModel closeModel) {
+ String reqBody = WxJsonUtils.toJsonString(closeModel);
+ //请求URL
+ HttpEntityEnclosingRequestBase httpPost = requestPost(
+ uri
+ , httpReadTimeoutMs
+ , httpConnectTimeoutMs, reqBody);
+ String repBody = result(httpClient, httpPost);
+ return repBody;
+ }
}
--
Gitblit v1.7.1