From d1e26df6265bac463366419977ff67aeccbe8c90 Mon Sep 17 00:00:00 2001
From: egzosn <egzosn@gmail.com>
Date: Sun, 9 Jan 2022 15:18:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1V3=E8=AE=A2=E5=8D=95=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/egzosn/pay/wx/v3/api/WxParameterStructure.java  | 5 +++--
 .../src/main/java/com/egzosn/pay/wx/v3/api/WxPayService.java | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxParameterStructure.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxParameterStructure.java
index bd0b101..d144801 100644
--- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxParameterStructure.java
+++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxParameterStructure.java
@@ -82,12 +82,13 @@ public class WxParameterStructure {
      *
      * @return 商户相关信息
      */
-    public String getMchParameters() {
+    public Map<String, Object> getMchParameters() {
         Map<String, Object> attr = initSubMchId(null);
         OrderParaStructure.loadParameters(attr, payConfigStorage.isPartner() ? WxConst.SP_MCH_ID : WxConst.MCH_ID, payConfigStorage.getMchId());
-        return UriVariables.getMapToParameters(attr);
+        return attr;
     }
 
+
     /**
      * 初始化商户相关信息
      *
diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayService.java
index e73284d..17c21db 100644
--- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayService.java
+++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayService.java
@@ -462,7 +462,7 @@ public class WxPayService extends BasePayService<WxPayConfigStorage> {
     public Map<String, Object> query(AssistOrder assistOrder) {
         String transactionId = assistOrder.getTradeNo();
         String outTradeNo = assistOrder.getOutTradeNo();
-        String parameters = wxParameterStructure.getMchParameters();
+        String parameters = UriVariables.getMapToParameters(wxParameterStructure.getMchParameters());
         WxTransactionType transactionType = WxTransactionType.QUERY_TRANSACTION_ID;
         String uriVariable = transactionId;
         if (StringUtils.isNotEmpty(outTradeNo)) {
@@ -495,7 +495,7 @@ public class WxPayService extends BasePayService<WxPayConfigStorage> {
      */
     @Override
     public Map<String, Object> close(AssistOrder assistOrder) {
-        String parameters = wxParameterStructure.getMchParameters();
+        String parameters = JSON.toJSONString(wxParameterStructure.getMchParameters());
         return getAssistService().doExecute(parameters, WxTransactionType.CLOSE, assistOrder.getOutTradeNo());
     }