Fedex / iClear-api

Go to a project
Toggle navigation Toggle navigation pinning
wei.zhou
17e3f20b 1 parent 453bd6d9

提交代码

Inline Side-by-side
Showing 5 changed files with 8 additions and 10 deletions
...@@ -39,7 +39,7 @@ public class Mawb implements Serializable { ...@@ -39,7 +39,7 @@ public class Mawb implements Serializable {
39 39
40 @ApiModelProperty(value = "进出口标志", name = "IEFlag", example = "固定值：E") 40 @ApiModelProperty(value = "进出口标志", name = "IEFlag", example = "固定值：E")
41 @Column(name = "IEFLAG") 41 @Column(name = "IEFLAG")
42 - private String IEFlag; 42 + private String ieFlag;
43 43
44 @ApiModelProperty(value = "报关类型", name = "Type", example = "固定值：EX") 44 @ApiModelProperty(value = "报关类型", name = "Type", example = "固定值：EX")
45 @Column(name = "TYPE") 45 @Column(name = "TYPE")
...@@ -103,7 +103,7 @@ public class Mawb implements Serializable { ...@@ -103,7 +103,7 @@ public class Mawb implements Serializable {
103 103
104 @ApiModelProperty(value = "出入境关闭", name = "IEPort", example = "固定值：0101") 104 @ApiModelProperty(value = "出入境关闭", name = "IEPort", example = "固定值：0101")
105 @Column(name = "IEPORT") 105 @Column(name = "IEPORT")
106 - private String IEPort; 106 + private String iePort;
107 107
108 @ApiModelProperty(value = "录入人名称", name = "InputerName", example = "固定值：0101") 108 @ApiModelProperty(value = "录入人名称", name = "InputerName", example = "固定值：0101")
109 @Column(name = "INPUTERNAME") 109 @Column(name = "INPUTERNAME")
...@@ -227,6 +227,6 @@ public class Mawb implements Serializable { ...@@ -227,6 +227,6 @@ public class Mawb implements Serializable {
227 227
228 @ApiModelProperty(value = "运单明细", name = "mawbDetailList", example = "") 228 @ApiModelProperty(value = "运单明细", name = "mawbDetailList", example = "")
229 @OneToMany(cascade = CascadeType.PERSIST) 229 @OneToMany(cascade = CascadeType.PERSIST)
230 - @JoinColumn(name = "MAWBID") 230 + @JoinColumn(name = "mawbId")
231 private List<MawbDetail> mawbDetailList; 231 private List<MawbDetail> mawbDetailList;
232 } 232 }
......
...@@ -29,7 +29,7 @@ public class MawbDetail implements Serializable { ...@@ -29,7 +29,7 @@ public class MawbDetail implements Serializable {
29 private Long msgId; 29 private Long msgId;
30 30
31 @Column(name="MAWBID") 31 @Column(name="MAWBID")
32 - private Long MAWBID; 32 + private Long mawbId;
33 33
34 @Column(name="DETAILID") 34 @Column(name="DETAILID")
35 private String detailId; 35 private String detailId;
......
...@@ -53,8 +53,6 @@ public class MawbService { ...@@ -53,8 +53,6 @@ public class MawbService {
53 53
54 result.setSuccess(Boolean.TRUE); 54 result.setSuccess(Boolean.TRUE);
55 log.info("checkMawb start>>>>>>>>>> mawb："+gson.toJson(mawb) +" result :" +result.getSuccess() ); 55 log.info("checkMawb start>>>>>>>>>> mawb："+gson.toJson(mawb) +" result :" +result.getSuccess() );
56 -
57 -
58 }catch (Exception e){ 56 }catch (Exception e){
59 log.error("checkMawb() error:" + e.getMessage()); 57 log.error("checkMawb() error:" + e.getMessage());
60 } 58 }
......
...@@ -96,7 +96,7 @@ public class ChmConsignmentServiceTest extends IClearApiApplicationTests { ...@@ -96,7 +96,7 @@ public class ChmConsignmentServiceTest extends IClearApiApplicationTests {
96 96
97 97
98 Mawb mawb = new Mawb(); 98 Mawb mawb = new Mawb();
99 - mawb.setIEFlag("E"); 99 + mawb.setIeFlag("E");
100 mawb.setType("EX"); 100 mawb.setType("EX");
101 mawb.setAgentCode("1111980005"); 101 mawb.setAgentCode("1111980005");
102 mawb.setAgentName("联邦快递（中国）有限公司"); 102 mawb.setAgentName("联邦快递（中国）有限公司");
...@@ -112,7 +112,7 @@ public class ChmConsignmentServiceTest extends IClearApiApplicationTests { ...@@ -112,7 +112,7 @@ public class ChmConsignmentServiceTest extends IClearApiApplicationTests {
112 mawb.setFeeMark("3"); 112 mawb.setFeeMark("3");
113 mawb.setFeeRate(BigDecimal.valueOf(100.58)); 113 mawb.setFeeRate(BigDecimal.valueOf(100.58));
114 mawb.setGrossWet(500); 114 mawb.setGrossWet(500);
115 - mawb.setIEPort("0101"); 115 + mawb.setIePort("0101");
116 mawb.setInputerName(""); 116 mawb.setInputerName("");
117 mawb.setInsurCurr("MOP"); 117 mawb.setInsurCurr("MOP");
118 mawb.setInsurMark("3"); 118 mawb.setInsurMark("3");
......
...@@ -125,7 +125,7 @@ public class HttpClientTest { ...@@ -125,7 +125,7 @@ public class HttpClientTest {
125 125
126 126
127 Mawb mawb = new Mawb(); 127 Mawb mawb = new Mawb();
128 - mawb.setIEFlag("E"); 128 + mawb.setIeFlag("E");
129 mawb.setType("EX"); 129 mawb.setType("EX");
130 mawb.setAgentCode("1111980005"); 130 mawb.setAgentCode("1111980005");
131 mawb.setAgentName("联邦快递（中国）有限公司"); 131 mawb.setAgentName("联邦快递（中国）有限公司");
...@@ -141,7 +141,7 @@ public class HttpClientTest { ...@@ -141,7 +141,7 @@ public class HttpClientTest {
141 mawb.setFeeMark("3"); 141 mawb.setFeeMark("3");
142 mawb.setFeeRate(BigDecimal.valueOf(100.58)); 142 mawb.setFeeRate(BigDecimal.valueOf(100.58));
143 mawb.setGrossWet(500); 143 mawb.setGrossWet(500);
144 - mawb.setIEPort("0101"); 144 + mawb.setIePort("0101");
145 mawb.setInputerName(""); 145 mawb.setInputerName("");
146 mawb.setInsurCurr("MOP"); 146 mawb.setInsurCurr("MOP");
147 mawb.setInsurMark("3"); 147 mawb.setInsurMark("3");
......