diff --git a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java index e9e7ba2..630b682 100644 --- a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java +++ b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java @@ -647,9 +647,8 @@ public class CustomerViewService { //店长 if(privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_DZ.getRoleCode())) { shopIdList = poiStoreStaffDOMapper.selectByUserId(userId); - String cpUserId = privilageCpUserStoreDOMapper.selectCpUserIdByStoreId(shopIdList.get(0)); - Long storeAll = privilageCpUserDOMapper.selectStoreCount(cpUserId); - Long storeDis = privilageCpUserDOMapper.selectDistinctStoreCount(cpUserId); + Long storeAll = privilageCpUserDOMapper.selectStoresCountById(shopIdList); + Long storeDis = privilageCpUserDOMapper.selectDistinctStoresCountById(shopIdList); result.setAllCustomer(storeAll); result.setAllValidCustomer(storeDis); @@ -663,9 +662,8 @@ public class CustomerViewService { //查询零售公司的门店 List list1 = retailCompanyService.selectShopByCompany(pm.get(0).getOrgId()); shopIdList = list1.stream().map(PoiStore::getId).collect(Collectors.toList()); - List cpUserIds = privilageCpUserStoreDOMapper.selectCpUserIdsByStoreIds(shopIdList); - Long all = privilageCpUserDOMapper.selectStoresCount(cpUserIds); - Long dis = privilageCpUserDOMapper.selectDistinctStoresCount(cpUserIds); + Long all = privilageCpUserDOMapper.selectStoresCountById(shopIdList); + Long dis = privilageCpUserDOMapper.selectDistinctStoresCountById(shopIdList); result.setAllCustomer(all); result.setAllValidCustomer(dis); diff --git a/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java b/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java index 492f78d..6da2e30 100644 --- a/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java +++ b/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java @@ -31,6 +31,10 @@ public interface PrivilageCpUserDOMapper extends BaseMapper { Long selectDistinctStoresCount(@Param("cpUserIds")List cpUserIds); + Long selectStoresCountById(@Param("shopIds")List shopIds); + + Long selectDistinctStoresCountById(@Param("shopIds")List shopIds); + int deleteCount(@Param("customerUserId")String customerUserId, @Param("cpUserId")String cpUserId); } diff --git a/src/main/resources/mapper/PrivilageCpUserDOMapper.xml b/src/main/resources/mapper/PrivilageCpUserDOMapper.xml index 541e36a..5138520 100644 --- a/src/main/resources/mapper/PrivilageCpUserDOMapper.xml +++ b/src/main/resources/mapper/PrivilageCpUserDOMapper.xml @@ -18,11 +18,11 @@ + + +