feat:名称筛选

repository/src/main/java/com/jiejing/fitness/finance/repository/service/StudioAxfOrderRpService.java

@@ -104,11 +104,15 @@ public class StudioAxfOrderRpService extends MapperRepoService<Long, StudioAxfOr
     if (null == vo) {
     if (null == vo) {
       return AggStudioAxfOrderVO.builder().receivedActualAmount(BigDecimal.ZERO)
       return AggStudioAxfOrderVO.builder().receivedActualAmount(BigDecimal.ZERO)
           .receivedAmount(BigDecimal.ZERO)
           .receivedAmount(BigDecimal.ZERO)
+          .originalPrice(BigDecimal.ZERO)
+          .salePrice(BigDecimal.ZERO)
           .build();
           .build();
     }
     }
     vo.setReceivedActualAmount(
     vo.setReceivedActualAmount(
         vo.getReceivedActualAmount() == null ? BigDecimal.ZERO : vo.getReceivedActualAmount());
         vo.getReceivedActualAmount() == null ? BigDecimal.ZERO : vo.getReceivedActualAmount());
     vo.setReceivedAmount(vo.getReceivedAmount() == null ? BigDecimal.ZERO : vo.getReceivedAmount());
     vo.setReceivedAmount(vo.getReceivedAmount() == null ? BigDecimal.ZERO : vo.getReceivedAmount());
+    vo.setSalePrice(vo.getSalePrice() == null ? BigDecimal.ZERO : vo.getSalePrice());
+    vo.setOriginalPrice(vo.getOriginalPrice() == null ? BigDecimal.ZERO : vo.getOriginalPrice());
     return vo;
     return vo;
   }
   }
 }
 }

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

@@ -612,8 +612,21 @@ public class AxfServiceImpl implements AxfService {
 
 
   @Override
   @Override
   public AggStudioAxfOrderVO aggOrder(PageStudioAxfOrderRequest request) {
   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)
+              .receivedAmount(BigDecimal.ZERO)
+              .originalPrice(BigDecimal.ZERO)
+              .salePrice(BigDecimal.ZERO)
+              .build();
+        }
+      }
+      studioIds.add(request.getStudioId());
+    }
     AggStudioAxfOrderVO vo = studioAxfOrderRpService.agg(
     AggStudioAxfOrderVO vo = studioAxfOrderRpService.agg(
-        Optional.ofNullable(request.getStudioId()).map(Lists::newArrayList).orElse(null),
+        Lists.newArrayList(studioIds),
         request.getMemberId(), request.getMemberName(), request.getVoucherBusinessNo(),
         request.getMemberId(), request.getMemberName(), request.getVoucherBusinessNo(),
         request.getThirdOrderNo(), request.getSignTimeStart(), request.getSignTimeEnd(),
         request.getThirdOrderNo(), request.getSignTimeStart(), request.getSignTimeEnd(),
         request.getCancelTimeStart(), request.getCancelTimeEnd(), request.getState());
         request.getCancelTimeStart(), request.getCancelTimeEnd(), request.getState());