Commit ba091301 by 吕明尚

Merge branch 'dev' into test

parents e4af0710 46d3a60d
......@@ -289,7 +289,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
queryWrapper.eq(SOrder::getPayStatus, YesNoEnum.yes.getIndex());
String nowDayStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, day);
String nextDayStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(day, 1));
String yesterdayStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(day, -1)) + "23";
String yesterdayStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(day, -1)) + " 23";
queryWrapper.apply("(DATE_FORMAT(IFNULL(start_date,pre_start_date), '%Y-%m-%d') = '" + nowDayStr + "'" +
" OR DATE_FORMAT(IFNULL(end_date,pre_end_date), '%Y-%m-%d') = '" + nowDayStr + "' " +
" OR DATE_FORMAT(IFNULL(start_date,pre_start_date), '%Y-%m-%d') = '" + nextDayStr + "'" +
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment