Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
zelong.shao
f5623e5d 2 parents 5f267b50 1cb87962

Merge remote-tracking branch 'origin/master'

Inline Side-by-side
Showing 10 changed files with 261 additions and 106 deletions
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <result column="CUSTOMS_CURRENCY" jdbcType="VARCHAR" property="customsCurrency" /> 20 <result column="CUSTOMS_CURRENCY" jdbcType="VARCHAR" property="customsCurrency" />
21 <result column="CUSTOMS_VALUE" jdbcType="NUMERIC" property="customsValue" /> 21 <result column="CUSTOMS_VALUE" jdbcType="NUMERIC" property="customsValue" />
22 <result column="WEIGHT" jdbcType="NUMERIC" property="weight" /> 22 <result column="WEIGHT" jdbcType="NUMERIC" property="weight" />
23 - <result column="WEIGHTUNIT" jdbcType="NUMERIC" property="weightunit" /> 23 + <result column="WEIGHTUNIT" jdbcType="VARCHAR" property="weightunit" />
24 <result column="SCANDATE" jdbcType="TIMESTAMP" property="scandate" /> 24 <result column="SCANDATE" jdbcType="TIMESTAMP" property="scandate" />
25 <result column="SHIPPER_CONTACT_NAME" jdbcType="VARCHAR" property="shipperContactName" /> 25 <result column="SHIPPER_CONTACT_NAME" jdbcType="VARCHAR" property="shipperContactName" />
26 <result column="SHIPPER_PHONE" jdbcType="VARCHAR" property="shipperPhone" /> 26 <result column="SHIPPER_PHONE" jdbcType="VARCHAR" property="shipperPhone" />
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
160 #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, 160 #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC},
161 #{modifyUserName,jdbcType=VARCHAR}, #{originCountry,jdbcType=VARCHAR}, #{destinationCountry,jdbcType=VARCHAR}, 161 #{modifyUserName,jdbcType=VARCHAR}, #{originCountry,jdbcType=VARCHAR}, #{destinationCountry,jdbcType=VARCHAR},
162 #{customsCurrency,jdbcType=VARCHAR}, #{customsValue,jdbcType=NUMERIC}, #{weight,jdbcType=NUMERIC}, 162 #{customsCurrency,jdbcType=VARCHAR}, #{customsValue,jdbcType=NUMERIC}, #{weight,jdbcType=NUMERIC},
163 - #{weightunit,jdbcType=NUMERIC}, #{scandate,jdbcType=TIMESTAMP}, #{shipperContactName,jdbcType=VARCHAR}, 163 + #{weightunit,jdbcType=VARCHAR}, #{scandate,jdbcType=TIMESTAMP}, #{shipperContactName,jdbcType=VARCHAR},
164 #{shipperPhone,jdbcType=VARCHAR}, #{shipperAccount,jdbcType=VARCHAR}, #{shipperCompany,jdbcType=VARCHAR}, 164 #{shipperPhone,jdbcType=VARCHAR}, #{shipperAccount,jdbcType=VARCHAR}, #{shipperCompany,jdbcType=VARCHAR},
165 #{shipperAddrLine1,jdbcType=VARCHAR}, #{shipperAddrLine2,jdbcType=VARCHAR}, #{shipperCity,jdbcType=VARCHAR}, 165 #{shipperAddrLine1,jdbcType=VARCHAR}, #{shipperAddrLine2,jdbcType=VARCHAR}, #{shipperCity,jdbcType=VARCHAR},
166 #{shipperEmail,jdbcType=VARCHAR}, #{recipientContactName,jdbcType=VARCHAR}, #{recipientPhone,jdbcType=VARCHAR}, 166 #{shipperEmail,jdbcType=VARCHAR}, #{recipientContactName,jdbcType=VARCHAR}, #{recipientPhone,jdbcType=VARCHAR},
...@@ -331,7 +331,7 @@ ...@@ -331,7 +331,7 @@
331 #{weight,jdbcType=NUMERIC}, 331 #{weight,jdbcType=NUMERIC},
332 </if> 332 </if>
333 <if test="weightunit != null"> 333 <if test="weightunit != null">
334 - #{weightunit,jdbcType=NUMERIC}, 334 + #{weightunit,jdbcType=VARCHAR},
335 </if> 335 </if>
336 <if test="scandate != null"> 336 <if test="scandate != null">
337 #{scandate,jdbcType=TIMESTAMP}, 337 #{scandate,jdbcType=TIMESTAMP},
...@@ -447,7 +447,7 @@ ...@@ -447,7 +447,7 @@
447 WEIGHT = #{record.weight,jdbcType=NUMERIC}, 447 WEIGHT = #{record.weight,jdbcType=NUMERIC},
448 </if> 448 </if>
449 <if test="record.weightunit != null"> 449 <if test="record.weightunit != null">
450 - WEIGHTUNIT = #{record.weightunit,jdbcType=NUMERIC}, 450 + WEIGHTUNIT = #{record.weightunit,jdbcType=VARCHAR},
451 </if> 451 </if>
452 <if test="record.scandate != null"> 452 <if test="record.scandate != null">
453 SCANDATE = #{record.scandate,jdbcType=TIMESTAMP}, 453 SCANDATE = #{record.scandate,jdbcType=TIMESTAMP},
...@@ -522,7 +522,7 @@ ...@@ -522,7 +522,7 @@
522 CUSTOMS_CURRENCY = #{record.customsCurrency,jdbcType=VARCHAR}, 522 CUSTOMS_CURRENCY = #{record.customsCurrency,jdbcType=VARCHAR},
523 CUSTOMS_VALUE = #{record.customsValue,jdbcType=NUMERIC}, 523 CUSTOMS_VALUE = #{record.customsValue,jdbcType=NUMERIC},
524 WEIGHT = #{record.weight,jdbcType=NUMERIC}, 524 WEIGHT = #{record.weight,jdbcType=NUMERIC},
525 - WEIGHTUNIT = #{record.weightunit,jdbcType=NUMERIC}, 525 + WEIGHTUNIT = #{record.weightunit,jdbcType=VARCHAR},
526 SCANDATE = #{record.scandate,jdbcType=TIMESTAMP}, 526 SCANDATE = #{record.scandate,jdbcType=TIMESTAMP},
527 SHIPPER_CONTACT_NAME = #{record.shipperContactName,jdbcType=VARCHAR}, 527 SHIPPER_CONTACT_NAME = #{record.shipperContactName,jdbcType=VARCHAR},
528 SHIPPER_PHONE = #{record.shipperPhone,jdbcType=VARCHAR}, 528 SHIPPER_PHONE = #{record.shipperPhone,jdbcType=VARCHAR},
...@@ -598,7 +598,7 @@ ...@@ -598,7 +598,7 @@
598 WEIGHT = #{weight,jdbcType=NUMERIC}, 598 WEIGHT = #{weight,jdbcType=NUMERIC},
599 </if> 599 </if>
600 <if test="weightunit != null"> 600 <if test="weightunit != null">
601 - WEIGHTUNIT = #{weightunit,jdbcType=NUMERIC}, 601 + WEIGHTUNIT = #{weightunit,jdbcType=VARCHAR},
602 </if> 602 </if>
603 <if test="scandate != null"> 603 <if test="scandate != null">
604 SCANDATE = #{scandate,jdbcType=TIMESTAMP}, 604 SCANDATE = #{scandate,jdbcType=TIMESTAMP},
...@@ -670,7 +670,7 @@ ...@@ -670,7 +670,7 @@
670 CUSTOMS_CURRENCY = #{customsCurrency,jdbcType=VARCHAR}, 670 CUSTOMS_CURRENCY = #{customsCurrency,jdbcType=VARCHAR},
671 CUSTOMS_VALUE = #{customsValue,jdbcType=NUMERIC}, 671 CUSTOMS_VALUE = #{customsValue,jdbcType=NUMERIC},
672 WEIGHT = #{weight,jdbcType=NUMERIC}, 672 WEIGHT = #{weight,jdbcType=NUMERIC},
673 - WEIGHTUNIT = #{weightunit,jdbcType=NUMERIC}, 673 + WEIGHTUNIT = #{weightunit,jdbcType=VARCHAR},
674 SCANDATE = #{scandate,jdbcType=TIMESTAMP}, 674 SCANDATE = #{scandate,jdbcType=TIMESTAMP},
675 SHIPPER_CONTACT_NAME = #{shipperContactName,jdbcType=VARCHAR}, 675 SHIPPER_CONTACT_NAME = #{shipperContactName,jdbcType=VARCHAR},
676 SHIPPER_PHONE = #{shipperPhone,jdbcType=VARCHAR}, 676 SHIPPER_PHONE = #{shipperPhone,jdbcType=VARCHAR},
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 <result column="CUSTOMS_CURRENCY" jdbcType="VARCHAR" property="customsCurrency" /> 13 <result column="CUSTOMS_CURRENCY" jdbcType="VARCHAR" property="customsCurrency" />
14 <result column="CUSTOMS_VALUE" jdbcType="NUMERIC" property="customsValue" /> 14 <result column="CUSTOMS_VALUE" jdbcType="NUMERIC" property="customsValue" />
15 <result column="WEIGHT" jdbcType="NUMERIC" property="weight" /> 15 <result column="WEIGHT" jdbcType="NUMERIC" property="weight" />
16 - <result column="WEIGHTUNIT" jdbcType="NUMERIC" property="weightunit" /> 16 + <result column="WEIGHTUNIT" jdbcType="VARCHAR" property="weightunit" />
17 <result column="SCANDATE" jdbcType="TIMESTAMP" property="scandate" /> 17 <result column="SCANDATE" jdbcType="TIMESTAMP" property="scandate" />
18 <result column="SHIPPER_CONTACT_NAME" jdbcType="VARCHAR" property="shipperContactName" /> 18 <result column="SHIPPER_CONTACT_NAME" jdbcType="VARCHAR" property="shipperContactName" />
19 <result column="SHIPPER_PHONE" jdbcType="VARCHAR" property="shipperPhone" /> 19 <result column="SHIPPER_PHONE" jdbcType="VARCHAR" property="shipperPhone" />
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
167 values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{shipDate,jdbcType=TIMESTAMP}, 167 values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{shipDate,jdbcType=TIMESTAMP},
168 #{shipperCountry,jdbcType=VARCHAR}, #{recipientCountry,jdbcType=VARCHAR}, #{destIataCode,jdbcType=VARCHAR}, 168 #{shipperCountry,jdbcType=VARCHAR}, #{recipientCountry,jdbcType=VARCHAR}, #{destIataCode,jdbcType=VARCHAR},
169 #{originCountry,jdbcType=VARCHAR}, #{destinationCountry,jdbcType=VARCHAR}, #{customsCurrency,jdbcType=VARCHAR}, 169 #{originCountry,jdbcType=VARCHAR}, #{destinationCountry,jdbcType=VARCHAR}, #{customsCurrency,jdbcType=VARCHAR},
170 - #{customsValue,jdbcType=NUMERIC}, #{weight,jdbcType=NUMERIC}, #{weightunit,jdbcType=NUMERIC}, 170 + #{customsValue,jdbcType=NUMERIC}, #{weight,jdbcType=NUMERIC}, #{weightunit,jdbcType=VARCHAR},
171 #{scandate,jdbcType=TIMESTAMP}, #{shipperContactName,jdbcType=VARCHAR}, #{shipperPhone,jdbcType=VARCHAR}, 171 #{scandate,jdbcType=TIMESTAMP}, #{shipperContactName,jdbcType=VARCHAR}, #{shipperPhone,jdbcType=VARCHAR},
172 #{shipperAccount,jdbcType=VARCHAR}, #{shipperCompany,jdbcType=VARCHAR}, #{shipperAddrLine1,jdbcType=VARCHAR}, 172 #{shipperAccount,jdbcType=VARCHAR}, #{shipperCompany,jdbcType=VARCHAR}, #{shipperAddrLine1,jdbcType=VARCHAR},
173 #{shipperAddrLine2,jdbcType=VARCHAR}, #{shipperCity,jdbcType=VARCHAR}, #{shipperEmail,jdbcType=VARCHAR}, 173 #{shipperAddrLine2,jdbcType=VARCHAR}, #{shipperCity,jdbcType=VARCHAR}, #{shipperEmail,jdbcType=VARCHAR},
...@@ -341,7 +341,7 @@ ...@@ -341,7 +341,7 @@
341 #{weight,jdbcType=NUMERIC}, 341 #{weight,jdbcType=NUMERIC},
342 </if> 342 </if>
343 <if test="weightunit != null"> 343 <if test="weightunit != null">
344 - #{weightunit,jdbcType=NUMERIC}, 344 + #{weightunit,jdbcType=VARCHAR},
345 </if> 345 </if>
346 <if test="scandate != null"> 346 <if test="scandate != null">
347 #{scandate,jdbcType=TIMESTAMP}, 347 #{scandate,jdbcType=TIMESTAMP},
...@@ -475,7 +475,7 @@ ...@@ -475,7 +475,7 @@
475 WEIGHT = #{record.weight,jdbcType=NUMERIC}, 475 WEIGHT = #{record.weight,jdbcType=NUMERIC},
476 </if> 476 </if>
477 <if test="record.weightunit != null"> 477 <if test="record.weightunit != null">
478 - WEIGHTUNIT = #{record.weightunit,jdbcType=NUMERIC}, 478 + WEIGHTUNIT = #{record.weightunit,jdbcType=VARCHAR},
479 </if> 479 </if>
480 <if test="record.scandate != null"> 480 <if test="record.scandate != null">
481 SCANDATE = #{record.scandate,jdbcType=TIMESTAMP}, 481 SCANDATE = #{record.scandate,jdbcType=TIMESTAMP},
...@@ -582,7 +582,7 @@ ...@@ -582,7 +582,7 @@
582 CUSTOMS_CURRENCY = #{record.customsCurrency,jdbcType=VARCHAR}, 582 CUSTOMS_CURRENCY = #{record.customsCurrency,jdbcType=VARCHAR},
583 CUSTOMS_VALUE = #{record.customsValue,jdbcType=NUMERIC}, 583 CUSTOMS_VALUE = #{record.customsValue,jdbcType=NUMERIC},
584 WEIGHT = #{record.weight,jdbcType=NUMERIC}, 584 WEIGHT = #{record.weight,jdbcType=NUMERIC},
585 - WEIGHTUNIT = #{record.weightunit,jdbcType=NUMERIC}, 585 + WEIGHTUNIT = #{record.weightunit,jdbcType=VARCHAR},
586 SCANDATE = #{record.scandate,jdbcType=TIMESTAMP}, 586 SCANDATE = #{record.scandate,jdbcType=TIMESTAMP},
587 SHIPPER_CONTACT_NAME = #{record.shipperContactName,jdbcType=VARCHAR}, 587 SHIPPER_CONTACT_NAME = #{record.shipperContactName,jdbcType=VARCHAR},
588 SHIPPER_PHONE = #{record.shipperPhone,jdbcType=VARCHAR}, 588 SHIPPER_PHONE = #{record.shipperPhone,jdbcType=VARCHAR},
...@@ -650,7 +650,7 @@ ...@@ -650,7 +650,7 @@
650 WEIGHT = #{weight,jdbcType=NUMERIC}, 650 WEIGHT = #{weight,jdbcType=NUMERIC},
651 </if> 651 </if>
652 <if test="weightunit != null"> 652 <if test="weightunit != null">
653 - WEIGHTUNIT = #{weightunit,jdbcType=NUMERIC}, 653 + WEIGHTUNIT = #{weightunit,jdbcType=VARCHAR},
654 </if> 654 </if>
655 <if test="scandate != null"> 655 <if test="scandate != null">
656 SCANDATE = #{scandate,jdbcType=TIMESTAMP}, 656 SCANDATE = #{scandate,jdbcType=TIMESTAMP},
...@@ -754,7 +754,7 @@ ...@@ -754,7 +754,7 @@
754 CUSTOMS_CURRENCY = #{customsCurrency,jdbcType=VARCHAR}, 754 CUSTOMS_CURRENCY = #{customsCurrency,jdbcType=VARCHAR},
755 CUSTOMS_VALUE = #{customsValue,jdbcType=NUMERIC}, 755 CUSTOMS_VALUE = #{customsValue,jdbcType=NUMERIC},
756 WEIGHT = #{weight,jdbcType=NUMERIC}, 756 WEIGHT = #{weight,jdbcType=NUMERIC},
757 - WEIGHTUNIT = #{weightunit,jdbcType=NUMERIC}, 757 + WEIGHTUNIT = #{weightunit,jdbcType=VARCHAR},
758 SCANDATE = #{scandate,jdbcType=TIMESTAMP}, 758 SCANDATE = #{scandate,jdbcType=TIMESTAMP},
759 SHIPPER_CONTACT_NAME = #{shipperContactName,jdbcType=VARCHAR}, 759 SHIPPER_CONTACT_NAME = #{shipperContactName,jdbcType=VARCHAR},
760 SHIPPER_PHONE = #{shipperPhone,jdbcType=VARCHAR}, 760 SHIPPER_PHONE = #{shipperPhone,jdbcType=VARCHAR},
......
1 package com.fedex.connect.common.model.biz; 1 package com.fedex.connect.common.model.biz;
2 2
3 import java.io.Serializable; 3 import java.io.Serializable;
4 +import java.math.BigDecimal;
4 import java.util.Date; 5 import java.util.Date;
5 6
6 /** 7 /**
...@@ -91,17 +92,17 @@ public class CeInfo implements Serializable { ...@@ -91,17 +92,17 @@ public class CeInfo implements Serializable {
91 /** 92 /**
92 * 申报价格 93 * 申报价格
93 */ 94 */
94 - private Long customsValue; 95 + private BigDecimal customsValue;
95 96
96 /** 97 /**
97 * 重量 98 * 重量
98 */ 99 */
99 - private Long weight; 100 + private BigDecimal weight;
100 101
101 /** 102 /**
102 * 重量单位 103 * 重量单位
103 */ 104 */
104 - private Long weightunit; 105 + private String weightunit;
105 106
106 /** 107 /**
107 * 扫描状态日期 108 * 扫描状态日期
...@@ -313,28 +314,28 @@ public class CeInfo implements Serializable { ...@@ -313,28 +314,28 @@ public class CeInfo implements Serializable {
313 this.customsCurrency = customsCurrency == null ? null : customsCurrency.trim(); 314 this.customsCurrency = customsCurrency == null ? null : customsCurrency.trim();
314 } 315 }
315 316
316 - public Long getCustomsValue() { 317 + public BigDecimal getCustomsValue() {
317 return customsValue; 318 return customsValue;
318 } 319 }
319 320
320 - public void setCustomsValue(Long customsValue) { 321 + public void setCustomsValue(BigDecimal customsValue) {
321 this.customsValue = customsValue; 322 this.customsValue = customsValue;
322 } 323 }
323 324
324 - public Long getWeight() { 325 + public BigDecimal getWeight() {
325 return weight; 326 return weight;
326 } 327 }
327 328
328 - public void setWeight(Long weight) { 329 + public void setWeight(BigDecimal weight) {
329 this.weight = weight; 330 this.weight = weight;
330 } 331 }
331 332
332 - public Long getWeightunit() { 333 + public String getWeightunit() {
333 return weightunit; 334 return weightunit;
334 } 335 }
335 336
336 - public void setWeightunit(Long weightunit) { 337 + public void setWeightunit(String weightunit) {
337 - this.weightunit = weightunit; 338 + this.weightunit = weightunit == null ? null : weightunit.trim();
338 } 339 }
339 340
340 public Date getScandate() { 341 public Date getScandate() {
......
1 package com.fedex.connect.common.model.biz; 1 package com.fedex.connect.common.model.biz;
2 2
3 +import java.math.BigDecimal;
3 import java.util.ArrayList; 4 import java.util.ArrayList;
4 import java.util.Date; 5 import java.util.Date;
5 import java.util.List; 6 import java.util.List;
...@@ -1185,52 +1186,52 @@ public class CeInfoExample { ...@@ -1185,52 +1186,52 @@ public class CeInfoExample {
1185 return (Criteria) this; 1186 return (Criteria) this;
1186 } 1187 }
1187 1188
1188 - public Criteria andCustomsValueEqualTo(Long value) { 1189 + public Criteria andCustomsValueEqualTo(BigDecimal value) {
1189 addCriterion("CUSTOMS_VALUE =", value, "customsValue"); 1190 addCriterion("CUSTOMS_VALUE =", value, "customsValue");
1190 return (Criteria) this; 1191 return (Criteria) this;
1191 } 1192 }
1192 1193
1193 - public Criteria andCustomsValueNotEqualTo(Long value) { 1194 + public Criteria andCustomsValueNotEqualTo(BigDecimal value) {
1194 addCriterion("CUSTOMS_VALUE <>", value, "customsValue"); 1195 addCriterion("CUSTOMS_VALUE <>", value, "customsValue");
1195 return (Criteria) this; 1196 return (Criteria) this;
1196 } 1197 }
1197 1198
1198 - public Criteria andCustomsValueGreaterThan(Long value) { 1199 + public Criteria andCustomsValueGreaterThan(BigDecimal value) {
1199 addCriterion("CUSTOMS_VALUE >", value, "customsValue"); 1200 addCriterion("CUSTOMS_VALUE >", value, "customsValue");
1200 return (Criteria) this; 1201 return (Criteria) this;
1201 } 1202 }
1202 1203
1203 - public Criteria andCustomsValueGreaterThanOrEqualTo(Long value) { 1204 + public Criteria andCustomsValueGreaterThanOrEqualTo(BigDecimal value) {
1204 addCriterion("CUSTOMS_VALUE >=", value, "customsValue"); 1205 addCriterion("CUSTOMS_VALUE >=", value, "customsValue");
1205 return (Criteria) this; 1206 return (Criteria) this;
1206 } 1207 }
1207 1208
1208 - public Criteria andCustomsValueLessThan(Long value) { 1209 + public Criteria andCustomsValueLessThan(BigDecimal value) {
1209 addCriterion("CUSTOMS_VALUE <", value, "customsValue"); 1210 addCriterion("CUSTOMS_VALUE <", value, "customsValue");
1210 return (Criteria) this; 1211 return (Criteria) this;
1211 } 1212 }
1212 1213
1213 - public Criteria andCustomsValueLessThanOrEqualTo(Long value) { 1214 + public Criteria andCustomsValueLessThanOrEqualTo(BigDecimal value) {
1214 addCriterion("CUSTOMS_VALUE <=", value, "customsValue"); 1215 addCriterion("CUSTOMS_VALUE <=", value, "customsValue");
1215 return (Criteria) this; 1216 return (Criteria) this;
1216 } 1217 }
1217 1218
1218 - public Criteria andCustomsValueIn(List<Long> values) { 1219 + public Criteria andCustomsValueIn(List<BigDecimal> values) {
1219 addCriterion("CUSTOMS_VALUE in", values, "customsValue"); 1220 addCriterion("CUSTOMS_VALUE in", values, "customsValue");
1220 return (Criteria) this; 1221 return (Criteria) this;
1221 } 1222 }
1222 1223
1223 - public Criteria andCustomsValueNotIn(List<Long> values) { 1224 + public Criteria andCustomsValueNotIn(List<BigDecimal> values) {
1224 addCriterion("CUSTOMS_VALUE not in", values, "customsValue"); 1225 addCriterion("CUSTOMS_VALUE not in", values, "customsValue");
1225 return (Criteria) this; 1226 return (Criteria) this;
1226 } 1227 }
1227 1228
1228 - public Criteria andCustomsValueBetween(Long value1, Long value2) { 1229 + public Criteria andCustomsValueBetween(BigDecimal value1, BigDecimal value2) {
1229 addCriterion("CUSTOMS_VALUE between", value1, value2, "customsValue"); 1230 addCriterion("CUSTOMS_VALUE between", value1, value2, "customsValue");
1230 return (Criteria) this; 1231 return (Criteria) this;
1231 } 1232 }
1232 1233
1233 - public Criteria andCustomsValueNotBetween(Long value1, Long value2) { 1234 + public Criteria andCustomsValueNotBetween(BigDecimal value1, BigDecimal value2) {
1234 addCriterion("CUSTOMS_VALUE not between", value1, value2, "customsValue"); 1235 addCriterion("CUSTOMS_VALUE not between", value1, value2, "customsValue");
1235 return (Criteria) this; 1236 return (Criteria) this;
1236 } 1237 }
...@@ -1245,52 +1246,52 @@ public class CeInfoExample { ...@@ -1245,52 +1246,52 @@ public class CeInfoExample {
1245 return (Criteria) this; 1246 return (Criteria) this;
1246 } 1247 }
1247 1248
1248 - public Criteria andWeightEqualTo(Long value) { 1249 + public Criteria andWeightEqualTo(BigDecimal value) {
1249 addCriterion("WEIGHT =", value, "weight"); 1250 addCriterion("WEIGHT =", value, "weight");
1250 return (Criteria) this; 1251 return (Criteria) this;
1251 } 1252 }
1252 1253
1253 - public Criteria andWeightNotEqualTo(Long value) { 1254 + public Criteria andWeightNotEqualTo(BigDecimal value) {
1254 addCriterion("WEIGHT <>", value, "weight"); 1255 addCriterion("WEIGHT <>", value, "weight");
1255 return (Criteria) this; 1256 return (Criteria) this;
1256 } 1257 }
1257 1258
1258 - public Criteria andWeightGreaterThan(Long value) { 1259 + public Criteria andWeightGreaterThan(BigDecimal value) {
1259 addCriterion("WEIGHT >", value, "weight"); 1260 addCriterion("WEIGHT >", value, "weight");
1260 return (Criteria) this; 1261 return (Criteria) this;
1261 } 1262 }
1262 1263
1263 - public Criteria andWeightGreaterThanOrEqualTo(Long value) { 1264 + public Criteria andWeightGreaterThanOrEqualTo(BigDecimal value) {
1264 addCriterion("WEIGHT >=", value, "weight"); 1265 addCriterion("WEIGHT >=", value, "weight");
1265 return (Criteria) this; 1266 return (Criteria) this;
1266 } 1267 }
1267 1268
1268 - public Criteria andWeightLessThan(Long value) { 1269 + public Criteria andWeightLessThan(BigDecimal value) {
1269 addCriterion("WEIGHT <", value, "weight"); 1270 addCriterion("WEIGHT <", value, "weight");
1270 return (Criteria) this; 1271 return (Criteria) this;
1271 } 1272 }
1272 1273
1273 - public Criteria andWeightLessThanOrEqualTo(Long value) { 1274 + public Criteria andWeightLessThanOrEqualTo(BigDecimal value) {
1274 addCriterion("WEIGHT <=", value, "weight"); 1275 addCriterion("WEIGHT <=", value, "weight");
1275 return (Criteria) this; 1276 return (Criteria) this;
1276 } 1277 }
1277 1278
1278 - public Criteria andWeightIn(List<Long> values) { 1279 + public Criteria andWeightIn(List<BigDecimal> values) {
1279 addCriterion("WEIGHT in", values, "weight"); 1280 addCriterion("WEIGHT in", values, "weight");
1280 return (Criteria) this; 1281 return (Criteria) this;
1281 } 1282 }
1282 1283
1283 - public Criteria andWeightNotIn(List<Long> values) { 1284 + public Criteria andWeightNotIn(List<BigDecimal> values) {
1284 addCriterion("WEIGHT not in", values, "weight"); 1285 addCriterion("WEIGHT not in", values, "weight");
1285 return (Criteria) this; 1286 return (Criteria) this;
1286 } 1287 }
1287 1288
1288 - public Criteria andWeightBetween(Long value1, Long value2) { 1289 + public Criteria andWeightBetween(BigDecimal value1, BigDecimal value2) {
1289 addCriterion("WEIGHT between", value1, value2, "weight"); 1290 addCriterion("WEIGHT between", value1, value2, "weight");
1290 return (Criteria) this; 1291 return (Criteria) this;
1291 } 1292 }
1292 1293
1293 - public Criteria andWeightNotBetween(Long value1, Long value2) { 1294 + public Criteria andWeightNotBetween(BigDecimal value1, BigDecimal value2) {
1294 addCriterion("WEIGHT not between", value1, value2, "weight"); 1295 addCriterion("WEIGHT not between", value1, value2, "weight");
1295 return (Criteria) this; 1296 return (Criteria) this;
1296 } 1297 }
...@@ -1305,52 +1306,62 @@ public class CeInfoExample { ...@@ -1305,52 +1306,62 @@ public class CeInfoExample {
1305 return (Criteria) this; 1306 return (Criteria) this;
1306 } 1307 }
1307 1308
1308 - public Criteria andWeightunitEqualTo(Long value) { 1309 + public Criteria andWeightunitEqualTo(String value) {
1309 addCriterion("WEIGHTUNIT =", value, "weightunit"); 1310 addCriterion("WEIGHTUNIT =", value, "weightunit");
1310 return (Criteria) this; 1311 return (Criteria) this;
1311 } 1312 }
1312 1313
1313 - public Criteria andWeightunitNotEqualTo(Long value) { 1314 + public Criteria andWeightunitNotEqualTo(String value) {
1314 addCriterion("WEIGHTUNIT <>", value, "weightunit"); 1315 addCriterion("WEIGHTUNIT <>", value, "weightunit");
1315 return (Criteria) this; 1316 return (Criteria) this;
1316 } 1317 }
1317 1318
1318 - public Criteria andWeightunitGreaterThan(Long value) { 1319 + public Criteria andWeightunitGreaterThan(String value) {
1319 addCriterion("WEIGHTUNIT >", value, "weightunit"); 1320 addCriterion("WEIGHTUNIT >", value, "weightunit");
1320 return (Criteria) this; 1321 return (Criteria) this;
1321 } 1322 }
1322 1323
1323 - public Criteria andWeightunitGreaterThanOrEqualTo(Long value) { 1324 + public Criteria andWeightunitGreaterThanOrEqualTo(String value) {
1324 addCriterion("WEIGHTUNIT >=", value, "weightunit"); 1325 addCriterion("WEIGHTUNIT >=", value, "weightunit");
1325 return (Criteria) this; 1326 return (Criteria) this;
1326 } 1327 }
1327 1328
1328 - public Criteria andWeightunitLessThan(Long value) { 1329 + public Criteria andWeightunitLessThan(String value) {
1329 addCriterion("WEIGHTUNIT <", value, "weightunit"); 1330 addCriterion("WEIGHTUNIT <", value, "weightunit");
1330 return (Criteria) this; 1331 return (Criteria) this;
1331 } 1332 }
1332 1333
1333 - public Criteria andWeightunitLessThanOrEqualTo(Long value) { 1334 + public Criteria andWeightunitLessThanOrEqualTo(String value) {
1334 addCriterion("WEIGHTUNIT <=", value, "weightunit"); 1335 addCriterion("WEIGHTUNIT <=", value, "weightunit");
1335 return (Criteria) this; 1336 return (Criteria) this;
1336 } 1337 }
1337 1338
1338 - public Criteria andWeightunitIn(List<Long> values) { 1339 + public Criteria andWeightunitLike(String value) {
1340 + addCriterion("WEIGHTUNIT like", value, "weightunit");
1341 + return (Criteria) this;
1342 + }
1343 +
1344 + public Criteria andWeightunitNotLike(String value) {
1345 + addCriterion("WEIGHTUNIT not like", value, "weightunit");
1346 + return (Criteria) this;
1347 + }
1348 +
1349 + public Criteria andWeightunitIn(List<String> values) {
1339 addCriterion("WEIGHTUNIT in", values, "weightunit"); 1350 addCriterion("WEIGHTUNIT in", values, "weightunit");
1340 return (Criteria) this; 1351 return (Criteria) this;
1341 } 1352 }
1342 1353
1343 - public Criteria andWeightunitNotIn(List<Long> values) { 1354 + public Criteria andWeightunitNotIn(List<String> values) {
1344 addCriterion("WEIGHTUNIT not in", values, "weightunit"); 1355 addCriterion("WEIGHTUNIT not in", values, "weightunit");
1345 return (Criteria) this; 1356 return (Criteria) this;
1346 } 1357 }
1347 1358
1348 - public Criteria andWeightunitBetween(Long value1, Long value2) { 1359 + public Criteria andWeightunitBetween(String value1, String value2) {
1349 addCriterion("WEIGHTUNIT between", value1, value2, "weightunit"); 1360 addCriterion("WEIGHTUNIT between", value1, value2, "weightunit");
1350 return (Criteria) this; 1361 return (Criteria) this;
1351 } 1362 }
1352 1363
1353 - public Criteria andWeightunitNotBetween(Long value1, Long value2) { 1364 + public Criteria andWeightunitNotBetween(String value1, String value2) {
1354 addCriterion("WEIGHTUNIT not between", value1, value2, "weightunit"); 1365 addCriterion("WEIGHTUNIT not between", value1, value2, "weightunit");
1355 return (Criteria) this; 1366 return (Criteria) this;
1356 } 1367 }
......
1 package com.fedex.connect.common.model.biz; 1 package com.fedex.connect.common.model.biz;
2 2
3 import java.io.Serializable; 3 import java.io.Serializable;
4 +import java.math.BigDecimal;
4 import java.util.Date; 5 import java.util.Date;
5 6
6 /** 7 /**
...@@ -56,17 +57,17 @@ public class Consignment implements Serializable { ...@@ -56,17 +57,17 @@ public class Consignment implements Serializable {
56 /** 57 /**
57 * 申报价格 58 * 申报价格
58 */ 59 */
59 - private Long customsValue; 60 + private BigDecimal customsValue;
60 61
61 /** 62 /**
62 * 重量 63 * 重量
63 */ 64 */
64 - private Long weight; 65 + private BigDecimal weight;
65 66
66 /** 67 /**
67 * 重量单位 68 * 重量单位
68 */ 69 */
69 - private Long weightunit; 70 + private String weightunit;
70 71
71 /** 72 /**
72 * 扫描状态日期 73 * 扫描状态日期
...@@ -287,28 +288,28 @@ public class Consignment implements Serializable { ...@@ -287,28 +288,28 @@ public class Consignment implements Serializable {
287 this.customsCurrency = customsCurrency == null ? null : customsCurrency.trim(); 288 this.customsCurrency = customsCurrency == null ? null : customsCurrency.trim();
288 } 289 }
289 290
290 - public Long getCustomsValue() { 291 + public BigDecimal getCustomsValue() {
291 return customsValue; 292 return customsValue;
292 } 293 }
293 294
294 - public void setCustomsValue(Long customsValue) { 295 + public void setCustomsValue(BigDecimal customsValue) {
295 this.customsValue = customsValue; 296 this.customsValue = customsValue;
296 } 297 }
297 298
298 - public Long getWeight() { 299 + public BigDecimal getWeight() {
299 return weight; 300 return weight;
300 } 301 }
301 302
302 - public void setWeight(Long weight) { 303 + public void setWeight(BigDecimal weight) {
303 this.weight = weight; 304 this.weight = weight;
304 } 305 }
305 306
306 - public Long getWeightunit() { 307 + public String getWeightunit() {
307 return weightunit; 308 return weightunit;
308 } 309 }
309 310
310 - public void setWeightunit(Long weightunit) { 311 + public void setWeightunit(String weightunit) {
311 - this.weightunit = weightunit; 312 + this.weightunit = weightunit == null ? null : weightunit.trim();
312 } 313 }
313 314
314 public Date getScandate() { 315 public Date getScandate() {
......
1 package com.fedex.connect.common.model.biz; 1 package com.fedex.connect.common.model.biz;
2 2
3 +import java.math.BigDecimal;
3 import java.util.ArrayList; 4 import java.util.ArrayList;
4 import java.util.Date; 5 import java.util.Date;
5 import java.util.List; 6 import java.util.List;
...@@ -745,52 +746,52 @@ public class ConsignmentExample { ...@@ -745,52 +746,52 @@ public class ConsignmentExample {
745 return (Criteria) this; 746 return (Criteria) this;
746 } 747 }
747 748
748 - public Criteria andCustomsValueEqualTo(Long value) { 749 + public Criteria andCustomsValueEqualTo(BigDecimal value) {
749 addCriterion("CUSTOMS_VALUE =", value, "customsValue"); 750 addCriterion("CUSTOMS_VALUE =", value, "customsValue");
750 return (Criteria) this; 751 return (Criteria) this;
751 } 752 }
752 753
753 - public Criteria andCustomsValueNotEqualTo(Long value) { 754 + public Criteria andCustomsValueNotEqualTo(BigDecimal value) {
754 addCriterion("CUSTOMS_VALUE <>", value, "customsValue"); 755 addCriterion("CUSTOMS_VALUE <>", value, "customsValue");
755 return (Criteria) this; 756 return (Criteria) this;
756 } 757 }
757 758
758 - public Criteria andCustomsValueGreaterThan(Long value) { 759 + public Criteria andCustomsValueGreaterThan(BigDecimal value) {
759 addCriterion("CUSTOMS_VALUE >", value, "customsValue"); 760 addCriterion("CUSTOMS_VALUE >", value, "customsValue");
760 return (Criteria) this; 761 return (Criteria) this;
761 } 762 }
762 763
763 - public Criteria andCustomsValueGreaterThanOrEqualTo(Long value) { 764 + public Criteria andCustomsValueGreaterThanOrEqualTo(BigDecimal value) {
764 addCriterion("CUSTOMS_VALUE >=", value, "customsValue"); 765 addCriterion("CUSTOMS_VALUE >=", value, "customsValue");
765 return (Criteria) this; 766 return (Criteria) this;
766 } 767 }
767 768
768 - public Criteria andCustomsValueLessThan(Long value) { 769 + public Criteria andCustomsValueLessThan(BigDecimal value) {
769 addCriterion("CUSTOMS_VALUE <", value, "customsValue"); 770 addCriterion("CUSTOMS_VALUE <", value, "customsValue");
770 return (Criteria) this; 771 return (Criteria) this;
771 } 772 }
772 773
773 - public Criteria andCustomsValueLessThanOrEqualTo(Long value) { 774 + public Criteria andCustomsValueLessThanOrEqualTo(BigDecimal value) {
774 addCriterion("CUSTOMS_VALUE <=", value, "customsValue"); 775 addCriterion("CUSTOMS_VALUE <=", value, "customsValue");
775 return (Criteria) this; 776 return (Criteria) this;
776 } 777 }
777 778
778 - public Criteria andCustomsValueIn(List<Long> values) { 779 + public Criteria andCustomsValueIn(List<BigDecimal> values) {
779 addCriterion("CUSTOMS_VALUE in", values, "customsValue"); 780 addCriterion("CUSTOMS_VALUE in", values, "customsValue");
780 return (Criteria) this; 781 return (Criteria) this;
781 } 782 }
782 783
783 - public Criteria andCustomsValueNotIn(List<Long> values) { 784 + public Criteria andCustomsValueNotIn(List<BigDecimal> values) {
784 addCriterion("CUSTOMS_VALUE not in", values, "customsValue"); 785 addCriterion("CUSTOMS_VALUE not in", values, "customsValue");
785 return (Criteria) this; 786 return (Criteria) this;
786 } 787 }
787 788
788 - public Criteria andCustomsValueBetween(Long value1, Long value2) { 789 + public Criteria andCustomsValueBetween(BigDecimal value1, BigDecimal value2) {
789 addCriterion("CUSTOMS_VALUE between", value1, value2, "customsValue"); 790 addCriterion("CUSTOMS_VALUE between", value1, value2, "customsValue");
790 return (Criteria) this; 791 return (Criteria) this;
791 } 792 }
792 793
793 - public Criteria andCustomsValueNotBetween(Long value1, Long value2) { 794 + public Criteria andCustomsValueNotBetween(BigDecimal value1, BigDecimal value2) {
794 addCriterion("CUSTOMS_VALUE not between", value1, value2, "customsValue"); 795 addCriterion("CUSTOMS_VALUE not between", value1, value2, "customsValue");
795 return (Criteria) this; 796 return (Criteria) this;
796 } 797 }
...@@ -805,52 +806,52 @@ public class ConsignmentExample { ...@@ -805,52 +806,52 @@ public class ConsignmentExample {
805 return (Criteria) this; 806 return (Criteria) this;
806 } 807 }
807 808
808 - public Criteria andWeightEqualTo(Long value) { 809 + public Criteria andWeightEqualTo(BigDecimal value) {
809 addCriterion("WEIGHT =", value, "weight"); 810 addCriterion("WEIGHT =", value, "weight");
810 return (Criteria) this; 811 return (Criteria) this;
811 } 812 }
812 813
813 - public Criteria andWeightNotEqualTo(Long value) { 814 + public Criteria andWeightNotEqualTo(BigDecimal value) {
814 addCriterion("WEIGHT <>", value, "weight"); 815 addCriterion("WEIGHT <>", value, "weight");
815 return (Criteria) this; 816 return (Criteria) this;
816 } 817 }
817 818
818 - public Criteria andWeightGreaterThan(Long value) { 819 + public Criteria andWeightGreaterThan(BigDecimal value) {
819 addCriterion("WEIGHT >", value, "weight"); 820 addCriterion("WEIGHT >", value, "weight");
820 return (Criteria) this; 821 return (Criteria) this;
821 } 822 }
822 823
823 - public Criteria andWeightGreaterThanOrEqualTo(Long value) { 824 + public Criteria andWeightGreaterThanOrEqualTo(BigDecimal value) {
824 addCriterion("WEIGHT >=", value, "weight"); 825 addCriterion("WEIGHT >=", value, "weight");
825 return (Criteria) this; 826 return (Criteria) this;
826 } 827 }
827 828
828 - public Criteria andWeightLessThan(Long value) { 829 + public Criteria andWeightLessThan(BigDecimal value) {
829 addCriterion("WEIGHT <", value, "weight"); 830 addCriterion("WEIGHT <", value, "weight");
830 return (Criteria) this; 831 return (Criteria) this;
831 } 832 }
832 833
833 - public Criteria andWeightLessThanOrEqualTo(Long value) { 834 + public Criteria andWeightLessThanOrEqualTo(BigDecimal value) {
834 addCriterion("WEIGHT <=", value, "weight"); 835 addCriterion("WEIGHT <=", value, "weight");
835 return (Criteria) this; 836 return (Criteria) this;
836 } 837 }
837 838
838 - public Criteria andWeightIn(List<Long> values) { 839 + public Criteria andWeightIn(List<BigDecimal> values) {
839 addCriterion("WEIGHT in", values, "weight"); 840 addCriterion("WEIGHT in", values, "weight");
840 return (Criteria) this; 841 return (Criteria) this;
841 } 842 }
842 843
843 - public Criteria andWeightNotIn(List<Long> values) { 844 + public Criteria andWeightNotIn(List<BigDecimal> values) {
844 addCriterion("WEIGHT not in", values, "weight"); 845 addCriterion("WEIGHT not in", values, "weight");
845 return (Criteria) this; 846 return (Criteria) this;
846 } 847 }
847 848
848 - public Criteria andWeightBetween(Long value1, Long value2) { 849 + public Criteria andWeightBetween(BigDecimal value1, BigDecimal value2) {
849 addCriterion("WEIGHT between", value1, value2, "weight"); 850 addCriterion("WEIGHT between", value1, value2, "weight");
850 return (Criteria) this; 851 return (Criteria) this;
851 } 852 }
852 853
853 - public Criteria andWeightNotBetween(Long value1, Long value2) { 854 + public Criteria andWeightNotBetween(BigDecimal value1, BigDecimal value2) {
854 addCriterion("WEIGHT not between", value1, value2, "weight"); 855 addCriterion("WEIGHT not between", value1, value2, "weight");
855 return (Criteria) this; 856 return (Criteria) this;
856 } 857 }
...@@ -865,52 +866,62 @@ public class ConsignmentExample { ...@@ -865,52 +866,62 @@ public class ConsignmentExample {
865 return (Criteria) this; 866 return (Criteria) this;
866 } 867 }
867 868
868 - public Criteria andWeightunitEqualTo(Long value) { 869 + public Criteria andWeightunitEqualTo(String value) {
869 addCriterion("WEIGHTUNIT =", value, "weightunit"); 870 addCriterion("WEIGHTUNIT =", value, "weightunit");
870 return (Criteria) this; 871 return (Criteria) this;
871 } 872 }
872 873
873 - public Criteria andWeightunitNotEqualTo(Long value) { 874 + public Criteria andWeightunitNotEqualTo(String value) {
874 addCriterion("WEIGHTUNIT <>", value, "weightunit"); 875 addCriterion("WEIGHTUNIT <>", value, "weightunit");
875 return (Criteria) this; 876 return (Criteria) this;
876 } 877 }
877 878
878 - public Criteria andWeightunitGreaterThan(Long value) { 879 + public Criteria andWeightunitGreaterThan(String value) {
879 addCriterion("WEIGHTUNIT >", value, "weightunit"); 880 addCriterion("WEIGHTUNIT >", value, "weightunit");
880 return (Criteria) this; 881 return (Criteria) this;
881 } 882 }
882 883
883 - public Criteria andWeightunitGreaterThanOrEqualTo(Long value) { 884 + public Criteria andWeightunitGreaterThanOrEqualTo(String value) {
884 addCriterion("WEIGHTUNIT >=", value, "weightunit"); 885 addCriterion("WEIGHTUNIT >=", value, "weightunit");
885 return (Criteria) this; 886 return (Criteria) this;
886 } 887 }
887 888
888 - public Criteria andWeightunitLessThan(Long value) { 889 + public Criteria andWeightunitLessThan(String value) {
889 addCriterion("WEIGHTUNIT <", value, "weightunit"); 890 addCriterion("WEIGHTUNIT <", value, "weightunit");
890 return (Criteria) this; 891 return (Criteria) this;
891 } 892 }
892 893
893 - public Criteria andWeightunitLessThanOrEqualTo(Long value) { 894 + public Criteria andWeightunitLessThanOrEqualTo(String value) {
894 addCriterion("WEIGHTUNIT <=", value, "weightunit"); 895 addCriterion("WEIGHTUNIT <=", value, "weightunit");
895 return (Criteria) this; 896 return (Criteria) this;
896 } 897 }
897 898
898 - public Criteria andWeightunitIn(List<Long> values) { 899 + public Criteria andWeightunitLike(String value) {
900 + addCriterion("WEIGHTUNIT like", value, "weightunit");
901 + return (Criteria) this;
902 + }
903 +
904 + public Criteria andWeightunitNotLike(String value) {
905 + addCriterion("WEIGHTUNIT not like", value, "weightunit");
906 + return (Criteria) this;
907 + }
908 +
909 + public Criteria andWeightunitIn(List<String> values) {
899 addCriterion("WEIGHTUNIT in", values, "weightunit"); 910 addCriterion("WEIGHTUNIT in", values, "weightunit");
900 return (Criteria) this; 911 return (Criteria) this;
901 } 912 }
902 913
903 - public Criteria andWeightunitNotIn(List<Long> values) { 914 + public Criteria andWeightunitNotIn(List<String> values) {
904 addCriterion("WEIGHTUNIT not in", values, "weightunit"); 915 addCriterion("WEIGHTUNIT not in", values, "weightunit");
905 return (Criteria) this; 916 return (Criteria) this;
906 } 917 }
907 918
908 - public Criteria andWeightunitBetween(Long value1, Long value2) { 919 + public Criteria andWeightunitBetween(String value1, String value2) {
909 addCriterion("WEIGHTUNIT between", value1, value2, "weightunit"); 920 addCriterion("WEIGHTUNIT between", value1, value2, "weightunit");
910 return (Criteria) this; 921 return (Criteria) this;
911 } 922 }
912 923
913 - public Criteria andWeightunitNotBetween(Long value1, Long value2) { 924 + public Criteria andWeightunitNotBetween(String value1, String value2) {
914 addCriterion("WEIGHTUNIT not between", value1, value2, "weightunit"); 925 addCriterion("WEIGHTUNIT not between", value1, value2, "weightunit");
915 return (Criteria) this; 926 return (Criteria) this;
916 } 927 }
......
1 +package com.fedex.connect.common.dependencies.contants;
2 +
3 +/**
4 + * @Author mt
5 + * @Description 类说明
6 + * @Date 2024/11/1
7 + */
8 +public interface BaseConstants {
9 + //基础字段列名
10 + interface BASE_TABLE_COLUMN_KEYS{
11 + //创建时间
12 + String CREATE_TIME = "createTime";
13 + //创建人ID
14 + String CREATE_USER_ID = "createUserId";
15 + //创建人名称
16 + String CREATE_USER_NAME = "createUserName";
17 + //修改时间
18 + String MODIFY_TIME = "modifyTime";
19 + //修改人ID
20 + String MODIFY_USER_ID = "modifyUserId";
21 + //修改人名称
22 + String MODIFY_USER_NAME = "modifyUserName";
23 + }
24 +
25 +
26 +}
...\ No newline at end of file ...\ No newline at end of file
1 +package com.fedex.connect.common.dependencies.util;
2 +
3 +import com.fedex.connect.common.dependencies.contants.BaseConstants;
4 +import com.fedex.connect.common.dependencies.contants.SystemDefaultUserConstants;
5 +
6 +import java.lang.reflect.Field;
7 +import java.util.Date;
8 +import java.util.Objects;
9 +
10 +/**
11 + * @Author mt
12 + * @Description 分配字段
13 + * @Date 2024/11/1
14 + */
15 +public class AssignmentFieldUtils {
16 +
17 + /**
18 + * @Author mt
19 + * @Description 初始化表基础字段，例如：create_time,update_time
20 + * @Date 2024/11/1
21 + * @param entity
22 + * @return void
23 + */
24 + public static void assignmentTableBaseField(Object entity) throws Exception{
25 + Object createTime = getFieldValue(entity, BaseConstants.BASE_TABLE_COLUMN_KEYS.CREATE_TIME);
26 + //创建时间
27 + if(Objects.isNull(createTime)){
28 + assignmentField(entity,BaseConstants.BASE_TABLE_COLUMN_KEYS.CREATE_TIME,new Date());
29 + }
30 + //创建人ID
31 + Object createUserId = getFieldValue(entity, BaseConstants.BASE_TABLE_COLUMN_KEYS.CREATE_USER_ID);
32 + if(Objects.isNull(createUserId)){
33 + assignmentField(entity,BaseConstants.BASE_TABLE_COLUMN_KEYS.CREATE_USER_ID, SystemDefaultUserConstants.SYSTEM_USER_KEYS.ID);
34 + }
35 + //创建人名称
36 + Object createUserName = getFieldValue(entity, BaseConstants.BASE_TABLE_COLUMN_KEYS.CREATE_USER_NAME);
37 + if(Objects.isNull(createUserName)){
38 + assignmentField(entity,BaseConstants.BASE_TABLE_COLUMN_KEYS.CREATE_USER_NAME,SystemDefaultUserConstants.SYSTEM_USER_KEYS.USER_NAME);
39 + }
40 + //修改时间
41 + Object modifyTime = getFieldValue(entity, BaseConstants.BASE_TABLE_COLUMN_KEYS.MODIFY_TIME);
42 + if(Objects.isNull(modifyTime)){
43 + assignmentField(entity,BaseConstants.BASE_TABLE_COLUMN_KEYS.MODIFY_TIME,new Date());
44 + }
45 + //修改人ID
46 + Object modifyUserId = getFieldValue(entity, BaseConstants.BASE_TABLE_COLUMN_KEYS.MODIFY_USER_ID);
47 + if(Objects.isNull(modifyUserId)){
48 + assignmentField(entity,BaseConstants.BASE_TABLE_COLUMN_KEYS.MODIFY_USER_ID,SystemDefaultUserConstants.SYSTEM_USER_KEYS.ID);
49 + }
50 + //修改人名称
51 + Object modifyUserName = getFieldValue(entity, BaseConstants.BASE_TABLE_COLUMN_KEYS.MODIFY_USER_NAME);
52 + if(Objects.isNull(modifyUserName)){
53 + assignmentField(entity,BaseConstants.BASE_TABLE_COLUMN_KEYS.MODIFY_USER_NAME,SystemDefaultUserConstants.SYSTEM_USER_KEYS.USER_NAME);
54 + }
55 + }
56 +
57 + /**
58 + * @Author mt
59 + * @Description 通过反射为字段赋值
60 + * @Date 2024/7/26
61 + * @param entity
62 + * @param fieldName
63 + * @param value
64 + * @return void
65 + */
66 + public static void assignmentField(Object entity, String fieldName, Object value) throws Exception{
67 + Field field = entity.getClass().getDeclaredField(fieldName);
68 + field.setAccessible(true);
69 + field.set(entity,value);
70 + }
71 +
72 + /**
73 + * @Author mt
74 + * @Description 通过反射获取字段值
75 + * @Date 2024/7/26
76 + * @param entity
77 + * @param fieldName
78 + * @return void
79 + */
80 + public static Object getFieldValue(Object entity, String fieldName) throws Exception{
81 + Field field = entity.getClass().getDeclaredField(fieldName);
82 + field.setAccessible(true);
83 + Object value = field.get(entity);
84 + return value;
85 + }
86 +}
...\ No newline at end of file ...\ No newline at end of file
1 -package com.fedex.connect.common.dependencies.util;
2 -
3 -public class TableColumnInitUtil {
4 -
5 -}
1 package com.fedex.connect.kafka.util; 1 package com.fedex.connect.kafka.util;
2 2
3 -import com.fedex.connect.common.dependencies.contants.SystemDefaultUserConstants; 3 +import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
4 import com.fedex.connect.common.dependencies.util.DateUtil; 4 import com.fedex.connect.common.dependencies.util.DateUtil;
5 import com.fedex.connect.common.model.biz.CeInfo; 5 import com.fedex.connect.common.model.biz.CeInfo;
6 import com.fedex.connect.common.model.biz.Consignment; 6 import com.fedex.connect.common.model.biz.Consignment;
...@@ -10,8 +10,10 @@ import com.fedex.connect.kafka.data.dto.dm.dm501.Dm501Consignments; ...@@ -10,8 +10,10 @@ import com.fedex.connect.kafka.data.dto.dm.dm501.Dm501Consignments;
10 import org.apache.commons.lang3.StringUtils; 10 import org.apache.commons.lang3.StringUtils;
11 import org.springframework.stereotype.Component; 11 import org.springframework.stereotype.Component;
12 12
13 +import java.math.BigDecimal;
13 import java.util.Date; 14 import java.util.Date;
14 import java.util.List; 15 import java.util.List;
16 +import java.util.Objects;
15 17
16 @Component 18 @Component
17 public class Dm501Util { 19 public class Dm501Util {
...@@ -23,7 +25,7 @@ public class Dm501Util { ...@@ -23,7 +25,7 @@ public class Dm501Util {
23 * @param dm501Consignment 25 * @param dm501Consignment
24 * @return com.fedex.connect.common.model.biz.CeInfo 26 * @return com.fedex.connect.common.model.biz.CeInfo
25 */ 27 */
26 - public CeInfo generateCeInfo(Dm501Consignments dm501Consignment,Date sendTime){ 28 + public CeInfo generateCeInfo(Dm501Consignments dm501Consignment,Date sendTime) throws Exception{
27 CeInfo ceInfo = new CeInfo(); 29 CeInfo ceInfo = new CeInfo();
28 //地址信息 30 //地址信息
29 List<Dm501ConAddresses> addressList = dm501Consignment.getAddresses(); 31 List<Dm501ConAddresses> addressList = dm501Consignment.getAddresses();
...@@ -50,7 +52,14 @@ public class Dm501Util { ...@@ -50,7 +52,14 @@ public class Dm501Util {
50 * 报文主体处理 52 * 报文主体处理
51 */ 53 */
52 this.generateCeInfoBody(ceInfo,dm501Consignment,sendTime); 54 this.generateCeInfoBody(ceInfo,dm501Consignment,sendTime);
53 - 55 + /**
56 + * 发件人信息处理
57 + */
58 + this.generateCeInfoShipper();
59 + /**
60 + * 收件人信息处理
61 + */
62 + this.generateCeInfoRecipient();
54 return ceInfo; 63 return ceInfo;
55 } 64 }
56 65
...@@ -61,7 +70,7 @@ public class Dm501Util { ...@@ -61,7 +70,7 @@ public class Dm501Util {
61 * @param 70 * @param
62 * @return void 71 * @return void
63 */ 72 */
64 - private void generateCeInfoBody(CeInfo ceInfo,Dm501Consignments dm501Consignment,Date sendTime){ 73 + private void generateCeInfoBody(CeInfo ceInfo,Dm501Consignments dm501Consignment,Date sendTime) throws Exception{
65 ceInfo.setConsignmentCode(dm501Consignment.getTrackingNumber()); 74 ceInfo.setConsignmentCode(dm501Consignment.getTrackingNumber());
66 ceInfo.setDestIataCode(dm501Consignment.getDestIataCode()); 75 ceInfo.setDestIataCode(dm501Consignment.getDestIataCode());
67 //扫描状态日期 76 //扫描状态日期
...@@ -73,9 +82,24 @@ public class Dm501Util { ...@@ -73,9 +82,24 @@ public class Dm501Util {
73 if(StringUtils.isNotEmpty(shipDate)){ 82 if(StringUtils.isNotEmpty(shipDate)){
74 ceInfo.setShipDate(DateUtil.parse(shipDate)); 83 ceInfo.setShipDate(DateUtil.parse(shipDate));
75 } 84 }
76 - ceInfo.setCreateTime(new Date()); 85 + //申报币制
77 - ceInfo.setCreateUserId(SystemDefaultUserConstants.SYSTEM_USER_KEYS.ID); 86 + ceInfo.setCustomsCurrency(dm501Consignment.getCustomsCurrency());
78 -// ceInfo.setCreateUserName(); 87 + //申报价格
88 + String customsValue = dm501Consignment.getCustomsValue();
89 + if(Objects.nonNull(customsValue)){
90 + ceInfo.setCustomsValue(new BigDecimal(customsValue));
91 + }
92 + //重量
93 + String weight = dm501Consignment.getWeight();
94 + if(Objects.nonNull(weight)){
95 + ceInfo.setWeight(new BigDecimal(weight));
96 + }
97 + //重量单位
98 + ceInfo.setWeightunit(dm501Consignment.getWeightUnit());
99 + /**
100 + * 初始化表基础字段
101 + */
102 + AssignmentFieldUtils.assignmentTableBaseField(ceInfo);
79 } 103 }
80 104
81 /** 105 /**
......