Merge branch 'develop-new' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumCategoryController.java

@@ -18,8 +18,6 @@ import com.yonge.cooleshow.biz.dal.service.TenantAlbumCategoryService;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumCategoryWrapper;
 import com.yonge.toolset.base.exception.BizException;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,14 +56,14 @@ public class TenantAlbumCategoryController {
     private SysUserService sysUserService;
 
     @ApiOperation(value = "详情", notes = "机构专辑分类-根据详情ID查询单条, 传入id")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/detail', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/detail', {'BACKEND'})")
     @GetMapping("/detail/{id}")
     public R<TenantAlbumCategoryWrapper.TenantAlbumCategory> detail(@PathVariable("id") Long id) {
         return R.from(tenantAlbumCategoryService.detail(id));
     }
 
     @ApiOperation(value = "查询分页", notes = "机构专辑分类- 传入 TenantAlbumCategoryVo.TenantAlbumCategoryQuery")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/page', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/page', {'BACKEND'})")
     @PostMapping("/page")
     public R<PageInfo<TenantAlbumCategoryVo.TenantAlbumCategory>> page(@RequestBody TenantAlbumCategoryWrapper.TenantAlbumCategoryQuery query) {
 
@@ -89,7 +87,7 @@ public class TenantAlbumCategoryController {
     }
 
     @ApiOperation(value = "新增", notes = "机构专辑分类- 传入 TenantAlbumCategoryVo.TenantAlbumCategory")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/save', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/save', {'BACKEND'})")
     @PostMapping("/save")
     public R<JSONObject> add(@Validated @RequestBody TenantAlbumCategoryVo.TenantAlbumCategory tenantAlbumCategoryVo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -105,7 +103,7 @@ public class TenantAlbumCategoryController {
     }
 
     @ApiOperation(value = "修改", notes = "机构专辑分类- 传入 TenantAlbumCategoryVo.TenantAlbumCategory")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/update', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/update', {'BACKEND'})")
     @PostMapping("/update")
     public R<JSONObject> update(@Validated @RequestBody TenantAlbumCategoryVo.TenantAlbumCategory tenantAlbumCategoryVo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -120,7 +118,7 @@ public class TenantAlbumCategoryController {
     }
 
     @ApiOperation(value = "删除", notes = "机构专辑分类- 传入id")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/remove', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/remove', {'BACKEND'})")
     @PostMapping("/remove")
     public R<Boolean> remove(@RequestParam Long id) {
 
@@ -128,7 +126,7 @@ public class TenantAlbumCategoryController {
     }
 
     @ApiOperation(value = "获取专辑分类值列表")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/queryCategoryValue', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/queryCategoryValue', {'BACKEND'})")
     @GetMapping("/queryCategoryValue")
     public R<List<TenantAlbumCategoryDetail>> queryCategoryValue(@RequestParam("id") Long id) {
         TenantAlbumCategory albumCategory = tenantAlbumCategoryService.getById(id);

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantGroupController.java

@@ -27,14 +27,14 @@ public class TenantGroupController {
     private TenantGroupService tenantGroupService;
 
     @ApiOperation(value = "查询分页", notes = "机构小组表- 传入 TenantGroupWrapper.TenantGroupQuery")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantGroup/page', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantGroup/page', {'BACKEND'})")
     @PostMapping("/page")
     public R<PageInfo<TenantGroupWrapper.TenantGroup>> page(@RequestBody TenantGroupWrapper.TenantGroupQuery query) {
         return R.from(QueryInfo.pageInfo(tenantGroupService.selectPage(QueryInfo.getPage(query), query)));
     }
 
     @ApiOperation(value = "处理机构小组交接", notes = "处理机构小组交接")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantGroup/adjustTenantGroup', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantGroup/adjustTenantGroup', {'BACKEND'})")
     @PostMapping("/adjustTenantGroup")
     public R<Boolean> adjustTenantGroup(@RequestBody TenantGroupWrapper.AdjustTenantGroup adjustTenantGroup) {
         return R.from(tenantGroupService.adjustTenantGroup(adjustTenantGroup));

cooleshow-app/src/main/java/com/yonge/cooleshow/classroom/controller/HereWhiteController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/hereWhite")
+@RequestMapping("${app-config.url.classroom:}/hereWhite")
 public class HereWhiteController extends BaseController {
 
     @Autowired

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumCategoryController.java

@@ -58,14 +58,14 @@ public class TenantAlbumCategoryController {
     private SysUserService sysUserService;
 
     @ApiOperation(value = "详情", notes = "机构专辑分类-根据详情ID查询单条, 传入id")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/detail', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/detail', {'BACKEND'})")
     @GetMapping("/detail/{id}")
     public R<TenantAlbumCategoryWrapper.TenantAlbumCategory> detail(@PathVariable("id") Long id) {
         return R.from(tenantAlbumCategoryService.detail(id));
     }
 
     @ApiOperation(value = "查询分页", notes = "机构专辑分类- 传入 TenantAlbumCategoryVo.TenantAlbumCategoryQuery")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/page', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/page', {'BACKEND'})")
     @PostMapping("/page")
     public R<PageInfo<TenantAlbumCategoryVo.TenantAlbumCategory>> page(@RequestBody TenantAlbumCategoryWrapper.TenantAlbumCategoryQuery query) {
 
@@ -89,7 +89,7 @@ public class TenantAlbumCategoryController {
     }
 
     @ApiOperation(value = "新增", notes = "机构专辑分类- 传入 TenantAlbumCategoryVo.TenantAlbumCategory")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/save', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/save', {'BACKEND'})")
     @PostMapping("/save")
     public R<JSONObject> add(@Validated @RequestBody TenantAlbumCategoryVo.TenantAlbumCategory tenantAlbumCategoryVo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -105,7 +105,7 @@ public class TenantAlbumCategoryController {
     }
 
     @ApiOperation(value = "修改", notes = "机构专辑分类- 传入 TenantAlbumCategoryVo.TenantAlbumCategory")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/update', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/update', {'BACKEND'})")
     @PostMapping("/update")
     public R<JSONObject> update(@Validated @RequestBody TenantAlbumCategoryVo.TenantAlbumCategory tenantAlbumCategoryVo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -120,7 +120,7 @@ public class TenantAlbumCategoryController {
     }
 
     @ApiOperation(value = "删除", notes = "机构专辑分类- 传入id")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/remove', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/remove', {'BACKEND'})")
     @PostMapping("/remove")
     public R<Boolean> remove(@RequestParam Long id) {
 
@@ -128,7 +128,7 @@ public class TenantAlbumCategoryController {
     }
 
     @ApiOperation(value = "获取专辑分类值列表")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumCategory/queryCategoryValue', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbumCategory/queryCategoryValue', {'BACKEND'})")
     @GetMapping("/queryCategoryValue")
     public R<List<TenantAlbumCategoryDetail>> queryCategoryValue(@RequestParam("id") Long id) {
         TenantAlbumCategory albumCategory = tenantAlbumCategoryService.getById(id);

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TenantGroupController.java

@@ -1,6 +1,5 @@
 package com.yonge.cooleshow.admin.controller;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.microsvc.toolkit.common.response.template.R;
@@ -17,8 +16,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @Slf4j
 @Validated
 @RestController
@@ -30,14 +27,14 @@ public class TenantGroupController {
     private TenantGroupService tenantGroupService;
 
     @ApiOperation(value = "查询分页", notes = "机构小组表- 传入 TenantGroupWrapper.TenantGroupQuery")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantGroup/page', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantGroup/page', {'BACKEND'})")
     @PostMapping("/page")
     public R<PageInfo<TenantGroupWrapper.TenantGroup>> page(@RequestBody TenantGroupWrapper.TenantGroupQuery query) {
         return R.from(QueryInfo.pageInfo(tenantGroupService.selectPage(QueryInfo.getPage(query), query)));
     }
 
     @ApiOperation(value = "处理机构小组交接", notes = "处理机构小组交接")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantGroup/adjustTenantGroup', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantGroup/adjustTenantGroup', {'BACKEND'})")
     @PostMapping("/adjustTenantGroup")
     public R<Boolean> adjustTenantGroup(@RequestBody TenantGroupWrapper.AdjustTenantGroup adjustTenantGroup) {
         return R.from(tenantGroupService.adjustTenantGroup(adjustTenantGroup));

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImUserFriendServiceImpl.java

@@ -94,6 +94,10 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
         List<ImUserFriend> imUserFriends = new ArrayList<>();
         BasicUserInfo teacherInfo = teacherDao.getBasicUserInfo(teacherId);
         List<BasicUserInfo> studentInfos = teacherDao.findBasicUserInfo(studentIds);
+        if (teacherInfo == null || studentInfos.isEmpty()) {
+            // 过滤注销状态的账号
+            return;
+        }
         studentInfos.add(teacherInfo);
         Map<Long, List<BasicUserInfo>> basicUserInfoMap =
                 studentInfos.stream().collect(Collectors.groupingBy(BasicUserInfo::getUserId));

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/PaymentDivMemberRecordServiceImpl.java

@@ -12,6 +12,7 @@ import com.microsvc.toolkit.middleware.payment.common.api.BasePaymentService;
 import com.microsvc.toolkit.middleware.payment.common.api.PaymentServiceContext;
 import com.microsvc.toolkit.middleware.payment.common.api.entity.DivideReq;
 import com.microsvc.toolkit.middleware.payment.common.api.entity.DivideResp;
+import com.microsvc.toolkit.middleware.payment.common.api.enums.PaymentStatus;
 import com.yonge.cooleshow.biz.dal.dao.CourseScheduleStudentPaymentDao;
 import com.yonge.cooleshow.biz.dal.dao.UserOrderDao;
 import com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDao;
@@ -889,6 +890,7 @@ public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMem
         TenantMember tenantMember = null;
         String divideOrderNo = IdWorker.getIdStr();
         BigDecimal feeAmt = BigDecimal.ZERO;
+        DivideResp divide = new DivideResp();
         if (merchantConfig != null && newestPayment != null) {
             if (accountTenantTo.getIncomeTenant() > 0) {
                 tenantMember = tenantMemberService
@@ -910,7 +912,7 @@ public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMem
                         .divMembers(Lists.newArrayList(divMember))
                         .build();
                 try {
-                    DivideResp divide = paymentService.divide(divideReq);
+                    divide = paymentService.divide(divideReq);
                     feeAmt = divide.getFeeAmount();
                     tenantEnterFlag = true;
                 } catch (Exception e) {
@@ -928,7 +930,7 @@ public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMem
                 .divOrderNo(divideOrderNo)
                 .transNo(newestPayment != null ? newestPayment.getTransNo() : null)
                 .amount(amount)
-                .tenantEnterFlag(tenantEnterFlag)
+                .tenantEnterFlag(divide.getStatus()!=null && divide.getStatus().equals(PaymentStatus.SUCCESSED))
                 .status("SUCCESS")
                 .feeFlag(true)
                 .feeAmt(feeAmt)

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java

@@ -31,6 +31,7 @@ import com.yonge.cooleshow.biz.dal.service.ImGroupMemberService;
 import com.yonge.cooleshow.biz.dal.service.ImUserFriendService;
 import com.yonge.cooleshow.biz.dal.service.StudentService;
 import com.yonge.cooleshow.biz.dal.service.StudentTotalService;
+import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.service.im.ImGroupCoreService;
 import com.yonge.cooleshow.biz.dal.service.SysConfigService;
 import com.yonge.cooleshow.biz.dal.service.TenantInfoService;
@@ -809,19 +810,16 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
                     new HashSet<>(ImmutableList.of(sysUser.getId()))));
         }
 
-        //  与客服建立好友
+        //  与随机一个客服建立好友
         String customerService = customerServiceConfig.getCustomerService();
-        if(StringUtils.isNotBlank(customerService)){
+        if (StringUtils.isNotBlank(customerService)) {
             List<String> phones = Arrays.stream(customerService.split(",")).collect(Collectors.toList());
-            // 通过手机号获取用户ID
-            QueryWrapper<com.yonge.cooleshow.biz.dal.entity.SysUser> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().in(com.yonge.cooleshow.biz.dal.entity.SysUser::getPhone,phones);
-            List<com.yonge.cooleshow.biz.dal.entity.SysUser> sysUsers = sysUserMapper.selectList(queryWrapper);
-            Set<Long> userIds = sysUsers.stream().map(com.yonge.cooleshow.biz.dal.entity.SysUser::getId).collect(Collectors.toSet());
-            for (Long teacherId : userIds) {
-                HashSet<Long> studentIds = new HashSet<>();
-                studentIds.add(student.getUserId());
-                imUserFriendService.saveUserFriend(teacherId, studentIds);
+            Random rand = new Random();
+            String mobile = phones.get(rand.nextInt(phones.size()));
+            SysUser friend = sysUserMapper.findUserByPhone(mobile);
+            if (friend != null) {
+                imUserFriendService.registerUserBindCustomerService(student.getUserId(),
+                        Collections.singletonList(friend.getId()), ClientEnum.STUDENT);
             }
         }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysMessageServiceImpl.java

@@ -49,7 +49,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	@Autowired
 	private RedisCache<String, Object> redisCache;
 	// 验证码有效期
-	public static final int CODE_EXPIRE = 60 * 5;
+	public static final int CODE_EXPIRE = 60 * 10;
 	// 发送验证码的间隔时间
 	public static final int CODE_INTERVAL_TIME = 60;
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -86,13 +86,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -116,8 +110,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -488,15 +480,14 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         }
         //  与客服建立好友
         String customerService = customerServiceConfig.getCustomerService();
-        if(StringUtils.isNotBlank(customerService)){
+        if (StringUtils.isNotBlank(customerService)) {
             List<String> phones = Arrays.stream(customerService.split(",")).collect(Collectors.toList());
-            // 通过手机号获取用户ID
-            QueryWrapper<com.yonge.cooleshow.biz.dal.entity.SysUser> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().in(com.yonge.cooleshow.biz.dal.entity.SysUser::getPhone,phones);
-            List<com.yonge.cooleshow.biz.dal.entity.SysUser> sysUsers = sysUserMapper.selectList(queryWrapper);
-            Set<Long> userIds = sysUsers.stream().map(com.yonge.cooleshow.biz.dal.entity.SysUser::getId).collect(Collectors.toSet());
-            if (!userIds.isEmpty()) {
-                imUserFriendService.saveUserTeacherFriend(teacher.getUserId(), userIds);
+            Random rand = new Random();
+            String mobile = phones.get(rand.nextInt(phones.size()));
+            SysUser friend = sysUserMapper.findUserByPhone(mobile);
+            if (friend != null) {
+                imUserFriendService.registerUserBindCustomerService(teacher.getUserId(),
+                        Collections.singletonList(friend.getId()), ClientEnum.TEACHER);
             }
         }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantAlbumCategoryServiceImpl.java

@@ -4,10 +4,12 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yonge.cooleshow.biz.dal.entity.TenantAlbum;
 import com.yonge.cooleshow.biz.dal.entity.TenantAlbumCategory;
 import com.yonge.cooleshow.biz.dal.entity.TenantAlbumCategoryDetail;
 import com.yonge.cooleshow.biz.dal.entity.TenantAlbumMusic;
 import com.yonge.cooleshow.biz.dal.mapper.TenantAlbumCategoryMapper;
+import com.yonge.cooleshow.biz.dal.mapper.TenantAlbumMapper;
 import com.yonge.cooleshow.biz.dal.mapper.TenantAlbumMusicMapper;
 import com.yonge.cooleshow.biz.dal.service.TenantAlbumCategoryDetailService;
 import com.yonge.cooleshow.biz.dal.service.TenantAlbumCategoryService;
@@ -35,6 +37,8 @@ public class TenantAlbumCategoryServiceImpl extends ServiceImpl<TenantAlbumCateg
     private TenantAlbumCategoryDetailService tenantAlbumCategoryDetailService;
     @Autowired
     private TenantAlbumMusicMapper tenantAlbumMusicMapper;
+    @Autowired
+    private TenantAlbumMapper tenantAlbumMapper;
 
     /**
      * 查询详情
@@ -155,10 +159,20 @@ public class TenantAlbumCategoryServiceImpl extends ServiceImpl<TenantAlbumCateg
         if (albumCategory == null) {
             throw new BizException("删除的数据不存在");
         }
-        List<TenantAlbumCategoryDetail> list = tenantAlbumCategoryDetailService.lambdaQuery()
-                .eq(TenantAlbumCategoryDetail::getTenantAlbumCategoryId, albumCategory.getId())
-                .list();
-        checkTenantAlbumCategoryDetailUsed(albumCategory.getCategoryType(), list);
+        QueryWrapper<TenantAlbum> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda()
+                .eq(TenantAlbum::getCategoryLevelId, id)
+                .or()
+                .eq(TenantAlbum::getCategoryTypeId, id);
+        Integer count = tenantAlbumMapper.selectCount(queryWrapper);
+        if (count > 0) {
+            throw new BizException("专辑分类被使用");
+        }
+
+//        List<TenantAlbumCategoryDetail> list = tenantAlbumCategoryDetailService.lambdaQuery()
+//                .eq(TenantAlbumCategoryDetail::getTenantAlbumCategoryId, albumCategory.getId())
+//                .list();
+//        checkTenantAlbumCategoryDetailUsed(albumCategory.getCategoryType(), list);
         albumCategory.setDelFlag(true);
         this.updateById(albumCategory);
         return true;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantMemberServiceImpl.java

@@ -344,7 +344,7 @@ public class TenantMemberServiceImpl extends ServiceImpl<TenantMemberMapper, Ten
     @Override
     public TenantMember getByAppIdAndTenantId(String appId, Long tenantId, EPayerType payerType) {
         return this.lambdaQuery()
-                .eq(TenantMember::getAppId, appId)
+//                .eq(TenantMember::getAppId, appId)
                 .eq(TenantMember::getTenantId, tenantId)
                 .eq(TenantMember::getStatus, AuthStatusEnum.PASS)
                 .eq(TenantMember::getPayerType, payerType)