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 getMchParameters() { Map 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 { public Map 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 { */ @Override public Map close(AssistOrder assistOrder) { - String parameters = wxParameterStructure.getMchParameters(); + String parameters = JSON.toJSONString(wxParameterStructure.getMchParameters()); return getAssistService().doExecute(parameters, WxTransactionType.CLOSE, assistOrder.getOutTradeNo()); }