From b39fdda68739d672bb8d0d34e867cf643e63e31c Mon Sep 17 00:00:00 2001 From: luoyang Date: Sat, 12 Oct 2019 10:29:04 +0800 Subject: [PATCH] =?UTF-8?q?add=20App=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/appclient/beans/AppQueryBean.java | 14 ++++++++++++++ .../manage/mappers/payment/OrderMapper.xml | 7 +++++++ .../ui/static/dashboard/partner-dashboard.js | 5 +++-- .../dashboard/templates/partner_dashboard.html | 16 ++++++++++++++-- 5 files changed, 39 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index ed8df5983..1032f15fd 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.29 + 1.2.30 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java index 938344f1c..9cf7ebfe9 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java @@ -6,7 +6,9 @@ import au.com.royalpay.payment.core.beans.PayChannel; import au.com.royalpay.payment.tools.defines.TradeType; import au.com.royalpay.payment.tools.utils.TimeZoneUtils; import com.alibaba.fastjson.JSONObject; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; +import org.castor.util.StringUtil; import java.text.DateFormat; import java.text.ParseException; @@ -32,6 +34,7 @@ public class AppQueryBean { private int page = 1; private int limit = 20; private String timezone = "Australia/Melbourne"; + private String order_id; public JSONObject toParams() { JSONObject params = new JSONObject(); @@ -91,6 +94,9 @@ public class AppQueryBean { if (clearing_status != -1) { params.put("clearing_status", clearing_status); } + if (StringUtils.isNotBlank(order_id)) { + params.put("order_id", order_id); + } return params; } @@ -182,4 +188,12 @@ public class AppQueryBean { public void setClearing_status(int clearing_status) { this.clearing_status = clearing_status; } + + public void setOrder_id(String order_id) { + this.order_id = order_id; + } + + public String getOrder_id() { + return order_id; + } } diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml index 3617be041..b6bd80487 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml @@ -745,6 +745,13 @@ and t.clearing_status=#{clearing_status} + + AND ( + OR t.system_transaction_id = #{order_id} + OR o.client_order_id = #{order_id} + OR o.order_id = #{order_id} + ) + ORDER BY transaction_time desc LIMIT #{after_limit},#{limit} diff --git a/src/main/ui/static/dashboard/partner-dashboard.js b/src/main/ui/static/dashboard/partner-dashboard.js index 07209cc68..7ab9a69fe 100644 --- a/src/main/ui/static/dashboard/partner-dashboard.js +++ b/src/main/ui/static/dashboard/partner-dashboard.js @@ -504,6 +504,7 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct $scope.rateHistory = chartParser.parse(rateHistoryConfig, exchangeRates); } }]); + */ app.controller('unSettledAmountHistoryDialogCtrl', ['$scope', '$http', '$filter','commonDialog', function ($scope, $http, $filter,commonDialog) { $scope.params = {isAll:true}; $scope.settleParams = {}; @@ -559,7 +560,7 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct }); $scope.manualSettle = function () { if($scope.currentSettle.locked){ - alert("系统正好在执行清算任务,暂不能提现,请稍后再试!"); + alert("系统在执行清算任务,暂不能提现,请稍后再试!"); return; } $scope.settle_to = $scope.params.to_date || $scope.params.maxData; @@ -571,7 +572,7 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); }) } - }]);*/ + }]); app.controller('partnerDashboardCtrl', ['$scope', '$http', '$filter', '$uibModal','$timeout', 'chartParser','clearingDetailService','commonDialog','company_info', function ($scope, $http, $filter, $uibModal,$timeout, chartParser,clearingDetailService,commonDialog,company_info) { $scope.company_info = company_info.data || {}; diff --git a/src/main/ui/static/dashboard/templates/partner_dashboard.html b/src/main/ui/static/dashboard/templates/partner_dashboard.html index 21f01b1bd..4419d3668 100644 --- a/src/main/ui/static/dashboard/templates/partner_dashboard.html +++ b/src/main/ui/static/dashboard/templates/partner_dashboard.html @@ -1,4 +1,13 @@ +