feat:studioName

service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/PayServiceImpl.java

@@ -497,11 +497,12 @@ public class PayServiceImpl implements PayService {
     String buyerName = e.getExtra().getString("buyerName");
     String buyerName = e.getExtra().getString("buyerName");
 
 
     // 有乐动收银权限的账户
     // 有乐动收银权限的账户
-    Set<Long> targetIds = permissionRpcService.getUserIdByCode(AuthDomainEnum.FITNESS_ADMIN.getCode(),
+    Set<Long> userIds = permissionRpcService.getUserIdByCode(AuthDomainEnum.FITNESS_ADMIN.getCode(),
         TenantTypeEnum.STUDIO.buildKey(studioId), "FitXmPay", false);
         TenantTypeEnum.STUDIO.buildKey(studioId), "FitXmPay", false);
-    if (CollectionUtil.isEmpty(targetIds)) {
+    if (CollectionUtil.isEmpty(userIds)) {
       return;
       return;
     }
     }
+    List<Long> targetIds = studioRpcService.listAdminIdsByUserIds(studioId, Lists.newArrayList(userIds));
 
 
     List<Map<String, Object>> paramList = targetIds.stream().map(targetId -> {
     List<Map<String, Object>> paramList = targetIds.stream().map(targetId -> {
       Map<String, Object> paramMap = new HashMap<>(1);
       Map<String, Object> paramMap = new HashMap<>(1);

service/src/main/java/com/jiejing/fitness/finance/service/rpc/StudioRpcService.java

@@ -3,7 +3,10 @@ package com.jiejing.fitness.finance.service.rpc;
 import com.jiejing.common.model.JsonResult;
 import com.jiejing.common.model.JsonResult;
 import com.jiejing.common.request.IdRequest;
 import com.jiejing.common.request.IdRequest;
 import com.jiejing.common.request.IdsRequest;
 import com.jiejing.common.request.IdsRequest;
+import com.jiejing.fitness.enums.studio.AdminStudioStatusEnum;
+import com.jiejing.studio.api.admin.AdminApi;
 import com.jiejing.studio.api.studio.StudioApi;
 import com.jiejing.studio.api.studio.StudioApi;
+import com.jiejing.studio.api.studio.request.GetStudioAdminRequest;
 import com.jiejing.studio.api.studio.vo.StudioVO;
 import com.jiejing.studio.api.studio.vo.StudioVO;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
@@ -25,6 +28,17 @@ public class StudioRpcService {
   @Resource
   @Resource
   private StudioApi studioApi;
   private StudioApi studioApi;
 
 
+  @Resource
+  private AdminApi adminApi;
+
+  public List<Long> listAdminIdsByUserIds(Long studioId, List<Long> userIds) {
+    GetStudioAdminRequest request = new GetStudioAdminRequest();
+    request.setStudioId(studioId);
+    request.setState(AdminStudioStatusEnum.DUTY);
+    request.setUserIds(userIds);
+    return Optional.ofNullable(adminApi.getStudioAdminIds(request).getResult()).orElse(new ArrayList<>(1));
+  }
+
   public StudioVO getStudio(Long studioId) {
   public StudioVO getStudio(Long studioId) {
     JsonResult<StudioVO> result = studioApi.getStudio(IdRequest.builder().id(studioId).build());
     JsonResult<StudioVO> result = studioApi.getStudio(IdRequest.builder().id(studioId).build());
     result.assertSuccess();
     result.assertSuccess();
@@ -47,4 +61,6 @@ public class StudioRpcService {
         .stream()
         .stream()
         .collect(Collectors.groupingBy(StudioVO::getBrandId));
         .collect(Collectors.groupingBy(StudioVO::getBrandId));
   }
   }
+
+
 }
 }