From 27daa124bba734f3bce571297c76e55cf7e1eaf9 Mon Sep 17 00:00:00 2001
From: egzosn <egzosn@gmail.com>
Date: Wed, 8 Mar 2017 21:55:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=AE=E4=BF=A1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/in/egan/pay/wx/api/WxPayService.java    | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pay-java-wx/src/main/java/in/egan/pay/wx/api/WxPayService.java b/pay-java-wx/src/main/java/in/egan/pay/wx/api/WxPayService.java
index 8455717..e4cf441 100644
--- a/pay-java-wx/src/main/java/in/egan/pay/wx/api/WxPayService.java
+++ b/pay-java-wx/src/main/java/in/egan/pay/wx/api/WxPayService.java
@@ -78,8 +78,8 @@ public class WxPayService extends BasePayService {
         }
 
         if(null == params.get("sign")) {
-
             log.debug("微信支付异常：签名为空！out_trade_no=" + params.get("out_trade_no"));
+            return false;
         }
 
         try {
@@ -139,8 +139,6 @@ public class WxPayService extends BasePayService {
     @Override
     public Map<String, Object> orderInfo(PayOrder order) {
 
-
-//        Map<String, Object> results = new HashMap<String, Object>();
         ////统一下单
         Map<String, Object> parameters = getPublicParameters();
      /*   parameters.put("appid", payConfigStorage.getAppid());
@@ -177,7 +175,7 @@ public class WxPayService extends BasePayService {
         params.put("partnerid", payConfigStorage.getPid());
         params.put("prepayid", result.get("prepay_id"));
         params.put("timestamp", System.currentTimeMillis() / 1000);
-        params.put("noncestr", result.get("nonce_str")/*WxpayCore.genNonceStr()*/);
+        params.put("noncestr", result.get("nonce_str"));
 
         if (WxTransactionType.JSAPI == order.getTransactionType()){
             params.put("package", "prepay_id=" + result.get("prepay_id"));
@@ -375,6 +373,16 @@ public class WxPayService extends BasePayService {
         setSign(parameters);
         return callback.perform(requestTemplate.postForObject(getUrl(WxTransactionType.DOWNLOADBILL),  XML.getMap2Xml(parameters), JSONObject.class));
     }
+
+    /**
+     *
+     * @param transactionIdOrBillDate 支付平台订单号或者账单类型， 具体请 类型为{@link String }或者 {@link Date }，类型须强制限制，类型不对应则抛出异常{@link in.egan.pay.common.exception.PayErrorException}
+     * @param outTradeNoBillType  商户单号或者 账单类型
+     * @param transactionType 交易类型
+     * @param callback 处理器
+     * @param <T>
+     * @return
+     */
     @Override
     public <T> T secondaryInterface(Object transactionIdOrBillDate, String outTradeNoBillType, TransactionType transactionType, Callback<T> callback) {