From c65001312e0ff72e070580db1bf85a53f1d8701a Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Sat, 9 May 2020 20:16:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A8=E5=B9=BF=E4=BA=BA?= =?UTF-8?q?=E5=88=A4=E7=A9=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/PoiStoreStaffService.java | 68 ++++++++++++++++++- 1 file changed, 66 insertions(+), 2 deletions(-) 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 49e5d83..4cd1350 100644 --- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java +++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java @@ -261,8 +261,14 @@ public class PoiStoreStaffService { //添加一个用户 PrivilageUserDO privilageUserDO = new PrivilageUserDO(); BeanUtils.copyProperties(poiStoreStaffVO,privilageUserDO); - Long userId = privilageUserService.addUser(privilageUserDO); - if (null == userId ) return "0001"; + if(null == poiStoreStaffVO.getUserId()){ + poiStoreStaffVO.setUserId(0L); + } + Long userId = poiStoreStaffVO.getUserId(); + if(poiStoreStaffVO.getUserId().equals(0L)){ + userId = privilageUserService.addUser(privilageUserDO); + if (null == userId ) return "0001"; + } QueryWrapper rowMapper = new QueryWrapper<>(); rowMapper.eq("code",poiStoreStaffVO.getRole()); PrivilageRoleDO privilageRoleDO = privilageRoleDOMapper.selectOne(rowMapper); @@ -654,4 +660,62 @@ public class PoiStoreStaffService { wrapper.eq("user_id",userId); return poiStoreStaffDOMapper.update(poiStoreStaff,wrapper); } + + /** + * 添加店铺人员 + * @param poiStoreStaffVO + */ + public String addStaffNew(PoiStoreStaffVO poiStoreStaffVO) throws Exception { + String staffCode = poiStoreStaffVO.getStaffCode(); + String mobil = poiStoreStaffVO.getMobil(); + QueryWrapper staffQw = new QueryWrapper<>(); + staffQw.eq("staff_code", staffCode).eq("status", "1"); + List staffs = poiStoreStaffDOMapper.selectList(staffQw); + if (CollectionUtils.isNotEmpty(staffs)){ + return "0002"; + } + if (StringUtils.isNotBlank(mobil) && poiStoreStaffVO.getUserId().equals(0L)){ + QueryWrapper mobileUserQw = new QueryWrapper<>(); + mobileUserQw.eq("mobil",mobil).eq("status", "1"); + List mobileUsers = privilageUserDOMapper.selectList(mobileUserQw); + if (CollectionUtils.isNotEmpty(mobileUsers)){ + return "0003"; + } + } + QueryWrapper loginUserQw = new QueryWrapper<>(); + loginUserQw.eq("login",mobil).eq("type", "1").eq("status", "1"); + List loginUsers = privilageAccountDOMapper.selectList(loginUserQw); + if (CollectionUtils.isNotEmpty(loginUsers)){ + return "0004"; + } + + //添加一个用户 + PrivilageUserDO privilageUserDO = new PrivilageUserDO(); + BeanUtils.copyProperties(poiStoreStaffVO,privilageUserDO); + Long userId = privilageUserService.addUser(privilageUserDO); + if (null == userId ) return "0001"; + QueryWrapper rowMapper = new QueryWrapper<>(); + rowMapper.eq("code",poiStoreStaffVO.getRole()); + PrivilageRoleDO privilageRoleDO = privilageRoleDOMapper.selectOne(rowMapper); + //添加用户和角色的关系 + privilageUserRoleService.insertUserRoleRelation(userId,privilageRoleDO.getId()); + if (StringUtils.isNotBlank(poiStoreStaffVO.getIsOpen())){ + //添加一个账号 + privilageAccountService.insertAccount(poiStoreStaffVO.getStaffCode(), AccountEnum.ACCOUNT_FIRST_PWD.getDescribe(), userId); + } + //去生成一个推广人员二维码 + QrCodeDO qrCodeDO = parseQrCodeBSD(poiStoreStaffVO); + //添加一个店铺人员 + PoiStoreStaff poiStoreStaff = new PoiStoreStaff(); + BeanUtils.copyProperties(poiStoreStaffVO,poiStoreStaff); + poiStoreStaff.setUserId(userId); + if (privilageRoleDO.getCode().equals("DZ-DIANZHANG")){ + poiStoreStaff.setType(1L); + }else if(privilageRoleDO.getCode().equals("DG-DAOGOU")){ + poiStoreStaff.setType(4L); + } + poiStoreStaff.setEpWechatQrCode(qrCodeDO.getQrCode()); + poiStoreStaffDOMapper.insert(poiStoreStaff); + return "0000"; + } }