Merge remote-tracking branch 'origin/clientApply' into clientApply

# Conflicts:
#	src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
#	src/main/ui/merchant_application.html

src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java

@@ -250,6 +250,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         JSONObject param = new JSONObject();
         param.put("begin_time",DateFormatUtils.format(now,"YYYYMMdd"));
         param.put("end_time",DateFormatUtils.format(DateUtils.addDays(now,1),"YYYYMMdd"));
+        param.put("agree",true);
         List<JSONObject> existCount =  sysClientPreMapperMapper.query(param);
         if(existCount.size()>30){
             throw new BadRequestException("New merchant over limit,Please contact us");
@@ -297,7 +298,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         sysAccount.put("client_id",clientId);
         sysAccount.put("create_time",new Date());
         sysAccount.put("is_password_expired",0);
-        sysAccount.put("nation_code",'+'+apply.getString("nation_code"));
+        sysAccount.put("nation_code","+61");
         clientAccountMapper.save(sysAccount);
 
         JSONObject sysBank = new JSONObject();

src/main/resources/au/com/royalpay/payment/manage/mappers/preapply/SysClientPreMapperMapper.xml

@@ -10,6 +10,9 @@
             <if test="#{end_time}!=null">
                 and create_time &lt; #{end_time}
             </if>
+            <if test="agree">
+                and agree = #{agree}
+            </if>
         </where>
     </select>
 </mapper>

src/main/ui/merchant_application.html

@@ -285,7 +285,7 @@
                                     <span class="input-group-addon">+61</span>
                                     <input type="text" name="contact_phone" required ng-model="partner.contact_phone"
                                            class="form-control" style="display: inline"
-                                           placeholder="Your Phone"  maxlength="20" ng-mouseleave="checkParams()" ng-mousedown="name_exist =false">
+                                           placeholder="Your Phone"  maxlength="15" ng-mouseleave="checkParams()" ng-mousedown="name_exist =false">
                                     <button type="button"  class="btn btn-success button_width" style="display:inline;height: 34px;float: right;border-radius: 0px"
                                             title="发送验证码" ng-click="sendVerificationCode()"
                                             ng-bind="description" ng-disabled="canClick"></button>

src/main/ui/static/merchantapplication/merchant_application.js

@@ -1,4 +1,4 @@
-angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl', ['$scope', '$http','$interval','$timeout', function ($scope, $http,$interval,$timeout) {
+angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl', ['$scope', '$http','$interval', function ($scope, $http,$interval) {
     var countryMap = [{
         "label": "AUS",
         "value": "AUS"
@@ -61,7 +61,7 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
     $scope.partner = {nation_code:"+61"};
     $scope.bankaccount = {};
     $scope.rate = {};
-    $scope.phone_code_timer=$timeout(function () {}, 0);
+    $scope.phone_code_timer=$interval(function () {}, 1000);
 
     $scope.loadRoyalpayindustry = function () {
         $http.get('/static/data/royalpayindustry.json').then(function (resp) {
@@ -121,9 +121,9 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
     };
     $scope.sendPhoneCodeTime = function(){
         var second=59;
-        $scope.phone_code_timer = $timeout(function () {
+        $scope.phone_code_timer = $interval(function () {
             if(second<=0){
-                $interval.cancel(timerHandler);
+                $interval.cancel($scope.phone_code_timer);
                 second=59;
                 $scope.description="Send Code";
                 $scope.canClick=false;
@@ -160,7 +160,10 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
         $scope.sendPhoneCodeTime();
         $http.post('/register/info/phone/'+ $scope.partner.contact_phone +'/verify?nation_code='+$scope.partner.nation_code).then(function (resp) {
         }, function (resp) {
-            $timeout.cancel($scope.phone_code_timer);
+            if(resp.data.status+0 ==500) {
+                $interval.cancel($scope.phone_code_timer);
+            }
+
             $scope.resError = resp.data.message;
         });
     };