From 4754d0b844f1011cd46186d68f67bdb22518f4bc Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 26 Feb 2019 14:22:00 +0800 Subject: [PATCH] =?UTF-8?q?add=20transaction=20pos=20=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mappers/payment/TransactionMapper.xml | 6 +++++ .../partner/templates/add_partner.html | 5 ++-- .../templates/client_partner_detail.html | 12 ++++----- .../templates/client_partner_edit.html | 26 +++++++++--------- .../partner/templates/partner_detail.html | 2 +- .../partner/templates/partner_edit.html | 11 ++++---- .../tradelog/templates/balance_report.html | 11 ++++++++ .../ui/static/payment/tradelog/transflow.js | 27 +++++++++++++++++++ 8 files changed, 71 insertions(+), 29 deletions(-) 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 4572cdea4..7a579dd59 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 @@ -130,6 +130,9 @@ and t.transaction_type = 'Credit' and t.refund_id is NOT NULL and t.transaction_type='Debit' and t.refund_id is NULL + + and o.dev_id = #{dev_id} + and o.channel=#{chan} @@ -198,6 +201,9 @@ and t.transaction_type = 'Credit' and t.refund_id is NOT NULL and t.transaction_type='Debit' and t.refund_id is NULL + + and o.dev_id = #{dev_id} + and o.channel=#{chan} diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html index 1492bb698..aff61f82b 100644 --- a/src/main/ui/static/payment/partner/templates/add_partner.html +++ b/src/main/ui/static/payment/partner/templates/add_partner.html @@ -368,12 +368,11 @@
- +
+ id="remark-input" maxlength="500">
diff --git a/src/main/ui/static/payment/partner/templates/client_partner_detail.html b/src/main/ui/static/payment/partner/templates/client_partner_detail.html index 71f79f2f5..315dd19b2 100644 --- a/src/main/ui/static/payment/partner/templates/client_partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/client_partner_detail.html @@ -166,13 +166,13 @@

-
- + + -
-

-
-
+ + + + diff --git a/src/main/ui/static/payment/partner/templates/client_partner_edit.html b/src/main/ui/static/payment/partner/templates/client_partner_edit.html index 2ab021514..b8d17dc48 100644 --- a/src/main/ui/static/payment/partner/templates/client_partner_edit.html +++ b/src/main/ui/static/payment/partner/templates/client_partner_edit.html @@ -168,19 +168,19 @@ -
- -
- -
-

Less Than 200 - Characters(including symbols and spaces)

-
-
-
+ + + + + + + + + + + + + diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html index 0617f91b5..4bb2c5c3c 100644 --- a/src/main/ui/static/payment/partner/templates/partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/partner_detail.html @@ -430,7 +430,7 @@
- +

diff --git a/src/main/ui/static/payment/partner/templates/partner_edit.html b/src/main/ui/static/payment/partner/templates/partner_edit.html index 3d6bd7781..c9dd152d5 100644 --- a/src/main/ui/static/payment/partner/templates/partner_edit.html +++ b/src/main/ui/static/payment/partner/templates/partner_edit.html @@ -99,7 +99,7 @@

Required Field

-

Less Than 50 +

Less Than 15 Characters(including symbols and spaces)

@@ -168,12 +168,11 @@

Required Field

-

Less Than 50 +

Less Than 15 Characters(including symbols and spaces)

-
- +
+ id="remark-input" maxlength="500">
@@ -749,4 +748,4 @@
- \ No newline at end of file + diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html index bdaca8d6d..aa6a2146b 100644 --- a/src/main/ui/static/payment/tradelog/templates/balance_report.html +++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html @@ -103,6 +103,17 @@

+
+ +
+

+ All + +

+
+
diff --git a/src/main/ui/static/payment/tradelog/transflow.js b/src/main/ui/static/payment/tradelog/transflow.js index 9b83f39cb..3429e06c8 100644 --- a/src/main/ui/static/payment/tradelog/transflow.js +++ b/src/main/ui/static/payment/tradelog/transflow.js @@ -17,6 +17,8 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) { $scope.pagination = {}; $scope.params.clearing_status = -1; $scope.params.channel = 'ALL' + $scope.dev_params = {client_type:'sunmi',limit:100}; + $scope.device_isAll = true; $scope.params.trans_type = 0; $scope.isAll = true; $scope.clients = [$scope.currentUser.client]; @@ -69,6 +71,26 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) { $scope.params.datefrom = monthBegin; $scope.loadTradeLogs(1); }; + $scope.listDevices = function () { + var params = angular.copy($scope.dev_params) + $http.get('/client/partner_info/devices', {params: params}).then(function (resp) { + $scope.devices = resp.data.data; + }) + }; + $scope.chooseDevices = function (dev_id) { + if(dev_id == 'all'){ + $scope.chooseDevice_id = ''; + $scope.params.dev_id = null; + $scope.device_isAll = true; + $scope.loadTradeLogs(1); + }else { + $scope.chooseDevice_id = dev_id; + $scope.params.dev_id = dev_id; + $scope.device_isAll = false; + $scope.loadTradeLogs(1); + } + }; + $scope.listDevices(); $scope.loadTradeLogs = function (page) { var params = angular.copy($scope.params); if (params.datefrom) { @@ -123,6 +145,10 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) { url += connectSymbol + 'trans_type=' + params.trans_type; connectSymbol = '&'; } + if (params.dev_id) { + url += connectSymbol + 'dev_id=' + params.dev_id; + connectSymbol = '&' + } params.client_ids.forEach(function (i) { url += connectSymbol + 'client_ids=' + i; connectSymbol = '&'; @@ -137,6 +163,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) { url += connectSymbol + 'dateto=' + params.dateto; connectSymbol = '&'; } + params.page = page || $scope.pagination.page || 1; url += connectSymbol + 'page=' + params.page; return url;