From 1c8cb8714e7be7f31e79cdf9e325d3fe97b55e3f Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Tue, 17 Apr 2018 17:20:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E7=AE=A1=E7=90=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0merchangt=20pay=20gst=E5=BC=80=E5=85=B3=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8Cfix=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/merchants/core/ClientManager.java    |   2 ++
 .../merchants/core/impls/ClientManagerImpl.java |  14 ++++++++++++++
 .../merchants/web/PartnerManageController.java  |   5 +++++
 src/main/ui/static/analysis/clearing-log.js     |   3 ++-
 .../templates/settlement_transactions.html      |   2 +-
 .../commons/services/clearingDetailService.js   |   6 ++++--
 src/main/ui/static/config/bdprize/bdprize.js    |   3 ++-
 src/main/ui/static/images/alipay_online.png     | Bin 0 -> 12088 bytes
 .../ui/static/payment/partner/partner-manage.js |   6 ++++++
 .../partner/templates/partner_bankaccounts.html |   7 +++++++
 .../templates/partner_settlement_dialog.html    |   2 +-
 11 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 src/main/ui/static/images/alipay_online.png

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
index 711b267b1..ba7130b77 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
@@ -199,6 +199,8 @@ public interface ClientManager {
 
     void setClientTaxInSurcharge(String clientMoniker, boolean taxInSurcharge);
 
+    void setClientCustomerTaxFree(String clientMoniker, boolean customerTaxFree);
+
     List<JSONObject> listClientsForSettlement();
 
     List<JSONObject> listClientsDetailsForSettlement();
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index 11d9d7282..3bbe27eea 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -2324,6 +2324,20 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         clientInfoCacheSupport.clearClientCache(clientId);
     }
 
