需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/ChangeOrderLogic.java

@@ -281,6 +281,10 @@ public class ChangeOrderLogic {
 
     @Transactional(rollbackFor = Exception.class)
     public void saveOrder(WebsitDispatch websitDispatch) {
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+
+        websitDispatch.setCompanyWechatId(adminUser.getCompanyWechatId());
+        websitDispatch.setCompanyWechatName(adminUser.getCompanyName());
         websitDispatch.insert();
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseExcelLogic.java

@@ -1312,6 +1312,14 @@ public class OrderBaseExcelLogic {
                 pgOrderBase.setAreaId(region.getAreaCode());
                 pgOrderBase.setStreetId(region.getId());
 
+            }else {
+                Region one = regionService.lambdaQuery()
+                        .like(Region::getProvinceName, pgOrderBase.getProvince()).eq(Region::getCityName, pgOrderBase.getCity()).eq(Region::getAreaName, pgOrderBase.getArea())
+                        .eq(Region::getLevel, 3).one();
+
+                one.setId(null);
+
+
             }
             pgOrderBase.setIsThreeOrder(true);
         }