|
@@ -50,7 +50,7 @@ public class OrderBaseCountLogic {
|
|
|
|
|
|
List<PgOrderBase> pgOrderBaseListOver = pgOrderBaseService.lambdaQuery()
|
|
|
.select(PgOrderBase::getOrderType, PgOrderBase::getOrderTypeText, PgOrderBase::getCreateTime, PgOrderBase::getId
|
|
|
- , PgOrderBase::getOrderStatus,PgOrderBase::getAppointmentTime)
|
|
|
+ , PgOrderBase::getOrderStatus,PgOrderBase::getAppointmentTime,PgOrderBase::getOverDate)
|
|
|
.between(PgOrderBase::getOverDate, DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), -8)), new Date())
|
|
|
.in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()),PgOrderBase::getCompanyWechatId,adminUser.getCompanyWechatId())
|
|
|
.and(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()),
|