|
|
@ -985,6 +985,7 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
TimeZoneUtils.switchTimeZone(orders, query.getTimezone(), "create_time", "transaction_time", "confirm_time");
|
|
|
|
TimeZoneUtils.switchTimeZone(orders, query.getTimezone(), "create_time", "transaction_time", "confirm_time");
|
|
|
|
ArrayList<String> dateContains = new ArrayList<>();
|
|
|
|
ArrayList<String> dateContains = new ArrayList<>();
|
|
|
|
for (JSONObject order : orders) {
|
|
|
|
for (JSONObject order : orders) {
|
|
|
|
|
|
|
|
order.put("geek_apply_deduction", order.getBooleanValue("geek_apply_deduction"));
|
|
|
|
Calendar calendar = (Calendar) order.get("transaction_time");
|
|
|
|
Calendar calendar = (Calendar) order.get("transaction_time");
|
|
|
|
if (timezone != null) {
|
|
|
|
if (timezone != null) {
|
|
|
|
calendar.setTimeZone(TimeZone.getTimeZone(timezone));
|
|
|
|
calendar.setTimeZone(TimeZone.getTimeZone(timezone));
|
|
|
|