Merge branch 'develop'

src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java

@@ -40,7 +40,7 @@ public class ChannelsAnalysisServiceImpl implements ChannelsAnalysisService {
         }
         List<JSONObject> list = new ArrayList<>();
         Map<Date,JSONObject> 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);
         }

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);

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

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
         ]]>

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';
             }
         }
     });

src/main/ui/static/analysis/templates/customer_analysis.html

@@ -179,6 +179,8 @@
                                      uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/>
                                 <img src="/static/images/hf_sign.png"
                                      uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
+                                <img src="/static/images/rpayplus.png"
+                                     uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/>
                                 {{order.order_id}}
                             </td>
                             <td>{{order.short_name}}(<a class="text-primary" role="button" title="Detail"

src/main/ui/static/analysis/templates/manage_customers_orders.html

@@ -90,7 +90,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='jd'}"
                                                    ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
-                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a>
+                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>

src/main/ui/static/analysis/templates/settlement_transactions.html

@@ -48,6 +48,11 @@
                         <img src="/static/images/hf_sign_lg.png" class="channel-icon-lg">
                     </a>
                 </li>
+                <li ng-class="{active:ctrl.channel=='Rpay'}" ng-if="report.channels.Rpay">
+                    <a role="button" ng-click="ctrl.channel='Rpay';channelAndDayOfAnalysis()" title="RPAY">
+                        <img src="/static/images/rpayplus.png" class="channel-icon-lg">
+                    </a>
+                </li>
             </ul>
         </div>
     </div>

src/main/ui/static/analysis/templates/trans_analysis.html

@@ -97,7 +97,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='jd'}"
                                                    ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
-                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a>
+                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
@@ -197,6 +199,17 @@
                                     </div>
                                 </div>
                             </div>
+                            <!-- Rpay+显示交易额分析，先注释掉，日后可能需要显示
+                            <div class="col-sm-2 col-xs-6">
+                                <div class="description-block">
+                                    <div class="description-header text-bold"><img src="/static/images/rpayplus.png"/>R Pay</div>
+                                    <div class="description-text text-red">
+                                        <label class="description-text"
+                                               ng-bind="totalChannelAmount.rpayamount|currency: ' $ '"></label>
+                                    </div>
+                                </div>
+                            </div>
+                            -->
                         </div>
                         <!--<table class="table">
                             <tr>
@@ -216,9 +229,12 @@
                                 <th>
                                     <img src="/static/images/jd_sign.png"/>
                                     JD Pay:{{totalChannelAmount.jdPayAmount|currency: ' $ '}}</th>
+                                <th>
+                                    <img src="/static/images/rpayplus.png"/>
+                                    R Pay:{{totalChannelAmount.rpayamount|currency: ' $ '}}</th>
                                 <th>
                                     <img src="/static/images/hf_sign.png"/>
-                                    JD Pay:{{totalChannelAmount.hfPayAmount|currency: ' $ '}}</th>
+                                    hf Pay:{{totalChannelAmount.hfPayAmount|currency: ' $ '}}</th>
                                 &lt;!&ndash;<th>&ndash;&gt;
                                     &lt;!&ndash;<img src="/static/images/wechatpay_sign.png"/>&ndash;&gt;
                                     &lt;!&ndash;Znyoo:{{totalChannelAmount.znyooAmount|currency: ' $ '}}</th>&ndash;&gt;

src/main/ui/static/analysis/templates/trans_analysis_monthly.html

@@ -67,7 +67,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='jd'}"
                                                    ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
-                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a>
+                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
@@ -157,6 +159,18 @@
                                     </div>
                                 </div>
                             </div>
+
+                            <!-- 显示Rpay+交易额分析，先注释掉，日后可能需要显示
+                            <div class="col-sm-2 col-xs-6">
+                                <div class="description-block">
+                                    <div class="description-header text-bold"><img src="/static/images/rpayplus.png"/>R Pay</div>
+                                    <div class="description-text">
+                                        <label class="description-text text-red"
+                                               ng-bind="totalChannelAmount.rpayamount|currency: ' $ '"></label>
+                                    </div>
+                                </div>
+                            </div>
+                            -->
                         </div>
                       <!--  <table class="table">
                             <tr>
