Fedex / iClear-api

Go to a project
Toggle navigation Toggle navigation pinning
tao.mo
22e7b906 2 parents df77d08b 7bf63a28

Merge branches 'API-2023-07-30-bug' and 'API-2023-11-19-release' of http://118.1… 

…78.128.178//Fedex/iClear-api into API-2023-11-19-release
Inline Side-by-side
Showing 2 changed files with 11 additions and 0 deletions
...@@ -468,6 +468,12 @@ public class ChmConsignment implements Serializable { ...@@ -468,6 +468,12 @@ public class ChmConsignment implements Serializable {
468 @Column(name = "PICK_UP_DATE") 468 @Column(name = "PICK_UP_DATE")
469 private Date pickUpDate; 469 private Date pickUpDate;
470 470
471 + /**
472 + * 运单提交时间
473 + */
474 + @Column(name = "COMMIT_TIME")
475 + private Date commitTime;
476 +
471 @OneToMany(mappedBy = "chmConsignment", cascade = CascadeType.ALL) 477 @OneToMany(mappedBy = "chmConsignment", cascade = CascadeType.ALL)
472 private List<ChmConsignmentDetail> chmConsignmentDetailList; 478 private List<ChmConsignmentDetail> chmConsignmentDetailList;
473 479
...@@ -526,6 +532,7 @@ public class ChmConsignment implements Serializable { ...@@ -526,6 +532,7 @@ public class ChmConsignment implements Serializable {
526 ", updateTime=" + updateTime + 532 ", updateTime=" + updateTime +
527 ", consStatusDic=" + consStatusDic + 533 ", consStatusDic=" + consStatusDic +
528 ", consStatus='" + consStatus + '\'' + 534 ", consStatus='" + consStatus + '\'' +
535 + ", commitTime=" + commitTime +
529 '}'; 536 '}';
530 } 537 }
531 } 538 }
......
...@@ -234,6 +234,7 @@ public class ChmConsignmentService { ...@@ -234,6 +234,7 @@ public class ChmConsignmentService {
234 //推送时间作为创建时间，可以用来校验数据的有序性，如果新的推送时间小于已有的创建时间，就不更新数据 234 //推送时间作为创建时间，可以用来校验数据的有序性，如果新的推送时间小于已有的创建时间，就不更新数据
235 result.setCreateTime(new Date()); 235 result.setCreateTime(new Date());
236 result.setUpdateTime(new Date()); 236 result.setUpdateTime(new Date());
237 + result.setCommitTime(new Date());
237 SysUser sysUser = sysUserRepository.findUserByLoginName(creator); 238 SysUser sysUser = sysUserRepository.findUserByLoginName(creator);
238 if (sysUser == null){ 239 if (sysUser == null){
239 result.setCreator(creator); 240 result.setCreator(creator);
...@@ -301,6 +302,7 @@ public class ChmConsignmentService { ...@@ -301,6 +302,7 @@ public class ChmConsignmentService {
301 //推送时间作为创建时间，可以用来校验数据的有序性，如果新的推送时间小于已有的创建时间，就不更新数据 302 //推送时间作为创建时间，可以用来校验数据的有序性，如果新的推送时间小于已有的创建时间，就不更新数据
302 result.setCreateTime(new Date()); 303 result.setCreateTime(new Date());
303 result.setUpdateTime(pushTime); 304 result.setUpdateTime(pushTime);
305 + result.setCommitTime(pushTime);
304 SysUser sysUser = sysUserRepository.findUserByLoginName(creator); 306 SysUser sysUser = sysUserRepository.findUserByLoginName(creator);
305 if (sysUser == null){ 307 if (sysUser == null){
306 result.setCreator(creator); 308 result.setCreator(creator);
...@@ -611,6 +613,7 @@ public class ChmConsignmentService { ...@@ -611,6 +613,7 @@ public class ChmConsignmentService {
611 613
612 chmConsignment.setCreateTime(chmConsignmentDB.getCreateTime()); 614 chmConsignment.setCreateTime(chmConsignmentDB.getCreateTime());
613 chmConsignment.setUpdateTime(new Date()); 615 chmConsignment.setUpdateTime(new Date());
616 + chmConsignment.setCommitTime(new Date());
614 ChmConsignment updateResult = this.saveChmConsignment(chmConsignment); 617 ChmConsignment updateResult = this.saveChmConsignment(chmConsignment);
615 if(!Objects.equals(updateResult,null)){ 618 if(!Objects.equals(updateResult,null)){
616 log.info("主单"+ mawb.getBillNo()+" 更新成功，chmConsignmentId:"+updateResult.getId()); 619 log.info("主单"+ mawb.getBillNo()+" 更新成功，chmConsignmentId:"+updateResult.getId());
...@@ -751,6 +754,7 @@ public class ChmConsignmentService { ...@@ -751,6 +754,7 @@ public class ChmConsignmentService {
751 chmConsignment.setId(chmConsignmentDB.getId()); 754 chmConsignment.setId(chmConsignmentDB.getId());
752 //chmConsignment.setCreateTime(chmConsignmentDB.getCreateTime()); 755 //chmConsignment.setCreateTime(chmConsignmentDB.getCreateTime());
753 chmConsignment.setUpdateTime(pushTime); 756 chmConsignment.setUpdateTime(pushTime);
757 + chmConsignment.setCommitTime(pushTime);
754 ChmConsignment updateResult = this.saveChmConsignment(chmConsignment); 758 ChmConsignment updateResult = this.saveChmConsignment(chmConsignment);
755 if(!Objects.equals(updateResult,null)){ 759 if(!Objects.equals(updateResult,null)){
756 log.info("主单"+ fedexMawb.getBillNo()+" 更新成功，chmConsignmentId:"+updateResult.getId()); 760 log.info("主单"+ fedexMawb.getBillNo()+" 更新成功，chmConsignmentId:"+updateResult.getId());
......