会员列表

src/main/java/org/springblade/modules/api/controller/ApiMerchantUserController.java

@@ -268,7 +268,7 @@ public class ApiMerchantUserController {
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "商家端-会员列表", notes = "商家端-会员列表")
     public R<IPage<PageMemberVO>> pageMember(Query query) {
-        IPage<PageMemberVO> pages = iUserMerchantService.pageMember(Condition.getPage(query));
+        IPage<PageMemberVO> pages = iUserMerchantService.pageMember(Condition.getPage(query), AuthUtil.getUserId());
         return R.data(pages);
     }
 

src/main/java/org/springblade/modules/system/mapper/UserMerchantMapper.java

@@ -44,6 +44,6 @@ public interface UserMerchantMapper extends BaseMapper<UserMerchant> {
 
 	List<MerchantIncomeVO> pageIncome(IPage<MerchantIncomeVO> page, @Param("merchantId") Long merchantId);
 
-	List<PageMemberVO> pageMember(IPage<PageMemberVO> page);
+	List<PageMemberVO> pageMember(IPage<PageMemberVO> page, @Param("merchantId") Long userId);
 
 }

src/main/java/org/springblade/modules/system/service/IUserMerchantService.java

@@ -76,6 +76,6 @@ public interface IUserMerchantService extends IService<UserMerchant> {
 	 * @param page
 	 * @return
 	 */
-    IPage<PageMemberVO> pageMember(IPage<PageMemberVO> page);
+    IPage<PageMemberVO> pageMember(IPage<PageMemberVO> page,Long userId);
 
 }

src/main/java/org/springblade/modules/system/service/impl/UserMerchantServiceImpl.java

@@ -81,8 +81,8 @@ public class UserMerchantServiceImpl extends ServiceImpl<UserMerchantMapper, Use
 	}
 
 	@Override
-	public IPage<PageMemberVO> pageMember(IPage<PageMemberVO> page) {
-		return page.setRecords(baseMapper.pageMember(page));
+	public IPage<PageMemberVO> pageMember(IPage<PageMemberVO> page,Long userId) {
+		return page.setRecords(baseMapper.pageMember(page,userId));
 	}
 
 }