@@ -178,6 +192,9 @@
                                 <th>
                                     <img src="/static/images/hf_sign.png"/>
                                     JD Pay:{{totalChannelAmount.hfPayAmount|currency: ' $ '}}</th>
+                                <th>
+                                    <img src="/static/images/rpayplus.png"/>
+                                    R Pay:{{totalChannelAmount.rpayamount|currency: ' $ '}}</th>
                             </tr>
                         </table>-->
                     </div>

src/main/ui/static/analysis/templates/transaction_amount_Analysis.html

@@ -32,6 +32,8 @@
                                                    ng-click="params.channel='jd';loadTradeLogs()">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
                                                    ng-click="params.channel='hf';loadTradeLogs()">HF Pay</a>
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>

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';
             }
         }
     });

src/main/ui/static/commons/templates/order_detail.html

@@ -45,6 +45,8 @@
                                  uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/>
                             <img src="/static/images/hf_sign.png"
                                  uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
+                            <img src="/static/images/rpayplus.png"
+                                 uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/>
                             {{order.order_id}}
                             </td>
                         </p>

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';
             }
         }
     });

src/main/ui/static/config/bdprize/templates/bd_prize_detail.html

@@ -132,6 +132,19 @@
                 </div>
             </div>
         </div>
+        <div class="col-xs-4" ng-if="detail.RpayDetail">
+            <div class="info-box" style="background: lightcyan">
+                <div class="info-box-icon" style="    background: bottom;">
+                    <img uib-tooltip="HF" src="/static/images/rpayplus.png">
+                </div>
+                <div class="info-box-content">
+                    <h5>Transaction: ${{detail.RpayDetail.total_amount}}</h5>
+                    <h5>Commission: ${{detail.RpayDetail.total_prize}}</h5>
+                    <h5>Send: ${{detail.RpayDetail.send_prize}}</h5>
+                    <h5>Fund: ${{detail.RpayDetail.total_donation}}</h5>
+                </div>
+            </div>
+        </div>
     </div>
     <div class="box box-default" ng-if="!detail.no_record">
         <div class="box-header">Details<span class="text-danger">(Red Client Moniker means received from BD User who left company.)</span></div>
@@ -174,6 +187,7 @@
                         <img ng-if="log.channel=='Bestpay'" uib-tooltip="Bestpay" src="/static/images/bestpay_sign_lg.png">
                         <img ng-if="log.channel=='jd'" uib-tooltip="Bestpay" src="/static/images/jd_sign_lg.png">
                         <img ng-if="log.channel=='hf'" uib-tooltip="Bestpay" src="/static/images/hf_sign_lg.png">
+                        <img ng-if="log.channel=='Rpay'" uib-tooltip="Rpay" src="/static/images/rpayplus.png">
                     </td>
                 </tr>
                 </tbody>

src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html

@@ -107,6 +107,18 @@
                     </div>
                 </div>
             </div>
+            <div class="col-xs-4" ng-if="report.RpayReport">
+                <div class="info-box" style="background: lightcyan">
+                    <div class="info-box-icon" style="    background: bottom;">
+                        <img uib-tooltip="HF" src="/static/images/rpayplus.png">
+                    </div>
+                    <div class="info-box-content">
+                        <h5>BD Total Commission: ${{report.RpayReport.total_prize}}</h5>
+                        <h5>BD Total Send: ${{report.RpayReport.total_send_prize}}</h5>
+                        <h5>BD Total Fund: ${{report.RpayReport.total_donation}}</h5>
+                    </div>
+                </div>
+            </div>
         </div>
         <div class="box box-default">
             <div class="box-header">BD Commission</div>

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

@@ -159,6 +159,23 @@
                         <div class="description-header text-bold"><img src="/static/images/hf_sign.png"/>HF</div>
                     </div>
                 </div>
+
+                <!-- dashboard显示Rpay+交易额，先注释掉，日后可能需要显示
+                <div class="col-sm-4 col-xs-6">
+                    <div class="description-block">
+                        <div class="description-text">交易额:
+                            <label class="description-text text-red"
+                                   ng-bind="totalChannelAmount.rpayamount|currency: ' $ '"></label>
+                        </div>
+                        <div class="description-text">订单数:
+                            <label class="description-text text-red"
+                                   ng-bind="totalChannelAmount.rpay_order_count"></label>
+                        </div>
+                        <div class="description-header text-bold"><img src="/static/images/rpayplus.png"/>R</div>
+                    </div>
+                </div>
+                -->
+
             </div>
         </div>
     </div>

