From 228b3791ae350fe535954a5c4855a08875aacdd8 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sat, 10 Jun 2017 13:08:44 +0800 Subject: [PATCH] =?UTF-8?q?#247=20=E7=BB=9F=E4=B8=80=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81H5=E6=94=AF=E4=BB=98?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E5=8E=BB=E6=8E=89=E4=BA=A4=E6=98=93=E7=B1=BB?= =?UTF-8?q?=E5=9E=8Btrade=5Ftype=E7=9A=84=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/request/WxPayUnifiedOrderRequest.java | 10 +++++----- .../wxpay/bean/result/WxPayUnifiedOrderResult.java | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java index 669f597b..a5560c20 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java @@ -27,7 +27,7 @@ import java.util.Arrays; */ @XStreamAlias("xml") public class WxPayUnifiedOrderRequest extends WxPayBaseRequest { - private static final String[] TRADE_TYPES = new String[]{"JSAPI", "NATIVE", "APP"}; + private static final String[] TRADE_TYPES = new String[]{"JSAPI", "NATIVE", "APP","MWEB"}; /** *
@@ -443,10 +443,10 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
 
   @Override
   protected void checkConstraints() {
-    if (!ArrayUtils.contains(TRADE_TYPES, this.getTradeType())) {
-      throw new IllegalArgumentException(String.format("trade_type目前必须为%s其中之一,实际值:%s",
-        Arrays.toString(TRADE_TYPES), this.getTradeType()));
-    }
+//    if (!ArrayUtils.contains(TRADE_TYPES, this.getTradeType())) {
+//      throw new IllegalArgumentException(String.format("trade_type目前必须为%s其中之一,实际值:%s",
+//        Arrays.toString(TRADE_TYPES), this.getTradeType()));
+//    }
 
     if ("JSAPI".equals(this.getTradeType()) && this.getOpenid() == null) {
       throw new IllegalArgumentException("当 trade_type是'JSAPI'时未指定openid");
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderResult.java
index f6d82bd1..92c98bda 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderResult.java
@@ -25,6 +25,12 @@ public class WxPayUnifiedOrderResult extends WxPayBaseResult {
   @XStreamAlias("trade_type")
   private String tradeType;
 
+  /**
+   * mweb_url 支付跳转链接
+   */
+  @XStreamAlias("mweb_url")
+  private String mwebUrl;
+
   /**
    * trade_type为NATIVE时有返回,用于生成二维码,展示给用户进行扫码支付
    */
@@ -54,4 +60,12 @@ public class WxPayUnifiedOrderResult extends WxPayBaseResult {
   public void setCodeURL(String codeURL) {
     this.codeURL = codeURL;
   }
+
+  public String getMwebUrl() {
+    return mwebUrl;
+  }
+
+  public void setMwebUrl(String mwebUrl) {
+    this.mwebUrl = mwebUrl;
+  }
 }