feat:list by sub order nos

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

@@ -2,7 +2,9 @@ package com.jiejing.fitness.finance.api.cashier.request;
 
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
@@ -20,7 +22,7 @@ import lombok.NoArgsConstructor;
 public class ListStudioCashierBySubOrderNoRequest {
 public class ListStudioCashierBySubOrderNoRequest {
 
 
   @ApiModelProperty(value = "子订单号", required = true)
   @ApiModelProperty(value = "子订单号", required = true)
-  @NotBlank(message = "子订单号不能为空")
-  private String subOrderNo;
+  @NotEmpty(message = "子订单号不能为空")
+  private List<String> subOrderNos;
 
 
 }
 }

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

@@ -110,7 +110,7 @@ public class StudioCashierController implements StudioCashierApi {
   @Override
   @Override
   public JsonResult<List<StudioCashierRecordVO>> listBySubOrderNo(
   public JsonResult<List<StudioCashierRecordVO>> listBySubOrderNo(
       @Valid @RequestBody ListStudioCashierBySubOrderNoRequest request) {
       @Valid @RequestBody ListStudioCashierBySubOrderNoRequest request) {
-    return JsonResult.success(studioCashierService.listBySubOrderNo(request.getSubOrderNo()));
+    return JsonResult.success(studioCashierService.listBySubOrderNo(request.getSubOrderNos()));
   }
   }
 
 
   @ApiOperation(value = "分页筛选结算记录", tags = {TAG})
   @ApiOperation(value = "分页筛选结算记录", tags = {TAG})

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

@@ -118,9 +118,9 @@ public class StudioCashierRecordRpService extends
     return this.findByWrapperPage(wrapper, query.getCurrent(), query.getSize());
     return this.findByWrapperPage(wrapper, query.getCurrent(), query.getSize());
   }
   }
 
 
-  public List<StudioCashierRecord> listBySubOrderNo(String subOrderNo) {
+  public List<StudioCashierRecord> listBySubOrderNo(List<String> subOrderNos) {
     QueryWrapper<StudioCashierRecord> wrapper = new QueryWrapper<>();
     QueryWrapper<StudioCashierRecord> wrapper = new QueryWrapper<>();
-    wrapper.eq(StudioCashierRecord.SUB_ORDER_NO, subOrderNo);
+    wrapper.in(StudioCashierRecord.SUB_ORDER_NO, subOrderNos);
     return this.baseMapper.selectList(wrapper);
     return this.baseMapper.selectList(wrapper);
   }
   }
 
 

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

@@ -57,10 +57,10 @@ public interface StudioCashierService {
   /**
   /**
    * 根据业务子订单号查询列表
    * 根据业务子订单号查询列表
    *
    *
-   * @param subOrderNo 业务子订单号
+   * @param subOrderNos 业务子订单号
    * @return 结果
    * @return 结果
    */
    */
-  List<StudioCashierRecordVO> listBySubOrderNo(String subOrderNo);
+  List<StudioCashierRecordVO> listBySubOrderNo(List<String> subOrderNos);
 
 
   /**
   /**
    * 分页查询收银流水
    * 分页查询收银流水

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

@@ -95,8 +95,8 @@ public class StudioCashierServiceImpl implements StudioCashierService {
   }
   }
 
 
   @Override
   @Override
-  public List<StudioCashierRecordVO> listBySubOrderNo(String subOrderNo) {
-    List<StudioCashierRecord> list = studioCashierRecordRpService.listBySubOrderNo(subOrderNo);
+  public List<StudioCashierRecordVO> listBySubOrderNo(List<String> subOrderNos) {
+    List<StudioCashierRecord> list = studioCashierRecordRpService.listBySubOrderNo(subOrderNos);
     return CashierConvert.convertList(list);
     return CashierConvert.convertList(list);
   }
   }