feat:settle

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

@@ -6,7 +6,9 @@ import com.jiejing.fitness.finance.api.cashier.request.GetStudioCashierByIdReque
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest;
 import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest;
+import com.jiejing.fitness.finance.api.cashier.request.PageStudioSettleRequest;
 import com.jiejing.fitness.finance.api.cashier.vo.StudioCashierRecordVO;
 import com.jiejing.fitness.finance.api.cashier.vo.StudioCashierRecordVO;
+import com.jiejing.fitness.finance.api.cashier.vo.StudioSettleVO;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;
 import java.util.List;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -37,4 +39,8 @@ public interface StudioCashierApi {
   @PostMapping(value = "/private/studioCashier/listBySubOrderNo")
   @PostMapping(value = "/private/studioCashier/listBySubOrderNo")
   JsonResult<List<StudioCashierRecordVO>> listBySubOrderNo(ListStudioCashierBySubOrderNoRequest request);
   JsonResult<List<StudioCashierRecordVO>> listBySubOrderNo(ListStudioCashierBySubOrderNoRequest request);
 
 
+  @ApiOperation(value = "分页筛选结算记录", tags = {TAG})
+  @PostMapping(value = "/private/studioCashier/pageSettle")
+  JsonResult<PageVO<StudioSettleVO>> pageSettle(PageStudioSettleRequest request);
+
 }
 }

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

@@ -6,7 +6,9 @@ import com.jiejing.fitness.finance.api.cashier.request.GetStudioCashierByIdReque
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest;
 import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest;
+import com.jiejing.fitness.finance.api.cashier.request.PageStudioSettleRequest;
 import com.jiejing.fitness.finance.api.cashier.vo.StudioCashierRecordVO;
 import com.jiejing.fitness.finance.api.cashier.vo.StudioCashierRecordVO;
+import com.jiejing.fitness.finance.api.cashier.vo.StudioSettleVO;
 import feign.hystrix.FallbackFactory;
 import feign.hystrix.FallbackFactory;
 import java.util.List;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -45,6 +47,11 @@ public class StudioCashierApiFallback implements FallbackFactory<StudioCashierAp
         return JsonResult.rpcError();
         return JsonResult.rpcError();
       }
       }
 
 
+      @Override
+      public JsonResult<PageVO<StudioSettleVO>> pageSettle(PageStudioSettleRequest request) {
+        return JsonResult.rpcError();
+      }
+
     };
     };
   }
   }
 }
 }

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

+package com.jiejing.fitness.finance.api.cashier.request;
+
+import com.jiejing.paycenter.common.enums.common.TransStateEnums;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author chengyubing
+ * @since 2024/4/7 18:03
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(description = "分页查询场馆结算记录参数")
+public class PageStudioSettleRequest {
+
+  @ApiModelProperty(value = "场馆名称")
+  private String studioName;
+
+  @ApiModelProperty(value = "场馆ID")
+  private Long studioId;
+
+  @ApiModelProperty(value = "商户号")
+  private String merchantNo;
+
+  @ApiModelProperty(value = "结算状态")
+  private TransStateEnums transState;
+
+  @ApiModelProperty(value = "开始时间")
+  private Date startTime;
+
+  @ApiModelProperty(value = "结束时间")
+  private Date endTime;
+
+  @ApiModelProperty(value = "页码：0开始", required = true)
+  @NotNull(message = "页码不能为空")
+  private Integer current;
+
+  @ApiModelProperty(value = "分页大小", required = true)
+  @NotNull(message = "分页大小不能为空")
+  private Integer size;
+
+}

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

@@ -8,9 +8,12 @@ import com.jiejing.fitness.finance.api.cashier.request.GetStudioCashierByIdReque
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest;
 import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest;
+import com.jiejing.fitness.finance.api.cashier.request.PageStudioSettleRequest;
 import com.jiejing.fitness.finance.api.cashier.vo.StudioCashierRecordVO;
 import com.jiejing.fitness.finance.api.cashier.vo.StudioCashierRecordVO;
+import com.jiejing.fitness.finance.api.cashier.vo.StudioSettleVO;
 import com.jiejing.fitness.finance.service.cashier.StudioCashierService;
 import com.jiejing.fitness.finance.service.cashier.StudioCashierService;
 import com.jiejing.fitness.finance.service.cashier.params.PageStudioCashierParams;
 import com.jiejing.fitness.finance.service.cashier.params.PageStudioCashierParams;
+import com.jiejing.fitness.finance.service.cashier.params.PageStudioSettleParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;
 import java.util.List;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
@@ -61,4 +64,12 @@ public class StudioCashierController implements StudioCashierApi {
     return JsonResult.success(studioCashierService.listBySubOrderNo(request.getSubOrderNo()));
     return JsonResult.success(studioCashierService.listBySubOrderNo(request.getSubOrderNo()));
   }
   }
 
 
+  @ApiOperation(value = "分页筛选结算记录", tags = {TAG})
+  @PostMapping(value = "/private/studioCashier/pageSettle")
+  @Override
+  public JsonResult<PageVO<StudioSettleVO>> pageSettle(@Valid @RequestBody PageStudioSettleRequest request) {
+    PageStudioSettleParams params = BeanUtil.map(request, PageStudioSettleParams.class);
+    return JsonResult.success(studioCashierService.page(params));
+  }
+
 }
 }