From 9948d85f9dadb900cf5db36bc40c2df0e501e992 Mon Sep 17 00:00:00 2001
From: "egzosn@gmail.com" <930928lI1>
Date: Fri, 23 Jun 2017 17:14:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=9F=A5=E8=AF=A2=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=A9=BA=E4=B8=B2=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/egzosn/pay/wx/api/WxPayService.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java
index 82f77b0..cce7cfd 100644
--- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java
+++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java
@@ -1,6 +1,5 @@
 package com.egzosn.pay.wx.api;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.egzosn.pay.common.api.BasePayService;
 import com.egzosn.pay.common.api.Callback;
@@ -537,10 +536,10 @@ public class WxPayService extends BasePayService {
 
         //获取公共参数
         Map<String, Object> parameters = getPublicParameters();
-        if (null != transactionIdOrBillDate){
-            parameters.put("transaction_id", transactionIdOrBillDate);
-        }else {
+        if (null == transactionIdOrBillDate ||  "".equals(transactionIdOrBillDate)){
             parameters.put("out_trade_no", outTradeNoBillType);
+        }else {
+            parameters.put("transaction_id", transactionIdOrBillDate);
         }
         //设置签名
         setSign(parameters);