店铺列表查询修改
This commit is contained in:
@@ -81,7 +81,8 @@ public class AShopUserServiceImpl implements AShopUserService {
|
|||||||
@Override
|
@Override
|
||||||
public Page<ShopUserDTO> getPage(String key, Integer isVip, BigDecimal amount) {
|
public Page<ShopUserDTO> getPage(String key, Integer isVip, BigDecimal amount) {
|
||||||
PageHelper.startPage(PageUtil.buildPageHelp());
|
PageHelper.startPage(PageUtil.buildPageHelp());
|
||||||
return PageUtil.convert(new PageInfo<>(shopUserMapper.selectPageByKeyAndIsVip(StpKit.USER.getShopId(), isVip, key, amount)));
|
Long mainIdByShopId = shopInfoService.getMainIdByShopId(StpKit.USER.getShopId());
|
||||||
|
return PageUtil.convert(new PageInfo<>(shopUserMapper.selectPageByKeyAndIsVip(mainIdByShopId, isVip, key, amount)));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -88,7 +88,7 @@
|
|||||||
GROUP BY user_id, shop_id
|
GROUP BY user_id, shop_id
|
||||||
) f ON f.user_id = a.user_id AND f.shop_id = a.shop_id
|
) f ON f.user_id = a.user_id AND f.shop_id = a.shop_id
|
||||||
|
|
||||||
WHERE a.source_shop_id = #{shopId}
|
WHERE a.main_shop_id = #{shopId}
|
||||||
|
|
||||||
<if test="isVip != null">
|
<if test="isVip != null">
|
||||||
AND a.is_vip = #{isVip}
|
AND a.is_vip = #{isVip}
|
||||||
|
|||||||
Reference in New Issue
Block a user