|
|
|
@ -818,14 +818,17 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
|
}
|
|
|
|
|
if (!date_contains.contains(trade_date)) {
|
|
|
|
|
String re_date = trade_date.replaceAll("-", "");
|
|
|
|
|
TradeLogQuery date_query = new TradeLogQuery();
|
|
|
|
|
date_query.setDatefrom(re_date);
|
|
|
|
|
date_query.setDateto(re_date);
|
|
|
|
|
AppQueryBean date_query = new AppQueryBean();
|
|
|
|
|
date_query.setBegin(re_date);
|
|
|
|
|
date_query.setEnd(re_date);
|
|
|
|
|
if (timezone != null && !timezone.isEmpty()) {
|
|
|
|
|
query.setTimezone(timezone);
|
|
|
|
|
}
|
|
|
|
|
// date_query.setStatus(OrderStatus.ALL);
|
|
|
|
|
if (params.containsKey("client_ids")) {
|
|
|
|
|
date_query.setClient_ids((String[]) params.get("client_ids"));
|
|
|
|
|
}
|
|
|
|
|
JSONObject date_params = date_query.toParams(query.getTimezone());
|
|
|
|
|
JSONObject date_params = date_query.toParams();
|
|
|
|
|
date_params.put("begin", date_params.getDate("from"));
|
|
|
|
|
date_params.put("end", date_params.getDate("to"));
|
|
|
|
|
date_params.put("client_id", device.getIntValue("client_id"));
|
|
|
|
|