提交代码

@@ -33,7 +33,7 @@ public class Constant {
 
     public static String MSG_TYPE_D="D";
 
-    public static String LEVY_TYPE="levyType_";
+    //public static String LEVY_TYPE="levyType_";
 
     public static String TRANSACTION_UNIT="transactionUnit_";
 
@@ -51,5 +51,11 @@ public class Constant {
 
     public static String SUPERVISION_MODE ="supervisionMode_";
 
+    public static String NATURE_EXEMPTION ="natureExemption_";
+
+
+
+
+
 
 }

@@ -99,75 +99,4 @@ public class SignInterceptor extends HandlerInterceptorAdapter {
         }
     }
 
-
-
-
-
-
-
-//
-//    @Override
-//    public void afterCompletion(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, Exception arg3) throws Exception {
-//        // TODO Auto-generated method stub
-//
-//    }
-//    @Override
-//    public void postHandle(HttpServletRequest arg0, HttpServletResponse arg1,  Object arg2, ModelAndView arg3) throws Exception {
-//        // TODO Auto-generated method stub
-//
-//    }
-//    @Override
-//    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object arg2) throws Exception {
-//        String appId=(String) request.getHeader("Appid");
-//        String appkey=(String) request.getHeader("Appkey");
-//        String timeStamp=(String) request.getHeader("TimeStamp");
-//        String token= (String) request.getHeader("token");
-//
-//
-//        if(StringUtils.isBlank(appId)){
-//            log.info("Appid 为空");
-//            return false;
-//        }
-//
-//
-//        if(StringUtils.isBlank(appkey)){
-//            log.info("Appkey 为空");
-//            return false;
-//        }
-//
-//
-//        if(StringUtils.isBlank(timeStamp)){
-//            log.info("TimeStamp 为空");
-//            return false;
-//        }
-//
-//
-//        if(StringUtils.isBlank(token)){
-//            log.info("token 为空");
-//            return false;
-//        }
-//
-//
-//        HashMap<String,String> secretMap = Constant.appIdSecurityCache.get(appId);
-//        if(secretMap==null){
-//            log.info("系统异常,该appId没有注册");
-//            return false;
-//        }
-//
-//        String secretInSys = secretMap.get(appkey);
-//        if (StringUtils.isBlank(secretInSys)) {
-//            log.info("系统异常,该appId没有权限/密码");
-//            return false;
-//        }
-//
-//
-//        String sha256Str = SHA256Util.getSHA256String(appId+appkey+secretInSys+timeStamp);
-//        if(!token.equals(sha256Str)){
-//            log.info("Token验证失败");
-//            return false;
-//        }
-//        return false;
-//    }
-
-
 }
\ No newline at end of file

@@ -35,7 +35,7 @@ public class ChmConsignmentDetailService {
             //申报总价
             result.setAmount(mawbDetail.getDeclTotal());
             //征免方式
-            DictionaryEntries levyTypeDictionaryEntries = Constant.dictionaryEntriesCache.get(Constant.LEVY_TYPE+mawbDetail.getDutyMode());
+            DictionaryEntries levyTypeDictionaryEntries = Constant.dictionaryEntriesCache.get(Constant.NATURE_EXEMPTION+mawbDetail.getDutyMode());
             result.setLevyTypeDic(levyTypeDictionaryEntries);
             result.setLevyType(levyTypeDictionaryEntries.getChineseName());
             //货号

@@ -63,7 +63,7 @@ public class ChmConsignmentService {
             //主管海关（申报地海关）
             result.setCustomsNo(mawb.getCustomMaster());
             //征免性质
-            DictionaryEntries levyTypeDictionaryEntries = Constant.dictionaryEntriesCache.get(Constant.LEVY_TYPE+mawb.getCutMode());
+            DictionaryEntries levyTypeDictionaryEntries = Constant.dictionaryEntriesCache.get(Constant.NATURE_EXEMPTION+mawb.getCutMode());
             result.setTaxNatureDic(levyTypeDictionaryEntries);
             result.setTaxNature(levyTypeDictionaryEntries.getChineseName());
             //报关/转关关系标志:固定值0  ，但数据字典里没有0