From 72d1fe2f188679957fcb623b59036395f0a7256f Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Mon, 1 Apr 2019 16:09:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B8=85=E7=AE=97=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E6=97=A0=E6=B3=95=E4=B8=8B=E8=BD=BD=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impls/SignInAccountServiceImpl.java  |  2 +-
 .../core/impls/TradeLogServiceImpl.java       |  1 +
 .../mappers/payment/TransactionMapper.xml     | 13 +++++++++----
 src/main/ui/index.html                        |  2 +-
 src/main/ui/static/payment/partner/partner.js | 19 -------------------
 5 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
index 5b790db1c..81159d1fd 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
@@ -420,7 +420,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
                 "company_phone", "suburb", "postcode", "state", "contact_person", "contact_phone", "contact_email", "short_name", "logo_url", "enable_refund",
                 "enable_refund_auth", "retail_surcharge", "require_custinfo", "require_remark", "logo_thumbnail", "creator", "create_time", "approver",
                 "approve_result", "approve_time", "timezone", "has_children", "source", "customer_surcharge_rate", "enable_alipay", "enable_wechat",
-                "enable_bestpay", "manual_settle", "skip_clearing" ,"mail_confirm"};
+                "enable_bestpay", "manual_settle", "skip_clearing" ,"mail_confirm","surcharge_mode"};
         for (String col : columns) {
             simpleClient.put(col, client.get(col));
         }
diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
index 7639691e5..5683c4782 100644
--- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
@@ -1302,6 +1302,7 @@ public class TradeLogServiceImpl implements TradeLogService {
         JSONObject client = partner.getJSONObject("client");
         String timezone = client.getString("timezone");
         JSONObject params = query.toParams(timezone);
+        params.put("client_id",client.getString("client_id"));
         List<JSONObject> clientOrderList = transactionMapper.getClientOrderByTransactionTime(params);
         List<Integer> clientOrders = new ArrayList<>(clientOrderList.size());
         clientOrderList.parallelStream().forEach(p->{
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
index cf99392c3..9ad45c620 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
@@ -1116,10 +1116,15 @@
         SELECT t.clearing_order
         FROM pmt_transactions t
         WHERE t.channel='Settlement'
-        AND t.client_id IN
-        <foreach collection="client_ids" open="(" close=")" separator="," item="clientId">
-            #{clientId}
-        </foreach>
+        <if test="client_ids!=null">
+            AND t.client_id IN
+            <foreach collection="client_ids" open="(" close=")" separator="," item="client_id">
+                #{client_id}
+            </foreach>
+        </if>
+        <if test="client_ids==null">
+            and t.client_id=#{client_id}
+        </if>
         <if test="from!=null">and t.transaction_time &gt;= #{from}</if>
         <if test="to!=null">and t.transaction_time &lt; #{to}</if>
     </select>
diff --git a/src/main/ui/index.html b/src/main/ui/index.html
index 8ba265962..57d546216 100644
--- a/src/main/ui/index.html
+++ b/src/main/ui/index.html
@@ -899,7 +899,7 @@ margin-bottom: 10%;"/>
                                     </li>
                                 </ul>
                             </li>
-                            <li ng-if="([1,2]|withRole)">
+                            <li ng-if="([1,2]|withRole) &&(currentUser.client.surcharge_mode=='distributed')">
                                 <ul>
                                     <li>
                                         <a ui-sref="surcharge_account">
diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js
index dfcf180fb..3b1dc7ccc 100644
--- a/src/main/ui/static/payment/partner/partner.js
+++ b/src/main/ui/static/payment/partner/partner.js
@@ -37,15 +37,6 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload','uiBoot
                     return $http.get('/client/partner_info/compliance/files');
                 }]
             }
-        }).state('payment_materials', {
-            url: '/payment_materials',
-            templateUrl: '/static/payment/partner/templates/client_payment_materials.html',
-            controller: 'clientPaymentMaterialCtrl',
-            resolve: {
-                partner: ['$http', function ($http) {
-                    return $http.get('/client/partner_info');
-                }]
-            }
         }).state('basic.clearing_config', {
             url: '/clearing_config',
             templateUrl: '/static/payment/partner/templates/client_bankaccounts.html',
@@ -868,16 +859,6 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload','uiBoot
         };
 
     }]);
-    app.controller('clientPaymentMaterialCtrl', ['$scope', '$http', 'partner', function ($scope, $http, partner) {
-        $scope.paymentInfo = partner.data;
-        $scope.qrConfig = {currency: 'AUD'};
-        $scope.reloadQRCode = function () {
-            $http.get('/client/partner_info/qrcode', {params: $scope.qrConfig}).then(function (resp) {
-                $scope.qrcode = resp.data;
-            });
-        };
-        $scope.reloadQRCode();
-    }]);
     app.controller('clientParameterCtrl', ['$scope', '$http', 'commonDialog', 'timezone', function ($scope, $http, commonDialog, timezone) {
         $scope.getClientConfig = function () {
             $http.get('/client/partner_info').then(function (resp) {