From 1df4b4b0a9c031cab4d8173b6261601c718f77d5 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 4 Mar 2020 12:24:10 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96=E5=95=86=E6=88=B7?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=90=A5=E9=94=80=E8=81=94=E7=B3=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../core/impls/ClientManagerImpl.java | 4 +- .../static/payment/partner/partner-manage.js | 2 +- src/main/ui/static/payment/partner/partner.js | 24 +++- .../partner/templates/add_partner.html | 39 +----- .../templates/add_sub_partner_dialog.html | 39 +----- .../templates/client_partner_detail.html | 114 +++++++++++++++++- .../templates/client_partner_edit.html | 39 +----- .../partner/templates/partner_detail.html | 2 +- .../partner/templates/partner_edit.html | 53 ++------ 10 files changed, 166 insertions(+), 152 deletions(-) diff --git a/pom.xml b/pom.xml index 15508715d..5395d2346 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.79 + 1.3.80 UTF-8 1.8.0 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 5b0d1d746..84eddb7b2 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 @@ -801,7 +801,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid representativeInfo.put("suburb", partner.getString("registered_suburb")); representativeInfo.put("postcode", partner.getString("registered_postcode")); representativeInfo.put("state", partner.getString("registered_state")); - representativeInfo.put("wechatid", partner.getString("legal_representative_wechatid")); + representativeInfo.put("legal_representative_wechatid", partner.getString("legal_representative_wechatid")); // marking联系人 representativeInfo.put("marketing_person", partner.getString("marketing_person")); representativeInfo.put("marketing_phone", partner.getString("marketing_phone")); @@ -872,7 +872,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid representativeInfo.put("suburb", info.getRegisteredSuburb()); representativeInfo.put("postcode", info.getRegisteredPostcode()); representativeInfo.put("state", info.getRegisteredState()); - representativeInfo.put("wechatid", info.getRepresentativeWechatId()); + representativeInfo.put("legal_representative_wechatid", info.getRepresentativeWechatId()); // marketing 联系人 representativeInfo.put("marketing_person", info.getMarketingPerson()); representativeInfo.put("marketing_phone", info.getMarketingPhone()); diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 33bd3d61c..c766df9c0 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -1319,7 +1319,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.partner.marketing_email = $scope.partner.representativeInfo.marketing_email; $scope.partner.marketing_job = $scope.partner.representativeInfo.marketing_job_title; - $scope.partner.legal_representative_wechatid = $scope.partner.representativeInfo.wechatid; + $scope.partner.legal_representative_wechatid = $scope.partner.representativeInfo.legal_representative_wechatid; $scope.partner.marketing_wechatid = $scope.partner.representativeInfo.marketing_wechatid; } diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js index 7b0300a6c..402145648 100644 --- a/src/main/ui/static/payment/partner/partner.js +++ b/src/main/ui/static/payment/partner/partner.js @@ -88,6 +88,9 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo if ($scope.partner.representativeInfo && $scope.partner.representativeInfo.phone) { $scope.partner.representativeInfo.phone = $scope.partner.representativeInfo.phone.substring(1, $scope.partner.contact_phone.length); } + if ($scope.partner.representativeInfo && $scope.partner.representativeInfo.marketing_phone) { + $scope.partner.representativeInfo.marketing_phone = $scope.partner.representativeInfo.marketing_phone.substring(1, $scope.partner.contact_phone.length); + } $scope.getMerchantLocation = function () { $http.get('/sys/partners/' + $scope.partner.client_moniker + '/location').then(function (resp) { $scope.merchant_location = resp.data; @@ -105,9 +108,21 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo $scope.partner.representativeInfo.phone = $scope.partner.contact_phone.substring(1, $scope.partner.contact_phone.length); $scope.partner.representativeInfo.email = $scope.partner.contact_email; $scope.partner.representativeInfo.job_title = $scope.partner.contact_job; + $scope.partner.representativeInfo.legal_representative_wechatid = $scope.partner.contact_wechatid; } }; + $scope.checkMarketingSameAsContact = function (){ + $scope.partner.marketingSameAsContact = !($scope.partner.marketingSameAsContact); + if($scope.partner.marketingSameAsContact) { + $scope.partner.representativeInfo.marketing_person = $scope.partner.contact_person; + $scope.partner.representativeInfo.marketing_phone = $scope.partner.contact_phone.substring(1, $scope.partner.contact_phone.length); + $scope.partner.representativeInfo.marketing_email = $scope.partner.contact_email; + $scope.partner.representativeInfo.marketing_job_title = $scope.partner.contact_job; + $scope.partner.representativeInfo.marketing_wechatid = $scope.partner.contact_wechatid; + } + } + $scope.sameAddress = function (){ $scope.partner.sameAsAddress = !($scope.partner.sameAsAddress); if($scope.partner.sameAsAddress){ @@ -298,6 +313,13 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo $scope.partner.registered_suburb = $scope.partner.representativeInfo.suburb; $scope.partner.registered_postcode = $scope.partner.representativeInfo.postcode; $scope.partner.registered_state = $scope.partner.representativeInfo.state; + $scope.partner.marketing_person = $scope.partner.representativeInfo.marketing_person; + $scope.partner.marketing_phone = '+' + $scope.partner.representativeInfo.marketing_phone; + $scope.partner.marketing_email = $scope.partner.representativeInfo.marketing_email; + $scope.partner.marketing_job = $scope.partner.representativeInfo.marketing_job_title; + + $scope.partner.legal_representative_wechatid = $scope.partner.representativeInfo.legal_representative_wechatid; + $scope.partner.marketing_wechatid = $scope.partner.representativeInfo.marketing_wechatid; $http.put('/client/partner_info/update/partnerInfo', $scope.partner).then(function () { if (content != '') { commonDialog.alert({ @@ -422,7 +444,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo $scope.partner.marketing_email = $scope.partner.representativeInfo.marketing_email; $scope.partner.marketing_job = $scope.partner.representativeInfo.marketing_job_title; - $scope.partner.legal_representative_wechatid = $scope.partner.representativeInfo.wechatid; + $scope.partner.legal_representative_wechatid = $scope.partner.representativeInfo.legal_representative_wechatid; $scope.partner.marketing_wechatid = $scope.partner.representativeInfo.marketing_wechatid; } 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 58028bc61..a89d75908 100644 --- a/src/main/ui/static/payment/partner/templates/add_partner.html +++ b/src/main/ui/static/payment/partner/templates/add_partner.html @@ -688,23 +688,14 @@ -
-
-
-
@@ -953,23 +935,14 @@ Characters(including symbols and spaces)

