wei.zhou

提交代码

......@@ -39,7 +39,7 @@ public class Mawb implements Serializable {
@ApiModelProperty(value = "进出口标志", name = "IEFlag", example = "固定值:E")
@Column(name = "IEFLAG")
private String IEFlag;
private String ieFlag;
@ApiModelProperty(value = "报关类型", name = "Type", example = "固定值:EX")
@Column(name = "TYPE")
......@@ -103,7 +103,7 @@ public class Mawb implements Serializable {
@ApiModelProperty(value = "出入境关闭", name = "IEPort", example = "固定值:0101")
@Column(name = "IEPORT")
private String IEPort;
private String iePort;
@ApiModelProperty(value = "录入人名称", name = "InputerName", example = "固定值:0101")
@Column(name = "INPUTERNAME")
......@@ -227,6 +227,6 @@ public class Mawb implements Serializable {
@ApiModelProperty(value = "运单明细", name = "mawbDetailList", example = "")
@OneToMany(cascade = CascadeType.PERSIST)
@JoinColumn(name = "MAWBID")
@JoinColumn(name = "mawbId")
private List<MawbDetail> mawbDetailList;
}
......
......@@ -29,7 +29,7 @@ public class MawbDetail implements Serializable {
private Long msgId;
@Column(name="MAWBID")
private Long MAWBID;
private Long mawbId;
@Column(name="DETAILID")
private String detailId;
......
......@@ -53,8 +53,6 @@ public class MawbService {
result.setSuccess(Boolean.TRUE);
log.info("checkMawb start>>>>>>>>>> mawb:"+gson.toJson(mawb) +" result :" +result.getSuccess() );
}catch (Exception e){
log.error("checkMawb() error:" + e.getMessage());
}
......
......@@ -96,7 +96,7 @@ public class ChmConsignmentServiceTest extends IClearApiApplicationTests {
Mawb mawb = new Mawb();
mawb.setIEFlag("E");
mawb.setIeFlag("E");
mawb.setType("EX");
mawb.setAgentCode("1111980005");
mawb.setAgentName("联邦快递(中国)有限公司");
......@@ -112,7 +112,7 @@ public class ChmConsignmentServiceTest extends IClearApiApplicationTests {
mawb.setFeeMark("3");
mawb.setFeeRate(BigDecimal.valueOf(100.58));
mawb.setGrossWet(500);
mawb.setIEPort("0101");
mawb.setIePort("0101");
mawb.setInputerName("");
mawb.setInsurCurr("MOP");
mawb.setInsurMark("3");
......
......@@ -125,7 +125,7 @@ public class HttpClientTest {
Mawb mawb = new Mawb();
mawb.setIEFlag("E");
mawb.setIeFlag("E");
mawb.setType("EX");
mawb.setAgentCode("1111980005");
mawb.setAgentName("联邦快递(中国)有限公司");
......@@ -141,7 +141,7 @@ public class HttpClientTest {
mawb.setFeeMark("3");
mawb.setFeeRate(BigDecimal.valueOf(100.58));
mawb.setGrossWet(500);
mawb.setIEPort("0101");
mawb.setIePort("0101");
mawb.setInputerName("");
mawb.setInsurCurr("MOP");
mawb.setInsurMark("3");
......