安心付订购单按场馆名称模糊查询

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.jiejing.common.enums.ConfirmEnum;
@@ -584,6 +585,13 @@ public class AxfServiceImpl implements AxfService {
   @Override
   public PageVO<StudioAxfOrderVO> pageOrder(PageStudioAxfOrderRequest request) {
     Set<Long> studioIds = new HashSet<>(1);
+    if (StringUtils.isNotEmpty(request.getStudioName())) {
+      List<Long> queryStudioIds = studioRpcService.queryStudioIdsByNameLike(request.getStudioName());
+      if (CollectionUtils.isEmpty(queryStudioIds)) {
+        return PageVO.empty(request.getCurrent(), request.getCurrent());
+      }
+      studioIds.addAll(queryStudioIds);
+    }
     if (null != request.getStudioId()) {
       if (CollectionUtils.isNotEmpty(studioIds)) {
         if (!studioIds.contains(request.getStudioId())) {

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

@@ -4,7 +4,10 @@ import com.google.common.collect.Lists;
 import com.jiejing.common.model.JsonResult;
 import com.jiejing.common.request.IdRequest;
 import com.jiejing.common.request.IdsRequest;
+import com.jiejing.common.utils.collection.CollectionUtil;
 import com.jiejing.fitness.enums.studio.AdminStudioStatusEnum;
+import com.jiejing.fitness.request.IdNameRequest;
+import com.jiejing.fitness.vo.IdNameVO;
 import com.jiejing.studio.api.admin.AdminApi;
 import com.jiejing.studio.api.admin.vo.AdminVO;
 import com.jiejing.studio.api.admin.vo.BaseAdminVO;
@@ -75,5 +78,17 @@ public class StudioRpcService {
         .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);
+    jsonResult.assertSuccess();
+    List<IdNameVO> idNameVOS = jsonResult.getResult();
+    if (CollectionUtil.isNotEmpty(idNameVOS)){
+      return idNameVOS.stream().map(IdNameVO::getId).collect(Collectors.toList());
+    }
+    return Lists.newArrayList();
+  }
+
 
 }