From 9acc33a5092724baa082eeb338fb8f6a9110f5e9 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Fri, 18 May 2018 10:01:51 +0800
Subject: [PATCH] fixbug daily_transactions

---
 .../manage/appclient/core/impls/RetailAppServiceImp.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
index ee01712c7..046be4ee5 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
@@ -1133,8 +1133,9 @@ public class RetailAppServiceImp implements RetailAppService {
     @Override
     public JSONObject listDailyTransactions(String dateStr, String timezone, boolean thisDevOnly, JSONObject device,String app_client_ids) {
         try {
+            JSONObject client = clientManager.getClientInfo(device.getIntValue("client_id"));
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
-            dateFormat.setTimeZone(TimeZone.getTimeZone(timezone));
+            dateFormat.setTimeZone(TimeZone.getTimeZone(client.getString("timezone")));
             Date date = dateFormat.parse(dateStr);
             String clientType = device.getString("client_type");
             DeviceRegister register = deviceSupport.findRegister(clientType);