binarywang#555 修复微信支付服务商模式支付验证签名失败的问题

binarywang · binarywang · commit 936b40cd883f · 2018-05-13T19:19:18.000+08:00
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/order/WxPayMpOrderResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/order/WxPayMpOrderResult.java
@@ -20,7 +20,7 @@ public class WxPayMpOrderResult {
   private String timeStamp;
   private String nonceStr;
   /**
-   * 由于package为java保留关键字，因此改为packageValue
+   * 由于package为java保留关键字，因此改为packageValue.
    */
   @XStreamAlias("package")
   private String packageValue;
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
@@ -311,8 +311,12 @@ public <T> T createOrder(WxPayUnifiedOrderRequest request) throws WxPayException
 
       case TradeType.APP: {
         // APP支付绑定的是微信开放平台上的账号，APPID为开放平台上绑定APP后发放的参数
-        String appId = this.getConfig().getAppId();
-        Map<String, String> configMap = new HashMap<>();
+        String appId = unifiedOrderResult.getAppid();
+        if (StringUtils.isNotEmpty(unifiedOrderResult.getSubAppId())) {
+          appId = unifiedOrderResult.getSubAppId();
+        }
+
+        Map<String, String> configMap = new HashMap<>(8);
         // 此map用于参与调起sdk支付的二次签名,格式全小写，timestamp只能是10位,格式固定，切勿修改
         String partnerId = getConfig().getMchId();
         configMap.put("prepayid", prepayId);
@@ -336,21 +340,20 @@ public <T> T createOrder(WxPayUnifiedOrderRequest request) throws WxPayException
 
       case TradeType.JSAPI: {
         String signType = SignType.MD5;
+        String appid = unifiedOrderResult.getAppid();
+        if (StringUtils.isNotEmpty(this.getConfig().getSubAppId())) {
+          appid = this.getConfig().getSubAppId();
+        }
+
         WxPayMpOrderResult payResult = WxPayMpOrderResult.builder()
-          .appId(unifiedOrderResult.getAppid())
+          .appId(appid)
           .timeStamp(timestamp)
           .nonceStr(nonceStr)
           .packageValue("prepay_id=" + prepayId)
           .signType(signType)
           .build();
 
-        payResult.setPaySign(
-          SignUtils.createSign(
-            payResult,
-            signType,
-            this.getConfig().getMchKey(),
-            false)
-        );
+        payResult.setPaySign(SignUtils.createSign(payResult, signType, this.getConfig().getMchKey(), false));
         return (T) payResult;
       }
 
@@ -534,7 +537,7 @@ private String handleGzipBill(String url, String requestStr) throws WxPayExcepti
         }
       }
     } catch (Exception e) {
-      this.log.error("解析对账单文件时出错",e);
+      this.log.error("解析对账单文件时出错", e);
     }
 
     return null;
