From 088305e4c15b0a85dc3af39d887628e41a35fd19 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 18 Sep 2019 15:26:42 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=94=B6=E9=93=B6=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=85=B6=E4=BB=96=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/static/merchantapplication/merchant_application.js   | 4 ++--
 src/main/ui/static/payment/partner/partner-manage.js        | 6 +++---
 src/main/ui/static/payment/partner/partner.js               | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/ui/static/merchantapplication/merchant_application.js b/src/main/ui/static/merchantapplication/merchant_application.js
index 948d46d4c..5b39f2f54 100644
--- a/src/main/ui/static/merchantapplication/merchant_application.js
+++ b/src/main/ui/static/merchantapplication/merchant_application.js
@@ -369,7 +369,7 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
                     return;
                 }
                 if ($scope.partner.client_pay_desc.join(',').indexOf('203') >= 0) {
-                    if ($scope.partner.client_pay_desc.join(',').indexOf('2030') < 0) {
+                    if ($scope.partner.client_pay_desc.join(',').indexOf('2030') < 0 && $scope.partner.client_pay_desc.join(',').indexOf('20399') < 0) {
                         alert("请检查线下支付是否已选择收银系统类型");
                         return;
                     }
@@ -380,7 +380,7 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
                     return;
                 }
                 if ($scope.partner.client_pay_desc.indexOf('203') >= 0) {
-                    if ($scope.partner.client_pay_desc.indexOf('2030') < 0) {
+                    if ($scope.partner.client_pay_desc.indexOf('2030') < 0 && $scope.partner.client_pay_desc.join(',').indexOf('20399') < 0) {
                         alert("请检查线下支付是否已选择收银系统类型");
                         return;
                     }
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 8062df243..9b4f04290 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -702,7 +702,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 }
             }
             if ($scope.partner.client_pay_desc.join(',').indexOf('203') >= 0) {
-                if ($scope.partner.client_pay_desc.join(',').indexOf('2030') < 0) {
+                if ($scope.partner.client_pay_desc.join(',').indexOf('2030') < 0 && $scope.partner.client_pay_desc.join(',').indexOf('20399') < 0) {
                     alert("请检查线下支付是否已选择收银系统类型");
                     return;
                 }
@@ -1546,7 +1546,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     }
                 }
                 if ($scope.partner.client_pay_desc.join(',').indexOf('203') >= 0) {
-                    if ($scope.partner.client_pay_desc.join(',').indexOf('2030') < 0) {
+                    if ($scope.partner.client_pay_desc.join(',').indexOf('2030') < 0 && $scope.partner.client_pay_desc.join(',').indexOf('20399') < 0) {
                         alert("请检查线下支付是否已选择收银系统类型");
                         return;
                     }
@@ -3215,7 +3215,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     }
                 }
                 if ($scope.partner.client_pay_desc.join(',').indexOf('203') >= 0) {
-                    if ($scope.partner.client_pay_desc.join(',').indexOf('2030') < 0) {
+                    if ($scope.partner.client_pay_desc.join(',').indexOf('2030') < 0 && $scope.partner.client_pay_desc.join(',').indexOf('20399') < 0) {
                         alert("请检查线下支付是否已选择收银系统类型");
                         return;
                     }
diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js
index 9ddb3eb23..0cf45a744 100644
--- a/src/main/ui/static/payment/partner/partner.js
+++ b/src/main/ui/static/payment/partner/partner.js
@@ -283,7 +283,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo
                 }
             }
             if ($scope.partner.client_pay_desc.join(',').indexOf('203') >= 0) {
-                if ($scope.partner.client_pay_desc.join(',').indexOf('2030') < 0) {
+                if ($scope.partner.client_pay_desc.join(',').indexOf('2030') < 0 && $scope.partner.client_pay_desc.join(',').indexOf('20399') < 0) {
                     alert("请检查线下支付是否已选择收银系统类型");
                     return;
                 }
@@ -567,7 +567,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo
                 }
             }
             if ($scope.partner.client_pay_desc.join(',').indexOf('203') >= 0) {
-                if ($scope.partner.client_pay_desc.join(',').indexOf('2030') < 0) {
+                if ($scope.partner.client_pay_desc.join(',').indexOf('2030') < 0 && $scope.partner.client_pay_desc.join(',').indexOf('20399') < 0) {
                     alert("请检查线下支付是否已选择收银系统类型");
                     return;
                 }