feat:list by order nos

api/src/main/java/com/jiejing/fitness/finance/api/cashier/StudioCashierApi.java

@@ -8,6 +8,7 @@ import com.jiejing.fitness.finance.api.cashier.request.GetStudioCashierByIdReque
 import com.jiejing.fitness.finance.api.cashier.request.GetStudioSettleRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByIdsRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
+import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNosRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByTransNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest;
@@ -72,6 +73,10 @@ public interface StudioCashierApi {
   @PostMapping(value = "/private/studioCashier/listByOrderNo")
   JsonResult<List<StudioCashierRecordVO>> listByOrderNo(ListStudioCashierByOrderNoRequest request);
 
+  @ApiOperation(value = "根据订单号集合查询收银列表", tags = {TAG})
+  @PostMapping(value = "/private/studioCashier/listByOrderNos")
+  JsonResult<List<StudioCashierRecordVO>> listByOrderNos(ListStudioCashierByOrderNosRequest request);
+
   @ApiOperation(value = "根据子订单号查询收银列表", tags = {TAG})
   @PostMapping(value = "/private/studioCashier/listBySubOrderNo")
   JsonResult<List<StudioCashierRecordVO>> listBySubOrderNo(ListStudioCashierBySubOrderNoRequest request);

api/src/main/java/com/jiejing/fitness/finance/api/cashier/StudioCashierApiFallback.java

@@ -8,6 +8,7 @@ import com.jiejing.fitness.finance.api.cashier.request.GetStudioSettleRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListRelatedStudioCashierRecordRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByIdsRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
+import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNosRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByTransNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest;
@@ -89,6 +90,12 @@ public class StudioCashierApiFallback implements FallbackFactory<StudioCashierAp
       }
 
       @Override
+      public JsonResult<List<StudioCashierRecordVO>> listByOrderNos(
+          ListStudioCashierByOrderNosRequest request) {
+        return JsonResult.rpcError();
+      }
+
+      @Override
       public JsonResult<List<StudioCashierRecordVO>> listBySubOrderNo(
           ListStudioCashierBySubOrderNoRequest request) {
         return JsonResult.rpcError();

api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/ListStudioCashierByOrderNosRequest.java

+package com.jiejing.fitness.finance.api.cashier.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Set;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author chengyubing
+ * @since 2024/2/29 10:57
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(description = "根据订单号列表查询场馆收银流水Request")
+public class ListStudioCashierByOrderNosRequest {
+
+  @ApiModelProperty(value = "订单号", required = true)
+  @NotEmpty(message = "订单号不能为空")
+  private Set<String> orderNos;
+
+}

app/src/main/java/com/jiejing/fitness/finance/app/controller/cashier/StudioCashierController.java

@@ -10,6 +10,7 @@ import com.jiejing.fitness.finance.api.cashier.request.GetStudioSettleRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListRelatedStudioCashierRecordRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByIdsRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
+import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNosRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByTransNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest;
@@ -125,6 +126,14 @@ public class StudioCashierController implements StudioCashierApi {
     return JsonResult.success(studioCashierService.listByOrderNo(request.getOrderNo()));
   }
 
+  @ApiOperation(value = "根据订单号集合查询收银列表", tags = {TAG})
+  @PostMapping(value = "/private/studioCashier/listByOrderNos")
+  @Override
+  public JsonResult<List<StudioCashierRecordVO>> listByOrderNos(
+      @Valid @RequestBody ListStudioCashierByOrderNosRequest request) {
+    return JsonResult.success(studioCashierService.listByOrderNos(request.getOrderNos()));
+  }
+
   @ApiOperation(value = "根据子订单号查询收银列表", tags = {TAG})
   @PostMapping(value = "/private/studioCashier/listBySubOrderNo")
   @Override

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

@@ -34,6 +34,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
@@ -225,4 +226,11 @@ public class StudioCashierRecordRpService extends
     wrapper.orderByDesc(StudioCashierRecord.ID);
     return Optional.ofNullable(this.baseMapper.selectList(wrapper)).orElse(new ArrayList<>(1));
   }
+
+  public List<StudioCashierRecord> listByOrderNos(Set<String> orderNos) {
+    QueryWrapper<StudioCashierRecord> wrapper = new QueryWrapper<>();
+    wrapper.in(StudioCashierRecord.ORDER_NO, orderNos);
+    return this.baseMapper.selectList(wrapper);
+  }
+
 }

service/src/main/java/com/jiejing/fitness/finance/service/cashier/StudioCashierService.java

@@ -10,6 +10,7 @@ import com.jiejing.fitness.finance.service.cashier.params.PageStudioSettleParams
 import com.jiejing.paycenter.common.enums.common.PayChannelEnums;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * @author chengyubing
@@ -56,6 +57,14 @@ public interface StudioCashierService {
   List<StudioCashierRecordVO> listByOrderNo(String orderNo);
 
   /**
+   * 根据订单号查询列表
+   *
+   * @param orderNos 订单号
+   * @return 结果
+   */
+  List<StudioCashierRecordVO> listByOrderNos(Set<String> orderNos);
+
+  /**
    * 根据业务子订单号查询列表
    *
    * @param subOrderNos 业务子订单号

service/src/main/java/com/jiejing/fitness/finance/service/cashier/impl/StudioCashierServiceImpl.java

@@ -35,6 +35,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -117,6 +118,12 @@ public class StudioCashierServiceImpl implements StudioCashierService {
   }
 
   @Override
+  public List<StudioCashierRecordVO> listByOrderNos(Set<String> orderNos) {
+    List<StudioCashierRecord> list = studioCashierRecordRpService.listByOrderNos(orderNos);
+    return CashierConvert.convertList(list, new HashMap<>(1));
+  }
+
+  @Override
   public List<StudioCashierRecordVO> listBySubOrderNo(List<String> subOrderNos) {
     List<StudioCashierRecord> list = studioCashierRecordRpService.listBySubOrderNo(subOrderNos);
     return CashierConvert.convertList(list);