-
-
diff --git a/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html b/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html index 046b2988a..cd73afa9e 100644 --- a/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html +++ b/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html @@ -592,23 +592,14 @@ Characters(including symbols and spaces)

-
-
@@ -725,23 +716,14 @@ Characters(including symbols and spaces)

-
-
@@ -854,23 +836,14 @@ Characters(including symbols and spaces)

-
-
diff --git a/src/main/ui/static/payment/partner/templates/client_partner_detail.html b/src/main/ui/static/payment/partner/templates/client_partner_detail.html index 3e7f3cd98..2a1f185f7 100644 --- a/src/main/ui/static/payment/partner/templates/client_partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/client_partner_detail.html @@ -417,7 +417,7 @@
-

+

@@ -946,10 +946,20 @@ Characters(including symbols and spaces)

+
+ +
+ +
+
-
+
+
@@ -1033,6 +1043,106 @@ Characters(including symbols and spaces)

+
+ +
+ +
+
+ + + +
+
+ +
+
+
+ +
+ +
+

Required + Field

+

Less + Than 50 + Characters(including symbols and spaces)

+
+
+
+
+ +
+
+
+
+ +
+
+
+

Required Field

+

Less Than 20 + Characters(including symbols and spaces)

+
+
+
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+ +
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+
+ +
+ +
+
+
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 0cd9fc0fc..7cb3edb4f 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 @@ -408,23 +408,14 @@ Characters(including symbols and spaces)

-
-
-
-
@@ -611,23 +593,14 @@ -
-
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 e595f4a34..645832936 100644 --- a/src/main/ui/static/payment/partner/templates/partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/partner_detail.html @@ -772,7 +772,7 @@
-

+

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 f4884eecd..1138da0a5 100644 --- a/src/main/ui/static/payment/partner/templates/partner_edit.html +++ b/src/main/ui/static/payment/partner/templates/partner_edit.html @@ -595,23 +595,14 @@ Characters(including symbols and spaces)

-
-
-
-
@@ -836,28 +813,14 @@ Characters(including symbols and spaces)

-
-