Merge remote-tracking branch 'origin/develop'

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

@@ -1495,6 +1495,18 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
             });
         };
+        $scope.submitAlipaySubId = function () {
+            commonDialog.confirm({
+                title: 'Warning',
+                content: '是否使用该商户的现有信息进件？'
+            }).then(function () {
+                $http.post('/sys/partners/' + $scope.partner.client_moniker + '/register/alipay_gms').then(function () {
+                    commonDialog.alert({title: 'Success', content: 'Alipay进件成功', type: 'success'});
+                }, function (resp) {
+                    commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
+                })
+            })
+        };
         $scope.refreshCredential = function () {
             commonDialog.confirm({
                 title: 'Warning',

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

@@ -71,6 +71,7 @@
                             <p ng-if="!ctrl.editAliSubMerchant" class="form-control-static">
                                 {{paymentInfo.ali_sub_merchant_id||'Not Configure'}}
                                 <a role="button" ng-click="ctrl.editAliSubMerchant=true" ng-if="'10'|withRole"><i class="fa fa-edit"></i></a>
+                                <a role="button" ng-click="submitAlipaySubId()"><i class="fa fa-arrow-up" title="Alipay进件"></i></a>
                             </p>
                             <div class="input-group" ng-if="ctrl.editAliSubMerchant">
                                 <input type="text" class="form-control" ng-model="paymentInfo.ali_sub_merchant_id"