From 3fa24f63c71c747e78e9e9a8b583c53bd8f6562d Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 17 Feb 2023 19:05:19 +0800 Subject: [PATCH 1/3] fix car pay --- .../main/java/com/iformall/controller/WxCarController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index 0f4cdbc43..5b589b8ea 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -493,7 +493,7 @@ public class WxCarController extends BaseController { StringBuffer attachSb = new StringBuffer("{") .append("\"u\":").append(user.getUserId()) .append(",\"uh\":\"").append(user.getPhone()).append("\"") - .append(",\"car:\":\"").append(carNumber).append("\"") + .append(",\"car:\":\"").append("aaaaaa").append("\"") .append(",\"fee\":").append(payOrder.getFee()); if (rlength > 4) { attachSb.append(",\"ma\":\"").append(receiverAccount.substring(rlength-4,rlength)).append("\""); @@ -524,6 +524,10 @@ public class WxCarController extends BaseController { } } + private String handleChinese(String content) { + + } + /** * 停车费支付订单列表 * From 22d666061f56224f0ff28a376f42ac19ab2cec69 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 17 Feb 2023 19:15:25 +0800 Subject: [PATCH 2/3] fix car pay --- .../java/com/iformall/controller/WxCarController.java | 10 +++------- .../src/main/java/com/iformall/pay/WxPayment.java | 7 ++++++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index 5b589b8ea..9eb8be67e 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -493,7 +493,7 @@ public class WxCarController extends BaseController { StringBuffer attachSb = new StringBuffer("{") .append("\"u\":").append(user.getUserId()) .append(",\"uh\":\"").append(user.getPhone()).append("\"") - .append(",\"car:\":\"").append("aaaaaa").append("\"") + .append(",\"car:\":\"").append(carNumber).append("\"") .append(",\"fee\":").append(payOrder.getFee()); if (rlength > 4) { attachSb.append(",\"ma\":\"").append(receiverAccount.substring(rlength-4,rlength)).append("\""); @@ -512,8 +512,8 @@ public class WxCarController extends BaseController { String uniquePayOrderNo = carVendor.getMessage()+"_"+idWorker.nextId(); String apiKey = (String)receiver.getReceiverParamValue(Constant.paymentReceicerParamApiKey); String attach = attachSb.toString(); - //String productPre = new String("停车费支付,车场订单号".getBytes("ISO-8859-1"), "UTF-8");//中文签名错误 - String productPre = "ParkOrderId"; + String productPre = "停车费支付,车场订单号";//中文签名错误 + //String productPre = "ParkOrderId"; PayAdapterResult wxResult = wxParkPayService.createWxPayOrder(park,isIsv,false,user.getOpenId(), user.getAppId(), receiver.getReceiverAccount(), productPre+payOrder.getParkOrderNumber(), attach, uniquePayOrderNo, payOrder.getFee(), "127.0.0.1", park.getPaidCallBack(), apiKey, new Date()); return new ResultData(wxResult); @@ -524,10 +524,6 @@ public class WxCarController extends BaseController { } } - private String handleChinese(String content) { - - } - /** * 停车费支付订单列表 * diff --git a/mallinkService/src/main/java/com/iformall/pay/WxPayment.java b/mallinkService/src/main/java/com/iformall/pay/WxPayment.java index f8931e90b..24ff79b91 100644 --- a/mallinkService/src/main/java/com/iformall/pay/WxPayment.java +++ b/mallinkService/src/main/java/com/iformall/pay/WxPayment.java @@ -500,7 +500,12 @@ public class WxPayment { xml.append(""); } xml.append(""); - return xml.toString(); + try { + return new String(xml.toString().getBytes("utf-8"),"IOS8859-1"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + return null; + } } /** From a0e809d966a713e2f344c746c2c67383b47598a7 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 17 Feb 2023 19:27:25 +0800 Subject: [PATCH 3/3] fix car pay --- .../pay/wx/v2/miniApp/appPay/WxMiniAppPayAdapterService.java | 1 + 1 file changed, 1 insertion(+) 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 e91d9096f..e5dcb0ba9 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 @@ -279,6 +279,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); + log.info(">>>>> payorder >>>>"+wxPayOrderP.toString() ); String response = WxPay.pushOrder(BeanUtils.toStringMap(wxPayOrderP)); log.info("pay order, wechat pushOrder, " + wxPayOrderP.toString() + ", response: " + response.toString()); Map returnMap = WxPayment.xmlToMap(response);