fix~

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

@@ -264,4 +264,6 @@ public interface ClientManager {
     void validRefundPwd(JSONObject account, String pwd);
 
     void setWeekendDelay(int clientId, boolean delay);
+
+    List<JSONObject> listSubMerchantIdApplys(JSONObject manager, String clientMoniker);
 }

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

@@ -2922,4 +2922,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
 
     }
+
+    @Override
+    public List<JSONObject> listSubMerchantIdApplys(JSONObject manager, String clientMoniker) {
+        return null;
+    }
 }

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

@@ -109,6 +109,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             url: '/partner_product',
             templateUrl: 'static/payment/product/templates/product.html',
             controller: 'productCtrl'
+        }).state('partners.detail.sub_merchant_applicaitons', {
+            url: '/sub_merchant_applicaitons',
+            templateUrl: 'static/payment/partner/templates/sub_merchant_id_apply.html',
+            controller: 'subMerchantIdApplicaitonsCtrl'
         });
     }]);
     app.controller('partnerListCtrl', ['$scope', '$sce', '$http', '$filter', '$uibModal', 'businessStructuresMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap',
@@ -2522,6 +2526,31 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             }
         }
     }]);
+    app.controller('subMerchantIdApplicaitonsCtrl', ['$scope', '$http', '$uibModal','$state', 'industryMap', function ($scope, $http, $uibModal, $state, industryMap) {
+        $scope.industries = industryMap.configs();
+        $scope.loadSubMerchantInfos = function () {
+           /* $http.get('/client/product/' + $scope.partner.client_moniker + '/list', {params: params}).then(function (resp) {
+                $scope.subMerchantInfos = resp.data.data;
+
+            });*/
+        };
+        $scope.applySubMerchantId = function () {
+            $uibModal.open({
+                templateUrl: '/static/payment/partner/templates/apply_sub_merchant_id.html',
+                controller: 'applySubMerchantIdCtrl',
+                resolve: {
+                    subMerchantInfo:function () {
+                        return $scope.partner;
+                    }
+                }
+            }).result.then(function () {
+                $scope.loadSubMerchantInfos();
+            })
+        };
+    }]);
+    app.controller('applySubMerchantIdCtrl', ['$scope', '$http', '$uibModal','$state','subMerchantInfo', 'industryMap', function ($scope, $http, $uibModal, $state, subMerchantInfo,industryMap) {
+        $scope.subMerchantInfo = angular.copy(subMerchantInfo);
+    }]);
     app.filter('bdOrg', function () {
         return function (bdUsers, org_id) {
             if (org_id) {

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

@@ -0,0 +1,131 @@
+<div class="content">
+    <form novalidate name="form">
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">Apply Sub Merchant Id</div>
+                    <div class="panel-body">
+                        <div class="form-horizontal">
+                            <div class="form-group"
+                                 ng-class="{'has-error':form.merchant_name.$invalid && form.merchant_name.$dirty}">
+                                <label class="control-label col-sm-3" for="merchant_name_input">* Merchant Name</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.company_name"
+                                           type="text" name="merchant_name" id="merchant_name_input" required maxlength="50">
+                                    <div ng-messages="form.merchant_name.$error" ng-if="form.merchant_name.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 50</p>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group"
+                                 ng-class="{'has-error':form.merchant_shortname.$invalid && form.merchant_shortname.$dirty}">
+                                <label class="control-label col-sm-3" for="merchant_shortname_input">* Merchant Short Name</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.short_name"
+                                           type="text" name="merchant_shortname" id="merchant_shortname_input" required maxlength="50">
+                                    <div ng-messages="form.merchant_shortname.$error" ng-if="form.merchant_shortname.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 50</p>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group"
+                                 ng-class="{'has-error':form.business_category.$invalid && form.business_category.$dirty}">
+                                <label class="control-label col-sm-3" for="business_category_input">* Business Category</label>
+                                <div class="col-sm-8">
+                                    <select class="form-control" name="business_category"
+                                            ng-model="subMerchantInfo.industry"
+                                            id="business_category_input" required
+                                            ng-options="industry.value as industry.label for industry in industries">
+                                        <option value="">Please Choose</option>
+                                    </select>
+                                    <div ng-messages="form.business_category.$error" ng-if="form.business_category.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                    </div>
+                                </div>
+                                <div ng-messages="form.business_category.$error" ng-if="form.business_category.$dirty">
+                                    <p class="small text-danger" ng-message="maxLength">More than 50</p>
+                                </div>
+                            </div>
+
+                            <div class="form-group"
+                                 ng-class="{'has-error':form.merchant_remark.$invalid && form.merchant_remark.$dirty}">
+                                <label class="control-label col-sm-3" for="merchant_remark_input">* Merchant Remark</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.remark"
+                                           type="text" name="merchant_remark" id="merchant_remark_input" required maxlength="20">
+                                    <div ng-messages="form.merchant_remark.$error" ng-if="form.merchant_remark.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 20</p>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group"
+                                 ng-class="{'has-error':form.merchant_introduction.$invalid && form.merchant_introduction.$dirty}">
+                                <label class="control-label col-sm-3" for="merchant_introduction_input">* Merchant Introduction</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.description"
+                                           type="text" name="merchant_introduction" id="merchant_introduction_input" required maxlength="256" MINLENGTH="10">
+                                    <div ng-messages="form.merchant_introduction.$error" ng-if="form.merchant_introduction.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 256</p>
+                                        <p class="small text-danger" ng-message="minlength">Length is less than 10</p>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="office_phone_input">Office Phone</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.company_phone"
+                                           type="text" name="office_phone" id="office_phone_input">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="contact_name_input">Contact Name</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.contact_person"
+                                           type="text" name="contact_name" id="contact_name_input">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="contact_phone_input">Contact Phone</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.contact_phone"
+                                           type="text" name="contact_phone" id="contact_phone_input">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="contact_email_input">Contact Email</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.contact_email"
+                                           type="text" name="contact_email" id="contact_email_input">
+                                </div>
+                            </div>
+
+                        </div>
+                    </div>
+                </div>
+                <!--end 商品基本资料-->
+                <!--<div class="panel panel-default">-->
+                <!--<div class="panel-heading">Goods Qr Code</div>-->
+                <!--<div class="panel-body">-->
+
+                <!--</div>-->
+                <!--</div>-->
+                <!--end 商品二维码-->
+                <div class="btn-group margin-bottom margin-top">
+                    <button ng-disabled="goodForm.$dirty&&goodForm.$invalid" class="btn btn-success" type="button"
+                            ng-click="save(goodForm)">Save
+                    </button>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>

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

@@ -238,6 +238,9 @@
                     <li ui-sref-active="active" ng-if="partner.show_all_permission">
                         <a ui-sref=".product">Product</a>
                     </li>
+                    <li ui-sref-active="active" ng-if="('10'|withRole)">
+                        <a ui-sref=".sub_merchant_applicaitons">Sub Merchant Id Applicaitons</a>
+                    </li>
                 </ul>
                 <div class="tab-content" ui-view>
                     <div class="panel panel-default">

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

@@ -0,0 +1,57 @@
+<div class="content">
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="box-solid">
+                <div class="box box-warning">
+                    <div class="box-header">
+                        <button role="button" class="btn btn-info pull-right" title="Apply Sub Merchant Id"
+                                ng-click="applySubMerchantId()">
+                            <i class="fa fa-plus"></i>
+                            Apply Sub Merchant Id
+                        </button>
+                    </div>
+                </div>
+                <div class="box">
+                    <div class="box-header">
+                        <h3 class="box-title">List of Sub Merchant Id</h3>
+                    </div>
+                    <div class="box-body">
+                        <ul class="list-group col-sm-6">
+                            <li class="list-group-item list-group-item-success">
+                                Sub Merchant Id
+                                <span style="float: right" ng-bind="id_apply.sub_merchant_id"></span>
+                            </li>
+                            <li class="list-group-item list-group-item-success">
+                                Apply Time
+                                <span style="float: right" ng-bind="id_apply.create_time"></span>
+                            </li>
+                            <li class="list-group-item list-group-item-success">
+                                Merchant Short Name
+                                <span style="float: right" ng-bind="id_apply.merchant_shortname"></span>
+                            </li>
+                            <li class="list-group-item list-group-item-success">
+                                Business Category
+                                <span style="float: right" ng-bind="id_apply.business_category"></span>
+                            </li>
+                            <li class="list-group-item list-group-item-success">
+                                Description
+                                <span style="float: right" ng-bind="id_apply.merchant_introduction"></span>
+                            </li>
+                           <!-- <li class="list-group-item list-group-item-success">
+                                Merchant Remark
+                                <span style="float: right" ng-bind="id_apply.merchant_remark"></span>
+                            </li>-->
+
+                            <li class="list-group-item list-group-item-success">
+                                Operator
+                                <span style="float: right" ng-bind="id_apply.operator"></span>
+                            </li>
+
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</div>