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

@@ -468,6 +468,12 @@ public class ChmConsignment implements Serializable {
     @Column(name = "PICK_UP_DATE")
     private Date pickUpDate;
 
+    /**
+     * 运单提交时间
+     */
+    @Column(name = "COMMIT_TIME")
+    private Date commitTime;
+
     @OneToMany(mappedBy = "chmConsignment", cascade = CascadeType.ALL)
     private List<ChmConsignmentDetail> chmConsignmentDetailList;
 
@@ -526,6 +532,7 @@ public class ChmConsignment implements Serializable {
                 ", updateTime=" + updateTime +
                 ", consStatusDic=" + consStatusDic +
                 ", consStatus='" + consStatus + '\'' +
+                ", commitTime=" + commitTime +
                 '}';
     }
 }

@@ -234,6 +234,7 @@ public class ChmConsignmentService {
             //推送时间作为创建时间，可以用来校验数据的有序性，如果新的推送时间小于已有的创建时间，就不更新数据
             result.setCreateTime(new Date());
             result.setUpdateTime(new Date());
+            result.setCommitTime(new Date());
             SysUser sysUser = sysUserRepository.findUserByLoginName(creator);
             if (sysUser == null){
                 result.setCreator(creator);
@@ -301,6 +302,7 @@ public class ChmConsignmentService {
             //推送时间作为创建时间，可以用来校验数据的有序性，如果新的推送时间小于已有的创建时间，就不更新数据
             result.setCreateTime(new Date());
             result.setUpdateTime(pushTime);
+            result.setCommitTime(pushTime);
             SysUser sysUser = sysUserRepository.findUserByLoginName(creator);
             if (sysUser == null){
                 result.setCreator(creator);
@@ -611,6 +613,7 @@ public class ChmConsignmentService {
 
                 chmConsignment.setCreateTime(chmConsignmentDB.getCreateTime());
                 chmConsignment.setUpdateTime(new Date());
+                chmConsignment.setCommitTime(new Date());
                 ChmConsignment updateResult = this.saveChmConsignment(chmConsignment);
                 if(!Objects.equals(updateResult,null)){
                     log.info("主单"+ mawb.getBillNo()+" 更新成功，chmConsignmentId:"+updateResult.getId());
@@ -751,6 +754,7 @@ public class ChmConsignmentService {
                 chmConsignment.setId(chmConsignmentDB.getId());
                 //chmConsignment.setCreateTime(chmConsignmentDB.getCreateTime());
                 chmConsignment.setUpdateTime(pushTime);
+                chmConsignment.setCommitTime(pushTime);
                 ChmConsignment updateResult = this.saveChmConsignment(chmConsignment);
                 if(!Objects.equals(updateResult,null)){
                     log.info("主单"+ fedexMawb.getBillNo()+" 更新成功，chmConsignmentId:"+updateResult.getId());