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

@@ -26,7 +26,8 @@ public enum ErrorCodeEnum {
     ERROR_30102("30102","hscode编码字段长度超过2000字符"),
     ERROR_30103("30103","skuCode与skuName必须传递一项"),
     ERROR_30104("30104","skuCode或skuName长度超出限制"),
-    ERROR_30105("30105","skuCode编码最少输入4位字符，skuName最少输入2个字符");
+    ERROR_30105("30105","skuCode编码最少输入4位字符，skuName最少输入2个字符"),
+    ERROR_30106("30106","此申报{columnName}币制不在海关要求的范围内 请修改！");
 
     ErrorCodeEnum(String code,String name){
         this.code = code;

@@ -192,15 +192,31 @@ public class MawbService {
         String insurCurr = mawb.getInsurCurr();
         DictionaryEntries insurCurrDict = Constant.dictionaryEntriesCache.get(Constant.CURRENCY_SYSTEM + insurCurr);
 
-        if((StringUtils.isNotEmpty(feeCurr) && Objects.isNull(feeCurrDict) )
-                || (StringUtils.isNotEmpty(otherCurr) && Objects.isNull(otherCurrDict) )
-                || (StringUtils.isNotEmpty(insurCurr) && Objects.isNull(insurCurrDict) )){
+        //运费币制检查
+        if (StringUtils.isNotEmpty(feeCurr) && Objects.isNull(feeCurrDict) ){
             result.setSuccess(Boolean.FALSE);
-            result.setCode(ErrorCodeEnum.ERROR_30001.getCode());
-            result.setMsg(ErrorCodeEnum.ERROR_30001.getName());
+            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<MawbDetail> mawbDetailList = mawb.getMawbDetailList();
         for (int i = 0, maxi = mawbDetailList.size(); i < maxi; i++) {
             MawbDetail mawbDetail = mawbDetailList.get(i);
@@ -208,8 +224,8 @@ public class MawbService {
             DictionaryEntries tradeCurrDict = Constant.dictionaryEntriesCache.get(Constant.CURRENCY_SYSTEM + tradeCurr);
             if((StringUtils.isNotEmpty(tradeCurr) && Objects.isNull(tradeCurrDict))){
                 result.setSuccess(Boolean.FALSE);
-                result.setCode(ErrorCodeEnum.ERROR_30001.getCode());
-                result.setMsg(ErrorCodeEnum.ERROR_30001.getName());
+                result.setCode(ErrorCodeEnum.ERROR_30106.getCode());
+                result.setMsg(ErrorCodeEnum.ERROR_30106.getName().replace("{columnName}",""));
                 break;
             }
         }