返回提示信息修改

@@ -78,11 +78,26 @@ public class CustomsDataInterface {
             mawb.getMawbDetailList().forEach(d->{
                 d.setMsgId(saveIClearApiLogResult.getMsgId());
             });
-            Mawb saveMawbResult= mawbService.saveMawb(mawb);
-            if(!Objects.equals(saveMawbResult,null)){
-                log.info("请求数据主单号"+mawb.getBillNo()+"保存成功，msgId："+saveMawbResult.getMsgId());
+            Map<String,String> map = mawbService.saveMawb(mawb);
+            if(map != null && map.get("success").equals("true")){
+                log.info("请求数据主单号"+mawb.getBillNo()+"保存成功，msgId："+map.get("msg"));
             }else{
                 log.info("请求数据主单号"+mawb.getBillNo()+"保存失败");
+                String [] erroeMes = map.get("msg").split("interpolatedMessage=");
+                String msg = "";
+                if (erroeMes != null){
+                    for (int i =1;i<erroeMes.length;i++){
+                        if (i== erroeMes.length -1){
+                            msg += erroeMes[i].substring(0,erroeMes[i].indexOf(","));
+                        }else{
+                            msg += erroeMes[i].substring(0,erroeMes[i].indexOf(","))+",";
+                        }
+                    }
+                }
+                sw.stop();
+                result.setCode("30001");
+                result.setMsg(msg);
+                return result;
             }
         }else{
             log.info("请求日志保存失败，BillNo："+mawb.getBillNo());
@@ -133,6 +148,7 @@ public class CustomsDataInterface {
         //6、return result
         result.setSuccess(Boolean.TRUE);
         result.setCode("0");
+        result.setMsg("操作成功");
         return result;
     }
 }

@@ -11,4 +11,5 @@ public class IClearCheckResponseResult implements Serializable {
     //成功标识
     private Boolean success = false;
     private String message;
+    private String code;
 }

@@ -23,9 +23,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * @author Administrator
@@ -52,16 +50,20 @@ public class MawbService {
      * 保存主单Request
      * @param mawb
      */
-    public Mawb saveMawb(Mawb mawb){
-        Mawb result=null;
+    public Map<String,String> saveMawb(Mawb mawb){
+        Map<String,String> map = new HashMap<>();
         try{
             log.info("saveMawb start>>>>>>>>>>>");
-            result =mawbRepository.save(mawb);
+            Mawb mawb1 = mawbRepository.save(mawb);
             log.info("saveMawb end>>>>>>>>>>>");
+            map.put("success","true");
+            map.put("msg",mawb1.getMsgId().toString());
         }catch (Exception e){
             log.error("saveMawb() error:"+e.getMessage());
+            map.put("success","false");
+            map.put("msg",e.getMessage());
         }
-        return result;
+        return map;
     }
 
 
@@ -103,6 +105,7 @@ public class MawbService {
             String json = HttpClientUtil.post(config);
             IClearCheckResponseResult iclearCheckResponseResult = JsonToJava.parseJson(json, IClearCheckResponseResult.class);
             result.setSuccess(iclearCheckResponseResult.getSuccess());
+            result.setCode(iclearCheckResponseResult.getCode());
             result.setMsg(iclearCheckResponseResult.getMessage());
             log.info("<<<<<<<< checkMawb start >>>>>>>>>>  mawb："+gson.toJson(mawb) +" result :" +result.getSuccess() +" iclear check response : " + json + " status : " + result.getSuccess());
         }catch (Exception e){

@@ -26,9 +26,9 @@ api:
     password: toQu3arch6
   address:
     #IClear校验运单地址
-    iclear-check-url: http://40.73.78.157:8080/chmConsignmentController/checkChmAndDetaliD
+    iclear-check-url: http://139.217.114.139:8082/chmConsignmentController/checkChmAndDetaliD
     #IClear校验C类运单地址
-    iclear-check-url-c: http://40.73.78.157:8080/chmConsignmentController/checkChmAndDetaliC
+    iclear-check-url-c: http://139.217.114.139:8082/chmConsignmentController/checkChmAndDetaliC
     #获取token地址
     token-url: https://apiuat.iclrccd-fedex.com/login
     #刷新token地址

@@ -27,7 +27,7 @@ api:
     #IClear校验运单地址
     iclear-check-url: https://www.iclrccd-fedex.com/chmConsignmentController/checkChmAndDetaliD
     #IClear校验C类运单地址
-    iclear-check-url-c: http://40.73.78.157:8080/chmConsignmentController/checkChmAndDetaliC
+    iclear-check-url-c: http://139.217.114.139:8082/chmConsignmentController/checkChmAndDetaliC
     #获取token地址
     token-url: https://api.iclrccd-fedex.com/export/login
     #刷新token地址

@@ -25,9 +25,9 @@ api:
     password: toQu3arch6
   address:
     #IClear校验运单地址
-    iclear-check-url: http://40.73.78.157:8080/chmConsignmentController/checkChmAndDetaliD
+    iclear-check-url: http://139.217.114.139:8082/chmConsignmentController/checkChmAndDetaliD
     #IClear校验C类运单地址
-    iclear-check-url-c: http://40.73.78.157:8080/chmConsignmentController/checkChmAndDetaliC
+    iclear-check-url-c: http://139.217.114.139:8082/chmConsignmentController/checkChmAndDetaliC
     #获取token地址
     token-url: https://apiuat.iclrccd-fedex.com/login
     #刷新token地址