add 商户进件 商户编码检测

pom.xml

@@ -13,7 +13,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.1.2</jib-maven-plugin.version>
-        <docker-image.version>1.1.10</docker-image.version>
+        <docker-image.version>1.1.11</docker-image.version>
     </properties>
 
     <dependencies>

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

@@ -45,6 +45,8 @@ public interface ClientManager {
 
     String initMerchantCode();
 
+    boolean getMerchantIsValid(String clientMoniker);
+
     @Transactional
     JSONObject registerClient(String clientMoniker, ClientRegisterInfo registery, JSONObject manager);
 

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

@@ -633,12 +633,20 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     @Override
     public String initMerchantCode() {
         String code = RandomStringUtils.randomAlphanumeric(4).toUpperCase();
-        if (clientMapper.getPartnercode(code) > 0) {
+        if (!getMerchantIsValid(code)) {
             return initMerchantCode();
         }
         return code;
     }
 
+    @Override
+    public boolean getMerchantIsValid(String clientMoniker) {
+        if (clientMapper.getPartnercode(clientMoniker) > 0) {
+            return false;
+        }
+        return true;
+    }
+
     @Override
     @Transactional
     public JSONObject registerClient(String clientMoniker, ClientRegisterInfo registery, JSONObject manager) {

src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java

@@ -54,6 +54,11 @@ public class PartnerManageController {
         return clientManager.initMerchantCode();
     }
 
+    @RequestMapping(value = "/init/check_code_isvalid", method = RequestMethod.GET)
+    public boolean getMerchantIsValid(@RequestParam String clientMoniker) {
+        return clientManager.getMerchantIsValid(clientMoniker);
+    }
+
     @RequestMapping(method = RequestMethod.POST)
     @RequireManager(role = {ManagerRole.ADMIN, ManagerRole.BD_USER, ManagerRole.OPERATOR})
     public JSONObject registerPartner(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @RequestBody @Valid ClientRegisterInfo registery,

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

@@ -371,6 +371,8 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         $scope.initMerchantCode = function () {
             $http.get('/sys/partners/init/merchant_code').then(function (response) {
                 $scope.partner.client_moniker = response.data;
+                $scope.merchantCodeChecked = true;
+                $scope.merchantIsValid = true;
             });
         };
         $scope.initMerchantCode();
@@ -437,6 +439,8 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         $scope.clean_days = angular.copy(clean_days_map);
         $scope.bd_citys = angular.copy(bd_city_map);
         $scope.params = {textType: 'all', org_name: 'ALL'};
+        $scope.merchantIsValid = false;
+        $scope.merchantCodeChecked = false;
 
         function remove(arr, val) {
             if (angular.isArray(arr)) {
@@ -526,6 +530,17 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         // $scope.t2city_map = angular.copy(t2city_map);
 
         $scope.timezones = timezone.configs();
+        $scope.checkMerchantCodeIsValid = function (code) {
+            if (code.length != 4) {
+                $scope.merchantCodeChecked = false;
+                $scope.merchantIsValid = false;
+                return;
+            }
+            $http.get('/sys/partners/init/check_code_isvalid',{params:{clientMoniker:code}}).then(function (response) {
+                $scope.merchantIsValid = response.data;
+                $scope.merchantCodeChecked = true;
+            });
+        };
         $scope.save = function (form) {
             if (form.$invalid) {
                 angular.forEach(form, function (item, key) {

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

@@ -40,8 +40,12 @@
                                            type="text"
                                            name="client_moniker"
                                            id="short-id-input" required maxlength="4"
-                                           ng-pattern="/^[a-zA-Z0-9]+$/" readonly>
+                                           ng-pattern="/^[a-zA-Z0-9]+$/" ng-change="checkMerchantCodeIsValid(partner.client_moniker)">
                                     <a style="display: inline-block" role="button" ng-click="initMerchantCode()"><i class="fa fa-refresh" title="Refreshes the partner code"></i></a>
+                                    <span ng-if="merchantCodeChecked">
+                                        <i ng-if="merchantIsValid" class="fa fa-check-square-o check-i" aria-hidden="true" style="float: none;padding-left: 20px"></i>
+                                        <i ng-if="!merchantIsValid" class="text-danger fa fa-close" style="float: none;padding-left: 20px"></i>
+                                    </span>
                                     <p class="small text-info">No further changeable!</p>
                                     <div ng-messages="partnerForm.client_moniker.$error"
                                          ng-if="partnerForm.client_moniker.$dirty">