commit prod 测试

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

@@ -3720,10 +3720,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayRetailMerchant();
         Element resultElement = alipayClient.queryGmsPortalStatus(mch.getPid(), client);
         if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) {
-            return resultElement.elementText("error");
+            return "查询成功：" + resultElement.elementText("error");
         }
         Element responseElement = resultElement.element("response").element("alipay");
-        return responseElement.elementText("secondary_merchant_id") + " -  status : " + responseElement.elementText("status");
+        return "查询成功：" + responseElement.elementText("secondary_merchant_id") + "报备状态 : " + responseElement.elementText("status");
     }
 
     @Override
@@ -3772,10 +3772,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayOnlineMerchant();
         Element resultElement = alipayClient.queryOnlineGmsPortalStatus(mch.getPid(), client);
         if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) {
-            return resultElement.elementText("error");
+            return "查询成功：" + resultElement.elementText("error");
         }
         Element responseElement = resultElement.element("response").element("alipay");
-        return responseElement.elementText("secondary_merchant_id") + " -  status : " + responseElement.elementText("status");
+        return "查询成功：" + responseElement.elementText("secondary_merchant_id") + "报备状态 : " + responseElement.elementText("status");
     }
 
     @Override

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

@@ -1504,29 +1504,24 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     $http.post('/sys/partners/' + $scope.partner.client_moniker + '/register/alipay_gms',{representative_id:""}).then(function () {
                         commonDialog.alert({title: 'Success', content: 'Alipay进件成功', type: 'success'});
                     }, function (resp) {
-                        commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
+                        commonDialog.alert({title: 'Error', content: "进件失败：" + resp.data.message, type: 'error'});
                     })
                 }else {
                     commonDialog.inputText({title: '请输入商户身份证或护照号码'}).then(function (text) {
                         $http.post('/sys/partners/' + $scope.partner.client_moniker + '/register/alipay_gms',{representative_id:text}).then(function () {
-                            commonDialog.alert({title: 'Success', content: 'Alipay进件成功', type: 'success'});
+                            commonDialog.alert({title: 'Success', content: '提示：Alipay进件成功', type: 'success'});
                         }, function (resp) {
-                            commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
+                            commonDialog.alert({title: 'Error', content: "进件失败：" + resp.data.message, type: 'error'});
                         })
                     });
                 }
             })
         };
         $scope.queryAlipayGms = function () {
-            commonDialog.confirm({
-                title: 'Warning',
-                content: '是否查询该商户报备状态？'
-            }).then(function () {
-               $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipay_gms').then(function (resp) {
-                   commonDialog.alert({title: 'Success', content: resp.data, type: 'success'});
-                   }, function (resp) {
-                   commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
-                   })
+            $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipay_gms').then(function (resp) {
+                commonDialog.alert({title: 'Success', content: resp.data, type: 'success'});
+            }, function (resp) {
+                commonDialog.alert({title: 'Error', content: "查询失败：" + resp.data.message, type: 'error'});
             })
         }
         $scope.submitAlipayOnlineSubId = function () {
@@ -1536,24 +1531,19 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             }).then(function () {
                 commonDialog.inputText({title: '请输入商户身份证或护照号码'}).then(function (text) {
                      $http.post('/sys/partners/' + $scope.partner.client_moniker + '/register/alipayOnline_gms',{representative_id:text}).then(function () {
-                            commonDialog.alert({title: 'Success', content: 'AlipayOnline进件成功', type: 'success'});
+                            commonDialog.alert({title: 'Success', content: '提示：AlipayOnline进件成功', type: 'success'});
                     }, function (resp) {
-                            commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
+                            commonDialog.alert({title: 'Error', content: "进件失败：" + resp.data.message, type: 'error'});
                     })
                 });
 
             })
         };
         $scope.queryAlipayOnlineGms = function () {
-            commonDialog.confirm({
-                title: 'Warning',
-                content: '是否查询该商户报备状态？'
-            }).then(function () {
-                $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipayOnline_gms').then(function (resp) {
-                    commonDialog.alert({title: 'Success', content: resp.data, type: 'success'});
-                }, function (resp) {
-                    commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
-                })
+            $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/alipayOnline_gms').then(function (resp) {
+                commonDialog.alert({title: 'Success', content: resp.data, type: 'success'});
+            }, function (resp) {
+                commonDialog.alert({title: 'Error', content: "查询失败：" + resp.data.message, type: 'error'});
             })
         }
         $scope.refreshCredential = function () {