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 1b3f2b439..5ad52e954 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 @@ -40,7 +40,7 @@ public class ChannelsAnalysisServiceImpl implements ChannelsAnalysisService { } List list = new ArrayList<>(); Map analysisMap = new TreeMap<>(); - String[] channels = {"Wechat","Bestpay","Alipay","jd","AlipayOnline","hf"}; + String[] channels = {"Wechat","Bestpay","Alipay","jd","AlipayOnline","hf", "Rpay"}; for (String channel:channels){ analysisChannelCustomers(params, analysisMap, channel); } diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java index 9584e26f5..ece285f7a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java @@ -556,7 +556,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT } } private JSONObject getTodayChannelCount(JSONObject params){ - String[] channels = new String[]{"Bestpay","Wechat","Alipay","jd","AlipayOnline","hf"}; + String[] channels = new String[]{"Bestpay","Wechat","Alipay","jd","AlipayOnline","hf", "Rpay"}; JSONObject resp = new JSONObject(); for(String channel:channels) { params.put("channel", channel); diff --git a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java index 99217ffa0..85b8e6ae8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java @@ -80,7 +80,7 @@ public class BDPrizeServiceImpl implements BDPrizeService { private static BigDecimal percent = new BigDecimal(100); - private static String[] channels = new String[]{"Wechat", "Alipay", "Bestpay", "jd", "AlipayOnline","hf"}; + private static String[] channels = new String[]{"Wechat", "Alipay", "Bestpay", "jd", "AlipayOnline","hf", "Rpay"}; private static Logger logger = LoggerFactory.getLogger(BDPrizeServiceImpl.class); @Override diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml index 361c1769b..253dcc017 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml @@ -316,7 +316,9 @@ ifnull(sum(CASE WHEN s.channel = 'AlipayOnline' THEN s.total ELSE 0 END),0) alipayonlineamount, ifnull(sum(CASE WHEN s.channel = 'AlipayOnline' THEN s.orders ELSE 0 END),0) alipayonline_order_count, ifnull(sum(CASE WHEN s.channel = 'hf' THEN s.total ELSE 0 END),0) hfamount, - ifnull(sum(CASE WHEN s.channel = 'hf' THEN s.orders ELSE 0 END),0) hf_order_count + ifnull(sum(CASE WHEN s.channel = 'hf' THEN s.orders ELSE 0 END),0) hf_order_count, + ifnull(sum(CASE WHEN s.channel = 'Rpay' THEN s.total ELSE 0 END),0) rpayamount, + ifnull(sum(CASE WHEN s.channel = 'Rpay' THEN s.orders ELSE 0 END),0) rpay_order_count FROM statistics_customer_order s LEFT JOIN sys_clients c ON c.client_id = s.client_id and c.is_valid=1 ]]> diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js index cb1429ab3..d77ea8380 100644 --- a/src/main/ui/static/analysis/clearing-log.js +++ b/src/main/ui/static/analysis/clearing-log.js @@ -533,7 +533,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func case 'AlipayOnline': return '/static/images/alipay_online.png'; case 'System': - return '/static/images/royalpay_sign.png'; + return '/static/images/rpayplus.png'; case 'Bestpay': return '/static/images/bestpay_sign_lg.png'; case 'Wechat': @@ -542,6 +542,8 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func return '/static/images/jd_sign_lg.png'; case 'hf': return '/static/images/hf_sign_lg.png'; + case 'Rpay': + return '/static/images/rpayplus.png'; } } }); diff --git a/src/main/ui/static/analysis/templates/customer_analysis.html b/src/main/ui/static/analysis/templates/customer_analysis.html index d155affb3..d28281419 100644 --- a/src/main/ui/static/analysis/templates/customer_analysis.html +++ b/src/main/ui/static/analysis/templates/customer_analysis.html @@ -179,6 +179,8 @@ uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/> + {{order.order_id}} {{order.short_name}}(JD Pay | HF Pay + ng-click="params.channel='hf';doAnalysis(1)">HF Pay | + RPay +

diff --git a/src/main/ui/static/analysis/templates/settlement_transactions.html b/src/main/ui/static/analysis/templates/settlement_transactions.html index c1f522e0c..247848535 100644 --- a/src/main/ui/static/analysis/templates/settlement_transactions.html +++ b/src/main/ui/static/analysis/templates/settlement_transactions.html @@ -48,6 +48,11 @@ +
  • + + + +
    • diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html index 17f6b602a..67db5f858 100644 --- a/src/main/ui/static/analysis/templates/trans_analysis.html +++ b/src/main/ui/static/analysis/templates/trans_analysis.html @@ -97,7 +97,9 @@ JD Pay | HF Pay + ng-click="params.channel='hf';doAnalysis(1)">HF Pay | + RPay +

    @@ -197,6 +199,17 @@ + diff --git a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html index b23530dd5..f5fd6e838 100644 --- a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html +++ b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html @@ -32,6 +32,8 @@ ng-click="params.channel='jd';loadTradeLogs()">JD Pay | HF Pay + RPay +

    diff --git a/src/main/ui/static/commons/services/clearingDetailService.js b/src/main/ui/static/commons/services/clearingDetailService.js index bc2d39f35..73de796be 100644 --- a/src/main/ui/static/commons/services/clearingDetailService.js +++ b/src/main/ui/static/commons/services/clearingDetailService.js @@ -51,7 +51,7 @@ define(['../app','decimal'], function (app,Decimal) { case 'AlipayOnline': return '/static/images/alipay_online.png'; case 'System': - return '/static/images/royalpay_sign.png'; + return '/static/images/rpayplus.png'; case 'Bestpay': return '/static/images/bestpay_sign_lg.png'; case 'Wechat': @@ -60,6 +60,8 @@ define(['../app','decimal'], function (app,Decimal) { return '/static/images/jd_sign_lg.png'; case 'hf': return '/static/images/hf_sign_lg.png'; + case 'Rpay': + return '/static/images/rpayplus.png'; } } }); diff --git a/src/main/ui/static/commons/templates/order_detail.html b/src/main/ui/static/commons/templates/order_detail.html index 748662a23..3184f16b2 100644 --- a/src/main/ui/static/commons/templates/order_detail.html +++ b/src/main/ui/static/commons/templates/order_detail.html @@ -45,6 +45,8 @@ uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/> + {{order.order_id}}

    diff --git a/src/main/ui/static/config/bdprize/bdprize.js b/src/main/ui/static/config/bdprize/bdprize.js index d444fb858..d79cf24c4 100644 --- a/src/main/ui/static/config/bdprize/bdprize.js +++ b/src/main/ui/static/config/bdprize/bdprize.js @@ -383,7 +383,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) { case 'AlipayOnline': return '/static/images/alipay_online.png'; case 'System': - return '/static/images/royalpay_sign.png'; + return '/static/images/rpayplus.png'; case 'Bestpay': return '/static/images/bestpay_sign_lg.png'; case 'Wechat': @@ -392,6 +392,8 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) { return '/static/images/jd_sign_lg.png'; case 'hf': return '/static/images/hf_sign_lg.png'; + case 'Rpay': + return '/static/images/rpayplus.png'; } } }); diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html index 05fd32c87..1e418ed94 100644 --- a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html +++ b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html @@ -132,6 +132,19 @@ +
    +
    +
    + +
    +
    +
    Transaction: ${{detail.RpayDetail.total_amount}}
    +
    Commission: ${{detail.RpayDetail.total_prize}}
    +
    Send: ${{detail.RpayDetail.send_prize}}
    +
    Fund: ${{detail.RpayDetail.total_donation}}
    +
    +
    +
    Details(Red Client Moniker means received from BD User who left company.)
    @@ -174,6 +187,7 @@ + diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html index 1ab3492ee..377e1386d 100644 --- a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html +++ b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html @@ -107,6 +107,18 @@
    +
    +
    +
    + +
    +
    +
    BD Total Commission: ${{report.RpayReport.total_prize}}
    +
    BD Total Send: ${{report.RpayReport.total_send_prize}}
    +
    BD Total Fund: ${{report.RpayReport.total_donation}}
    +
    +
    +
    BD Commission
    diff --git a/src/main/ui/static/dashboard/templates/dashboard.html b/src/main/ui/static/dashboard/templates/dashboard.html index 73b1c3d38..55c56f2fa 100644 --- a/src/main/ui/static/dashboard/templates/dashboard.html +++ b/src/main/ui/static/dashboard/templates/dashboard.html @@ -159,6 +159,23 @@
    HF
    + + + diff --git a/src/main/ui/static/images/rpayplus.png b/src/main/ui/static/images/rpayplus.png new file mode 100644 index 000000000..d23029388 Binary files /dev/null and b/src/main/ui/static/images/rpayplus.png differ diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html index 43420b87c..a477b413a 100644 --- a/src/main/ui/static/invoice/templates/invoice_assistant.html +++ b/src/main/ui/static/invoice/templates/invoice_assistant.html @@ -206,6 +206,8 @@ uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/> + {{trade.order_id2}} diff --git a/src/main/ui/static/payment/custom/templates/custom.html b/src/main/ui/static/payment/custom/templates/custom.html index 2a15a45f7..c4b3299e2 100644 --- a/src/main/ui/static/payment/custom/templates/custom.html +++ b/src/main/ui/static/payment/custom/templates/custom.html @@ -101,6 +101,8 @@ uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/> + {{order.order_id}}

    diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html index cf06b87f7..6a49339c8 100644 --- a/src/main/ui/static/payment/invoice/templates/invoice.html +++ b/src/main/ui/static/payment/invoice/templates/invoice.html @@ -200,6 +200,8 @@ uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/> + {{trade.order_id2}} 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 0055cf480..dd8618334 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 @@ -85,7 +85,9 @@ JDpay | HFpay + ng-click="params.channel='HF';loadTradeLogs(1)">HFpay | + RPay +

    @@ -185,6 +187,7 @@ + {{trade.order_id}} 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 e373aee29..2ab2afc98 100644 --- a/src/main/ui/static/payment/tradelog/templates/balance_report.html +++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html @@ -95,9 +95,9 @@ JD Pay | HF Pay + ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay | + RPay +

    @@ -296,6 +296,8 @@ uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/> + {{trade.order_id2}} diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html index 8671dcfa1..1d1f07f0e 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html @@ -7,7 +7,7 @@ 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 e093dd66e..b63e52165 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 @@ -96,6 +96,8 @@ ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay | HF Pay + RPay+

    @@ -322,6 +324,7 @@ AlipayOnline + {{trade.order_id}} 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 7dc4e3a21..4a1d0ab54 100644 --- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html @@ -133,7 +133,9 @@ JD Pay | HF Pay + ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay | + RPay +

    @@ -351,6 +353,8 @@ uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/> + {{trade.order_id}}