Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
tao.mo
2345d62e 1 parent 9cec5e26

biz-customer | 修改 | 运单信息更新逻辑调整 

mt
2024年12月19日16:43:28
Inline Side-by-side
Showing 1 changed file with 14 additions and 13 deletions
...@@ -58,25 +58,26 @@ public class ConsignmentUtil { ...@@ -58,25 +58,26 @@ public class ConsignmentUtil {
58 //如果最近30天内没有提交过该运单，则新建 58 //如果最近30天内没有提交过该运单，则新建
59 if(consignment == null){ 59 if(consignment == null){
60 consignment = new Consignment(); 60 consignment = new Consignment();
61 + /******提交信息记录******/
62 + consignment.setCreateTime(nowDate);
63 + consignment.setCreateUserName(user.getUserName());
64 + consignment.setCreateUserId(user.getId());
65 + //用户录入数据拷贝
66 + BeanUtils.copyProperties(consignmentBo, consignment);
67 + }else {
68 + //用户录入shipperaccount
69 + consignment.setUserInputShipperAccount(consignmentBo.getShipperAccount());
70 + //始发国名称
71 + consignment.setUserInputOriginCountry(consignmentBo.getOriginCountry());
72 + //始发国编码
73 + consignment.setUserInputOriginCountryCode(consignmentBo.getOriginCountryCode());
61 } 74 }
62 - //用户录入数据拷贝
63 - BeanUtils.copyProperties(consignmentBo, consignment);
64 - //用户录入shipperaccount
65 - consignment.setUserInputShipperAccount(consignmentBo.getShipperAccount());
66 - //始发国名称
67 - consignment.setUserInputOriginCountry(consignmentBo.getOriginCountry());
68 - //始发国编码
69 - consignment.setUserInputOriginCountryCode(consignmentBo.getOriginCountryCode());
70 - /******提交信息记录******/
71 - consignment.setCreateTime(nowDate);
72 - consignment.setCreateUserName(user.getUserName());
73 - consignment.setCreateUserId(user.getId());
74 } else { 75 } else {
75 consignment.setModifyTime(nowDate); 76 consignment.setModifyTime(nowDate);
76 consignment.setModifyUserName(user.getUserName()); 77 consignment.setModifyUserName(user.getUserName());
77 consignment.setModifyUserId(user.getId()); 78 consignment.setModifyUserId(user.getId());
78 } 79 }
79 - if (!StringUtils.isEmpty(consignment.getFirstSubmitter())){ 80 + if (StringUtils.isEmpty(consignment.getFirstSubmitter())){
80 consignment.setFirstSubmitTime(nowDate); 81 consignment.setFirstSubmitTime(nowDate);
81 consignment.setFirstSubmitter(user.getUserName()); 82 consignment.setFirstSubmitter(user.getUserName());
82 consignment.setFirstSubmitterId(user.getId()); 83 consignment.setFirstSubmitterId(user.getId());
......