|
@@ -2,6 +2,7 @@ package com.fjhx.victoriatourist.service.jd.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
+import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
|
|
@@ -79,6 +80,8 @@ public class JdOrderDetailsServiceImpl extends ServiceImpl<JdOrderDetailsMapper,
|
|
|
.or().like(JdOrderDetails::getWareId, dto.getKeyword())
|
|
|
.or().like(JdOrderDetails::getProductId, dto.getKeyword()))
|
|
|
.orderByAsc(JdOrderDetails::getHandleStatus)
|
|
|
+ .ge(ObjectUtil.isNotNull(dto.getStartTime()), JdOrderDetails::getCreateTime, DateUtil.beginOfDay(dto.getStartTime()))
|
|
|
+ .le(ObjectUtil.isNotNull(dto.getEndTime()), JdOrderDetails::getCreateTime, DateUtil.endOfDay(dto.getEndTime()))
|
|
|
.orderByDesc(JdOrderDetails::getUpdateTime)
|
|
|
.page(new Page<>(dto.getPageNum(), dto.getPageSize()));
|
|
|
|