平台运营-佣金结算记录 日期筛选支持

device-api-service/src/main/java/com/xy/service/MercFeeSettleServiceImpl.java

@@ -74,7 +74,10 @@ public class MercFeeSettleServiceImpl extends ServiceImpl<MercFeeSettleMapper, M
     @ApiOperation("平台运营-佣金结算记录")
     public R<PageBean<MercFeeSettleDto.Vo>> page(@RequestBody MercFeeSettleDto.Page page) {
         PageBean pageBean = page.getPage();
-        LambdaQueryWrapper<MercFeeSettle> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, MercFeeSettle.class).build();
+        LambdaQueryWrapper<MercFeeSettle> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, MercFeeSettle.class)
+                .ge(MercFeeSettle::getCreateTime, page.getBeginCreateTime())
+                .le(MercFeeSettle::getCreateTime, page.getEndCreateTime())
+                .build();
         IPage<MercFeeSettle> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
         PageBean<MercFeeSettleDto.Vo> pb = toPageBean(MercFeeSettleDto.Vo.class, iPage);
         List<MercFeeSettleDto.Vo> records = pb.getRecords();

device-api/src/main/java/com/xy/dto/MercFeeSettleDto.java

@@ -8,6 +8,7 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -30,7 +31,14 @@ public class MercFeeSettleDto {
     @Data
     @Accessors(chain = true)
     public static class Page extends Vo {
-
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        @ApiModelProperty(value = "创建时间-起")
+        private LocalDate beginCreateTime;
+
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        @ApiModelProperty(value = "创建时间-始")
+        private LocalDate endCreateTime;
+        
         @ApiModelProperty(value = "分页对象", required = true)
         private PageBean page;