优化统一下单时参数校验逻辑

binarywang · binarywang · commit 4f1c66efceef · 2017-10-13T11:52:44.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -152,7 +152,7 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
-        <version>3.6</version>
+        <version>3.5</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
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
@@ -333,12 +333,18 @@ public void setTradeType(String tradeType) {
 
   @Override
   protected void checkConstraints() throws WxPayException {
-    if (TradeType.JSAPI.equals(this.getTradeType()) && this.getOpenid() == null && this.getSubOpenid() == null) {
-      throw new WxPayException("当 trade_type是'JSAPI'时未指定openid或sub_openid");
+    if (TradeType.JSAPI.equals(this.getTradeType())) {
+      if (StringUtils.isBlank(this.getSubAppId()) && StringUtils.isBlank(this.getOpenid())) {
+        throw new WxPayException("当trade_type是'JSAPI'时，需指定非空的openid值");
+      }
+
+      if (StringUtils.isNotBlank(this.getSubAppId()) && StringUtils.isBlank(this.getSubOpenid())) {
+        throw new WxPayException("在服务商模式下，当trade_type是'JSAPI'时，需指定非空的sub_openid值");
+      }
     }
 
-    if (TradeType.NATIVE.equals(this.getTradeType()) && this.getProductId() == null) {
-      throw new WxPayException("当 trade_type是'NATIVE'时未指定product_id");
+    if (TradeType.NATIVE.equals(this.getTradeType()) && StringUtils.isBlank(this.getProductId())) {
+      throw new WxPayException("当trade_type是'NATIVE'时，需指定非空的product_id值");
     }
   }
 
