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