Merge branches 'API-2023-04-02' and 'EnglishDescription' of http://118.178.128.1…

…78//Fedex/iClear-api into API-2023-04-02

@@ -38,6 +38,6 @@ public class CommonExceptionAdvice {
             String itemMessage= messageSource.getMessage(x.getDefaultMessage(), null, x.getDefaultMessage(), LocaleContextHolder.getLocale());
             return String.format("%s", itemMessage);
         }).collect(Collectors.toList());
-        return new ResultRS(Boolean.FALSE, ErrorCodeEnum.ERROR_30002.getCode(),errorMessages.toString());
+        return new ResultRS(Boolean.FALSE, ErrorCodeEnum.ERROR_30002.getCode(),errorMessages.toString(),null);
     }
 }

@@ -50,7 +50,7 @@ public class CustomsDataInterface {
     public ResultRS sendMawb(HttpServletRequest request
                                 ,@Validated(MawbAdd.class) @RequestBody Mawb mawb) {
         log.info("接收到请求数据billNo:"+mawb.getBillNo()+" data:" + gson.toJson(mawb));
-        ResultRS result = new ResultRS(Boolean.FALSE,"","");
+        ResultRS result = new ResultRS(Boolean.FALSE,null,null,null);
 
         if(Objects.equals(mawb,null)){
             result.setCode(ErrorCodeEnum.ERROR_7.getCode());

@@ -91,7 +91,8 @@ public class FedexDataInterface {
         log.info("checkBASFMawbFedex:"+fedexc.toString());
         log.info("appId:{},appKey:{},timeStamp:{},token:{}",appId,appKey,timeStamp,token);
 
-        ResultRS result = fedexService.checkBasfInterfaceData(fedexc,appInfo);
+        //非空校验
+        ResultRS nonEmptyCheck = fedexService.checkBasfInterfaceData(fedexc,appInfo);
 
         StopWatch sw = new StopWatch("checkBASFMawbFedex");
         sw.start("generate FedexMawb");
@@ -100,30 +101,36 @@ public class FedexDataInterface {
         sw.stop();
 
         sw.start("checkFedexMawb");
-        String msg = result.getMsg();
-        String iclearCheckMsg = fedexService.checkFedexMawb(saveMawbFedexResult,appInfo).getMsg();
-        if(result.getSuccess() && StringUtil.isEmpty(iclearCheckMsg)){
+        ResultRS iclearCheckRs = fedexService.checkFedexMawb(saveMawbFedexResult,appInfo);
+        //返回结果
+        ResultRS result = new ResultRS(Boolean.TRUE,ErrorCodeEnum.SUCCESS.getCode(),null,null);
+        if(nonEmptyCheck.getSuccess() && iclearCheckRs.getSuccess()){
+            //验证通过
             result.setSuccess(Boolean.TRUE);
+            result.setCode(ErrorCodeEnum.SUCCESS.getCode());
         }else{
-            if(result.getSuccess()){
+            //验证不通过
+            if(nonEmptyCheck.getSuccess()){
                 //基本非空信息验证通过，并且iclear验证失败
-                result.setMsg(iclearCheckMsg);
+                result.setMsg(iclearCheckRs.getMsg());
+                result.setMsgUS(iclearCheckRs.getMsgUS());
+                result.setCode(iclearCheckRs.getCode());
+                result.setSuccess(Boolean.FALSE);
             }else{
                 //基本非空信息验证失败，并且iclear验证失败
-                result.setMsg(msg+";"+iclearCheckMsg);
+                result.setMsg(nonEmptyCheck.getMsg()+";"+iclearCheckRs.getMsg());
+                //基本非空信息验证失败，并且iclear验证失败(英文)
+                result.setMsgUS(iclearCheckRs.getMsgUS());
+                //非空校验与iclear校验都失败，则优先显示非空失败编码
+                result.setCode(nonEmptyCheck.getCode());
+                result.setSuccess(Boolean.FALSE);
             }
         }
         sw.stop();
-
         log.info(sw.prettyPrint());
-        if(result.getSuccess()){
-            result.setSuccess(Boolean.TRUE);
-            result.setCode(ErrorCodeEnum.SUCCESS.getCode());
-        }
         tiClearApiCheckLogSave.setResponseText(result.getMsg());
         tiClearApiCheckLogSave.setCode(result.getCode());
         tiClearApiCheckLogSave.setSuccess(result.getSuccess());
-
         iClearApiCheckLogRepository.save(tiClearApiCheckLogSave);
         log.info(result.toString());
         return result;
@@ -135,7 +142,7 @@ public class FedexDataInterface {
     public ResultRS sendMawbFedex(HttpServletRequest request
             , @RequestBody Fedexc fedexc) throws HttpProcessException {
         log.info("接收到请求数据consignmentCode:"+fedexc.getConsignmentCode()+" data:" + gson.toJson(fedexc));
-        ResultRS result = new ResultRS(Boolean.FALSE,"","");
+        ResultRS result = new ResultRS(Boolean.FALSE,null,null,null);
 
         if(Objects.equals(fedexc,null)){
             result.setCode(ErrorCodeEnum.ERROR_7.getCode());

@@ -7,9 +7,13 @@ import java.io.Serializable;
 
 @Data
 @AllArgsConstructor
-public class IClearCheckResponseResult implements Serializable {
+public class IClearCheckResult implements Serializable {
     //成功标识
     private Boolean success = false;
+    //中文消息
     private String message;
+    //英文消息
+    private String messageUS;
+    //消息编码
     private String code;
 }

@@ -11,14 +11,11 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 public class ResultRS implements Serializable {
-
     //成功标识
     private Boolean success = true;
     private String code;
-
     //错误信息
     private String msg;
     //Object data;
-
-
+    private String msgUS;
 }

@@ -89,7 +89,7 @@ public class SignInterceptor extends HandlerInterceptorAdapter {
         response.setContentType("application/json; charset=utf-8");
         try {
             writer = response.getWriter();
-            ResultRS result = new ResultRS(success,code,msg);
+            ResultRS result = new ResultRS(success,code,msg,null);
             writer.print(JSON.toJSONString(result));
         } catch (IOException e){
             log.error("拦截器输出流异常"+e);

@@ -494,7 +494,7 @@ public class ChmConsignmentService {
      * @param timeStamp
      */
     public ResultRS processChmConsignment(Mawb mawb, String timeStamp, String creator) {
-        ResultRS result = new ResultRS(Boolean.FALSE,null,null);
+        ResultRS result = new ResultRS(Boolean.FALSE,null,null,null);
         try {
             Date pushTime = DateUtils.timeStampToDate(Long.valueOf(timeStamp));
             ChmConsignment chmConsignment=this.convertToChmConsignment(mawb,pushTime,creator);
@@ -580,7 +580,7 @@ public class ChmConsignmentService {
      * @param timeStamp
      */
     public ResultRS processChmConsignmentFedex(FedexMawb fedexMawb, String timeStamp, String creator) {
-        ResultRS result = new ResultRS(Boolean.FALSE,null,null);
+        ResultRS result = new ResultRS(Boolean.FALSE,null,null,null);
         try {
             Date pushTime = DateUtils.timeStampToDate(Long.valueOf(timeStamp));
             ChmConsignment chmConsignment = this.convertToChmConsignmentFedex(fedexMawb,pushTime,creator,null);

@@ -2,7 +2,7 @@ package com.erry.iclear.dateInterface.service;
 
 import com.erry.iclear.dateInterface.enums.ErrorCodeEnum;
 import com.erry.iclear.dateInterface.api.request.*;
-import com.erry.iclear.dateInterface.api.response.IClearCheckResponseResult;
+import com.erry.iclear.dateInterface.api.response.IClearCheckResult;
 import com.erry.iclear.dateInterface.api.response.ResultRS;
 import com.erry.iclear.dateInterface.entity.AppInfo;
 import com.erry.iclear.dateInterface.entity.ChmConsignment;
@@ -114,7 +114,7 @@ public class FedexService {
      * @return
      */
     public ResultRS checkFedexMawb(FedexMawb fedexMawb,AppInfo appInfo){
-        ResultRS result = new ResultRS(Boolean.FALSE,null,null);
+        ResultRS result = new ResultRS(Boolean.FALSE,null,null,null);
         try{
             log.info("checkMawb start>>>>>>>>>>  mawb："+gson.toJson(fedexMawb));
 
@@ -150,10 +150,11 @@ public class FedexService {
 
             log.info("iclearCheckUrl:"+json);
 
-            IClearCheckResponseResult iclearCheckResponseResult = JsonToJava.parseJson(json, IClearCheckResponseResult.class);
+            IClearCheckResult iclearCheckResponseResult = JsonToJava.parseJson(json, IClearCheckResult.class);
             result.setSuccess(iclearCheckResponseResult.getSuccess());
             result.setCode(iclearCheckResponseResult.getCode());
             result.setMsg(iclearCheckResponseResult.getMessage());
+            result.setMsgUS(iclearCheckResponseResult.getMessageUS());
             log.info("<<<<<<<< checkMawb start >>>>>>>>>>  mawb："+gson.toJson(fedexMawb) +" result :" +result.getSuccess() +" iclear check response : " + json + " status : " + result.getSuccess());
         }catch (Exception e){
             log.error("checkMawb() error:",e);
@@ -169,7 +170,7 @@ public class FedexService {
      */
     public ResultRS checkBasfInterfaceData(Fedexc fedexc, AppInfo appInfo){
 
-        ResultRS result = new ResultRS(Boolean.TRUE,null,null);
+        ResultRS result = new ResultRS(Boolean.TRUE,null,null,null);
 
         if(Objects.equals(fedexc,null)){
             result.setCode(ErrorCodeEnum.ERROR_7.getCode());

@@ -25,7 +25,7 @@ public class MawbDetailService {
     }
 
     public ResultRS checkMawbDetail(Mawb mawb){
-        ResultRS result = new ResultRS(Boolean.FALSE,null,null);
+        ResultRS result = new ResultRS(Boolean.FALSE,null,null,null);
         try{
             result.setSuccess(Boolean.TRUE);
         }catch (Exception e){

@@ -3,7 +3,7 @@ package com.erry.iclear.dateInterface.service;
 import com.erry.iclear.dateInterface.enums.ErrorCodeEnum;
 import com.erry.iclear.dateInterface.api.request.Mawb;
 import com.erry.iclear.dateInterface.api.request.MawbDetail;
-import com.erry.iclear.dateInterface.api.response.IClearCheckResponseResult;
+import com.erry.iclear.dateInterface.api.response.IClearCheckResult;
 import com.erry.iclear.dateInterface.api.response.ResultRS;
 import com.erry.iclear.dateInterface.entity.ChmConsignment;
 import com.erry.iclear.dateInterface.entity.ChmConsignmentDetail;
@@ -172,7 +172,7 @@ public class MawbService {
      * @return
      */
     public ResultRS checkMawb(Mawb mawb){
-        ResultRS result = new ResultRS(Boolean.FALSE,null,null);
+        ResultRS result = new ResultRS(Boolean.FALSE,null,null,null);
         try{
             log.info("checkMawb start>>>>>>>>>>  mawb："+gson.toJson(mawb));
             //1、将请求转换为运单
@@ -208,7 +208,7 @@ public class MawbService {
             Map<String,String> headerMap = new HashMap<>();
             headerMap.put("Content-Type", "application/json");
             String json = HttpUtils.doPost(this.iclearCheckUrl,objJson,headerMap);
-            IClearCheckResponseResult iclearCheckResponseResult = JsonToJava.parseJson(json, IClearCheckResponseResult.class);
+            IClearCheckResult iclearCheckResponseResult = JsonToJava.parseJson(json, IClearCheckResult.class);
             result.setSuccess(iclearCheckResponseResult.getSuccess());
             result.setCode(iclearCheckResponseResult.getCode());
             result.setMsg(iclearCheckResponseResult.getMessage());
@@ -226,7 +226,7 @@ public class MawbService {
      * @return
      */
     private ResultRS notBlankCheck(Mawb mawb,String dealMode) {
-        ResultRS result = new ResultRS(Boolean.TRUE, null, null);
+        ResultRS result = new ResultRS(Boolean.TRUE, null, null,null);
         //成交方式为CIF时  '参数feeCurr不能为空','参数feeMark不能为空'',参数feeRate不能为空','参数insurCurr不能为空', '参数insurRate不能为空'
         if(dealMode.equals("CIF、CIP、DDP、DDU、DAP")){
             if(StringUtil.isEmpty(mawb.getFeeCurr())){