提货单发料

src/main/java/com/srq/modules/base/utils/HttpClientUtil.java

@@ -298,10 +298,14 @@ public class HttpClientUtil {
                 responseData.setCode(code + "");
                 responseData.setMsg(strData);
                 responseData.setCount(resultMap.get("total") == null ? 0 : Integer.parseInt(resultMap.get("total").toString()));
-                if (code != 400) {
+                if (code != 400 && resultMap.containsKey("row")) {
                     String objString = String.valueOf(resultMap.get("row"));
                     responseData.setObj(objString);
                 }
+                if (code != 400 && resultMap.containsKey("rows")) {
+                    String objString = String.valueOf(resultMap.get("rows"));
+                    responseData.setObj(objString);
+                }
             } else {
                 responseData.setCode(statusCode + "");
                 responseData.setMsg("错误码：" + statusCode);

src/main/java/com/srq/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java

@@ -16,11 +16,7 @@ import com.srq.modules.base.utils.HttpClientUtil;
 import com.srq.modules.base.utils.ResponseData;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 @Service
@@ -164,6 +160,6 @@ public class IssureNotifyServiceImpl implements IssureNotifyService {
         }
         String rows = result.getObj().toString();
 //        List<Map> list = JSON.parseArray(rows, Map.class);
-        return JSON.parseArray(rows, PickDetail.class);
+        return Optional.ofNullable(JSON.parseArray(rows, PickDetail.class)).orElse(Collections.emptyList());
     }
 }