From 3ad7ed96eba7e2a222affcbfecd010e86800a650 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 17 Feb 2023 21:24:12 +0800 Subject: [PATCH] fix car pay --- .../src/main/java/com/iformall/pay/WxPay.java | 7 ------- .../src/main/java/com/iformall/pay/WxPayment.java | 11 +---------- .../v2/miniApp/appPay/WxMiniAppPayAdapterService.java | 5 +++-- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/pay/WxPay.java b/mallinkService/src/main/java/com/iformall/pay/WxPay.java index ac2f5f991..d95755537 100644 --- a/mallinkService/src/main/java/com/iformall/pay/WxPay.java +++ b/mallinkService/src/main/java/com/iformall/pay/WxPay.java @@ -80,9 +80,6 @@ public class WxPay { public static String pushOrder(Map params) { return doPost(UNIFIEDORDER_URL, params); } - public static String pushOrderWithChines(Map params) { - return doPostWithChinese(UNIFIEDORDER_URL, params); - } /** * 订单查询 @@ -336,10 +333,6 @@ public class WxPay { public static String doPost(String url, Map params) { return HttpUtil.payPost(url, WxPayment.toXml(params)); } - - public static String doPostWithChinese(String url, Map params) { - return HttpUtil.payPost(url, WxPayment.toXmlWhitChinese(params)); - } public static String doPostSSL(String url, Map params, String certPath, String certPass) { return HttpUtil.payPostSSL(url, WxPayment.toXml(params), certPath, certPass); diff --git a/mallinkService/src/main/java/com/iformall/pay/WxPayment.java b/mallinkService/src/main/java/com/iformall/pay/WxPayment.java index d7ff0f61c..d6115fa9e 100644 --- a/mallinkService/src/main/java/com/iformall/pay/WxPayment.java +++ b/mallinkService/src/main/java/com/iformall/pay/WxPayment.java @@ -500,16 +500,7 @@ public class WxPayment { xml.append(""); } xml.append(""); - try { - if (containChinese) { - return new String(xml.toString().getBytes("utf-8"),"ISO-8859-1"); - }else { - return xml.toString(); - } - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - return null; - } + return xml.toString(); } public static String toXml(Map params) { diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/appPay/WxMiniAppPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/appPay/WxMiniAppPayAdapterService.java index 69c655ac7..783739f21 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/appPay/WxMiniAppPayAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/appPay/WxMiniAppPayAdapterService.java @@ -177,6 +177,7 @@ public class WxMiniAppPayAdapterService extends BaseWxPayV2AdapterService implem wxPayOrderSP.setProfit_sharing("N"); } Map payOrderMap = BeanUtils.toStringMap(wxPayOrderSP); + log.info(">>>>> isv apikey"+apiKey+ "payOrderMap" + JSON.toJSONString(payOrderMap)); wxPayOrderSP.setSign(WxPayment.createSignHMAC(payOrderMap, apiKey)); return wxPayOrderSP; } @@ -279,7 +280,7 @@ public class WxMiniAppPayAdapterService extends BaseWxPayV2AdapterService implem public PayAdapterResult pay(String openId,String appId,String mchId,String productName,String attach,String payOrderNo,Integer fee,String ip,String notifyUrl,String apiKey,Date currentDate) throws Exception { WxPayOrderP wxPayOrderP = generateWxPayOrderP(openId, appId, mchId, productName, attach, payOrderNo, fee, ip, notifyUrl, apiKey, currentDate,null); - String response = WxPay.pushOrderWithChines(BeanUtils.toStringMap(wxPayOrderP)); + String response = WxPay.pushOrder(BeanUtils.toStringMap(wxPayOrderP)); log.info("pay order, wechat pushOrder, " + wxPayOrderP.toString() + ", response: " + response.toString()); Map returnMap = WxPayment.xmlToMap(response); return getOrderPResult(returnMap,wxPayOrderP.getNonce_str(),apiKey,null); @@ -288,7 +289,7 @@ public class WxMiniAppPayAdapterService extends BaseWxPayV2AdapterService implem public PayAdapterResult payIsv(WxPayAccount payAccount,WxAppinfo appInfo,String subMchId,String openId,String productName,String attach,String payOrderNo,Integer fee,String ip,String notifyUrl,Date currentDate,boolean share) throws Exception { String apiKey = payAccount.getApiKey(); WxPayOrderSP wxPayOrderP = generateWxPayOrderSP(openId,appInfo.getParentAppId(),payAccount.getMchId(),appInfo.getAppId(),subMchId,productName,attach,payOrderNo,fee,ip,notifyUrl,null,currentDate,share,apiKey); - String response = WxPay.pushOrderWithChines(BeanUtils.toStringMap(wxPayOrderP)); + String response = WxPay.pushOrder(BeanUtils.toStringMap(wxPayOrderP)); log.info("pay order, wechat pushOrder, " + wxPayOrderP.toString() + ", response: " + response.toString()); Map returnMap = WxPayment.xmlToMap(response); return getOrderSPResult(returnMap,null,appInfo.getAppId(),wxPayOrderP.getNonce_str(),apiKey);