From bdf9a8976797f1e07d349e30f780b3e43aced95f Mon Sep 17 00:00:00 2001
From: dalong306 <304592994@qq.com>
Date: Mon, 27 Sep 2021 12:52:00 +0800
Subject: [PATCH] =?UTF-8?q?alipay+=20=E6=B3=A8=E5=86=8CUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../merchants/core/impls/ClientManagerImpl.java      |  1 -
 src/main/ui/static/payment/partner/partner-manage.js | 12 ++++++------
 .../templates/apply_alipayplus_sub_merchant_id.html  | 10 +++++-----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index 57ad85576..25257a366 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -7117,7 +7117,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         boolean offline = apsMerchantApplication.getProductCodes().stream().allMatch(s -> s.equalsIgnoreCase(ProductCodeType.IN_STORE_PAYMENT.toString()));
         logger.info("====>offline:" + offline);
         if (offline) {
-            //todo 测试需要 先都改成线上,上线此处需要改成线下
             apsMerchantApplication.setPid(AlipayEnvironment.getEnv().getAlipayPlusApsRetailConfig().getPid());
         } else {
             apsMerchantApplication.setPid(AlipayEnvironment.getEnv().getAlipayPlusApsOnlineConfig().getPid());
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index c54a18b14..516a4b1ca 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -7373,7 +7373,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             $scope.subMerchantInfo = angular.copy(subMerchantInfo)
             $scope.subMerchantInfo.online = online;
             $scope.subMerchantInfo.merchantDisplayName = $scope.subMerchantInfo.short_name;
-            $scope.subMerchantInfo.registrationAddress = $scope.subMerchantInfo.address;
+            $scope.subMerchantInfo.registrationAddress = $scope.subMerchantInfo.address+","+$scope.subMerchantInfo.suburb+","+$scope.subMerchantInfo.state;
 
             // if ($scope.subMerchantInfo.client_pay_type) {
             //     if ($scope.subMerchantInfo.client_pay_type.indexOf('1') >= 0 && $scope.subMerchantInfo.client_pay_type.indexOf('2') >= 0) {
@@ -7389,20 +7389,20 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             //     $scope.subMerchantInfo.business_type_offline = true;
             // }
             if ($scope.subMerchantInfo.online) {
-                $scope.title = "AlipayPlus-aps(Online)Registration";
+                $scope.title = "Alipay+(Online)Registration";
             } else {
-                $scope.title = "AlipayPlus-aps(Retail)Registration";
+                $scope.title = "Alipay+(Retail)Registration";
             }
             $scope.subMerchantInfo.websiteType = 'WEB';
             $scope.subMerchantInfo.website = $scope.subMerchantInfo.company_website;
             $scope.subMerchantInfo.legalName = $scope.subMerchantInfo.company_name;
-            $scope.subMerchantInfo.registrationType = 'OTHER_IDENTIFICATION_NO'
+            $scope.subMerchantInfo.registrationType = 'ENTERPRISE_REGISTRATION_NO'
             if ($scope.subMerchantInfo.business_structure) {
-                $scope.subMerchantInfo.businessType = $scope.subMerchantInfo.business_structure != 'Registered body(Sole Trader)' ? 'ENTERPRISE' : 'INDIVIDUAL'
+                $scope.subMerchantInfo.businessType = $scope.subMerchantInfo.business_structure == 'Company' ? 'ENTERPRISE' : 'INDIVIDUAL'
             }
             $scope.subMerchantInfo.shareholderName = $scope.subMerchantInfo.representativeInfo ? $scope.subMerchantInfo.representativeInfo.representative_person : "";
             $scope.subMerchantInfo.representativeName = $scope.subMerchantInfo.representativeInfo ? $scope.subMerchantInfo.representativeInfo.representative_person : "";
-            $scope.subMerchantInfo.storeAddress = $scope.subMerchantInfo.address;
+            $scope.subMerchantInfo.storeAddress = $scope.subMerchantInfo.address+","+$scope.subMerchantInfo.suburb+","+$scope.subMerchantInfo.state;
             $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;
diff --git a/src/main/ui/static/payment/partner/templates/apply_alipayplus_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_alipayplus_sub_merchant_id.html
index 13bf4c3a0..fa9312472 100644
--- a/src/main/ui/static/payment/partner/templates/apply_alipayplus_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/apply_alipayplus_sub_merchant_id.html
@@ -12,10 +12,10 @@
                                 <label class="control-label col-sm-4" for="merchantDisplayName_input">Merchant DisplayName</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.merchantDisplayName"
-                                           type="text" name="merchantDisplayName" id="merchantDisplayName_input" required maxlength="50">
+                                           type="text" name="merchantDisplayName" id="merchantDisplayName_input" required maxlength="64">
                                     <div ng-messages="subForm.merchantDisplayName.$error" ng-if="subForm.merchantDisplayName.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
-                                        <p class="small text-danger" ng-message="maxlength">Length is more than 50</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 64</p>
                                     </div>
                                 </div>
                             </div>
@@ -146,7 +146,7 @@
                                            type="text" name="registrationAddress" id="registrationAddress_input" required maxlength="256">
                                     <div ng-messages="subForm.registrationAddress.$error" ng-if="subForm.registrationAddress.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
-                                        <p class="small text-danger" ng-message="maxlength">Length is more than 64</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 256</p>
                                     </div>
                                 </div>
                             </div>
@@ -193,7 +193,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group" ng-if="subMerchantInfo.businessType == 'ENTERPRISE'"
+                            <div class="form-group" ng-if="subMerchantInfo.businessType == 'INDIVIDUAL'"
                                  ng-class="{'has-error':subForm.representativeName.$invalid && subForm.representativeName.$dirty}">
                                 <label class="control-label col-sm-4" for="representativeName_input">* Representative Name</label>
                                 <div class="col-sm-8">
@@ -205,7 +205,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group" ng-if="subMerchantInfo.businessType == 'ENTERPRISE'"
+                            <div class="form-group" ng-if="subMerchantInfo.businessType == 'INDIVIDUAL'"
                                  ng-class="{'has-error':subForm.representativeId.$invalid && subForm.representativeId.$dirty}">
                                 <label class="control-label col-sm-4" for="representativeId_input">* Representative Id</label>
                                 <div class="col-sm-8">