Upd:商户端WEB,APP查询数据异常

master
duLingLing 5 years ago
parent 451310fc22
commit 63f12caff6

@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId>
<version>1.2.86</version>
<version>1.2.87</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>1.4.0</jib-maven-plugin.version>

@ -48,13 +48,9 @@ public class AppQueryBean {
params.put("from", fromDate.toDate());
}
if (end != null) {
/* DateTime toDate = DateTime.parse(end, DateTimeFormat.forPattern("yyyyMMdd")).withZoneRetainFields(DateTimeZone.forTimeZone(TimeZone.getTimeZone(timezone))).plusDays(1).withZone(DateTimeZone.getDefault());
DateTime toDate = DateTime.parse(end, DateTimeFormat.forPattern("yyyyMMdd")).withZoneRetainFields(DateTimeZone.forTimeZone(TimeZone.getTimeZone(timezone))).plusDays(1).withZone(DateTimeZone.getDefault());
params.put("end", toDate.toDate());
params.put("to", toDate.toDate());*/
DateTime toDate = DateTime.parse(end, DateTimeFormat.forPattern("yyyyMMdd"))
.withZoneRetainFields(DateTimeZone.forTimeZone(TimeZone.getTimeZone(StringUtils.isNotBlank(timezone)?timezone:"Australia/Melbourne"))).withZone(DateTimeZone.getDefault());
params.put("end", DateUtils.addDays(toDate.toDate(), 1));
params.put("to", DateUtils.addDays(toDate.toDate(), 1));
params.put("to", toDate.toDate());
}
if (gateway != null && gateway.length > 0) {

Loading…
Cancel
Save