From 2ae3ef9b6ddc50f59d2ae3b299a39c58efab3181 Mon Sep 17 00:00:00 2001 From: zhuhaoyu <123456789> Date: Mon, 20 Apr 2020 18:06:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=B4=AD=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StoreStaffController.java | 19 ++++++ .../ic/store/entity/PoiStoreStaffVO.java | 5 ++ .../store/service/PoiStoreStaffService.java | 65 +++++++++++++++++++ 3 files changed, 89 insertions(+) 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 5f36a6b..373b948 100644 --- a/src/main/java/com/kiisoo/ic/store/controller/StoreStaffController.java +++ b/src/main/java/com/kiisoo/ic/store/controller/StoreStaffController.java @@ -52,6 +52,25 @@ public class StoreStaffController extends BaseController { } } + /** + * 查询店铺人员列表 + * + * @param + * @return + * @throws + */ + @RequestMapping(value = "/list/userId", method = RequestMethod.GET) + @ResponseBody + public Map staffListByUserId(Long userId) { + try { + Map result = poiStoreStaffService.getStaffByUserId(userId); + return data(result); + } catch (Exception e) { + log.error("获取店铺人员", e); + return fail(); + } + } + /** * 查询店铺人员列表 * diff --git a/src/main/java/com/kiisoo/ic/store/entity/PoiStoreStaffVO.java b/src/main/java/com/kiisoo/ic/store/entity/PoiStoreStaffVO.java index 2b0b55c..eeea6b6 100644 --- a/src/main/java/com/kiisoo/ic/store/entity/PoiStoreStaffVO.java +++ b/src/main/java/com/kiisoo/ic/store/entity/PoiStoreStaffVO.java @@ -117,4 +117,9 @@ public class PoiStoreStaffVO { private Integer customerNum; private String isOpen; + + /** + * 导购账号状态 + */ + private Boolean accountFlag; } 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 f393802..1dc4ed9 100644 --- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java +++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java @@ -48,6 +48,9 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Pattern; import java.util.stream.Collectors; +import static com.kiisoo.ic.store.constant.Constants.TYPE_MANAGER; +import static com.kiisoo.ic.store.constant.Constants.TYPE_SELLER; + /** * 店铺 */ @@ -128,6 +131,68 @@ public class PoiStoreStaffService { return resultList; } + /** + * 根据条件查询导购信息 + * + * @param userId + */ + public Map getStaffByUserId(Long userId) { + Map result = new HashMap<>(); + List list = new ArrayList<>(); + QueryWrapper wrapperUser = new QueryWrapper<>(); + wrapperUser.eq("user_id", userId).eq("type", TYPE_MANAGER).last("limit 1"); + //店长的店铺 + PoiStoreStaff shopNameByUserId = poiStoreStaffDOMapper.selectOne(wrapperUser); + + if(shopNameByUserId!=null){ + //根据店铺查询所有扫码客户信息 + QueryWrapper wrapper = new QueryWrapper<>(); + //如果有店铺则查店铺 + wrapper.eq("store_id", shopNameByUserId.getStoreId()); + //状态有效 + wrapper.eq("status", 1); + //导购 + wrapper.eq("type", TYPE_SELLER); + wrapper.orderByDesc("id"); + //返回店铺对应的导购 + List poiStoreStaffs = poiStoreStaffDOMapper.selectList(wrapper); + poiStoreStaffs.forEach(poiStoreStaff -> { + PoiStoreStaffVO poiStoreStaffVO = new PoiStoreStaffVO(); + BeanUtils.copyProperties(poiStoreStaff, poiStoreStaffVO); + 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()); + } + //账号信息 + QueryWrapper wrapperAccount = new QueryWrapper<>(); + wrapperAccount.eq("user_id",poiStoreStaff.getUserId()); + PrivilageAccountDO privilageAccountDO = privilageAccountDOMapper.selectOne(wrapperAccount); + if(privilageAccountDO!=null){ + if(privilageAccountDO.getStatus()!=null &&privilageAccountDO.getStatus()== 1){ + poiStoreStaffVO.setAccountFlag(true); + }else{ + poiStoreStaffVO.setAccountFlag(false); + } + } + list.add(poiStoreStaffVO); + }); + //店铺信息 + PoiStore poiStore = poiStoreDOMapper.selectById(shopNameByUserId.getStoreId()); + if (null != poiStore) { + result.put("shopName",poiStore.getName()); + } + result.put("list",list); + result.put("staffNum",poiStoreStaffs.size()); + + } + + + return result; + } + /** * 添加店铺人员 * @param poiStoreStaffVO