添加推广人判空。

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<PrivilageRoleDO> 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<PoiStoreStaff> staffQw = new QueryWrapper<>();
+        staffQw.eq("staff_code", staffCode).eq("status", "1");
+        List<PoiStoreStaff> staffs = poiStoreStaffDOMapper.selectList(staffQw);
+        if (CollectionUtils.isNotEmpty(staffs)){
+            return "0002";
+        }
+        if (StringUtils.isNotBlank(mobil) && poiStoreStaffVO.getUserId().equals(0L)){
+            QueryWrapper<PrivilageUserDO> mobileUserQw = new QueryWrapper<>();
+            mobileUserQw.eq("mobil",mobil).eq("status", "1");
+            List<PrivilageUserDO> mobileUsers = privilageUserDOMapper.selectList(mobileUserQw);
+            if (CollectionUtils.isNotEmpty(mobileUsers)){
+                return "0003";
+            }
+        }
+        QueryWrapper<PrivilageAccountDO> loginUserQw = new QueryWrapper<>();
+        loginUserQw.eq("login",mobil).eq("type", "1").eq("status", "1");
+        List<PrivilageAccountDO> 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<PrivilageRoleDO> 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";
+    }
 }