fix 取消app默认7天查询时间

master
luoyang 5 years ago
parent d0e2d840e8
commit a589df3ad5

@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>1.2.24</version> <version>1.2.25</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

@ -929,15 +929,16 @@ public class RetailAppServiceImp implements RetailAppService {
params.put("dev_id", device.getString("dev_id")); params.put("dev_id", device.getString("dev_id"));
} }
params.put("client_id", client_id); params.put("client_id", client_id);
if (StringUtils.isBlank(params.getString("begin"))) { //去掉默认7天查询时间
Date now = new Date(); // if (StringUtils.isBlank(params.getString("from"))) {
Date lastWeekDay = DateUtils.addDays(now, -7); // Date now = new Date();
lastWeekDay = new DateTime(lastWeekDay.getTime()).withTimeAtStartOfDay().toDate(); // Date lastWeekDay = DateUtils.addDays(now, -7);
params.put("from", lastWeekDay); // lastWeekDay = new DateTime(lastWeekDay.getTime()).withTimeAtStartOfDay().toDate();
params.put("begin", lastWeekDay); // params.put("from", lastWeekDay);
params.put("end", now); // params.put("begin", lastWeekDay);
params.put("to", now); // params.put("end", now);
} // params.put("to", now);
// }
PageList<JSONObject> orders = orderMapper.listTransactionsForApp(params, PageList<JSONObject> orders = orderMapper.listTransactionsForApp(params,
new PageBounds(query.getPage(), query.getLimit(), Order.formString("transaction_time.desc"))); new PageBounds(query.getPage(), query.getLimit(), Order.formString("transaction_time.desc")));
TimeZoneUtils.switchTimeZone(orders, query.getTimezone(), "create_time", "transaction_time", "confirm_time"); TimeZoneUtils.switchTimeZone(orders, query.getTimezone(), "create_time", "transaction_time", "confirm_time");

Loading…
Cancel
Save