|
|
@ -805,6 +805,9 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
ArrayList<String> date_contains = new ArrayList<>();
|
|
|
|
ArrayList<String> date_contains = new ArrayList<>();
|
|
|
|
for (JSONObject order : orders) {
|
|
|
|
for (JSONObject order : orders) {
|
|
|
|
Calendar calendar = (Calendar) order.get("transaction_time");
|
|
|
|
Calendar calendar = (Calendar) order.get("transaction_time");
|
|
|
|
|
|
|
|
if (timezone != null) {
|
|
|
|
|
|
|
|
calendar.setTimeZone(TimeZone.getTimeZone(timezone));
|
|
|
|
|
|
|
|
}
|
|
|
|
String trade_date = DateFormatUtils.format(calendar, "yyyy-MM-dd", calendar.getTimeZone());
|
|
|
|
String trade_date = DateFormatUtils.format(calendar, "yyyy-MM-dd", calendar.getTimeZone());
|
|
|
|
String trade_time = DateFormatUtils.format(calendar, "HH:mm:ss", calendar.getTimeZone());
|
|
|
|
String trade_time = DateFormatUtils.format(calendar, "HH:mm:ss", calendar.getTimeZone());
|
|
|
|
order.put("trade_date", trade_date);
|
|
|
|
order.put("trade_date", trade_date);
|
|
|
|