From 3c79262ccda05d63a677ef7a0d4382ee995b4cb5 Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Fri, 27 Apr 2018 18:11:11 +0800 Subject: [PATCH] fix html --- src/db/modify.sql | 7 +++ .../merchants/beans/ClientRegisterInfo.java | 37 ++++++++++++++++ .../templates/client_sub_merchant_id.html | 25 ++++++++--- .../partner/templates/add_partner.html | 36 ++++++++++++++++ .../partner/templates/partner_detail.html | 36 ++++++++++++++++ .../partner/templates/partner_edit.html | 43 +++++++++++++++++++ 6 files changed, 179 insertions(+), 5 deletions(-) diff --git a/src/db/modify.sql b/src/db/modify.sql index 6aa30dce1..7b6db68ce 100644 --- a/src/db/modify.sql +++ b/src/db/modify.sql @@ -394,3 +394,10 @@ CREATE TABLE `cli_sub_merchant_id` ( `create_time` datetime DEFAULT NULL, PRIMARY KEY (`sub_merchant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +ALTER TABLE `sys_clients` ADD COLUMN `business_hours` varchar(100) DEFAULT ''; +ALTER TABLE `sys_clients` ADD COLUMN `merchant_introduction` varchar(500) DEFAULT ''; +ALTER TABLE `sys_clients` ADD COLUMN `merchant_tag` varchar(100) DEFAULT ''; +ALTER TABLE `sys_clients` ADD COLUMN `merchant_video_url` varchar(200) DEFAULT ''; + + 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 f5725e2ca..eb65168f7 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 @@ -69,6 +69,11 @@ public class ClientRegisterInfo { private String client_apply_id; + private String business_hours; + private String merchant_introduction; + private String merchant_tag; + private String merchant_video_url; + public JSONObject insertObject() { JSONObject res = (JSONObject) JSON.toJSON(this); if (client_apply_id==null){ @@ -330,4 +335,36 @@ public class ClientRegisterInfo { public void setRoyalpayindustry(String royalpayindustry) { this.royalpayindustry = royalpayindustry; } + + public String getBusiness_hours() { + return business_hours; + } + + public void setBusiness_hours(String business_hours) { + this.business_hours = business_hours; + } + + public String getMerchant_introduction() { + return merchant_introduction; + } + + public void setMerchant_introduction(String merchant_introduction) { + this.merchant_introduction = merchant_introduction; + } + + public String getMerchant_tag() { + return merchant_tag; + } + + public void setMerchant_tag(String merchant_tag) { + this.merchant_tag = merchant_tag; + } + + public String getMerchant_video_url() { + return merchant_video_url; + } + + public void setMerchant_video_url(String merchant_video_url) { + this.merchant_video_url = merchant_video_url; + } } diff --git a/src/main/ui/static/payment/merchantid/templates/client_sub_merchant_id.html b/src/main/ui/static/payment/merchantid/templates/client_sub_merchant_id.html index cb03f3f6e..e2460c5dc 100644 --- a/src/main/ui/static/payment/merchantid/templates/client_sub_merchant_id.html +++ b/src/main/ui/static/payment/merchantid/templates/client_sub_merchant_id.html @@ -1,11 +1,26 @@ -
-

Clients

+ +
+
Clients
-
+
- - {{client.client_moniker}}, + {{client.client_moniker}},  + + + {{client.client_moniker}}
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 f6b5aba16..9d859a856 100644 --- a/src/main/ui/static/payment/partner/templates/add_partner.html +++ b/src/main/ui/static/payment/partner/templates/add_partner.html @@ -371,6 +371,42 @@
+
+
Alipay Information
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
Contact Information
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 502fe7ab5..03d509c9d 100644 --- a/src/main/ui/static/payment/partner/templates/partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/partner_detail.html @@ -452,6 +452,42 @@
+ +
+
Alipay Information
+
+
+
+ +
+

+
+
+
+ +
+

+
+
+
+ +
+

+
+
+
+ +
+

+
+
+
+
+
Partner Contact Information
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 a7ddd8ed8..caeaf1af6 100644 --- a/src/main/ui/static/payment/partner/templates/partner_edit.html +++ b/src/main/ui/static/payment/partner/templates/partner_edit.html @@ -263,6 +263,48 @@
+
+
Alipay Information
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
Contact Information
@@ -314,6 +356,7 @@
+
Address Information