From 93719ed3196d8cd1c84d8f7bf99ce3030dc1642c Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 26 Sep 2018 14:12:48 +0800
Subject: [PATCH] add select_nap

---
 .../impls/CustomersAnalysisServiceImp.java    |   1 +
 .../analysis/mappers/OrderAnalysisMapper.xml  |  14 ++++++++++-
 .../ui/static/analysis/customer_analysis.js   |   1 +
 .../analysis/templates/customer_analysis.html |  22 ++++++++++++++++++
 src/main/ui/static/images/nap.png             | Bin 0 -> 1203 bytes
 .../ui/static/images/royalpay_sign_ln.png     | Bin 0 -> 1504 bytes
 6 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 src/main/ui/static/images/nap.png
 create mode 100644 src/main/ui/static/images/royalpay_sign_ln.png

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java
index 62d967da8..88e26c0d1 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java
@@ -78,6 +78,7 @@ public class CustomersAnalysisServiceImp implements CustomersAnalysisService {
         PageList<JSONObject> logs = orderAnalysisMapper.listCustomersData(params, new PageBounds(page, limit, Order.formString("amount.desc")));
         JSONObject result = PageListUtils.buildPageListResult(logs);
         result.put("analysis", orderAnalysisMapper.listCustomersDataAnalysis(params));
+        result.put("openid_type", params.getIntValue("openid_type"));
         return result;
     }
 
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
index d8c12acdc..81cee3fb0 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
@@ -197,10 +197,16 @@
     </select>
 
     <select id="listCustomersData" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT o.customer_id,sum(if(t.transaction_type='Credit',t.clearing_amount,0)) amount,
+        SELECT r.nickname,r.headimg,o.customer_id,sum(if(t.transaction_type='Credit',t.clearing_amount,0)) amount,
         COUNT(DISTINCT o.order_id) orders,max(t.clearing_amount) max_order
         FROM pmt_orders o
         INNER JOIN pmt_transactions t on t.order_id=o.order_id and t.system_generate=0 and (t.transaction_type='Credit' or t.transaction_type>0)
+        <if test="openid_type==4">
+            LEFT JOIN sys_customer_relation r on r.globalpay_openid = o.customer_id
+        </if>
+        <if test="openid_type==0 or openid_type==1">
+            LEFT JOIN sys_customer_relation r on r.wechat_openid = o.customer_id
+        </if>
         <where>
             <if test="begin!=null">and o.create_time &gt;= #{begin}</if>
             <if test="end!=null">and o.create_time &lt; #{end}</if>
@@ -216,6 +222,9 @@
             <if test="openid_type==3">
                 and o.channel='Bestpay'
             </if>
+            <if test="openid_type==4">
+                AND o.customer_id LIKE 'olH%' and o.channel='Wechat'
+            </if>
             <if test="customer_id!=null">
                 and o.customer_id=#{customer_id}
             </if>
@@ -245,6 +254,9 @@
             <if test="openid_type==3">
                 and o.channel='Bestpay'
             </if>
+            <if test="openid_type==4">
+                AND customer_id LIKE 'olH%'
+            </if>
             <if test="customer_id!=null">
                 and o.customer_id=#{customer_id}
             </if>
