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

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

@@ -7408,9 +7408,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             $scope.subMerchantInfo.website = $scope.subMerchantInfo.company_website;
             $scope.subMerchantInfo.legalName = $scope.subMerchantInfo.company_name;
             $scope.subMerchantInfo.registrationType = 'ENTERPRISE_REGISTRATION_NO'
-            if ($scope.subMerchantInfo.business_structure) {
+
-                $scope.subMerchantInfo.businessType = $scope.subMerchantInfo.business_structure == 'Company' ? 'ENTERPRISE' : 'INDIVIDUAL'
-            }
             $scope.subMerchantInfo.shareholderName = $scope.subMerchantInfo.representativeInfo ? $scope.subMerchantInfo.representativeInfo.representative_person : "";
             $scope.subMerchantInfo.shareholderId = $scope.subMerchantInfo.representativeInfo ? $scope.subMerchantInfo.representativeInfo.legal_representative_id : "";
             $scope.subMerchantInfo.representativeName = $scope.subMerchantInfo.representativeInfo ? $scope.subMerchantInfo.representativeInfo.representative_person : "";
@@ -7419,6 +7417,11 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             $scope.subMerchantInfo.registrationNo = $scope.subMerchantInfo.acn ? $scope.subMerchantInfo.acn : $scope.subMerchantInfo.abn;
             $scope.subMerchantInfo.storeMCC = $scope.subMerchantInfo.alipayindustry;
             $scope.subMerchantInfo.storeName = $scope.subMerchantInfo.store_name;
+            if($scope.subMerchantInfo.registrationNo){
+                $scope.subMerchantInfo.businessType='ENTERPRISE';
+            }else{
+                $scope.subMerchantInfo.businessType='INDIVIDUAL';
+            }
 
             $scope.alipayMccCategory = {}
             $scope.loadAlipayCategory = function () {