TradeLogs 添加商户数统计

pom.xml

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

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

@@ -393,6 +393,7 @@
         ifnull(sum(if(l.refund_id is not null AND l.pre_authorization=1,l.clearing_amount,0)),0)
         pre_refund_fee,
         count(DISTINCT l.customer_id) customers,
+        count(DISTINCT l.client_id) clients,
         ifnull(sum(if(l.transaction_type='Credit' and l.refund_id is null and l.currency!='CNY',l.display_amount,0)),0)
         display_amount,
         ifnull(sum(if(l.transaction_type='Credit' and l.refund_id is null and l.currency!='CNY' and

src/main/ui/static/payment/tradelog/templates/trade_logs.html

@@ -21,6 +21,37 @@
     .line_height_{
         line-height: 22px;
     }
+    .col-xs-1-5,
+    .col-sm-1-5,
+    .col-md-1-5,
+    .col-lg-1-5 {
+        position: relative;
+        min-height: 1px;
+        padding-right: 10px;
+        padding-left: 10px;
+    }
+    .col-xs-1-5 {
+        width: 20%;
+        float: left;
+    }
+    @media (min-width: 768px) {
+        .col-sm-1-5 {
+            width: 20%;
+            float: left;
+        }
+    }
+    @media (min-width: 992px) {
+        .col-md-1-5 {
+            width: 20%;
+            float: left;
+        }
+    }
+    @media (min-width: 1200px) {
+        .col-lg-1-5 {
+            width: 20%;
+            float: left;
+        }
+    }
 </style>
 <section class="content-header">
     <h1>Trade Logs</h1>
@@ -244,7 +275,7 @@
                 <div class="box">
                     <div class="box-header">
                         <div class="row">
-                            <div class="col-md-3 col-sm-6 col-xs-12">
+                            <div class="col-md-1-5 col-sm-6 col-xs-12">
                                 <div class="info-box info_box_bottom">
                                     <span class="info-box-icon bg-aqua box-icon_small"><i class="ion ion-social-usd"></i></span>
                                     <div class="info-box-content box-content_left">
@@ -255,7 +286,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-md-3 col-sm-6 col-xs-12" ng-if="!analysis.cny_display_amount">
+                            <div class="col-md-1-5 col-sm-6 col-xs-12" ng-if="!analysis.cny_display_amount">
                                 <div class="info-box info_box_bottom">
                                     <span class="info-box-icon bg-aqua box-icon_small"><i class="ion ion-social-usd"></i></span>
                                     <div class="info-box-content box-content_left">
@@ -266,7 +297,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-md-3 col-sm-6 col-xs-12" ng-if="analysis.cny_display_amount">
+                            <div class="col-md-1-5 col-sm-6 col-xs-12" ng-if="analysis.cny_display_amount">
                                 <div class="info-box info_box_bottom" ng-class="{'line_height':analysis.pre_display_amount||analysis.pre_cny_display_amount}">
                                     <span class="info-box-icon bg-aqua box-icon_small"><i class="ion ion-social-usd"></i></span>
                                     <div class="info-box-content box-content_left">
@@ -285,7 +316,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-md-3 col-sm-6 col-xs-12">
+                            <div class="col-md-1-5 col-sm-6 col-xs-12">
                                 <div class="info-box info_box_bottom">
                                     <span class="info-box-icon bg-red box-icon_small"><i class="ion ion-android-warning"></i></span>
                                     <div class="info-box-content box-content_left">
@@ -298,7 +329,18 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-md-3 col-sm-6 col-xs-12">
+                            <div class="col-md-1-5 col-sm-6 col-xs-12">
+                                <div class="info-box info_box_bottom">
+                                    <span class="info-box-icon bg-red box-icon_small"><i class="ion ion-android-warning"></i></span>
+                                    <div class="info-box-content box-content_left">
+                                        <span class="info-box-text">Merchants</span>
+                                        <span class="info-box-number box-number_font"
+                                              ng-bind="analysis.clients"></span>
+                                        </span>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-md-1-5 col-sm-6 col-xs-12">
                                 <div class="info-box info_box_bottom">
                                     <span class="info-box-icon bg-yellow box-icon_small"><i class="ion ion-ios-people"></i></span>
                                     <div class="info-box-content box-content_left">