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

mt
2024年12月19日16:43:28

@@ -58,25 +58,26 @@ public class ConsignmentUtil {
                 //如果最近30天内没有提交过该运单，则新建
                 if(consignment == null){
                     consignment = new Consignment();
+                    /******提交信息记录******/
+                    consignment.setCreateTime(nowDate);
+                    consignment.setCreateUserName(user.getUserName());
+                    consignment.setCreateUserId(user.getId());
+                    //用户录入数据拷贝
+                    BeanUtils.copyProperties(consignmentBo, consignment);
+                }else {
+                    //用户录入shipperaccount
+                    consignment.setUserInputShipperAccount(consignmentBo.getShipperAccount());
+                    //始发国名称
+                    consignment.setUserInputOriginCountry(consignmentBo.getOriginCountry());
+                    //始发国编码
+                    consignment.setUserInputOriginCountryCode(consignmentBo.getOriginCountryCode());
                 }
-                //用户录入数据拷贝
-                BeanUtils.copyProperties(consignmentBo, consignment);
-                //用户录入shipperaccount
-                consignment.setUserInputShipperAccount(consignmentBo.getShipperAccount());
-                //始发国名称
-                consignment.setUserInputOriginCountry(consignmentBo.getOriginCountry());
-                //始发国编码
-                consignment.setUserInputOriginCountryCode(consignmentBo.getOriginCountryCode());
-                /******提交信息记录******/
-                consignment.setCreateTime(nowDate);
-                consignment.setCreateUserName(user.getUserName());
-                consignment.setCreateUserId(user.getId());
             } else {
                 consignment.setModifyTime(nowDate);
                 consignment.setModifyUserName(user.getUserName());
                 consignment.setModifyUserId(user.getId());
             }
-            if (!StringUtils.isEmpty(consignment.getFirstSubmitter())){
+            if (StringUtils.isEmpty(consignment.getFirstSubmitter())){
                 consignment.setFirstSubmitTime(nowDate);
                 consignment.setFirstSubmitter(user.getUserName());
                 consignment.setFirstSubmitterId(user.getId());