src/main/ui/static/invoice/templates/invoice_assistant.html

@@ -206,6 +206,8 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
+                                    <img src="/static/images/rpayplus.png"
+                                         uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
                                 <td ng-bind="trade.currency"></td>

src/main/ui/static/payment/custom/templates/custom.html

@@ -101,6 +101,8 @@
                                                  uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/>
                                             <img src="/static/images/hf_sign.png"
                                                  uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
+                                            <img src="/static/images/rpayplus.png"
+                                                 uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/>
                                             {{order.order_id}}
                                     </td>
                                     </p>

src/main/ui/static/payment/invoice/templates/invoice.html

@@ -200,6 +200,8 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
+                                    <img src="/static/images/rpayplus.png"
+                                         uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
                                 <td ng-bind="trade.currency"></td>

src/main/ui/static/payment/partner/templates/partner_pay_logs.html

@@ -85,7 +85,9 @@
                         <a role="button" ng-class="{'bg-primary':params.channel=='JD'}"
                            ng-click="params.channel='JD';loadTradeLogs(1)">JDpay</a> |
                         <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
-                           ng-click="params.channel='HF';loadTradeLogs(1)">HFpay</a>
+                           ng-click="params.channel='HF';loadTradeLogs(1)">HFpay</a> |
+                        <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                           ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
                     </p>
                 </div>
             </div>
@@ -185,6 +187,7 @@
                         <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline" ng-if="trade.channel=='AlipayOnline'"/>
                         <img src="/static/images/jd_sign.png" uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                         <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
+                        <img src="/static/images/rpayplus.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                         {{trade.order_id}}
                     </td>
                     <td>

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

@@ -95,9 +95,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='JD'}"
                                                    ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
-                                                   ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a><!--|
+                                                   ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='ZNYOO'}"
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
-                                                   ng-click="params.channel='ZNYOO';loadTradeLogs(1)">Znyoo</a>-->
+                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
@@ -296,6 +296,8 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
+                                    <img src="/static/images/rpayplus.png"
+                                         uib-tooltip="RPay" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
                                 <td ng-bind="trade.currency"></td>

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

@@ -7,7 +7,7 @@
             <ul class="nav nav-pills">
                 <li ng-class="{active:ctrl.channel==null}">
                     <a role="button" ng-click="ctrl.channel=null;channelAndDayOfAnalysis()" title="All">
-                        <img src="/static/images/royalpay_sign.png">
+                        <img src="/static/images/rpayplus.png">
                     </a>
                 </li>
                 <li ng-class="{active:ctrl.channel=='Wechat'}" ng-if="report.channels.Wechat">
@@ -40,6 +40,11 @@
                         <img src="/static/images/hf_sign_lg.png">
                     </a>
                 </li>
+                <li ng-class="{active:ctrl.channel=='Rpay'}" ng-if="report.channels.Rpay">
+                    <a role="button" ng-click="ctrl.channel='Rpay';channelAndDayOfAnalysis()" title="Rpay Pay">
+                        <img src="/static/images/rpayplus.png">
+                    </a>
+                </li>
             </ul>
         </div>
     </div>

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

@@ -96,6 +96,8 @@
                                                    ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
                                                    ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a>
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='Rpay'}"
+                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay+</a>
                                             </p>
                                         </div>
                                     </div>
@@ -322,6 +324,7 @@
                                      <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline" alt="AlipayOnline" ng-if="trade.channel=='AlipayOnline'"/>
                                      <img src="/static/images/jd_sign.png" uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                      <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
+                                     <img src="/static/images/rpayplus.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                                      {{trade.order_id}}
                                  </td>
                                  <td>

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

@@ -133,7 +133,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='JD'}"
                                                    ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
-                                                   ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a>
+                                                   ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
@@ -351,6 +353,8 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
+                                    <img src="/static/images/rpayplus.png"
+                                         uib-tooltip="Royal Pay" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id}}
                                 </td>
                                 <td>