Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -744,8 +744,10 @@ public class UniversalController extends BaseRESTfulController {
 
         //List<String> list = universalService.getWarrantyAndPrint(orderNumber);
         List<String> list= universalService.getWarranty(orderNumber);
-        if(list.get(0).equals("0")){
-            return failed("质保书正在紧张制作中，请耐心等待！");
+        if(list.get(0).equals("-1")){
+            return failed(-1,"质保书正在紧张制作中，请耐心等待！");
+        }else if(list.get(0).equals("-2")){
+            return failed(-2,"该车还未装货");
         }
         return success(list);
     }

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -81,26 +81,32 @@ public class UniversalServiceImpl implements UniversalService {
 
     @Override
     public List<String> getWarranty(String orderNumber) {
+        List<String> list = new ArrayList<>();
         //回传金蝶
         //根据orderNumber查询
         Map<String,Object> map = getWarrantyToES(orderNumber);
-        String string = joinFeign.sendWarranty(map);
-        Map<String,Object> waMap = JSON.parseObject(string);
-        List<String> list = new ArrayList<>();
-        //成功
-        if(waMap.get("kdStatus").equals("1")){
-            List<Map<String,Object>> reportList = (List<Map<String,Object>>) waMap.get("qcReportList");
-            Map<String,Object> map1 = reportList.get(0);
-            Iterator<Map.Entry<String, Object>> it = map1.entrySet().iterator();
-            Map.Entry<String,Object> entry;
-            while(it.hasNext()){
-                entry =  it.next();
-                String value = (String) entry.getValue();
-                list.add(value);
+        String string = null;
+        try{
+             string = joinFeign.sendWarranty(map);
+            Map<String,Object> waMap = JSON.parseObject(string);
+            //成功
+            if(waMap.get("kdStatus").equals("1")){
+                List<Map<String,Object>> reportList = (List<Map<String,Object>>) waMap.get("qcReportList");
+                Map<String,Object> map1 = reportList.get(0);
+                Iterator<Map.Entry<String, Object>> it = map1.entrySet().iterator();
+                Map.Entry<String,Object> entry;
+                while(it.hasNext()){
+                    entry =  it.next();
+                    String value = (String) entry.getValue();
+                    list.add(value);
+                }
+            }    //失败
+            else{
+                list.add("-1");
             }
-        }//失败
-        else{
-            list.add("0");
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            list.add("-2");
         }
         return list;
     }