Commit bca0125a by 胡敬轩

Merge remote-tracking branch 'remotes/origin/feature/20210409-v2026-积分兑换记录-hujingxuan'

parents 35183655 c1ecb8a6
...@@ -4085,7 +4085,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -4085,7 +4085,7 @@ public class OrderServiceImpl implements Orderservice {
Date endDate; Date endDate;
if (StringUtils.isBlank(queryOrderVo.getStartDate()) || StringUtils.isBlank(queryOrderVo.getEndDate())) { if (StringUtils.isBlank(queryOrderVo.getStartDate()) || StringUtils.isBlank(queryOrderVo.getEndDate())) {
Date now = new Date(); Date now = new Date();
startDate = DateUtil.addMonths(now, -12); startDate = DateUtil.addMonths(now, -6);
endDate = DateUtil.addDays(now, 1); endDate = DateUtil.addDays(now, 1);
}else{ }else{
String startDateStr = queryOrderVo.getStartDate() + " 00:00:00"; String startDateStr = queryOrderVo.getStartDate() + " 00:00:00";
......
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