Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage

src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsMapper.java

@@ -38,7 +38,7 @@ public interface RiskAttentionMerchantsMapper {
             "   OR (contact_phone LIKE CONCAT('%',#{contact_phone},'%') ) " +
             "   OR (contact_person LIKE CONCAT('%',#{contact_person},'%') ) " +
             "   OR (client_moniker LIKE CONCAT('%',#{client_moniker},'%') ) " +
-            "   OR (bank_account_no LIKE CONCAT('%',#{bank_account_no},'%') ) ")
+            "   OR (bank_account_no LIKE CONCAT('%',#{bank_account_no},'%') ) AND is_valid=1")
     List<JSONObject> listRiskySimilarMerchants(JSONObject params);
 
 }

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -2621,12 +2621,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         JSONObject client = clientDetail(manager, clientMoniker);
         Assert.notEmpty(client);
         clientModifySupport.processClientModify(new DisableModify(manager, clientMoniker, false));
-        List<String> exceptClientIds = new ArrayList<>();
-        exceptClientIds.add(client.getString("client_id"));
-        JSONObject sameMailClients = getByEmail(client.getString("contact_email"), 1, 1, exceptClientIds);
-        if (sameMailClients.getJSONArray("data").size() < 1) {
-            mailGunService.removeMailList(client);
-        }
     }
 
     @Override

src/main/ui/static/payment/partner/partner-manage.js

@@ -1195,6 +1195,16 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         }]);
     app.controller('partnerPaymentInfoCtrl', ['$scope', '$http', '$state', 'commonDialog','$uibModal', '$sce', function ($scope, $http, $state, commonDialog,$uibModal, $sce) {
         $scope.refresh = false;
+        $scope.copyHfLink = function() {
+            var e=document.getElementById("cpbt");
+            e.select();
+            var successful = document.execCommand("Copy");
+            if (successful) {
+                commonDialog.alert({title: 'Success', content: '已复制到剪切板!', type: 'success'});
+            }else {
+                commonDialog.alert({title: 'Error', content: '您的浏览器不支持!', type: 'error'});
+            }
+        };
         $scope.loadPartnerPaymentInfo = function () {
             $http.get('/sys/partners/' + $scope.partner.client_moniker).then(function (resp) {
                 $scope.paymentInfo = resp.data;

src/main/ui/static/payment/partner/partner.js

@@ -557,6 +557,18 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
         $scope.paymentInfo = $scope.partner;
         $scope.old_customer_surcharge_rate = angular.copy($scope.partner.customer_surcharge_rate);
         $scope.qrConfig = {currency: 'AUD'};
+
+        $scope.clientCopyHfLink = function() {
+            var e=document.getElementById("c-cpbt");
+            e.select();
+            var successful = document.execCommand("Copy");
+            if (successful) {
+                commonDialog.alert({title: 'Success', content: '已复制到剪切板!', type: 'success'});
+            }else {
+                commonDialog.alert({title: 'Error', content: '您的浏览器不支持!', type: 'error'});
+            }
+        };
+
         $scope.reloadQRCode = function () {
             $http.get('/client/partner_info/qrcode', {params: $scope.qrConfig}).then(function (resp) {
                 $scope.qrcode = resp.data;

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

@@ -102,9 +102,11 @@
             <div class="form-group">
                 <label class="control-label col-sm-2">HF Pay Link</label>
                 <div class="col-sm-10">
-                    <a href={{paymentInfo.hf_pay_url}} target="_Blank">
-                        <p class="form-control-static">{{partner.hf_pay_url}}
-                        <span id="intro">
+                    <a href={{partner.hf_pay_url}} target="_Blank">
+                        <span class="form-control-static">{{partner.hf_pay_url}}
+
+
+<!--                        <span id="intro">
                                 <a href=""><i id="carousel_id"  class="glyphicon glyphicon-info-sign" ng-mouseover="toFirst();toShow()"></i></a>
                                  <div class="pos" ng-show="show">
                                        <i class="tocancle glyphicon glyphicon-remove" ng-click="toHide()"></i>
@@ -117,18 +119,21 @@
                                     </uib-slide>
                                     </uib-carousel>
                                 </div>
-                        </span>
-                    </p>
+                        </span>-->
+                    </span>
                 </a>
+                    <i class="fa fa-clipboard margin-r-5" style="cursor: pointer" ng-click="clientCopyHfLink()"></i>
+                    <input style="opacity: 0" id="c-cpbt" value={{partner.hf_pay_url}} readonly>
              </div>
-        <div >
-            <label class="col-sm-2 control-label">HF Pay QR Code</label>
-            <img ng-src="{{partner.hfQrcodeUrl}}" class="img-responsive" />
-            <div>
-                <span style="padding-left: 19.3%;font-size:9px;">仅支持微信客户端扫描</span>
             </div>
-        </div>
+            <div class="form-group">
+                <label class="col-sm-2 control-label">HF Pay QR Code</label>
+                <img ng-src="{{partner.hfQrcodeUrl}}" class="img-responsive" />
+                <div>
+                    <span style="padding-left: 19.5%;font-size:9px;">仅支持微信客户端扫描</span>
+                </div>
             </div>
+
         </div>
 </div>
 </div>

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

@@ -329,6 +329,8 @@
                 <div class="col-sm-10">
                     <input type="checkbox" ng-model="paymentInfo.enable_link" bs-switch switch-change="toggleHfLink('hf')">
                     &nbsp;&nbsp;<a href={{paymentInfo.hf_pay_url}} target="_Blank"><span ng-if="paymentInfo.enable_link">{{paymentInfo.hf_pay_url}}</span></a>
+                    <i class="fa fa-clipboard margin-r-5" style="cursor: pointer" ng-click="copyHfLink()"></i>
+                    <input style="opacity: 0" id="cpbt" value={{paymentInfo.hf_pay_url}} readonly>
                 </div>
             </div>
             <div class="form-group"  ng-if="paymentInfo.enable_link">