diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java index 830e1aa01..fc527e582 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java @@ -81,7 +81,7 @@ public class ChannelsAnalysisServiceImpl implements ChannelsAnalysisService { @Override public void exportData(JSONObject params, HttpServletResponse resp) { - params.put("channels", new String []{"Alipay", "AlipayOnline"}); + params.put("channels", new String []{"Alipay", "AlipayOnline","AlipayAps"}); String[] title = {"Channel", "Total Amount(AUD)", "Total orders", "Transaction Partners", "Enable Partners"}; JSONObject count = customerAndOrdersStatisticsMapper.countChannel(params); int enablePartners = customerAndOrdersStatisticsMapper.countEnableAlipay(params); 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 e0f911fc8..46631b45b 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 @@ -18,6 +18,7 @@ o.client_order_id, o.gateway, o.channel, + o.pay_type, o.pre_authorization, p.client_moniker, p.short_name, @@ -48,6 +49,7 @@ o.confirm_time pay_time, o.pre_authorization, o.source, + o.pay_type, CASE o.status WHEN 0 THEN 'SUBMITTING' @@ -159,7 +161,7 @@ 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,oo.source + oo.client_order_id,oo.gateway,oo.channel,oo.pre_authorization,oo.refund_amount,oo.customer_id,oo.source,oo.pay_type from pmt_orders oo @@ -301,7 +303,7 @@ 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,oo.source + oo.client_order_id,oo.gateway,oo.channel,oo.pre_authorization,oo.refund_amount,oo.customer_id,oo.source,oo.pay_type from pmt_orders oo diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html index 91cc2190d..747ae56ea 100644 --- a/src/main/ui/static/analysis/templates/trans_analysis.html +++ b/src/main/ui/static/analysis/templates/trans_analysis.html @@ -293,7 +293,7 @@
-
Alipay+
+
Alipay+

diff --git a/src/main/ui/static/images/alipay_aps.jpg b/src/main/ui/static/images/alipay_aps.jpg new file mode 100644 index 000000000..e050cf959 Binary files /dev/null and b/src/main/ui/static/images/alipay_aps.jpg differ diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html index ca7e331bb..595f5e863 100644 --- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html +++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html @@ -376,6 +376,8 @@ ng-if="trade.channel=='Alipay'" /> +
-
- -
- -
-
+ + + + + + +
@@ -556,7 +556,7 @@
-
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 88fc55b17..0da8bfeeb 100644 --- a/src/main/ui/static/payment/tradelog/templates/balance_report.html +++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html @@ -540,6 +540,8 @@ uib-tooltip="Card Payment" ng-if="trade.channel=='rpaypmt_card'"/> + {{trade.order_id2}} diff --git a/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html index cc5a23e51..447927324 100644 --- a/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html @@ -374,6 +374,8 @@ uib-tooltip="Card Payment" ng-if="trade.channel=='rpaypmt_card'"/> + {{trade.order_id}} diff --git a/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html index f191d3468..8973ecf50 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html @@ -349,6 +349,8 @@ + {{trade.order_id}} diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html index 7c3b74fc0..592c7b716 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html @@ -731,6 +731,9 @@ + {{trade.order_id}} +