Merge branch 'develop'

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

@@ -5689,8 +5689,13 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         // $scope.hideMerchantInfo = function () {
         //     $scope.showMoreMerchantInfo = !$scope.showMoreMerchantInfo;
         // };
-        $scope.updateSubMerchantId = function (merchant_app_id) {
-            $uibModal.open({
+        $scope.updateSubMerchantId = function (sub_merchant_id) {
+            angular.forEach($scope.subMerchantInfos, function (each) {
+                if(sub_merchant_id==each.sub_merchant_id){
+                    $scope.merchant_app_id=each.merchant_app_id;
+                }
+            });
+                $uibModal.open({
                 templateUrl: '/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html',
                 controller: 'updateApplyWxSubMerchantIdCtrl',
                 resolve: {
@@ -5699,7 +5704,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                         return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids');
                     }],
                     subMerchantInfo: ['$http', '$stateParams', function ($http) {
-                        return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids/' + merchant_app_id);
+                        return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids/' + $scope.merchant_app_id);
                     }]
                 }
             }).result.then(function () {

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

@@ -93,9 +93,12 @@
                                         ng-click="queryWechatSubMerchantIdStatus()">
                                         <i class="fa fa-search"></i> Result
                                     </button>
-                                    <!--<button role="button" class="btn btn-info" title="modify Sub Merchant Id" disabled>-->
-                                        <!--Modify-->
-                                    <!--</button>-->
+                                    <button role="button" class="btn btn-info" title="modify Sub Merchant Id" ng-if="partnerInfo.sub_merchant_id" ng-click="updateSubMerchantId(partnerInfo.sub_merchant_id)">
+                                        Modify
+                                    </button>
+                                    <button role="button" class="btn btn-info" title="modify Sub Merchant Id" ng-if="!partnerInfo.sub_merchant_id" disabled>
+                                        Modify
+                                    </button>
                                 </div>
                             </div>
                         </div>
@@ -138,8 +141,8 @@
                                         <a role="button" ng-click="useSubMerchantId(id_apply.sub_merchant_id)">Use</a>
                                         <a role="button" style="margin-left: 10px;"
                                             ng-click="checkDetail(id_apply,'Wechat')">Detail</a>
-                                        <a role="button" style="margin-left: 10px;"
-                                           ng-click="updateSubMerchantId(id_apply.merchant_app_id)">Modify</a>
+                                        <!--<a role="button" style="margin-left: 10px;"-->
+                                           <!--ng-click="updateSubMerchantId(id_apply.merchant_app_id)">Modify</a>-->
                                     </span>
                                 </li>
                             </ul>