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

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

@@ -77,7 +77,7 @@ public class MercFeeSettleServiceImpl extends ServiceImpl<MercFeeSettleMapper, M
         LambdaQueryWrapper<MercFeeSettle> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, MercFeeSettle.class)
                 .ge(MercFeeSettle::getCreateTime, page.getBeginCreateTime())
                 .le(MercFeeSettle::getCreateTime, page.getEndCreateTime())
-                .build();
+                .build().orderByDesc(!Emptys.check(pageBean.getOrders()), MercFeeSettle::getCreateTime);
         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,7 +8,6 @@ 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;
 
@@ -31,14 +30,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 HH:mm:ss")
+        private LocalDateTime beginCreateTime;
 
-        @JsonFormat(pattern = "yyyy-MM-dd")
         @ApiModelProperty(value = "创建时间-始")
-        private LocalDate endCreateTime;
-        
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime endCreateTime;
+
         @ApiModelProperty(value = "分页对象", required = true)
         private PageBean page;