From 0c1335bc1f19de026969ec1aae3ecca0954b9d96 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 15 Oct 2019 17:22:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=B8=85=E7=AE=97=E9=A2=84=E4=BC=B0?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=88=B0=E8=B4=A6=E9=87=91=E9=A2=9D=E6=97=B6?=
 =?UTF-8?q?=E5=8C=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                     | 2 +-
 .../analysis/core/impls/EstimateAnalysisServiceImpl.java    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index cbee49346..a4f99e23c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.2.33</version>
+    <version>1.2.34</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java
index 1b993edde..d2fce07ea 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java
@@ -228,13 +228,13 @@ public class EstimateAnalysisServiceImpl implements EstimateAnalysisService {
         //预计到账金额
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);
-        cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH) - 1, 0, 0, 0);
+        cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH) - 1, 2, 0, 0);
         Date datefrom = cal.getTime();
 
         if (DateUtils.isSameDay(new Date(), datefrom)) {
             JSONObject params = new JSONObject();
-            params.put("datefrom", DateFormatUtils.format(datefrom, "yyyy-MM-dd HH:mm:ss"));
-            params.put("dateto", DateFormatUtils.format(DateUtils.addDays(datefrom, 1), "yyyy-MM-dd HH:mm:ss"));
+            params.put("datefrom", DateFormatUtils.format(DateUtils.addDays(datefrom, -1), "yyyy-MM-dd HH:mm:ss"));
+            params.put("dateto", DateFormatUtils.format(datefrom, "yyyy-MM-dd HH:mm:ss"));
 
             List<JSONObject> lastDayClearingAmount = transactionMapper.getLastDaytransAmount(params);
             BigDecimal total_clearing = BigDecimal.ZERO;