Merge branch 'master' of http://gitlab.house365.com/xuzhou/njzsb

src/com/jshx/fstzs/fsutil/FsRequest.java

@@ -6,11 +6,9 @@ import com.google.gson.reflect.TypeToken;
 import com.jshx.core.utils.CodeUtil;
 import com.jshx.core.utils.SysPropertiesUtil;
 import com.jshx.fstzs.entity.Fstzs;
-import com.jshx.fstzs.entity.FstzsXm;
 import com.jshx.fstzs.fsutil.bean.*;
-import com.jshx.fstzs.service.FstzsService;
 import com.jshx.http.HttpclientUtil;
-import org.apache.commons.lang3.AnnotationUtils;
+import com.neusoft.egov.utils.TextUtils;
 
 import java.io.UnsupportedEncodingException;
 import java.text.SimpleDateFormat;
@@ -32,7 +30,7 @@ public class FsRequest {
             String post = HttpclientUtil.post(getProp("fs-url"), params);
 
             if(post != null) {
-                String resp = new String(CodeUtil.base64Decode(post));
+                String resp = new String(CodeUtil.base64Decode(post),"utf-8");
                 System.out.println("resp：" + resp);
                 return resp;
             }
@@ -41,7 +39,7 @@ public class FsRequest {
             e.printStackTrace();
         }
 
-        return "失败";
+        return null;
     }
 
     private static String test() {
@@ -87,6 +85,9 @@ public class FsRequest {
 
         try {
             String request = request("paybook.e.issue.do", map);
+            if(TextUtils.isEmpty(request)) {
+                return FsResult.fail("网络异常,请重试！");
+            }
             FsResp<KjjksResp> resp = new Gson().fromJson(request, new TypeToken<FsResp<KjjksResp>>() {
             }.getType());
             if(resp.errorMessage != null) {
@@ -109,6 +110,9 @@ public class FsRequest {
         Map<String,Object> map = new HashMap<>();
         map.put("pay_code",fstzs.getJkm());
         String request = request("paybook.e.invalidate.do", map);
+        if(TextUtils.isEmpty(request)) {
+            return FsResult.fail("网络异常,请重试！");
+        }
         FsResp<CaozuoResp> resp = new Gson().fromJson(request, new TypeToken<FsResp<CaozuoResp>>() {
         }.getType());
         if(resp.message != null && "0000".equals(resp.message.succCode)) {
@@ -149,6 +153,9 @@ public class FsRequest {
         mapPh.put("place_code",getProp("fs-kpdbm"));//开票点编码
         mapPh.put("bill_batch_code",getProp("fs-pjdm"));// 票据代码
         String requestPh = request("stock.billno.get", mapPh);
+        if(TextUtils.isEmpty(requestPh)) {
+            return FsResult.fail("网络异常,请重试！");
+        }
         FsResp<KaipiaoResp> respPh = new Gson().fromJson(requestPh, new TypeToken<FsResp<KaipiaoResp>>() {
         }.getType());
         //2,通过电子票号 开票