wei.zhou / iClear-api

Go to a project
Toggle navigation Toggle navigation pinning
wei.zhou
a7f60894 1 parent ebf9b658

提交代码

Inline Side-by-side
Showing 4 changed files with 9 additions and 74 deletions
...@@ -33,7 +33,7 @@ public class Constant { ...@@ -33,7 +33,7 @@ public class Constant {
33 33
34 public static String MSG_TYPE_D="D"; 34 public static String MSG_TYPE_D="D";
35 35
36 - public static String LEVY_TYPE="levyType_"; 36 + //public static String LEVY_TYPE="levyType_";
37 37
38 public static String TRANSACTION_UNIT="transactionUnit_"; 38 public static String TRANSACTION_UNIT="transactionUnit_";
39 39
...@@ -51,5 +51,11 @@ public class Constant { ...@@ -51,5 +51,11 @@ public class Constant {
51 51
52 public static String SUPERVISION_MODE ="supervisionMode_"; 52 public static String SUPERVISION_MODE ="supervisionMode_";
53 53
54 + public static String NATURE_EXEMPTION ="natureExemption_";
55 +
56 +
57 +
58 +
59 +
54 60
55 } 61 }
......
...@@ -99,75 +99,4 @@ public class SignInterceptor extends HandlerInterceptorAdapter { ...@@ -99,75 +99,4 @@ public class SignInterceptor extends HandlerInterceptorAdapter {
99 } 99 }
100 } 100 }
101 101
102 -
103 -
104 -
105 -
106 -
107 -
108 -//
109 -// @Override
110 -// public void afterCompletion(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, Exception arg3) throws Exception {
111 -// // TODO Auto-generated method stub
112 -//
113 -// }
114 -// @Override
115 -// public void postHandle(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, ModelAndView arg3) throws Exception {
116 -// // TODO Auto-generated method stub
117 -//
118 -// }
119 -// @Override
120 -// public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object arg2) throws Exception {
121 -// String appId=(String) request.getHeader("Appid");
122 -// String appkey=(String) request.getHeader("Appkey");
123 -// String timeStamp=(String) request.getHeader("TimeStamp");
124 -// String token= (String) request.getHeader("token");
125 -//
126 -//
127 -// if(StringUtils.isBlank(appId)){
128 -// log.info("Appid 为空");
129 -// return false;
130 -// }
131 -//
132 -//
133 -// if(StringUtils.isBlank(appkey)){
134 -// log.info("Appkey 为空");
135 -// return false;
136 -// }
137 -//
138 -//
139 -// if(StringUtils.isBlank(timeStamp)){
140 -// log.info("TimeStamp 为空");
141 -// return false;
142 -// }
143 -//
144 -//
145 -// if(StringUtils.isBlank(token)){
146 -// log.info("token 为空");
147 -// return false;
148 -// }
149 -//
150 -//
151 -// HashMap<String,String> secretMap = Constant.appIdSecurityCache.get(appId);
152 -// if(secretMap==null){
153 -// log.info("系统异常,该appId没有注册");
154 -// return false;
155 -// }
156 -//
157 -// String secretInSys = secretMap.get(appkey);
158 -// if (StringUtils.isBlank(secretInSys)) {
159 -// log.info("系统异常,该appId没有权限/密码");
160 -// return false;
161 -// }
162 -//
163 -//
164 -// String sha256Str = SHA256Util.getSHA256String(appId+appkey+secretInSys+timeStamp);
165 -// if(!token.equals(sha256Str)){
166 -// log.info("Token验证失败");
167 -// return false;
168 -// }
169 -// return false;
170 -// }
171 -
172 -
173 } 102 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -35,7 +35,7 @@ public class ChmConsignmentDetailService { ...@@ -35,7 +35,7 @@ public class ChmConsignmentDetailService {
35 //申报总价 35 //申报总价
36 result.setAmount(mawbDetail.getDeclTotal()); 36 result.setAmount(mawbDetail.getDeclTotal());
37 //征免方式 37 //征免方式
38 - DictionaryEntries levyTypeDictionaryEntries = Constant.dictionaryEntriesCache.get(Constant.LEVY_TYPE+mawbDetail.getDutyMode()); 38 + DictionaryEntries levyTypeDictionaryEntries = Constant.dictionaryEntriesCache.get(Constant.NATURE_EXEMPTION+mawbDetail.getDutyMode());
39 result.setLevyTypeDic(levyTypeDictionaryEntries); 39 result.setLevyTypeDic(levyTypeDictionaryEntries);
40 result.setLevyType(levyTypeDictionaryEntries.getChineseName()); 40 result.setLevyType(levyTypeDictionaryEntries.getChineseName());
41 //货号 41 //货号
......
...@@ -63,7 +63,7 @@ public class ChmConsignmentService { ...@@ -63,7 +63,7 @@ public class ChmConsignmentService {
63 //主管海关（申报地海关） 63 //主管海关（申报地海关）
64 result.setCustomsNo(mawb.getCustomMaster()); 64 result.setCustomsNo(mawb.getCustomMaster());
65 //征免性质 65 //征免性质
66 - DictionaryEntries levyTypeDictionaryEntries = Constant.dictionaryEntriesCache.get(Constant.LEVY_TYPE+mawb.getCutMode()); 66 + DictionaryEntries levyTypeDictionaryEntries = Constant.dictionaryEntriesCache.get(Constant.NATURE_EXEMPTION+mawb.getCutMode());
67 result.setTaxNatureDic(levyTypeDictionaryEntries); 67 result.setTaxNatureDic(levyTypeDictionaryEntries);
68 result.setTaxNature(levyTypeDictionaryEntries.getChineseName()); 68 result.setTaxNature(levyTypeDictionaryEntries.getChineseName());
69 //报关/转关关系标志:固定值0 ，但数据字典里没有0 69 //报关/转关关系标志:固定值0 ，但数据字典里没有0
......