msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

alipay+ 注册UI

Browse Source
master
dalong306 3 years ago
parent d9583e03cb
commit bdf9a89767
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File

1
src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
Unescape View File

@ -7117,7 +7117,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
boolean offline = apsMerchantApplication.getProductCodes().stream().allMatch(s -> s.equalsIgnoreCase(ProductCodeType.IN_STORE_PAYMENT.toString())); boolean offline = apsMerchantApplication.getProductCodes().stream().allMatch(s -> s.equalsIgnoreCase(ProductCodeType.IN_STORE_PAYMENT.toString()));
logger.info("====>offline:" + offline); logger.info("====>offline:" + offline);
if (offline) { if (offline) {
//todo 测试需要 先都改成线上,上线此处需要改成线下
apsMerchantApplication.setPid(AlipayEnvironment.getEnv().getAlipayPlusApsRetailConfig().getPid()); apsMerchantApplication.setPid(AlipayEnvironment.getEnv().getAlipayPlusApsRetailConfig().getPid());
} else { } else {
apsMerchantApplication.setPid(AlipayEnvironment.getEnv().getAlipayPlusApsOnlineConfig().getPid()); apsMerchantApplication.setPid(AlipayEnvironment.getEnv().getAlipayPlusApsOnlineConfig().getPid());

12
src/main/ui/static/payment/partner/partner-manage.js
Unescape View File

@ -7373,7 +7373,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.subMerchantInfo = angular.copy(subMerchantInfo) $scope.subMerchantInfo = angular.copy(subMerchantInfo)
$scope.subMerchantInfo.online = online; $scope.subMerchantInfo.online = online;
$scope.subMerchantInfo.merchantDisplayName = $scope.subMerchantInfo.short_name; $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) {
// if ($scope.subMerchantInfo.client_pay_type.indexOf('1') >= 0 && $scope.subMerchantInfo.client_pay_type.indexOf('2') >= 0) { // 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; // $scope.subMerchantInfo.business_type_offline = true;
// } // }
if ($scope.subMerchantInfo.online) { if ($scope.subMerchantInfo.online) {
$scope.title = "AlipayPlus-aps(Online)Registration"; $scope.title = "Alipay+(Online)Registration";
} else { } else {
$scope.title = "AlipayPlus-aps(Retail)Registration"; $scope.title = "Alipay+(Retail)Registration";
} }
$scope.subMerchantInfo.websiteType = 'WEB'; $scope.subMerchantInfo.websiteType = 'WEB';
$scope.subMerchantInfo.website = $scope.subMerchantInfo.company_website; $scope.subMerchantInfo.website = $scope.subMerchantInfo.company_website;
$scope.subMerchantInfo.legalName = $scope.subMerchantInfo.company_name; $scope.subMerchantInfo.legalName = $scope.subMerchantInfo.company_name;
$scope.subMerchantInfo.registrationType = 'OTHER_IDENTIFICATION_NO' $scope.subMerchantInfo.registrationType = 'ENTERPRISE_REGISTRATION_NO'
if ($scope.subMerchantInfo.business_structure) { 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.shareholderName = $scope.subMerchantInfo.representativeInfo ? $scope.subMerchantInfo.representativeInfo.representative_person : "";
$scope.subMerchantInfo.representativeName = $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.registrationNo = $scope.subMerchantInfo.acn ? $scope.subMerchantInfo.acn : $scope.subMerchantInfo.abn;
$scope.subMerchantInfo.storeMCC = $scope.subMerchantInfo.alipayindustry; $scope.subMerchantInfo.storeMCC = $scope.subMerchantInfo.alipayindustry;
$scope.subMerchantInfo.storeName = $scope.subMerchantInfo.store_name; $scope.subMerchantInfo.storeName = $scope.subMerchantInfo.store_name;

10
src/main/ui/static/payment/partner/templates/apply_alipayplus_sub_merchant_id.html
Unescape View File

@ -12,10 +12,10 @@
<label class="control-label col-sm-4" for="merchantDisplayName_input">Merchant DisplayName</label> <label class="control-label col-sm-4" for="merchantDisplayName_input">Merchant DisplayName</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.merchantDisplayName" <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"> <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="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> </div>
</div> </div>
@ -146,7 +146,7 @@
type="text" name="registrationAddress" id="registrationAddress_input" required maxlength="256"> type="text" name="registrationAddress" id="registrationAddress_input" required maxlength="256">
<div ng-messages="subForm.registrationAddress.$error" ng-if="subForm.registrationAddress.$dirty"> <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="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> </div>
</div> </div>
@ -193,7 +193,7 @@
</div> </div>
</div> </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}"> ng-class="{'has-error':subForm.representativeName.$invalid && subForm.representativeName.$dirty}">
<label class="control-label col-sm-4" for="representativeName_input">* Representative Name</label> <label class="control-label col-sm-4" for="representativeName_input">* Representative Name</label>
<div class="col-sm-8"> <div class="col-sm-8">
@ -205,7 +205,7 @@
</div> </div>
</div> </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}"> ng-class="{'has-error':subForm.representativeId.$invalid && subForm.representativeId.$dirty}">
<label class="control-label col-sm-4" for="representativeId_input">* Representative Id</label> <label class="control-label col-sm-4" for="representativeId_input">* Representative Id</label>
<div class="col-sm-8"> <div class="col-sm-8">

Write Preview
Loading…
Cancel
Save