From 655b2c3201cc945425495349e2f54de72087f998 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Fri, 26 May 2017 14:30:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wxpay/service/impl/WxPayServiceImpl.java        | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java
index e7c73fa62..cb4992850 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java
@@ -311,24 +311,23 @@ public class WxPayServiceImpl implements WxPayService {
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/pay/downloadbill";
-    //TODO 返回的内容可能是文件流，也有可能是xml，需要区分对待
     String responseContent = this.post(url, request.toXML());
-    if (responseContent.startsWith("<")){
+    if (responseContent.startsWith("<")) {
       WxPayCommonResult result = WxPayBaseResult.fromXML(responseContent, WxPayCommonResult.class);
       result.checkResult(this);
       return null;
-    }else{
+    } else {
       WxPayBillResult wxPayBillResult = billInformationDeal(responseContent);
       return wxPayBillResult;
     }
   }
 
-    private WxPayBillResult billInformationDeal(String responseContent){
+  private WxPayBillResult billInformationDeal(String responseContent) {
     WxPayBillResult wxPayBillResult = new WxPayBillResult();
 
     String listStr = "";
     String objStr = "";
-    if (responseContent.indexOf("总交易单数") >= 0){
+    if (responseContent.contains("总交易单数")) {
       listStr = responseContent.substring(0, responseContent.indexOf("总交易单数"));
       objStr = responseContent.substring(responseContent.indexOf("总交易单数"));
     }
@@ -341,13 +340,13 @@ public class WxPayServiceImpl implements WxPayService {
 
     // 参考以上格式进行取值
 
-    List<WxPayBillBaseResult> wxPayBillBaseResultLst = new LinkedList<WxPayBillBaseResult>();
+    List<WxPayBillBaseResult> wxPayBillBaseResultLst = new LinkedList<>();
     String newStr = listStr.replaceAll(",", " "); // 去空格
     String[] tempStr = newStr.split("`"); // 数据分组
     String[] t = tempStr[0].split(" ");// 分组标题
     int j = tempStr.length / t.length; // 计算循环次数
     int k = 1; // 纪录数组下标
-    for (int i = 0; i < j; i++){
+    for (int i = 0; i < j; i++) {
       WxPayBillBaseResult wxPayBillBaseResult = new WxPayBillBaseResult();
 
       wxPayBillBaseResult.setTradeTime(tempStr[k]);