From 7e0fa8d86382bc3f2c5df41f066e8650461898df Mon Sep 17 00:00:00 2001 From: wangweijia <495720349@qq.com> Date: Thu, 23 Apr 2020 12:54:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kiisoo/ic/store/entity/PoiStoreStaff.java | 4 ++++ src/test/java/init/OrganizationInit.java | 8 +++++--- src/test/java/init/OrganizationInitCompany.java | 2 +- src/test/java/init/OrganizationInitCustomer.java | 2 +- src/test/java/init/OrganizationInitRegion.java | 2 +- src/test/java/init/OrganizationInitShop.java | 2 +- src/test/java/init/UserInitDO.java | 3 ++- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/store/entity/PoiStoreStaff.java b/src/main/java/com/kiisoo/ic/store/entity/PoiStoreStaff.java index d89abcc..5797f6e 100644 --- a/src/main/java/com/kiisoo/ic/store/entity/PoiStoreStaff.java +++ b/src/main/java/com/kiisoo/ic/store/entity/PoiStoreStaff.java @@ -89,4 +89,8 @@ public class PoiStoreStaff { */ private Integer deleted; + /** + * 客户用户id + */ + private Long customerUserId; } diff --git a/src/test/java/init/OrganizationInit.java b/src/test/java/init/OrganizationInit.java index 19982c1..1e74fcd 100644 --- a/src/test/java/init/OrganizationInit.java +++ b/src/test/java/init/OrganizationInit.java @@ -38,8 +38,8 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest(classes = IcApplication.class) public class OrganizationInit { - static String sellerPath = "D:\\Backup\\桌面\\各种客户端\\bsd\\智慧导购\\初始人员数据.xlsx"; - static String[] sellerColumns= {"店铺编码","店铺名称","姓名","账号","别名","职务","性别","手机","座机","个人邮箱","地址"}; + static String sellerPath = "D:\\Backup\\桌面\\各种客户端\\bsd\\智慧导购\\初始人员数据20200422.xlsx"; + static String[] sellerColumns= {"店铺","店铺编码","userid","姓名","账号","别名","职务","性别","手机","座机","个人邮箱","地址"}; static String filePath = null; static String columns[] = null; @@ -143,8 +143,10 @@ public class OrganizationInit { p.setStatus(1l); p.setCreateTime(new Date()); p.setUpdateTime(new Date()); + if(v.getCustomerUserId() != null && !v.getCustomerUserId().equals("mal")){ + p.setCustomerUserId(Long.parseLong(v.getCustomerUserId())); + } poiStoreStaffDOMapper.insert(p); - }); } public long getType(String position){ diff --git a/src/test/java/init/OrganizationInitCompany.java b/src/test/java/init/OrganizationInitCompany.java index c283105..6a090da 100644 --- a/src/test/java/init/OrganizationInitCompany.java +++ b/src/test/java/init/OrganizationInitCompany.java @@ -28,7 +28,7 @@ import java.util.Map.Entry; @RunWith(SpringRunner.class) @SpringBootTest(classes = IcApplication.class) public class OrganizationInitCompany { - static String bigRegionPath = "D:\\Backup\\桌面\\各种客户端\\bsd\\智慧导购\\组织数据.xlsx"; + static String bigRegionPath = "D:\\Backup\\桌面\\各种客户端\\bsd\\智慧导购\\组织数据20200422.xlsx"; static String[] bigRegionColumns= {"上级组织","零售公司编码","零售公司"}; static String filePath = null; diff --git a/src/test/java/init/OrganizationInitCustomer.java b/src/test/java/init/OrganizationInitCustomer.java index aff08a5..98c2bec 100644 --- a/src/test/java/init/OrganizationInitCustomer.java +++ b/src/test/java/init/OrganizationInitCustomer.java @@ -32,7 +32,7 @@ import java.util.Map.Entry; @RunWith(SpringRunner.class) @SpringBootTest(classes = IcApplication.class) public class OrganizationInitCustomer { - static String bigRegionPath = "D:\\Backup\\桌面\\各种客户端\\bsd\\智慧导购\\组织数据.xlsx"; + static String bigRegionPath = "D:\\Backup\\桌面\\各种客户端\\bsd\\智慧导购\\组织数据20200422.xlsx"; static String[] bigRegionColumns= {"上级组织编码","上级组织","客户"}; static String filePath = null; diff --git a/src/test/java/init/OrganizationInitRegion.java b/src/test/java/init/OrganizationInitRegion.java index d70141f..0d94238 100644 --- a/src/test/java/init/OrganizationInitRegion.java +++ b/src/test/java/init/OrganizationInitRegion.java @@ -35,7 +35,7 @@ import java.util.Map.Entry; @RunWith(SpringRunner.class) @SpringBootTest(classes = IcApplication.class) public class OrganizationInitRegion { - static String bigRegionPath = "D:\\Backup\\桌面\\各种客户端\\bsd\\智慧导购\\组织数据.xlsx"; + static String bigRegionPath = "D:\\Backup\\桌面\\各种客户端\\bsd\\智慧导购\\组织数据20200422.xlsx"; static String[] bigRegionColumns= {"公司","大区"}; static String filePath = null; diff --git a/src/test/java/init/OrganizationInitShop.java b/src/test/java/init/OrganizationInitShop.java index 0534b58..a4db395 100644 --- a/src/test/java/init/OrganizationInitShop.java +++ b/src/test/java/init/OrganizationInitShop.java @@ -34,7 +34,7 @@ import java.util.Map.Entry; @RunWith(SpringRunner.class) @SpringBootTest(classes = IcApplication.class) public class OrganizationInitShop { - static String shopPath = "D:\\Backup\\桌面\\各种客户端\\bsd\\智慧导购\\组织数据.xlsx"; + static String shopPath = "D:\\Backup\\桌面\\各种客户端\\bsd\\智慧导购\\组织数据20200422.xlsx"; static String[] shopColumns= {"上级组织","店铺编码","店铺名称","店铺简称","网点地址","网点经营性质","店铺级别"}; static String filePath = null; diff --git a/src/test/java/init/UserInitDO.java b/src/test/java/init/UserInitDO.java index e4f486c..b25d61e 100644 --- a/src/test/java/init/UserInitDO.java +++ b/src/test/java/init/UserInitDO.java @@ -36,5 +36,6 @@ public class UserInitDO { @JSONField(name = "地址") private String adress ; - + @JSONField(name = "userid") + private String customerUserId; }