D类币值校验接口 币值不在系统22个币制范围内时候 提示“此申报币制不在海关要求的范围内 请修改！”

@@ -36,6 +36,9 @@ public class FedexDataInterface {
     private FedexService fedexService;
     private FedexService fedexService;
 
 
     @Autowired
     @Autowired
+    private MawbService mawbService;
+
+    @Autowired
     private ChmConsignmentService chmConsignmentService;
     private ChmConsignmentService chmConsignmentService;
 
 
     @Autowired
     @Autowired
@@ -98,6 +101,12 @@ public class FedexDataInterface {
         sw.start("generate FedexMawb");
         sw.start("generate FedexMawb");
         fedexc.setAppId(appId);
         fedexc.setAppId(appId);
         FedexMawb saveMawbFedexResult = fedexService.generateFedexMawb(fedexc);
         FedexMawb saveMawbFedexResult = fedexService.generateFedexMawb(fedexc);
+
+        //检验运单币制是否有效
+        ResultRS resultRS = mawbService.checkCurrency(saveMawbFedexResult);
+        if(!resultRS.getSuccess()){
+            return resultRS;
+        }
         sw.stop();
         sw.stop();
 
 
         sw.start("checkFedexMawb");
         sw.start("checkFedexMawb");
@@ -186,6 +195,12 @@ public class FedexDataInterface {
         }
         }
         sw.stop();
         sw.stop();
 
 
+        //检验运单币制是否有效
+        ResultRS resultRS = mawbService.checkCurrency(saveMawbFedexResult);
+        if(!resultRS.getSuccess()){
+            return resultRS;
+        }
+
 //        //3、TODO 校验子单
 //        //3、TODO 校验子单
 //        sw.start("checkMawbDetail");
 //        sw.start("checkMawbDetail");
 //        result=mawbDetailServicel.checkMawbDetail(mawb);
 //        result=mawbDetailServicel.checkMawbDetail(mawb);
@@ -359,4 +374,4 @@ public class FedexDataInterface {
         result.setCode(ErrorCodeEnum.SUCCESS.getCode());
         result.setCode(ErrorCodeEnum.SUCCESS.getCode());
         return result;
         return result;
     }
     }
-}
\ No newline at end of file
+}

 package com.erry.iclear.dateInterface.service;
 package com.erry.iclear.dateInterface.service;
 
 
+import com.erry.iclear.dateInterface.api.request.FedexMawb;
+import com.erry.iclear.dateInterface.api.request.FedexMawbDetail;
 import com.erry.iclear.dateInterface.common.Constant;
 import com.erry.iclear.dateInterface.common.Constant;
 import com.erry.iclear.dateInterface.entity.DictionaryEntries;
 import com.erry.iclear.dateInterface.entity.DictionaryEntries;
 import com.erry.iclear.dateInterface.enums.ErrorCodeEnum;
 import com.erry.iclear.dateInterface.enums.ErrorCodeEnum;
@@ -21,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import javax.validation.Valid;
 import java.util.*;
 import java.util.*;
 
 
 /**
 /**
@@ -232,7 +235,66 @@ public class MawbService {
 
 
         return result;
         return result;
     }
     }
+    /**
+     * 检查成交币制在系统中是否有效           Constant.CURRENCY_SYSTEM+ mawbDetail.getTradeCurr();
+     *        成交币制    TradeCurr
+     *        杂费币制    OtherCurr
+     *        运费币制    FeeCurr
+     *        保费币制    InsurCurr
+     *
+     */
+    public ResultRS checkCurrency(FedexMawb mawb){
+        ResultRS result = new ResultRS(Boolean.TRUE,null,null,null);
+
+        String feeCurr = mawb.getFeeCurr();
+        DictionaryEntries feeCurrDict = Constant.dictionaryEntriesCache.get(Constant.CURRENCY_SYSTEM + feeCurr);
+
+        String otherCurr = mawb.getOtherCurr();
+        DictionaryEntries otherCurrDict = Constant.dictionaryEntriesCache.get(Constant.CURRENCY_SYSTEM + otherCurr);
+
+        String insurCurr = mawb.getInsurCurr();
+        DictionaryEntries insurCurrDict = Constant.dictionaryEntriesCache.get(Constant.CURRENCY_SYSTEM + insurCurr);
+
+        //运费币制检查
+        if (StringUtils.isNotEmpty(feeCurr) && Objects.isNull(feeCurrDict) ){
+            result.setSuccess(Boolean.FALSE);
+            result.setCode(ErrorCodeEnum.ERROR_30106.getCode());
+            result.setMsg(ErrorCodeEnum.ERROR_30106.getName().replace("{columnName}","运费"));
+            return result;
+        }
+
+        //杂费币制检查
+        if (StringUtils.isNotEmpty(otherCurr) && Objects.isNull(otherCurrDict) ){
+            result.setSuccess(Boolean.FALSE);
+            result.setCode(ErrorCodeEnum.ERROR_30106.getCode());
+            result.setMsg(ErrorCodeEnum.ERROR_30106.getName().replace("{columnName}","杂费"));
+            return result;
+        }
+
+        //保费币制检查
+        if (StringUtils.isNotEmpty(insurCurr) && Objects.isNull(insurCurrDict) ){
+            result.setSuccess(Boolean.FALSE);
+            result.setCode(ErrorCodeEnum.ERROR_30106.getCode());
+            result.setMsg(ErrorCodeEnum.ERROR_30106.getName().replace("{columnName}","保费"));
+            return result;
+        }
 
 
+        //申报币制检查
+        List<FedexMawbDetail> mawbDetailList = mawb.getMawbDetailList();
+        for (int i = 0, maxi = mawbDetailList.size(); i < maxi; i++) {
+            FedexMawbDetail mawbDetail = mawbDetailList.get(i);
+            String tradeCurr = mawbDetail.getTradeCurr();
+            DictionaryEntries tradeCurrDict = Constant.dictionaryEntriesCache.get(Constant.CURRENCY_SYSTEM + tradeCurr);
+            if((StringUtils.isNotEmpty(tradeCurr) && Objects.isNull(tradeCurrDict))){
+                result.setSuccess(Boolean.FALSE);
+                result.setCode(ErrorCodeEnum.ERROR_30106.getCode());
+                result.setMsg(ErrorCodeEnum.ERROR_30106.getName().replace("{columnName}",""));
+                break;
+            }
+        }
+
+        return result;
+    }
 
 
     /**
     /**
      * 校验主单
      * 校验主单