diff --git a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java index 05182ee..7407f15 100644 --- a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java +++ b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java @@ -597,17 +597,14 @@ public class RetailCompanyService { List sellerIds = retailCompanyMapper.selectSellerIdsByShop(orgId, shopIds, sellerId); List list = new ArrayList<>(); - //查询所有的店铺信息 - QueryWrapper poiStoreQueryWrapper = new QueryWrapper<>(); - poiStoreQueryWrapper.in("id", sellerIds); - List list2 = privilageUserDOMapper.selectList(poiStoreQueryWrapper); - - Map map = list2.stream().collect(Collectors.toMap(PrivilageUserDO::getId, p -> p)); + //查询所有的用户信息 + List list2 = privilageUserDOMapper.selectListPr(sellerIds); + Map map = list2.stream().collect(Collectors.toMap(PrivilageUserDO::getSellerId, p -> p)); //所有的导购客户个数 List> map1 = opSellerCustomerRelationDOMapper.selectAllCustomer(sellerIds); Map collect = map1 == null ? new HashMap<>() : map1.stream().collect(Collectors.toMap(m -> Long.parseLong(m.get("user_id").toString()), m1 -> m1.get("count"))); - + //所有的导购有效客户个数 List> map3 = opSellerCustomerRelationDOMapper.selectAllCustomer1(sellerIds); Map collect1 = map3 == null ? new HashMap<>() : map3.stream().collect(Collectors.toMap(m -> Long.parseLong(m.get("user_id").toString()), m1 -> m1.get("count"))); diff --git a/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java b/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java index 8562dad..9599ab5 100644 --- a/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java +++ b/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java @@ -82,4 +82,7 @@ public class PrivilageUserDO implements Serializable { * 修改人 */ private String updateBy; + + @TableField(exist = false) + private long sellerId; } diff --git a/src/main/java/com/kiisoo/ic/system/mapper/PrivilageUserDOMapper.java b/src/main/java/com/kiisoo/ic/system/mapper/PrivilageUserDOMapper.java index afb277d..d2bf876 100644 --- a/src/main/java/com/kiisoo/ic/system/mapper/PrivilageUserDOMapper.java +++ b/src/main/java/com/kiisoo/ic/system/mapper/PrivilageUserDOMapper.java @@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kiisoo.ic.system.bean.PrivilageUserBean; import com.kiisoo.ic.system.entity.PrivilageRoleDO; import com.kiisoo.ic.system.entity.PrivilageUserDO; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 用户表 Mapper 接口 * @author jinchaofan @@ -19,4 +22,6 @@ public interface PrivilageUserDOMapper extends BaseMapper { Long selectStoreIdByUserId(Long userId); PrivilageRoleDO selecctRoleByUserId(long userId); + + List selectListPr(@Param("sellerIds") List sellerIds); } diff --git a/src/main/resources/mapper/PoiStoreDOMapper.xml b/src/main/resources/mapper/PoiStoreDOMapper.xml index b468613..358f1f0 100644 --- a/src/main/resources/mapper/PoiStoreDOMapper.xml +++ b/src/main/resources/mapper/PoiStoreDOMapper.xml @@ -29,7 +29,7 @@ and t3.domain_id = t4.domain_id and t4.type = 3 and t1.store_id = t4.entity_id - and t1.user_id = #{sellerId} + and t1.id = #{sellerId} limit 1 + diff --git a/src/main/resources/mapper/RetailCompanyMapper.xml b/src/main/resources/mapper/RetailCompanyMapper.xml index 785be27..fa52e2f 100644 --- a/src/main/resources/mapper/RetailCompanyMapper.xml +++ b/src/main/resources/mapper/RetailCompanyMapper.xml @@ -26,7 +26,7 @@