diff --git a/src/main/java/com/kiisoo/ic/constants/Constants.java b/src/main/java/com/kiisoo/ic/constants/Constants.java index 5762789..c10f607 100644 --- a/src/main/java/com/kiisoo/ic/constants/Constants.java +++ b/src/main/java/com/kiisoo/ic/constants/Constants.java @@ -108,10 +108,18 @@ public class Constants { public static final String CODE_ORGANIZATIONAL_HAS = "3001"; + public static final String MSG_INSERT_ERROR = "插入失败"; + + public static final String CODE_INSERT_ERROR = "0001"; + public static final String MSG_STORE_HAS = "已存在店铺"; public static final String CODE_STORE_HAS = "3002"; + public static final String MSG_STORE_NONE = "已存在店铺"; + + public static final String CODE_STORE_NONE = "3002"; + public static final String MSG_ORGANIZATIONAL_NO = "不存在对应客户"; public static final String CODE_ORGANIZATIONAL_NO = "3003"; 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 72e4dd5..dea660d 100644 --- a/src/main/java/com/kiisoo/ic/store/controller/StoreStaffController.java +++ b/src/main/java/com/kiisoo/ic/store/controller/StoreStaffController.java @@ -249,6 +249,23 @@ public class StoreStaffController extends BaseController { } } + /** + * 添加组织 + * @author dexiang.jiang + * @date 2020/05/20 14:52 + */ + @RequestMapping(value = "/cpuser/add/code",method = RequestMethod.POST) + @ResponseBody + public Map cpUserAddCode(@RequestParam("name") String name,@RequestParam("alias") String alias, @RequestParam("cpUserId") String cpUserId, @RequestParam("storeCode") String storeCode) { + try { + boolean b = storeEmployeeService.addCpUserIdByCode(name,alias, cpUserId, storeCode); + return data(b); + } catch (KiisooException e) { + log.error("添加组织", e); + return fail(e.getCode(),e.getMsg()); + } + } + /** * 添加店铺 * @author dexiang.jiang 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 8a1e73b..7509ae5 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -36,6 +36,7 @@ import com.kiisoo.ic.store.bean.PoiStoreStaffDTO; import com.kiisoo.ic.store.bean.PoiStoreVO; import com.kiisoo.ic.store.entity.PoiStore; import com.kiisoo.ic.store.entity.PoiStoreStaff; +import com.kiisoo.ic.store.entity.PrivilageCpUserStoreDO; import com.kiisoo.ic.store.entity.StoreUserDTO; import com.kiisoo.ic.store.mapper.PoiStoreDOMapper; import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; @@ -1050,6 +1051,62 @@ public class StoreEmployeeService { return b > 0; } } + /** + * 添加组织 + * @param name 名称 + * @param alias 别名 + * @param cpUserId 账号 + * @param storeCode 店铺编码 + * @author yechenhao + * @date 2020/05/20 14:57 + */ + @Transactional(rollbackFor = Exception.class) + public boolean addCpUserIdByCode(String name, String alias, String cpUserId, String storeCode) throws KiisooException { + //查询店铺code + QueryWrapper storeQw = new QueryWrapper<>(); + storeQw.eq("code",storeCode).last("limit 1"); + PoiStore poiStore = poiStoreDOMapper.selectOne(storeQw); + if (poiStore == null){ + throw new KiisooException(Constants.MSG_STORE_NONE, Constants.CODE_STORE_NONE); + } + //查询账号是否存在 + QueryWrapper cpUserQw = new QueryWrapper<>(); + cpUserQw.eq("cp_user_id",cpUserId).last("limit 1"); + PrivilageCpUserDO privilageCpUserDO = privilageCpUserDOMapper.selectOne(cpUserQw); + PrivilageCpUserStoreDO privilageCpUserStoreDO; + QueryWrapper cpUserRelationQwByStore = new QueryWrapper<>(); + cpUserRelationQwByStore.eq("store_id",privilageCpUserDO.getId()).last("limit 1"); + privilageCpUserStoreDO = privilageCpUserStoreDOMapper.selectOne(cpUserRelationQwByStore); + if (privilageCpUserStoreDO != null){ + throw new KiisooException(Constants.MSG_DOMAIN_ENTITY_HAS, Constants.CODE_DOMAIN_ENTITY_HAS); + } + if (privilageCpUserDO != null){ + //查询关系是否存在 + QueryWrapper cpUserRelationQwByCpUser = new QueryWrapper<>(); + cpUserRelationQwByCpUser.eq("cp_user_id",privilageCpUserDO.getId()).last("limit 1"); + privilageCpUserStoreDO = privilageCpUserStoreDOMapper.selectOne(cpUserRelationQwByCpUser); + if (privilageCpUserStoreDO != null){ + throw new KiisooException(Constants.MSG_DOMAIN_ENTITY_HAS, Constants.CODE_DOMAIN_ENTITY_HAS); + } + }else{ + privilageCpUserDO = new PrivilageCpUserDO(); + privilageCpUserDO.setStatus(1); + privilageCpUserDO.setName(name); + privilageCpUserDO.setAlias(alias); + privilageCpUserDO.setCpUserId(cpUserId); + privilageCpUserDO.setMobile(cpUserId); + privilageCpUserDO.setPosition("店长"); + privilageCpUserDOMapper.insert(privilageCpUserDO); + } + privilageCpUserStoreDO = new PrivilageCpUserStoreDO(); + privilageCpUserStoreDO.setStoreId(poiStore.getId()); + privilageCpUserStoreDO.setCpUserId(privilageCpUserDO.getId()); + int insert = privilageCpUserStoreDOMapper.insert(privilageCpUserStoreDO); + if (insert == 0){ + throw new KiisooException(Constants.MSG_INSERT_ERROR, Constants.CODE_INSERT_ERROR); + } + return true; + } /** * 添加组织