From b7b5d550ce02569bc7b5fab54bcc1d1f075b6e3a Mon Sep 17 00:00:00 2001 From: yechenhao Date: Wed, 27 May 2020 18:06:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=97=E9=95=BF=E6=97=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=A6=E5=8F=B7=E4=B8=8E=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E7=9A=84=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/StoreEmployeeService.java | 17 +++++++--- .../impl/PrivilageUserServiceImpl.java | 31 +++++++++++++++++++ 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java index 8a27d0f..a5e2ec7 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -53,10 +53,7 @@ import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; @@ -943,6 +940,7 @@ public class StoreEmployeeService { //初始化导购对象 com.kiisoo.ic.store.entity.PoiStoreStaffVO poiStoreStaffVO = new com.kiisoo.ic.store.entity.PoiStoreStaffVO(); //店铺code + dataRow.getCell(0).setCellType(CellType.STRING); String shopCode = dataRow.getCell(0).getStringCellValue(); if (StringUtils.isBlank(shopCode)) { getReason(row, "未填写店铺Code", results); @@ -959,6 +957,7 @@ public class StoreEmployeeService { poiStoreStaffVO.setStoreId(poiStore.getId()); //获取员工名 + dataRow.getCell(1).setCellType(CellType.STRING); String name = dataRow.getCell(1).getStringCellValue(); if (StringUtils.isBlank(name)) { getReason(row, "未填写推广人员名称", results); @@ -966,7 +965,7 @@ public class StoreEmployeeService { } poiStoreStaffVO.setName(name); - + dataRow.getCell(2).setCellType(CellType.STRING); String mobile = dataRow.getCell(2).getStringCellValue(); if (StringUtils.isBlank(mobile)) { getReason(row, "未填写手机号", results); @@ -974,6 +973,7 @@ public class StoreEmployeeService { } poiStoreStaffVO.setMobil(mobile); + dataRow.getCell(3).setCellType(CellType.STRING); String staffCode = dataRow.getCell(3).getStringCellValue(); if (StringUtils.isBlank(staffCode)) { getReason(row, "未填写工号", results); @@ -981,6 +981,7 @@ public class StoreEmployeeService { } poiStoreStaffVO.setStaffCode(staffCode); + dataRow.getCell(4).setCellType(CellType.STRING); String roleCode = dataRow.getCell(4).getStringCellValue(); if (StringUtils.isBlank(roleCode)) { getReason(row, "未填写角色", results); @@ -988,6 +989,12 @@ public class StoreEmployeeService { } poiStoreStaffVO.setRole(roleCode); + if ("DZ-DIANZHANG".equals(roleCode)) { + poiStoreStaffVO.setType(1L); + }else{ + poiStoreStaffVO.setType(4L); + } + String returnCode = poiStoreStaffService.addStaff(poiStoreStaffVO); switch (returnCode){ case "0001": diff --git a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageUserServiceImpl.java b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageUserServiceImpl.java index 6dc2027..0ec4935 100644 --- a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageUserServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageUserServiceImpl.java @@ -3,12 +3,16 @@ package com.kiisoo.ic.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.kiisoo.ic.constants.Constants; +import com.kiisoo.ic.employee.entity.PrivilageCpUserDO; import com.kiisoo.ic.employee.entity.QrCodeDO; +import com.kiisoo.ic.employee.mapper.PrivilageCpUserDOMapper; import com.kiisoo.ic.store.entity.PoiStore; import com.kiisoo.ic.store.entity.PoiStoreStaff; import com.kiisoo.ic.store.entity.PoiStoreStaffVO; +import com.kiisoo.ic.store.entity.PrivilageCpUserStoreDO; import com.kiisoo.ic.store.mapper.PoiStoreDOMapper; import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; +import com.kiisoo.ic.store.mapper.PrivilageCpUserStoreDOMapper; import com.kiisoo.ic.store.service.PoiStoreStaffService; import com.kiisoo.ic.system.entity.PrivilageUserDO; import com.kiisoo.ic.system.enums.UserEnum; @@ -33,6 +37,10 @@ public class PrivilageUserServiceImpl extends ServiceImpl cpUserQw = new QueryWrapper<>(); + cpUserQw.eq("cp_user_id",staffCode).last("limit 1"); + PrivilageCpUserDO privilageCpUserDO = privilageCpUserDOMapper.selectOne(cpUserQw); + if (privilageCpUserDO == null){ + privilageCpUserDO = new PrivilageCpUserDO(); + privilageCpUserDO.setCpUserId(staffCode); + privilageCpUserDO.setMobile(staffCode); + privilageCpUserDO.setPosition("店长"); + privilageCpUserDO.setStatus(1); + privilageCpUserDOMapper.insert(privilageCpUserDO); + } + QueryWrapper relationQw = new QueryWrapper<>(); + relationQw.eq("cp_user_id",privilageCpUserDO.getId()).eq("store_id",shopId).last("limit 1"); + PrivilageCpUserStoreDO privilageCpUserStoreDO = privilageCpUserStoreDOMapper.selectOne(relationQw); + if (privilageCpUserStoreDO == null){ + privilageCpUserStoreDO = new PrivilageCpUserStoreDO(); + privilageCpUserStoreDO.setCpUserId(privilageCpUserDO.getId()); + privilageCpUserStoreDO.setStoreId(shopId); + privilageCpUserStoreDOMapper.insert(privilageCpUserStoreDO); + } + } poiStoreStaff.setCreateTime(new Date()); poiStoreStaff.setUpdateTime(new Date()); poiStoreStaff.setStatus(1L);