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

src/document/openapi/cn/document.yml

@@ -152,11 +152,23 @@ tags:
     description: |
       用于移动端APP调用微信/支付宝SDK支付，调用API创建订单，得到微信SDK调用参数，将参数传递给SDK拉起微信/支付宝支付，并由客户端直接返回支付结果。 强烈建议获得支付结果后再调用RoyalPay订单查询API确认完成支付后再进行后续流程，避免因超时自动撤单导致资金损失
       <img src="img/sdk_wechat_api_payment_cn.png">
-      关于客户端和支付宝整和的更多信息：[支付宝SDK文档](https://global.alipay.com/doc/app_cn/about)
+      
-      关于客户端和微信整合的更多信息：[微信SDK文档](https://pay.weixin.qq.com/wiki/doc/api/app/app.php?chapter=11_1)
+      关于客户端和支付宝整和的更多信息：
+      
+      [支付宝SDK文档](https://global.alipay.com/doc/app_cn/about)
+      
+      [Alipay+接入文档](resources/api/AlipayPlusAppIntegrationGuide.pdf)
+      
+      关于客户端和微信整合的更多信息：
+      
+      [微信SDK文档](https://pay.weixin.qq.com/wiki/doc/api/app/app.php?chapter=11_1)
+      
       [Alipay SDK for Android](resources/api/alipaySdk-20160825.jar)
+      
       [Alipay SDK for iOS](resources/api/AlipaySDKForiOS.zip)
+      
       [Wechat SDK for Android](https://open.weixin.qq.com/cgi-bin/showdocument?action=dir_list&t=resource/res_list&verify=1&id=open1419319167&token=&lang=zh_CN)
+      
       [Wechat SDK for iOS](https://open.weixin.qq.com/cgi-bin/showdocument?action=dir_list&t=resource/res_list&verify=1&id=open1419319164&lang=zh_CN)
 
   - name: Custom

src/document/openapi/en/document.yml

@@ -160,11 +160,22 @@ tags:
       Used for mobile Apps calling Wechat payment with Wechat/Alipay SDK.
       Call this api to create order and get param string for SDK calling. Call SDK api with the param to start payment and get payment result from Wechat app *It is strongly advised to request RoyalPay order query Api to confirm that the order has been paid in order to cancelling order by system at the same time.*
       <img src="img/sdk_wechat_api_payment_en.png">
-      More information for integration with Alipay: [Alipay SDK Document](https://global.alipay.com/doc/app/intro)
+      More information for integration with Alipay: 
-      More information for integration with Wechat: [Wechat SDK Document](https://pay.weixin.qq.com/wiki/doc/api/app/app.php?chapter=11_1)
+      
+      [Alipay SDK Document](https://global.alipay.com/doc/app/intro)
+      
+      [Alipay+ SDK Document](resources/api/AlipayPlusAppIntegrationGuide.pdf)
+      
+      More information for integration with Wechat: 
+      
+      [Wechat SDK Document](https://pay.weixin.qq.com/wiki/doc/api/app/app.php?chapter=11_1)
+      
       [Alipay SDK for Android](resources/api/alipaySdk-20160825.jar)
+      
       [Alipay SDK for iOS](resources/api/AlipaySDKForiOS.zip)
+      
       [Wechat SDK for Android](https://open.weixin.qq.com/cgi-bin/showdocument?action=dir_list&t=resource/res_list&verify=1&id=open1419319167&token=&lang=zh_CN)
+      
       [Wechat SDK for iOS](https://open.weixin.qq.com/cgi-bin/showdocument?action=dir_list&t=resource/res_list&verify=1&id=open1419319164&lang=zh_CN)
 
   - name: Custom

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

@@ -2485,30 +2485,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 if (!$scope.paymentInfo) {
                     return
                 }
-                // if (!$scope.init.channel[channel]) {
-                //   $scope.init.channel[channel] = true
-                //   return
-                // }
-                if($scope.paymentInfo.aps_config_id){
-                    if(channel == 'alipay' && !$scope.paymentInfo.alipay_cn_switch){
-                        commonDialog.alert({
-                            title: 'ERROR',
-                            content: "Please switch AlipayCN to Alipay channel, and then close Alipay channel",
-                            type: 'error',
-                        })
-                        $scope.loadPartnerPaymentInfo()
-                        return;
-                    }
-                    if (channel == 'alipayaps' && $scope.paymentInfo.alipay_cn_switch) {
-                        commonDialog.alert({
-                            title: 'ERROR',
-                            content: "Please switch AlipayCN to Alipay channel, and then close Alipay+(APS) channel",
-                            type: 'error',
-                        })
-                        $scope.loadPartnerPaymentInfo()
-                        return;
-                    }
-                }
                 $scope.getComplianceInfo()
                 if ($scope.paymentInfo['enable_wechat'] && channel == 'wechat' && $scope.paymentInfo.open_status == 5 && info.length > 0) {
                     commonDialog