diff --git a/src/main/java/com/kiisoo/ic/constants/Constants.java b/src/main/java/com/kiisoo/ic/constants/Constants.java index 5026bb4..0a7570c 100644 --- a/src/main/java/com/kiisoo/ic/constants/Constants.java +++ b/src/main/java/com/kiisoo/ic/constants/Constants.java @@ -1,5 +1,8 @@ package com.kiisoo.ic.constants; +import java.util.HashMap; +import java.util.Map; + /** * @ClassName: Constants * @Description: @@ -44,4 +47,16 @@ public class Constants { * 无权限 */ public static final String LOGIN_NO_PERMISSIONS = "1007"; + + /** 数字对应周 */ + public static final Map SELLER_TYPE = new HashMap() { + private static final long serialVersionUID = 1L; + { + put(1L, "店长"); + put(2L, "副店长"); + put(3L, "店长助理"); + put(4L, "导购"); + + } + }; } diff --git a/src/main/java/com/kiisoo/ic/store/controller/StoreStaffController.java b/src/main/java/com/kiisoo/ic/store/controller/StoreStaffController.java index e279a45..062640f 100644 --- a/src/main/java/com/kiisoo/ic/store/controller/StoreStaffController.java +++ b/src/main/java/com/kiisoo/ic/store/controller/StoreStaffController.java @@ -59,7 +59,7 @@ public class StoreStaffController extends BaseController { * @return * @throws */ - @RequestMapping(value = "/add", method = RequestMethod.GET) + @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody public Map addStaff(PoiStoreStaffVO poiStoreStaffVO) { try { @@ -88,4 +88,44 @@ public class StoreStaffController extends BaseController { } } + /** + * 查询店铺人员列表 + * + * @param + * @return + * @throws + */ + @RequestMapping(value = "/edit", method = RequestMethod.POST) + @ResponseBody + public Map editStaff(PoiStoreStaffVO poiStoreStaffVO) { + try { + poiStoreStaffService.ediStaff(poiStoreStaffVO); + return success(); + } catch (Exception e) { + log.error("获取店铺人员", e); + return fail(); + } + } + + + /** + * 查询店铺人员列表 + * + * @param + * @return + * @throws + */ + @RequestMapping(value = "/detail", method = RequestMethod.GET) + @ResponseBody + public Map staffList(long id) { + try { + PoiStoreStaffVO storeStaff = poiStoreStaffService.getStaffDetail(id); + return data(storeStaff); + } catch (Exception e) { + log.error("获取店铺人员", e); + return fail(); + } + } + + } diff --git a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java index ee90e08..7397708 100644 --- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java +++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java @@ -3,7 +3,7 @@ package com.kiisoo.ic.store.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kiisoo.ic.customer.entity.OpCustomerEnterpriseWechat; +import com.kiisoo.ic.constants.Constants; import com.kiisoo.ic.domain.service.PrivilageDomainService; import com.kiisoo.ic.employee.entity.QrCodeDO; import com.kiisoo.ic.employee.entity.QrCodeVO; @@ -23,7 +23,6 @@ import com.kiisoo.ic.system.enums.AccountEnum; import com.kiisoo.ic.system.mapper.PrivilageRoleDOMapper; import com.kiisoo.ic.system.mapper.PrivilageUserDOMapper; import com.kiisoo.ic.system.service.PrivilageAccountService; -import com.kiisoo.ic.system.service.PrivilageRoleService; import com.kiisoo.ic.system.service.PrivilageUserRoleService; import com.kiisoo.ic.system.service.PrivilageUserService; import org.apache.commons.lang3.StringUtils; @@ -107,12 +106,16 @@ public class PoiStoreStaffService { records.forEach(poiStoreStaff -> { PoiStoreStaffVO poiStoreStaffVO = new PoiStoreStaffVO(); BeanUtils.copyProperties(poiStoreStaff, poiStoreStaffVO); - PrivilageUserBean privilageUserBean = privilageUserDOMapper.selectUserInfoAndRoleInfo(poiStoreStaff.getUserId()); - poiStoreStaffVO.setName(privilageUserBean.getName()); - poiStoreStaffVO.setMobil(privilageUserBean.getMobil()); - poiStoreStaffVO.setRole(privilageUserBean.getRoleName()); + poiStoreStaffVO.setRole(Constants.SELLER_TYPE.get(poiStoreStaff.getType())); + PrivilageUserBean privilageUserBean = privilageUserDOMapper.selectUserInfoAndRoleInfo(poiStoreStaff.getUserId()); + if(null != privilageUserBean){ + poiStoreStaffVO.setName(privilageUserBean.getName()); + poiStoreStaffVO.setMobil(privilageUserBean.getMobil()); + } PoiStore poiStore = poiStoreDOMapper.selectById(poiStoreStaff.getStoreId()); - poiStoreStaffVO.setStoreName(poiStore.getName()); + if (null != poiStore) { + poiStoreStaffVO.setStoreName(poiStore.getName()); + } list.add(poiStoreStaffVO); }); resultList.setTotal(poiStoreStaffs.getTotal()); @@ -133,9 +136,8 @@ public class PoiStoreStaffService { //添加用户和角色的关系 privilageUserRoleService.insertUserRoleRelation(userId,poiStoreStaffVO.getRoleId()); //添加一个账号 - privilageAccountService.insertAccount(poiStoreStaffVO.getLogin(), AccountEnum.ACCOUNT_FIRST_PWD.getDescribe(),userId); + privilageAccountService.insertAccount(poiStoreStaffVO.getStaffCode(), AccountEnum.ACCOUNT_FIRST_PWD.getDescribe(), userId); //去生成一个推广人员二维码 - QrCodeVO qrCodeVO = parseQrCode(poiStoreStaffVO); //添加一个店铺人员 PoiStoreStaff poiStoreStaff = new PoiStoreStaff(); @@ -152,9 +154,10 @@ public class PoiStoreStaffService { */ public int ediStaff(PoiStoreStaffVO poiStoreStaffVO) throws Exception { //修改用户信息 - long userId = poiStoreStaffVO.getUserId(); + Long userId = poiStoreStaffVO.getUserId(); PrivilageUserDO privilageUserDO = new PrivilageUserDO(); BeanUtils.copyProperties(poiStoreStaffVO,privilageUserDO); + privilageUserDO.setId(userId); privilageUserService.updateById(privilageUserDO); //保存用户角色 privilageUserRoleService.saveUserRole(userId, poiStoreStaffVO.getRoleId()); @@ -170,7 +173,7 @@ public class PoiStoreStaffService { } BeanUtils.copyProperties(poiStoreStaffVO,poiStoreStaff); poiStoreStaff.setType(poiStoreStaffVO.getRoleId()); - return poiStoreStaffDOMapper.insert(poiStoreStaff); + return poiStoreStaffDOMapper.updateById(poiStoreStaff); } /** @@ -184,13 +187,36 @@ public class PoiStoreStaffService { String staffCode = poiStoreStaffDOMapper.selectShopManagerByShop(poiStoreStaffVO.getStoreId()); String[] data = new String[1]; //选择店铺对应店长的编码 - data[0] = (staffCode); + //data[0] = (staffCode); + data[0] = ("JiangDeXiang"); qrCodeDO.setUser(data); //店铺编码-导购编码 - qrCodeDO.setState(poiStoreStaffVO.getStoreCode() +"-"+poiStoreStaffVO.getStaffCode()); + qrCodeDO.setState(poiStoreStaffVO.getStoreCode() + "-" + poiStoreStaffVO.getStaffCode()); return qrCodeService.getQrCode(qrCodeDO); } + /** + * 查询单个推广人的详细信息 + * + * @param id + * @return + */ + public PoiStoreStaffVO getStaffDetail(long id) { + //店铺人员信息 + PoiStoreStaff poiStoreStaff = poiStoreStaffDOMapper.selectById(id); + PoiStoreStaffVO staffVO = new PoiStoreStaffVO(); + if (null == poiStoreStaff) return staffVO; + BeanUtils.copyProperties(staffVO, poiStoreStaff); + PoiStore poiStore = poiStoreDOMapper.selectById(poiStoreStaff.getStoreId()); + if (null != null) { + staffVO.setStoreName(poiStore.getName()); + } + //用户信息 + PrivilageUserBean privilageUserBean = privilageUserDOMapper.selectUserInfoAndRoleInfo(poiStoreStaff.getUserId()); + staffVO.setName(privilageUserBean.getName()); + staffVO.setMobil(privilageUserBean.getMobil()); + return staffVO; + } /** * 批量上传推广人员 * @param files diff --git a/src/main/java/com/kiisoo/ic/system/enums/StoreStaffEnum.java b/src/main/java/com/kiisoo/ic/system/enums/StoreStaffEnum.java new file mode 100644 index 0000000..1961282 --- /dev/null +++ b/src/main/java/com/kiisoo/ic/system/enums/StoreStaffEnum.java @@ -0,0 +1,34 @@ +package com.kiisoo.ic.system.enums; + +import lombok.Getter; + +/** + * @author yinliujing + * @date 2020/4/14 10:21 + * @company kiisoo + * @details 店铺人员枚举 + */ +@Getter +public enum StoreStaffEnum { + + USER_STATUS_MANAGER("店长", 1), + USER_STATUS_VICE_MANAGER(" 副店长", 2), + USER_STATUS_MANAGER_ASSISTANT(" 店长助理", 3), + STORE_STAFF_ABNORMAL(" 导购", 4),; + + + /** + * 字段描述 + */ + private String describe; + + /** + * 字段类型 + */ + private int type; + + StoreStaffEnum(String describe, int type) { + this.describe = describe; + this.type = type; + } +}