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

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

@@ -620,15 +620,23 @@ public class AxfServiceImpl implements AxfService {
 
   @Override
   public AggStudioAxfOrderVO aggOrder(PageStudioAxfOrderRequest request) {
-    Set<Long> studioIds = new HashSet<>(1);
-    if (null != request.getStudioId()) {
-      if (CollectionUtils.isNotEmpty(studioIds)) {
-        if (!studioIds.contains(request.getStudioId())) {
-          return AggStudioAxfOrderVO.builder().receivedActualAmount(BigDecimal.ZERO)
+    AggStudioAxfOrderVO emptyVO = AggStudioAxfOrderVO.builder().receivedActualAmount(BigDecimal.ZERO)
         .receivedAmount(BigDecimal.ZERO)
         .originalPrice(BigDecimal.ZERO)
         .salePrice(BigDecimal.ZERO)
         .build();
+    Set<Long> studioIds = new HashSet<>(1);
+    if (StringUtils.isNotEmpty(request.getStudioName())) {
+      List<Long> queryStudioIds = studioRpcService.queryStudioIdsByNameLike(request.getStudioName());
+      if (CollectionUtils.isEmpty(queryStudioIds)) {
+        return emptyVO;
+      }
+      studioIds.addAll(queryStudioIds);
+    }
+    if (null != request.getStudioId()) {
+      if (CollectionUtils.isNotEmpty(studioIds)) {
+        if (!studioIds.contains(request.getStudioId())) {
+          return emptyVO;
         }
       }
       studioIds.add(request.getStudioId());