‘linchangsheng’ 8 months ago
parent
commit
8c7fb376fd

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.google.common.collect.Lists;
 import com.gree.mall.manager.bean.SyncOrderDto;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
@@ -1317,7 +1318,18 @@ public class OrderBaseExcelLogic {
                         .like(Region::getProvinceName, pgOrderBase.getProvince()).eq(Region::getCityName, pgOrderBase.getCity()).eq(Region::getAreaName, pgOrderBase.getArea())
                         .eq(Region::getLevel, 3).one();
 
-                one.setId(null);
+                pgOrderBase.setProvinceId(region.getProvinceCode());
+                pgOrderBase.setCityId(region.getCityCode());
+                pgOrderBase.setAreaId(region.getAreaCode());
+
+                one.setId(IdWorker.getIdStr());
+                one.setStreetCode(one.getId());
+                one.setName(pgOrderBase.getStreet());
+                one.setLevel(4);
+                one.insert();
+
+
+                pgOrderBase.setStreetId(one.getId());
 
 
             }