Fedex / iClear-api

Go to a project
Toggle navigation Toggle navigation pinning
Jiaqi.xu
a9dccafb 1 parent 16867954

BASF接口

Inline Side-by-side
Showing 3 changed files with 5 additions and 5 deletions
...@@ -62,7 +62,7 @@ public class BasfDataInterface { ...@@ -62,7 +62,7 @@ public class BasfDataInterface {
62 if(!Objects.equals(saveIClearApiLogResult,null)){ 62 if(!Objects.equals(saveIClearApiLogResult,null)){
63 log.info("请求保存成功，msgId："+saveIClearApiLogResult.getMsgId()); 63 log.info("请求保存成功，msgId："+saveIClearApiLogResult.getMsgId());
64 basfc.setMsgId(saveIClearApiLogResult.getMsgId()); 64 basfc.setMsgId(saveIClearApiLogResult.getMsgId());
65 - basfc.getBasfcDetailList().forEach(d->{ 65 + basfc.getConsignmentList().forEach(d->{
66 d.setMsgId(saveIClearApiLogResult.getMsgId()); 66 d.setMsgId(saveIClearApiLogResult.getMsgId());
67 }); 67 });
68 saveMawbBasfResult = basfService.saveMawbBasf(basfc); 68 saveMawbBasfResult = basfService.saveMawbBasf(basfc);
......
...@@ -91,8 +91,8 @@ public class Basfc implements Serializable { ...@@ -91,8 +91,8 @@ public class Basfc implements Serializable {
91 private String EANNo; 91 private String EANNo;
92 92
93 @Valid 93 @Valid
94 - @ApiModelProperty(value = "运单明细", name = "basfcDetailList", example = "") 94 + @ApiModelProperty(value = "运单明细", name = "consignmentList", example = "")
95 @OneToMany(cascade = CascadeType.PERSIST) 95 @OneToMany(cascade = CascadeType.PERSIST)
96 @JoinColumn(name = "BASFCID") 96 @JoinColumn(name = "BASFCID")
97 - private List<BasfcDetail> basfcDetailList; 97 + private List<BasfcDetail> consignmentList;
98 } 98 }
......
...@@ -77,8 +77,8 @@ public class BasfService { ...@@ -77,8 +77,8 @@ public class BasfService {
77 basfMawb.setEANNo(basfc.getEANNo()); 77 basfMawb.setEANNo(basfc.getEANNo());
78 //明细 78 //明细
79 List<BasfMawbDetail> mawbDetailList = new ArrayList<>(); 79 List<BasfMawbDetail> mawbDetailList = new ArrayList<>();
80 - if (basfc.getBasfcDetailList().size()>0){ 80 + if (basfc.getConsignmentList().size()>0){
81 - for (BasfcDetail basfcDetail : basfc.getBasfcDetailList()){ 81 + for (BasfcDetail basfcDetail : basfc.getConsignmentList()){
82 BasfMawbDetail mawbDetail = new BasfMawbDetail(); 82 BasfMawbDetail mawbDetail = new BasfMawbDetail();
83 mawbDetail.setDetailId(String.valueOf(basfcDetail.getConsignmentDetailId())); 83 mawbDetail.setDetailId(String.valueOf(basfcDetail.getConsignmentDetailId()));
84 mawbDetail.setGmodel(basfcDetail.getModel()); 84 mawbDetail.setGmodel(basfcDetail.getModel());
......