Просмотр исходного кода

fix car pay

release_toaliyun_real
lin 3 лет назад
Родитель
Сommit
3ad7ed96eb
3 измененных файлов: 4 добавлений и 19 удалений
  1. +0
    -7
      mallinkService/src/main/java/com/iformall/pay/WxPay.java
  2. +1
    -10
      mallinkService/src/main/java/com/iformall/pay/WxPayment.java
  3. +3
    -2
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/appPay/WxMiniAppPayAdapterService.java

+ 0
- 7
mallinkService/src/main/java/com/iformall/pay/WxPay.java Просмотреть файл

@@ -80,9 +80,6 @@ public class WxPay {
public static String pushOrder(Map<String, String> params) {
return doPost(UNIFIEDORDER_URL, params);
}
public static String pushOrderWithChines(Map<String, String> params) {
return doPostWithChinese(UNIFIEDORDER_URL, params);
}

/**
* 订单查询
@@ -336,10 +333,6 @@ public class WxPay {
public static String doPost(String url, Map<String, String> params) {
return HttpUtil.payPost(url, WxPayment.toXml(params));
}
public static String doPostWithChinese(String url, Map<String, String> params) {
return HttpUtil.payPost(url, WxPayment.toXmlWhitChinese(params));
}

public static String doPostSSL(String url, Map<String, String> params, String certPath, String certPass) {
return HttpUtil.payPostSSL(url, WxPayment.toXml(params), certPath, certPass);


+ 1
- 10
mallinkService/src/main/java/com/iformall/pay/WxPayment.java Просмотреть файл

@@ -500,16 +500,7 @@ public class WxPayment {
xml.append("</").append(key).append(">");
}
xml.append("</xml>");
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<String, String> params) {


+ 3
- 2
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<String, String> 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<String, String> 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<String, String> returnMap = WxPayment.xmlToMap(response);
return getOrderSPResult(returnMap,null,appInfo.getAppId(),wxPayOrderP.getNonce_str(),apiKey);


Загрузка…
Отмена
Сохранить