feat:page cashier

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

@@ -75,12 +75,10 @@ public class PageStudioCashierRequest {
   @ApiModelProperty(value = "交易成功结束时间")
   @ApiModelProperty(value = "交易成功结束时间")
   private Date successEndTime;
   private Date successEndTime;
 
 
-  @ApiModelProperty(value = "页码：0开始", required = true)
-  @NotNull(message = "页码不能为空")
+  @ApiModelProperty(value = "页码：0开始")
   private Integer current;
   private Integer current;
 
 
-  @ApiModelProperty(value = "分页大小", required = true)
-  @NotNull(message = "分页大小不能为空")
+  @ApiModelProperty(value = "分页大小")
   private Integer size;
   private Integer size;
 
 
 }
 }

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

@@ -19,6 +19,7 @@ import com.jiejing.fitness.finance.service.cashier.params.PageStudioCashierParam
 import com.jiejing.fitness.finance.service.cashier.params.PageStudioSettleParams;
 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 java.util.Optional;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.Valid;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -57,6 +58,8 @@ public class StudioCashierController implements StudioCashierApi {
   public JsonResult<PageVO<StudioCashierRecordVO>> page(
   public JsonResult<PageVO<StudioCashierRecordVO>> page(
       @Valid @RequestBody PageStudioCashierRequest request) {
       @Valid @RequestBody PageStudioCashierRequest request) {
     PageStudioCashierParams params = BeanUtil.map(request, PageStudioCashierParams.class);
     PageStudioCashierParams params = BeanUtil.map(request, PageStudioCashierParams.class);
+    params.setCurrent(Optional.ofNullable(request.getCurrent()).orElse(0));
+    params.setSize(Optional.ofNullable(request.getSize()).orElse(10));
     return JsonResult.success(studioCashierService.page(params));
     return JsonResult.success(studioCashierService.page(params));
   }
   }