From bbfcd63af5c2e2b8b6fda4f91ca53f62725929b9 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Thu, 22 Nov 2018 09:55:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=95=86=E6=88=B7=E5=8F=B7?=
 =?UTF-8?q?=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/CommonSubMerchantIdMapper.xml     |  8 +++--
 .../payment/merchantid/merchant_id_manager.js | 11 ++++++-
 .../templates/temp_sub_merchant_id.html       | 31 +++++++++++++++++--
 3 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/CommonSubMerchantIdMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/CommonSubMerchantIdMapper.xml
index 5d053be8f..624cd0323 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/CommonSubMerchantIdMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/CommonSubMerchantIdMapper.xml
@@ -2,10 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="au.com.royalpay.payment.manage.mappers.payment.CommonSubMerchantIdMapper">
     <select id="list" resultType="com.alibaba.fastjson.JSONObject">
-        select * from pmt_sub_merchant_id
-        where is_valid = #{is_valid}
+        select p.*, count(c.client_id) client_count from pmt_sub_merchant_id p
+        left join sys_clients c on p.sub_merchant_id = c.sub_merchant_id
+        where p.is_valid = #{is_valid}
         <if test="sub_merchant_id!=null">
-            and sub_merchant_id = #{sub_merchant_id}
+            and p.sub_merchant_id = #{sub_merchant_id}
         </if>
+        GROUP BY p.sub_merchant_id
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/ui/static/payment/merchantid/merchant_id_manager.js b/src/main/ui/static/payment/merchantid/merchant_id_manager.js
index a882aa33e..e8605865b 100644
--- a/src/main/ui/static/payment/merchantid/merchant_id_manager.js
+++ b/src/main/ui/static/payment/merchantid/merchant_id_manager.js
@@ -195,7 +195,16 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
               },function (resp) {
                   commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
               });
-          }
+          };
+          $scope.showClient = function (sub_merchant_id) {
+              if($scope.sub_merchant_id == sub_merchant_id){
+                  return;
+              }
+              $http.get('/sys/merchant_id/'+sub_merchant_id).then(function (resp) {
+                  $scope.client_monikers= resp.data;
+                  $scope.sub_merchant_id = sub_merchant_id;
+              });
+          };
     }]);
     app.controller('newCommonSubMerchantIdCtrl', ['$scope', '$http','commonDialog', function ($scope, $http,commonDialog) {
         $scope.params = {};
diff --git a/src/main/ui/static/payment/merchantid/templates/temp_sub_merchant_id.html b/src/main/ui/static/payment/merchantid/templates/temp_sub_merchant_id.html
index da6a4bbb7..b21a2ef28 100644
--- a/src/main/ui/static/payment/merchantid/templates/temp_sub_merchant_id.html
+++ b/src/main/ui/static/payment/merchantid/templates/temp_sub_merchant_id.html
@@ -33,9 +33,34 @@
             <tr ng-repeat="client in subMerchantIdList">
                 <td ng-bind="client.merchant_id"></td>
                 <td>
-                    {{client.sub_merchant_id}}
-                    <i class="fa fa-clock-o text-danger"
-                       title="Temp Sub Merchant ID"></i>
+                    <a ng-click="showClient(client.sub_merchant_id); toShow = !toShow" class="cursor">
+                        {{client.sub_merchant_id}}
+                        <i class="fa fa-clock-o text-danger"
+                           title="Temp Sub Merchant ID"></i>
+                        <span class="badge position_re">
+                            {{client.client_count}}
+                            <div ng-if="sub_merchant_id==client.sub_merchant_id&&toShow"
+                                 class="popover fade in position_ab"
+                                 role="tooltip" style="display: block;">
+                                <div class="arrow"></div>
+                                <h3 class="popover-title popover-color">Clients</h3>
+                                <div class="popover-content" style="width: 250px">
+                                    <button type="button" class="btn btn-link"
+                                            ng-repeat="client_moniker in client_monikers"
+                                            ng-show="$index<client_monikers.length-1"
+                                            ui-sref="partners.detail({clientMoniker:client_moniker.client_moniker})">
+                                        {{client_moniker.client_moniker}}
+                                        <span class="text-black">,</span>&nbsp;
+                                    </button>
+                                    <button type="button" class="btn btn-link"
+                                            ng-repeat="client_moniker in client_monikers" ng-if="$last"
+                                            ui-sref="partners.detail({clientMoniker:client_moniker.client_moniker})">
+                                        {{client_moniker.client_moniker}}
+                                    </button>
+                                </div>
+                            </div>
+                        </span>
+                    </a>
                 </td>
                 <td ng-bind="client.operator"></td>
                 <td ng-bind="client.create_time"></td>