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

商户注册新增字段法人ID

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

20
src/db/20210916/log_mch_alipay_aps_register.sql
Unescape View File

@ -0,0 +1,20 @@
CREATE TABLE `log_mch_alipay_aps_register` (
`request_id` varchar(50) NOT NULL,
`client_id` int(11) NOT NULL,
`pid` varchar(50) NOT NULL,
`mid` varchar(50) NOT NULL,
`store_id` varchar(50) DEFAULT NULL,
`merchant_type` varchar(20) DEFAULT NULL COMMENT ' 支付类型 ONLINE,RETAIL',
`request_time` datetime DEFAULT NULL,
`confirm_time` datetime DEFAULT NULL,
`result_code` varchar(50) DEFAULT NULL COMMENT '返回的状态码',
`result_status` varchar(10) DEFAULT NULL COMMENT '返回的状态 F, S',
`is_valid` tinyint(1) DEFAULT '1' COMMENT '记录是否有效，1有效 0无效',
`registration_status` varchar(30) DEFAULT NULL,
PRIMARY KEY (`request_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='AlipayPlus商户注册记录表';
//
ALTER TABLE sys_client_legal_person add legal_representative_id varchar(50) DEFAULT NULL COMMENT '法人身份ID'

10
src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
Unescape View File

@ -68,6 +68,8 @@ public class ClientRegisterInfo {
private String representativeEmail;
@JSONField(name = "legal_representative_job")
private String representativeJobTitle;
@JSONField(name = "legal_representative_id")
private String representativeId;
@JSONField(name = "marketing_person")
private String marketingPerson;
@JSONField(name = "marketing_phone")
@ -690,4 +692,12 @@ public class ClientRegisterInfo {
public void setMccode(String mc_code) {
this.mc_code = mc_code;
}
public String getRepresentativeId() {
return representativeId;
}
public void setRepresentativeId(String representativeId) {
this.representativeId = representativeId;
}
}

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

@ -946,6 +946,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
JSONObject representativeInfo = new JSONObject();
representativeInfo.put("client_id", clientId);
representativeInfo.put("representative_person", info.getRepresentativePerson());
representativeInfo.put("legal_representative_id", info.getRepresentativeId());
representativeInfo.put("phone", info.getRepresentativePhone());
representativeInfo.put("email", info.getRepresentativeEmail());
representativeInfo.put("job_title", info.getRepresentativeJobTitle());
@ -7348,6 +7349,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
representativeInfo.put("postcode", partner.getString("registered_postcode"));
representativeInfo.put("state", partner.getString("registered_state"));
representativeInfo.put("legal_representative_wechatid", partner.getString("legal_representative_wechatid"));
representativeInfo.put("legal_representative_id", partner.getString("legal_representative_id"));
representativeInfo.put("marketing_person", partner.getString("marketing_person"));
representativeInfo.put("marketing_phone", partner.getString("marketing_phone"));
representativeInfo.put("marketing_email", partner.getString("marketing_email"));

1
src/main/ui/static/payment/partner/add-partner.js
Unescape View File

@ -525,6 +525,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.partner.registered_postcode = $scope.partner.representativeInfo.postcode;
$scope.partner.registered_state = $scope.partner.representativeInfo.state;
$scope.partner.legal_representative_person = $scope.partner.representativeInfo.representative_person;
$scope.partner.legal_representative_id = $scope.partner.representativeInfo.legal_representative_id;
$scope.partner.legal_representative_phone = $scope.partner.representativeInfo.phone;
$scope.partner.legal_representative_email = $scope.partner.representativeInfo.email;
$scope.partner.legal_representative_job = $scope.partner.representativeInfo.job_title;

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

@ -7401,7 +7401,9 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$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 : "";
$scope.subMerchantInfo.representativeId = $scope.subMerchantInfo.representativeInfo ? $scope.subMerchantInfo.representativeInfo.legal_representative_id : "";
$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;

1
src/main/ui/static/payment/partner/partner.js
Unescape View File

@ -435,6 +435,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo
$scope.partner.registered_postcode = $scope.partner.representativeInfo.postcode;
$scope.partner.registered_state = $scope.partner.representativeInfo.state;
$scope.partner.legal_representative_person = $scope.partner.representativeInfo.representative_person;
$scope.partner.legal_representative_id = $scope.partner.representativeInfo.legal_representative_id;
$scope.partner.legal_representative_phone = $scope.partner.representativeInfo.phone;
$scope.partner.legal_representative_email = $scope.partner.representativeInfo.email;
$scope.partner.legal_representative_job = $scope.partner.representativeInfo.job_title;

19
src/main/ui/static/payment/partner/templates/add_partner.html
Unescape View File

@ -854,6 +854,25 @@
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_id.$invalid && partnerForm.legal_representative_id.$dirty}">
<label class="control-label col-sm-2" for="legal_representative_id-input">*
Representative ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.legal_representative_id"
required
name="legal_representative_person"
id="legal_representative_id-input" maxlength="50">
<div ng-messages="partnerForm.legal_representative_id.$error"
ng-if="partnerForm.legal_representative_id.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less
Than 50
Characters(including symbols and spaces)</p>
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_phone_p.$invalid && partnerForm.legal_representative_phone_p.$dirty}">
<label class="control-label col-sm-2" for="legal_representative_phone_p-input">*

19
src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html
Unescape View File

@ -712,6 +712,25 @@
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_id.$invalid && partnerForm.legal_representative_id.$dirty}">
<label class="control-label col-sm-2" for="legal_representative_id-input">*
Representative ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.legal_representative_id"
required
name="legal_representative_id"
id="legal_representative_id-input" maxlength="50">
<div ng-messages="partnerForm.legal_representative_id.$error"
ng-if="partnerForm.legal_representative_id.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less
Than 50
</p>
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_phone_p.$invalid && partnerForm.legal_representative_phone_p.$dirty}">
<label class="control-label col-sm-2" for="legal_representative_phone_p-input">*

7
src/main/ui/static/payment/partner/templates/client_partner_detail.html
Unescape View File

@ -421,6 +421,13 @@
<p class="form-control-static" ng-bind="partner.representativeInfo.representative_person"></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Representative ID</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.legal_representative_id"></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Wechat ID</label>

19
src/main/ui/static/payment/partner/templates/client_partner_edit.html
Unescape View File

@ -458,6 +458,25 @@
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_id.$invalid && partnerForm.legal_representative_id.$dirty}">
<label class="control-label col-sm-2" for="legal_representative_id-input">*
Representative ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.legal_representative_id"
required
name="legal_representative_id"
id="legal_representative_id-input" maxlength="50">
<div ng-messages="partnerForm.legal_representative_id.$error"
ng-if="partnerForm.legal_representative_id.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less
Than 50
</p>
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_phone.$invalid && partnerForm.legal_representative_phone.$dirty}">

8
src/main/ui/static/payment/partner/templates/partner_detail.html
Unescape View File

@ -1025,6 +1025,14 @@
ng-bind="partner.representativeInfo.representative_person "></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Representative ID</label>
<div class="col-sm-8">
<p class="form-control-static"
ng-bind="partner.representativeInfo.legal_representative_id "></p>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-sm-4">Wechat ID</label>

21
src/main/ui/static/payment/partner/templates/partner_edit.html
Unescape View File

@ -795,6 +795,27 @@
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_id.$invalid && partnerForm.legal_representative_id.$dirty}">
<label class="control-label col-sm-2" for="legal_representative_id-input">*
Representative ID</label>
<div class="col-sm-8">
<div >
<input class="form-control" ng-model="partner.legal_representative_id"
required
name="legal_representative_id"
id="legal_representative_id-input" maxlength="50">
</div>
<div ng-messages="partnerForm.legal_representative_id.$error"
ng-if="partnerForm.legal_representative_id.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
<p class="small text-danger" ng-message="maxlength">Less
Than 50
</p>
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_phone.$invalid && partnerForm.legal_representative_phone.$dirty}">
<label class="control-label col-sm-2" for="legal_representative_phone-input">* Phone</label>

Write Preview
Loading…
Cancel
Save