From dee5c6171bb9b791aac3c0f8bc9617759570bedb Mon Sep 17 00:00:00 2001
From: dalong306 <304592994@qq.com>
Date: Mon, 27 Sep 2021 15:48:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E6=B3=A8=E5=86=8C=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5=E6=B3=95=E4=BA=BAID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../20210916/log_mch_alipay_aps_register.sql | 20 ++++++++++++++++++
.../merchants/beans/ClientRegisterInfo.java | 10 +++++++++
.../core/impls/ClientManagerImpl.java | 2 ++
.../ui/static/payment/partner/add-partner.js | 1 +
.../static/payment/partner/partner-manage.js | 2 ++
src/main/ui/static/payment/partner/partner.js | 1 +
.../partner/templates/add_partner.html | 19 +++++++++++++++++
.../templates/add_sub_partner_dialog.html | 19 +++++++++++++++++
.../templates/client_partner_detail.html | 7 +++++++
.../templates/client_partner_edit.html | 19 +++++++++++++++++
.../partner/templates/partner_detail.html | 8 +++++++
.../partner/templates/partner_edit.html | 21 +++++++++++++++++++
12 files changed, 129 insertions(+)
create mode 100644 src/db/20210916/log_mch_alipay_aps_register.sql
diff --git a/src/db/20210916/log_mch_alipay_aps_register.sql b/src/db/20210916/log_mch_alipay_aps_register.sql
new file mode 100644
index 000000000..eddcf2db4
--- /dev/null
+++ b/src/db/20210916/log_mch_alipay_aps_register.sql
@@ -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'
+
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
index a2db2971f..a593580db 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
@@ -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;
+ }
}
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 25257a366..354bb4657 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
@@ -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"));
diff --git a/src/main/ui/static/payment/partner/add-partner.js b/src/main/ui/static/payment/partner/add-partner.js
index 2289ba3a5..06f762822 100644
--- a/src/main/ui/static/payment/partner/add-partner.js
+++ b/src/main/ui/static/payment/partner/add-partner.js
@@ -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;
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 516a4b1ca..d5a46fd4a 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -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;
diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js
index 43bf94ce6..e974da51a 100644
--- a/src/main/ui/static/payment/partner/partner.js
+++ b/src/main/ui/static/payment/partner/partner.js
@@ -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;
diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html
index 95308a108..5cf57baf3 100644
--- a/src/main/ui/static/payment/partner/templates/add_partner.html
+++ b/src/main/ui/static/payment/partner/templates/add_partner.html
@@ -854,6 +854,25 @@
+
+
+
diff --git a/src/main/ui/static/payment/partner/templates/client_partner_edit.html b/src/main/ui/static/payment/partner/templates/client_partner_edit.html
index f0e866f92..1417c4255 100644
--- a/src/main/ui/static/payment/partner/templates/client_partner_edit.html
+++ b/src/main/ui/static/payment/partner/templates/client_partner_edit.html
@@ -458,6 +458,25 @@
+
diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html
index d6aa58510..cd9d79c4c 100644
--- a/src/main/ui/static/payment/partner/templates/partner_detail.html
+++ b/src/main/ui/static/payment/partner/templates/partner_detail.html
@@ -1025,6 +1025,14 @@
ng-bind="partner.representativeInfo.representative_person ">
+
diff --git a/src/main/ui/static/payment/partner/templates/partner_edit.html b/src/main/ui/static/payment/partner/templates/partner_edit.html
index 6804d3cf0..1f14b0c1f 100644
--- a/src/main/ui/static/payment/partner/templates/partner_edit.html
+++ b/src/main/ui/static/payment/partner/templates/partner_edit.html
@@ -795,6 +795,27 @@
+