add App增加订单查询接口支持

pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.2.29</version>
+    <version>1.2.30</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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;
+    }
 }

src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml

@@ -745,6 +745,13 @@
                 </foreach>
             </if>
             <if test="clearing_status!=null">and t.clearing_status=#{clearing_status}</if>
+            <if test="order_id!=null">
+                AND (
+                OR t.system_transaction_id = #{order_id}
+                OR o.client_order_id = #{order_id}
+                OR o.order_id = #{order_id}
+                )
+            </if>
         </where>
         ORDER BY transaction_time desc
         LIMIT #{after_limit},#{limit}

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 || {};

src/main/ui/static/dashboard/templates/partner_dashboard.html

@@ -1,4 +1,13 @@
+<style>
+    #manual-settle {
+        font-size: 16px;
+        color: white;
+    }
 
+    #manual-settle .active{
+
+    }
+</style>
 <!--
 <section class="content-header">
     <h1>
@@ -348,10 +357,13 @@
                 <span class="mini-stat-icon bg-light"><i class="glyphicon glyphicon-btc text-info"></i></span>
                 <div class="mini-stat-info text-right text-light f-14">
                     <span class="counter text-white" style="font-size: 24px">
-                         {{transcommon.not_settled|currency:'AUD '}} <a role="button" ng-click="toShowUnSettledDialog()" ng-if="manual_settle&&([1]|withRole)">
+                         {{transcommon.not_settled|currency:'AUD '}}
-                        <i class="fa fa-info-circle text-black" uib-tooltip="withdraw deposit" aria-hidden="true"></i></a>
                     </span>
                     UNSETTLED
+                    <br>
+                    <a role="button" id="manual-settle" ng-click="toShowUnSettledDialog()" ng-if="manual_settle&&([1]|withRole)&&currentUser.client_moniker=='MEGP'">
+                        Manual Settle
+                        <i class="fa fa-info-circle text-black" uib-tooltip="withdraw deposit" aria-hidden="true"></i></a>
                 </div>
                 <p class="mb-0 m-t-20 text-light">Latest settlement: {{transcommon.latest_settle|currency:'AUD '}}
                 </p>