安心付 pageOrder 场馆名称精准

service/src/main/java/com/jiejing/fitness/finance/service/axf/impl/AxfServiceImpl.java

@@ -595,7 +595,7 @@ public class AxfServiceImpl implements AxfService {
   public PageVO<StudioAxfOrderVO> pageOrder(PageStudioAxfOrderRequest request) {
   public PageVO<StudioAxfOrderVO> pageOrder(PageStudioAxfOrderRequest request) {
     Set<Long> studioIds = new HashSet<>(1);
     Set<Long> studioIds = new HashSet<>(1);
     if (StringUtils.isNotEmpty(request.getStudioName())) {
     if (StringUtils.isNotEmpty(request.getStudioName())) {
-      List<Long> queryStudioIds = studioRpcService.queryStudioIdsByNameLike(request.getStudioName());
+      List<Long> queryStudioIds = studioRpcService.queryStudioIdsByName(request.getStudioName());
       if (CollectionUtils.isEmpty(queryStudioIds)) {
       if (CollectionUtils.isEmpty(queryStudioIds)) {
         return PageVO.empty(request.getCurrent(), request.getCurrent());
         return PageVO.empty(request.getCurrent(), request.getCurrent());
       }
       }
@@ -636,7 +636,7 @@ public class AxfServiceImpl implements AxfService {
         .build();
         .build();
     Set<Long> studioIds = new HashSet<>(1);
     Set<Long> studioIds = new HashSet<>(1);
     if (StringUtils.isNotEmpty(request.getStudioName())) {
     if (StringUtils.isNotEmpty(request.getStudioName())) {
-      List<Long> queryStudioIds = studioRpcService.queryStudioIdsByNameLike(request.getStudioName());
+      List<Long> queryStudioIds = studioRpcService.queryStudioIdsByName(request.getStudioName());
       if (CollectionUtils.isEmpty(queryStudioIds)) {
       if (CollectionUtils.isEmpty(queryStudioIds)) {
         return emptyVO;
         return emptyVO;
       }
       }

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

@@ -12,6 +12,7 @@ import com.jiejing.studio.api.admin.AdminApi;
 import com.jiejing.studio.api.admin.vo.AdminVO;
 import com.jiejing.studio.api.admin.vo.AdminVO;
 import com.jiejing.studio.api.admin.vo.BaseAdminVO;
 import com.jiejing.studio.api.admin.vo.BaseAdminVO;
 import com.jiejing.studio.api.studio.StudioApi;
 import com.jiejing.studio.api.studio.StudioApi;
+import com.jiejing.studio.api.studio.request.GetOneStudioPageRequest;
 import com.jiejing.studio.api.studio.request.GetStudioAdminRequest;
 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;
@@ -78,14 +79,14 @@ public class StudioRpcService {
         .collect(Collectors.groupingBy(StudioVO::getBrandId));
         .collect(Collectors.groupingBy(StudioVO::getBrandId));
   }
   }
 
 
-  public List<Long> queryStudioIdsByNameLike(String name){
-    IdNameRequest request = new IdNameRequest();
-    request.setIdOrName(name);
-    JsonResult<List<IdNameVO>> jsonResult = studioApi.selectStudioList(request);
+  public List<Long> queryStudioIdsByName(String name){
+    GetOneStudioPageRequest request = new GetOneStudioPageRequest();
+    request.setName(name);
+    JsonResult<List<StudioVO>> jsonResult = studioApi.getOnePage(request);
     jsonResult.assertSuccess();
     jsonResult.assertSuccess();
-    List<IdNameVO> idNameVOS = jsonResult.getResult();
+    List<StudioVO> idNameVOS = jsonResult.getResult();
     if (CollectionUtil.isNotEmpty(idNameVOS)){
     if (CollectionUtil.isNotEmpty(idNameVOS)){
-      return idNameVOS.stream().map(IdNameVO::getId).collect(Collectors.toList());
+      return idNameVOS.stream().map(StudioVO::getId).collect(Collectors.toList());
     }
     }
     return Lists.newArrayList();
     return Lists.newArrayList();
   }
   }