diff --git a/src/main/ui/static/analysis/customer_analysis.js b/src/main/ui/static/analysis/customer_analysis.js
index e7c2f4a9e..826c70478 100644
--- a/src/main/ui/static/analysis/customer_analysis.js
+++ b/src/main/ui/static/analysis/customer_analysis.js
@@ -77,6 +77,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
             $http.get('/analysis/customers/ranking/'+$scope.params.openid_type, {params: params}).then(function (resp) {
                 $scope.customer_loading = false;
                 $scope.customers = resp.data.data;
+                $scope.customers_type = resp.data.openid_type;
                 $scope.customers_analysis = resp.data.analysis;
                 $scope.pagination = resp.data.pagination;
                 if($scope.customers.length>0){
diff --git a/src/main/ui/static/analysis/templates/customer_analysis.html b/src/main/ui/static/analysis/templates/customer_analysis.html
index db731d054..34029ebb7 100644
--- a/src/main/ui/static/analysis/templates/customer_analysis.html
+++ b/src/main/ui/static/analysis/templates/customer_analysis.html
@@ -22,6 +22,7 @@
                                     <option value='1'>白RoyalPay</option>
                                     <option value='2'>Alipay</option>
                                     <option value='3'>Bestpay</option>
+                                    <option value='4'>Nap</option>
                                 </select>
                             </div>
                             <div class="form-group col-xs-4 form-inline">
@@ -99,6 +100,7 @@
                         <table class="table table-striped">
                             <thead>
                             <tr>
+                                <th style="width: 200px">Nick Name</th>
                                 <th>Customer openId</th>
                                 <th>Amount(AUD)</th>
                              <!--   <th>Points</th>-->
@@ -110,6 +112,26 @@
                             <tr ng-repeat="customer in customers"
                                 ng-class="{'selectRow':order_params.customer_id==customer.customer_id}"
                                 ng-click="order_params.customer_id=customer.customer_id;listCustomerOrders()">
+                                <td style="width: 60px" ng-if="customers_type ==0 || customers_type==1">
+                                    <span>
+                                        <img style="height: 30px;width: 30px" class="img-circle" ng-src="{{customer.headimg||'static/images/royalpay_sign_ln.png'}}" />
+                                        {{customer.nickname}}
+                                    </span></td>
+                                <td style="width: 60px" ng-if="customers_type ==2">
+                                    <span>
+                                    <img style="height: 30px;width: 30px" class="img-circle" ng-src="{{customer.headimg||'static/images/alipay_sign.png'}}" />
+                                    {{customer.nickname}}
+                                    </span></td>
+                                <td style="width: 60px" ng-if="customers_type ==3">
+                                    <span>
+                                    <img style="height: 30px;width: 30px" class="img-circle" ng-src="{{customer.headimg||'static/images/bestpay_sign.png'}}" />
+                                 {{customer.nickname}}
+                                     </span></td>
+                                <td style="width: 60px" ng-if="customers_type ==4">
+                                    <span>
+                                    <img style="height: 30px;width: 30px" class="img-circle" ng-src="{{customer.headimg||'static/images/nap.png'}}" />
+                                    {{customer.nickname}}
+                                    </span></td>
                                 <td ng-bind="customer.customer_id"></td>
                                 <td ng-bind="customer.amount"></td>
                            <!--     <td ng-bind="customer.points"></td>-->
diff --git a/src/main/ui/static/images/nap.png b/src/main/ui/static/images/nap.png
new file mode 100644
index 0000000000000000000000000000000000000000..613b393fa21a6c7df6e338b0de8999da031822b1
GIT binary patch
literal 1203
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T
z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?T<fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf`)Hma%LWg
zuL;)R>ucqiS6q^qmz?V9Vygr+LN7Bj#mdOh+0fG2&Be*m%*4>p)xy!#+1$d!$=T7_
z#n8yq$pxm@B|o_|H#M&WrZ)wl*A=H;P+G_>0NU)5T9jFqn&MWJpQ`}&vsET;w>aT6
z52`l>w_BWX>eUB2MjsTjNHGl)0wy026P|8?9C*r4%>yR)B4E0nT)Zrjfq_xY)5S5Q
z;#Shb=pXmH8XFVU1Wp@IV3T7iv{Js%Anwp+!Cd)3Rd|9xvVwd^BhL?~M#lIV5*n-r
z41Ro(=eTD7<G=g~w&tJP72bT#SNQYqw1Az54BNf`fBx@(apeE|0&y0G#|IpR5;rhd
zGdDLHg!nODz4WV?hey87(BR7~<AMbh3omjU<ZEzy#hk#Q`GLVu-zksTfJwflZNo#h
z29ZNKER60evi0_~UO2ICw*<#S`Kp5-+F8{q9#~$unZq$VQ7Yk&LuH4mfqugcX*q+M
zbf@pqKE@|Dux^)>_;TI(Pxl+93E~a24l+y;vS<8zoIB{tLv@u82O3YbeNgw{Il{iu
zQH;Ime1g6LX9KU}vc#O6M;jcTEL4#E*uYca+Q_)xA&z5_iZwHf1cPjHdv)7Kb4O4y
N;_2$=vd$@?2>=tDlC}T<

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/royalpay_sign_ln.png b/src/main/ui/static/images/royalpay_sign_ln.png
new file mode 100644
index 0000000000000000000000000000000000000000..72178aee3c77710dc4c5818afa021185dbbeaeeb
GIT binary patch
literal 1504
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T
z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?T<fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf`)Hma%LWg
zuL;)R>ucqiS6q^qmz?V9Vygr+LN7Bj#mdOh+0fG2&C<!z%*4>p)xy!#+1$d!$=T7_
z#n8yq$pxm@B|o_|H#M&WrZ)wl*Ab^)P+G_>0NU)5T9jFqn&MWJpQ`}&vsET;x0vHJ
z52`l>w_7Z5>eUB2MjsTjNHGl)0wy026P|8?9C*r4%>yR)B4D~s|F8v^r<j60T^vIy
zZcUkdHs2>u;@JFZtFF2;5+aXRA9RXx+%VyWptO7-_kRcTH91?PJ6#U#6O4_Vcw<6I
zBd?g4opR>oNtrHEhNo6&N?tX*<Y#Ss{r#QdG@t2tpY9aDw|riE?z7$V+U5^y_&j$p
zT79iQuVNwYFyV1>t;tmuv4*)Tn-(Pg=Gt)V{mN_U%XJ%XXI0d*YacxM`O>o3NgsKZ
z+FyE6`|@b8=DB+56)xHfRW$_et+V_+dkWuokG<wgAFVN&-7YmrVM@^LrRm$3G{$9`
zR!?_j*`Itdp?UUn@9?-oG1JuMG4JD_Q#h%3{*s5cFReU%X??#%S?H}dM`pg*%kfC}
z(yd&-ye#(R{+{pSJu@dfIq`1sr60;Kf2i&;IHx@?V(zjgQErcuectgFg&6_A5?q@u
zuU?XE{G-5Mt2k=X1{<EUrcA#hUK*x-n>S&Z(WM8{PbSyTyb`seNwDeq!h($|waPp8
z8nXV5*xV9%bpE9p!3E10p6yebDRi>W(8=J+`KY@`*jSgH+<4n2xVoT<d&!x-wFlDP
zy_IMb-)(7odY5&!rsD}8$;`RGm#kC1G}rFa6RGYQ28VdR6dQA{`)SJZd+$eY(Fwi@
zGM*3Hzf?FpIyU9Q>}rJ_A6k;EHO{8YVNX2EtgXIei%>`jd*v}}iHkb}`L>1G_X{2Q
z^VQ^;RJirMBimM-EB27xr=5F4v)A^>mdrcf50;(r-_>!(`k7OB!jWBRTp7zM@7qL|
z7f1byPq?bBb91X+(2NJWAI;J(Is4?+%?szIwK#>We!nm3y5xK3gXYoMS9}7k|BEIt
Yr2aef|A=YAKTw(L>FVdQ&MBb@0JpV7ivR!s

literal 0
HcmV?d00001