+    @Override
+    public void setClientCustomerTaxFree(String clientMoniker, boolean customerTaxFree) {
+        JSONObject client = getClientInfoByMoniker(clientMoniker);
+        if (client == null) {
+            throw new InvalidShortIdException();
+        }
+        JSONObject update = new JSONObject();
+        int clientId = client.getIntValue("client_id");
+        update.put("client_id", clientId);
+        update.put("customer_tax_free", customerTaxFree);
+        clientMapper.update(update);
+        clientInfoCacheSupport.clearClientCache(clientId);
+    }
+
     @Override
     public List<JSONObject> listClientsForSettlement() {
         return clientMapper.listClientsForSettlement();
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
index cb0627de9..f8e1c6561 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
@@ -198,6 +198,11 @@ public class PartnerManageController {
         clientManager.setClientTaxInSurcharge(clientMoniker, config.getBooleanValue("tax_in_surcharge"));
     }
 
+    @ManagerMapping(value = "/{clientMoniker}/customer_tax_free", method = RequestMethod.PUT, role = {ManagerRole.OPERATOR})
+    public void setClientCustomerTaxFree(@PathVariable String clientMoniker, @RequestBody JSONObject config) {
+        clientManager.setClientCustomerTaxFree(clientMoniker, config.getBooleanValue("customer_tax_free"));
+    }
+
     @ManagerMapping(value = "/{clientMoniker}/credential_code", method = RequestMethod.PUT, role = {ManagerRole.OPERATOR, ManagerRole.BD_USER})
     public void updateCredentialCode(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
         clientManager.refreshClientCredentialCode(manager, clientMoniker);
diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js
index 481128424..4067e4606 100644
--- a/src/main/ui/static/analysis/clearing-log.js
+++ b/src/main/ui/static/analysis/clearing-log.js
@@ -374,8 +374,9 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
         return function (channel) {
             switch (channel) {
                 case 'Alipay':
-                case 'AlipayOnline':
                     return '/static/images/alipay_sign_lg.png';
+                case 'AlipayOnline':
+                    return '/static/images/alipay_online.png';
                 case 'System':
                     return '/static/images/royalpay_sign.png';
                 case 'Bestpay':
diff --git a/src/main/ui/static/analysis/templates/settlement_transactions.html b/src/main/ui/static/analysis/templates/settlement_transactions.html
index 6a6afb28d..277fcf8e3 100644
--- a/src/main/ui/static/analysis/templates/settlement_transactions.html
+++ b/src/main/ui/static/analysis/templates/settlement_transactions.html
@@ -30,7 +30,7 @@
                 </li>
                 <li ng-class="{active:ctrl.channel=='AlipayOnline'}" ng-if="report.channels.AlipayOnline">
                     <a role="button" ng-click="ctrl.channel='AlipayOnline'" title="AlipayOnline">
-                        <img src="/static/images/alipay_sign_lg.png" class="channel-icon-lg">
+                        <img src="/static/images/alipay_online.png" class="channel-icon-lg">
                     </a>
                 </li>
                 <li ng-class="{active:ctrl.channel=='Bestpay'}" ng-if="report.channels.Bestpay">
diff --git a/src/main/ui/static/commons/services/clearingDetailService.js b/src/main/ui/static/commons/services/clearingDetailService.js
index 0444718d1..af223dfd6 100644
--- a/src/main/ui/static/commons/services/clearingDetailService.js
+++ b/src/main/ui/static/commons/services/clearingDetailService.js
@@ -1,7 +1,7 @@
 /**
  * Created by davep on 2016-08-15.
  */
-define(['../app'], function (app) {
+define(['../app','decimal'], function (app,Decimal) {
     'use strict';
     app.factory('clearingDetailService', ['$uibModal', function ($uibModal) {
         function openDetail(url, is_partner) {
@@ -28,14 +28,16 @@ define(['../app'], function (app) {
     app.controller('clearingDetailCtrl', ['$scope', 'detail', 'is_partner', function ($scope, detail, is_partner) {
         $scope.ctrl = {channel: null};
         $scope.report = detail.data;
+        $scope.report.total_charge = Decimal.add($scope.report.total_charge,$scope.report.tax_amount).toFixed(2);
         $scope.is_partner = is_partner;
     }]);
     app.filter('channel_image', function () {
         return function (channel) {
             switch (channel) {
                 case 'Alipay':
-                case 'AlipayOnline':
                     return '/static/images/alipay_sign_lg.png';
+                case 'AlipayOnline':
+                    return '/static/images/alipay_online.png';
                 case 'System':
                     return '/static/images/royalpay_sign.png';
                 case 'Bestpay':
diff --git a/src/main/ui/static/config/bdprize/bdprize.js b/src/main/ui/static/config/bdprize/bdprize.js
index e241f344d..409ef3a27 100644
--- a/src/main/ui/static/config/bdprize/bdprize.js
+++ b/src/main/ui/static/config/bdprize/bdprize.js
@@ -317,8 +317,9 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
         return function (channel) {
             switch (channel) {
                 case 'Alipay':
-                case 'AlipayOnline':
                     return '/static/images/alipay_sign_lg.png';
+                case 'AlipayOnline':
+                    return '/static/images/alipay_online.png';
                 case 'System':
                     return '/static/images/royalpay_sign.png';
                 case 'Bestpay':
diff --git a/src/main/ui/static/images/alipay_online.png b/src/main/ui/static/images/alipay_online.png
new file mode 100644
index 0000000000000000000000000000000000000000..95ee4665a811f10d18224225c075b1ba07ed95aa
GIT binary patch
literal 12088
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 481385b06..a20f2bb06 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -1359,6 +1359,11 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
 
             })
         };
+        $scope.customerTaxFree = function (customerTaxFree) {
+            $http.put('/sys/partners/' + $scope.partner.client_moniker + '/customer_tax_free', {customer_tax_free: customerTaxFree}).then(function (resp) {
+
+            })
+        };
         $scope.settleHours = [{value: undefined, label: 'Default(24:00, GMT+10)'}];
         for (var h = 24; h > 0; h--) {
             $scope.settleHours.push({value: h, label: ('00' + h).substr(-2) + ':00, ' + $scope.partner.timezone});
@@ -2485,6 +2490,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
     app.controller('managerClearingDetailCtrl', ['$scope', 'detail', function ($scope, detail) {
         $scope.ctrl = {channel: null};
         $scope.report = detail.data;
+        $scope.report.total_charge = Decimal.add($scope.report.total_charge,$scope.report.tax_amount).toFixed(2);
     }]);
 
     app.controller('productCtrl', ['$scope', '$http', '$uibModal', 'commonDialog', '$state', 'Upload', 'industryMap', function ($scope, $http, $uibModal, commonDialog, $state, Upload, industryMap) {
diff --git a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
index 3f7857156..0d758ce15 100644
--- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
+++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
@@ -20,6 +20,13 @@
                            switch-change="taxInSurcharge(partner.tax_in_surcharge)">
                 </div>
             </div>
+            <div class="form-group" ng-if="('10'|withRole)">
+                <label class="col-sm-4">Merchant Pay GST &ensp;<small><em>(消费者承担手续费时生效)</em></small></label>
+                <div class="col-sm-6">
+                    <input type="checkbox" ng-model="partner.customer_tax_free" bs-switch
+                           switch-change="customerTaxFree(partner.customer_tax_free)">
+                </div>
+            </div>
             <div class="form-group" ng-if="'modify_skip_clear'|withFunc">
                 <label class="col-sm-4">Skip Clearing</label>
                 <div class="col-sm-6">
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
index a69c2c8d1..b82ceaebc 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
@@ -22,7 +22,7 @@
                 </li>
                 <li ng-class="{active:ctrl.channel=='AlipayOnline'}" ng-if="report.channels.AlipayOnline">
                     <a role="button" ng-click="ctrl.channel='AlipayOnline'" title="AlipayOnline">
-                        <img src="/static/images/alipay_sign_lg.png" class="channel-icon-lg">
+                        <img src="/static/images/alipay_online.png" class="channel-icon-lg">
                     </a>
                 </li>
                 <li ng-class="{active:ctrl.channel=='Bestpay'}" ng-if="report.channels.Bestpay">