diff --git a/pom.xml b/pom.xml
index 6d2e38242..512e466bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
4.0.0
manage
- 1.2.51
+ 1.2.52
UTF-8
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 b6bd80487..0105fe750 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
@@ -146,58 +146,58 @@
FROM (
- select oo.order_id,oo.client_id,oo.total_amount,oo.display_amount,
- oo.customer_payment_amount,oo.coupon_payment_amount,oo.currency,
- oo.create_time,oo.confirm_time,oo.status,oo.order_description,oo.order_detail,
- oo.client_order_id,oo.gateway,oo.channel,oo.pre_authorization,oo.refund_amount,oo.customer_id
- from pmt_orders oo
-
-
-
-
- AND oo.order_detail LIKE #{name_pattern}
-
-
- AND oo.channel = #{search_text}
-
-
- AND oo.order_id = #{search_text}
-
-
-
- AND oo.order_id = #{order_id}
-
-
- AND oo.gateway IN
-
- #{gateway}
-
-
-
- AND oo.create_time >= #{from}
-
-
- AND oo.create_time < #{to}
-
-
- AND oo.transaction_date = DATE(#{date})
-
-
- AND oo.dev_id = #{dev_id}
-
-
- AND
-
- oo.status = #{std}
-
-
-
- AND
-
- oo.channel = #{chan}
-
-
-
+ select oo.order_id,oo.client_id,oo.total_amount,oo.display_amount,
+ oo.customer_payment_amount,oo.coupon_payment_amount,oo.currency,
+ oo.create_time,oo.confirm_time,oo.status,oo.order_description,oo.order_detail,
+ oo.client_order_id,oo.gateway,oo.channel,oo.pre_authorization,oo.refund_amount,oo.customer_id
+ from pmt_orders oo
+
+
+
+
+ AND oo.order_detail LIKE #{name_pattern}
+
+
+ AND oo.channel = #{search_text}
+
+
+ AND oo.order_id = #{search_text}
+
+
+
+ AND oo.order_id = #{order_id}
+
+
+ AND oo.gateway IN
+
+ #{gateway}
+
+
+
+ AND oo.create_time >= #{from}
+
+
+ AND oo.create_time < #{to}
+
+
+ AND oo.transaction_date = DATE(#{date})
+
+
+ AND oo.dev_id = #{dev_id}
+
+
+ AND
+
+ oo.status = #{std}
+
+
+
+ AND
+
+ oo.channel = #{chan}
+
+
+
) o
INNER JOIN sys_clients p
ON p.client_id = o.client_id
@@ -220,12 +220,12 @@
AND (
- p.client_moniker = #{search_text}
- OR p.short_name LIKE #{name_pattern}
- OR o.order_detail LIKE #{name_pattern}
- OR t.system_transaction_id = #{search_text}
- OR o.channel = #{search_text}
- OR o.order_id = #{search_text}
+ p.client_moniker = #{search_text}
+ OR p.short_name LIKE #{name_pattern}
+ OR o.order_detail LIKE #{name_pattern}
+ OR t.system_transaction_id = #{search_text}
+ OR o.channel = #{search_text}
+ OR o.order_id = #{search_text}
)
@@ -250,26 +250,26 @@
AND p.client_id IN(
- SELECT distinct b.client_id
- FROM sys_client_bd b
- INNER JOIN financial_bd_config c
- ON c.manager_id = b.bd_id
- WHERE b.is_valid = 1
- AND b.start_date <= now()
- AND (b.end_date is null or b.end_date >= now())
- AND (c.bd_group = #{bd_group} or c.manager_id = #{bd_group})
-
- AND c.manager_id = #{bd_group_bd}
-
+ SELECT distinct b.client_id
+ FROM sys_client_bd b
+ INNER JOIN financial_bd_config c
+ ON c.manager_id = b.bd_id
+ WHERE b.is_valid = 1
+ AND b.start_date <= now()
+ AND (b.end_date is null or b.end_date >= now())
+ AND (c.bd_group = #{bd_group} or c.manager_id = #{bd_group})
+
+ AND c.manager_id = #{bd_group_bd}
+
)
AND p.client_id in(select distinct d.client_id
from sys_client_bd d
where d.bd_id = #{bd_user}
- AND d.is_valid = 1
- AND DATE(d.start_date) <= curdate()
- AND (d.end_date IS NULL OR DATE(d.end_date) >= curdate()))
+ AND d.is_valid = 1
+ AND DATE(d.start_date) <= curdate()
+ AND (d.end_date IS NULL OR DATE(d.end_date) >= curdate()))
GROUP BY o.order_id
@@ -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
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index 44536eeb5..24a041cdb 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/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;
+ }
+ }