修改字段

@@ -97,17 +97,14 @@ public class ResultExitData implements Serializable {
     private String areaDescChn;
 
     /**
-     * 16.代理人全称
+     * 16.订仓代理人
      */
-    private String fullName;
+    private String orderName;
 
     /**
-     * 17.货主类型
-     * 111	= 发货代理
-     * 222	= 订舱代理
-     * 333	= 操作代理/结算代理
+     * 17.结算代理人
      */
-    private String theShipperType;
+    private String countName;
 
     /**
      * 18.品名
@@ -166,4 +163,6 @@ public class ResultExitData implements Serializable {
      * 28.体积
      */
     private BigDecimal volumeMeasure;
+
+
 }

@@ -41,7 +41,7 @@ public class CgoAsmController {
      * @return
      */
     @GetMapping("/getInfo")
-    public ResultExitData getInfo(@RequestParam(value = "waybillNoMaster", required = false)String waybillNoMaster) {
+    public ResultExitData getInfo(@RequestParam(value = "waybillNoMaster", required = false) String waybillNoMaster) {
         ResultExitData result = new ResultExitData();
         /**
          * 2.根据运单号，获取品名，二级品类，一级品类
@@ -66,11 +66,29 @@ public class CgoAsmController {
          */
         List<HzWaybillInfo> hz = hzWaybillInfoService.getHzWaybillInfo(waybillNoMaster);
         if (hz != null && hz.size() > 0) {
-            HzShipperInformation hzInfo = hzShipperInformationService.getHzInfo(hz.get(0).getHzInforId());
-            //设置代理人名称
-            result.setFullName(hzInfo.getFullName());
-            //设置代理人类型
-            result.setTheShipperType(hzInfo.getTheShipperType());
+            /**
+             * 同样运单号，货主信息表的ID不止一个，需要遍历
+             */
+            for (int i = 0; i < hz.size(); i++) {
+                HzShipperInformation hzInfo = new HzShipperInformation();
+                hzInfo = hzShipperInformationService.getHzInfo(hz.get(i).getHzInforId());
+                if ("222".equals(hzInfo.getTheShipperType())) {
+                    //订仓代理人
+                    result.setOrderName(hzInfo.getFullName());
+                }
+                if ("333".equals(hzInfo.getTheShipperType())) {
+                    //结算代理人
+                    result.setCountName(hzInfo.getFullName());
+                }
+            }
+//            HzShipperInformation hzInfo = hzShipperInformationService.getHzInfo(hz.get(0).getHzInforId());
+//            //设置代理人名称
+//            result.setCountName(hzInfo.getFullName());
+//            result.setOrderName(hzInfo.getFullName());
+//            //设置代理人类型
+//            result.setTheShipperType(hzInfo.getTheShipperType());
+
+
         }
         return result;
     }

@@ -34,10 +34,10 @@ mybatis:
   type-aliases-package: com.sunyo.wlpt.cgoasm.provide.domain
 
 # \u65E5\u5FD7\u6253\u5370
-#logging:
+logging:
 #  config: config/logback-dev.xml
-#  level:
-#    com.sunyo.wlpt.cgoasm.provide.mapper: debug
+  level:
+    com.sunyo.wlpt.cgoasm.provide.mapper: debug
 #logback:
 #  appname: cgonms-provide
 #  logdir: ./log
@@ -66,8 +66,8 @@ feign:
   client:
     config:
       default:
-        connectTimeout: 120000 # feign 的超时设置
-        readTimeout: 120000
+        connectTimeout: 600000 # feign 的超时设置
+        readTimeout: 600000
 # boot admin
 management:
   endpoints: