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

fix 优化商户增加营销联系人

Browse Source
master
luoyang 5 years ago
parent 3f123eee41
commit 1df4b4b0a9
10 changed files with 166 additions and 152 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId>
<version>1.3.79</version>
<version>1.3.80</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

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

@ -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());

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

@ -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;
}

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

@ -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;
}

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

@ -688,23 +688,14 @@
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.contact_wechatid.$invalid && partnerForm.contact_wechatid.$dirty}">
<label class="control-label col-sm-2" for="contact_wechatid-id">*
<div class="form-group">
<label class="control-label col-sm-2" for="contact_wechatid-id">
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.contact_wechatid"
required
name="contact_wechatid" id="contact_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.contact_wechatid.$error"
ng-if="partnerForm.contact_wechatid.$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 class="from-group">
@ -824,23 +815,14 @@
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_wechatid.$invalid && partnerForm.legal_representative_wechatid.$dirty}">
<label class="control-label col-sm-2" for="legal_representative_wechatid-id">*
<div class="form-group">
<label class="control-label col-sm-2" for="legal_representative_wechatid-id">
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.legal_representative_wechatid"
required
name="legal_representative_wechatid" id="legal_representative_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.legal_representative_wechatid.$error"
ng-if="partnerForm.legal_representative_wechatid.$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>
@ -953,23 +935,14 @@
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_wechatid.$invalid && partnerForm.marketing_wechatid.$dirty}">
<label class="control-label col-sm-2" for="marketing_wechatid-id">*
<div class="form-group">
<label class="control-label col-sm-2" for="marketing_wechatid-id">
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.marketing_wechatid"
required
name="marketing_wechatid" id="marketing_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.marketing_wechatid.$error"
ng-if="partnerForm.marketing_wechatid.$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>

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

@ -592,23 +592,14 @@
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.contact_wechatid.$invalid && partnerForm.contact_wechatid.$dirty}">
<label class="control-label col-sm-2" for="contact_wechatid-id">*
<div class="form-group">
<label class="control-label col-sm-2" for="contact_wechatid-id">
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.contact_wechatid"
required
name="contact_wechatid" id="contact_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.contact_wechatid.$error"
ng-if="partnerForm.contact_wechatid.$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>
@ -725,23 +716,14 @@
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_wechatid.$invalid && partnerForm.legal_representative_wechatid.$dirty}">
<label class="control-label col-sm-2" for="legal_representative_wechatid-id">*
<div class="form-group">
<label class="control-label col-sm-2" for="legal_representative_wechatid-id">
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.legal_representative_wechatid"
required
name="legal_representative_wechatid" id="legal_representative_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.legal_representative_wechatid.$error"
ng-if="partnerForm.legal_representative_wechatid.$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>
@ -854,23 +836,14 @@
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_wechatid.$invalid && partnerForm.marketing_wechatid.$dirty}">
<label class="control-label col-sm-2" for="marketing_wechatid-id">*
<div class="form-group">
<label class="control-label col-sm-2" for="marketing_wechatid-id">
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.marketing_wechatid"
required
name="marketing_wechatid" id="marketing_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.marketing_wechatid.$error"
ng-if="partnerForm.marketing_wechatid.$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>

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

@ -417,7 +417,7 @@
<label class="control-label col-sm-4">Wechat ID</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.wechatid"></p>
<p class="form-control-static" ng-bind="partner.representativeInfo.legal_representative_wechatid"></p>
</div>
</div>
<div class="form-group col-sm-6">
@ -946,10 +946,20 @@
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="contact_wechatid-id">
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.contact_wechatid"
name="contact_wechatid" id="contact_wechatid-id"
maxlength="50">
</div>
</div>
</div>
</div>
<div><hr/>
<div>
<hr/>
<div>
<label><input type="checkbox" ng-click="checkboxOnclick(this)">Legal Representative Same As Contact Information</label>
</div>
@ -1033,6 +1043,106 @@
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="legal_representative_wechatid-id">
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.representativeInfo.legal_representative_wechatid"
name="legal_representative_wechatid" id="legal_representative_wechatid-id"
maxlength="50">
</div>
</div>
</div>
</div>
</div>
<div>
<hr/>
<label><input type="checkbox" ng-click="checkMarketingSameAsContact(this)">Marketing Person Same As Contact Information</label>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_person.$invalid && partnerForm.marketing_person.$dirty}">
<label class="control-label col-sm-2" for="marketing_person-input">*
Marketing Person Name</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.representativeInfo.marketing_person"
required
name="marketing_person"
id="marketing_person-input" maxlength="50">
<div ng-messages="partnerForm.marketing_person.$error"
ng-if="partnerForm.marketing_person.$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.marketing_phone.$invalid && partnerForm.marketing_phone.$dirty}">
<label class="control-label col-sm-2" for="marketing_phone-input">* Phone</label>
<div class="col-sm-8">
<div class="input-group">
<div class="input-group-addon">+</div>
<input type="text" class="form-control" ng-model="partner.representativeInfo.marketing_phone" required
name="marketing_phone" id="marketing_phone-input" maxlength="20">
</div>
</div>
<div ng-messages="partnerForm.marketing_phone.$error"
ng-if="partnerForm.marketing_phone.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p>
<p class="small text-danger" ng-message="maxlength">Less Than 20
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_email.$invalid && partnerForm.marketing_email.$dirty}">
<label class="control-label col-sm-2" for="marketing_email-id">*
E-mail</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.representativeInfo.marketing_email"
required
name="marketing_email" id="marketing_email-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.marketing_email.$error"
ng-if="partnerForm.marketing_email.$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 class="form-group"
ng-class="{'has-error':partnerForm.marketing_job.$invalid && partnerForm.marketing_job.$dirty}">
<label class="control-label col-sm-2" for="marketing_job-id">*
Job title</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.representativeInfo.marketing_job_title"
required
name="marketing_job" id="marketing_job-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.marketing_job.$error"
ng-if="partnerForm.marketing_job.$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 class="form-group">
<label class="control-label col-sm-2" for="marketing_wechatid-id">
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.representativeInfo.marketing_wechatid"
name="marketing_wechatid" id="marketing_wechatid-id"
maxlength="50">
</div>
</div>
</div>
</div>
</div>

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

@ -408,23 +408,14 @@
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.contact_wechatid.$invalid && partnerForm.contact_wechatid.$dirty}">
<label class="control-label col-sm-2" for="contact_wechatid-id">*
<div class="form-group">
<label class="control-label col-sm-2" for="contact_wechatid-id">
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.contact_wechatid"
required
name="contact_wechatid" id="contact_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.contact_wechatid.$error"
ng-if="partnerForm.contact_wechatid.$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>
<label><input type="checkbox" ng-click="checkboxOnclick(this)">Legal Representative Same As Contact Information</label>
@ -512,23 +503,14 @@
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_wechatid.$invalid && partnerForm.legal_representative_wechatid.$dirty}">
<label class="control-label col-sm-2" for="legal_representative_wechatid-id">*
<div class="form-group">
<label class="control-label col-sm-2" for="legal_representative_wechatid-id">
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.legal_representative_wechatid"
required
name="legal_representative_wechatid" id="legal_representative_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.legal_representative_wechatid.$error"
ng-if="partnerForm.legal_representative_wechatid.$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>
@ -611,23 +593,14 @@
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_wechatid.$invalid && partnerForm.marketing_wechatid.$dirty}">
<label class="control-label col-sm-2" for="marketing_wechatid-id">*
<div class="form-group">
<label class="control-label col-sm-2" for="marketing_wechatid-id">
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.marketing_wechatid"
required
name="marketing_wechatid" id="marketing_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.marketing_wechatid.$error"
ng-if="partnerForm.marketing_wechatid.$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>

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

@ -772,7 +772,7 @@
<label class="control-label col-sm-4">Wechat ID</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.representativeInfo.wechatid"></p>
<p class="form-control-static" ng-bind="partner.representativeInfo.legal_representative_wechatid"></p>
</div>
</div>
<div class="form-group col-sm-6">

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

@ -595,23 +595,14 @@
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.contact_wechatid.$invalid && partnerForm.contact_wechatid.$dirty}">
<label class="control-label col-sm-2" for="contact_wechatid-id">*
<div class="form-group">
<label class="control-label col-sm-2" for="contact_wechatid-id">
Wechat ID</label>
<div class="col-sm-8">
<input class="form-control" ng-model="partner.contact_wechatid"
required
name="contact_wechatid" id="contact_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.contact_wechatid.$error"
ng-if="partnerForm.contact_wechatid.$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>
<label><input type="checkbox" ng-click="checkboxOnclick(this)">Legal Representative Same As Contact Information</label>
@ -716,28 +707,14 @@
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_wechatid.$invalid && partnerForm.legal_representative_wechatid.$dirty}">
<label class="control-label col-sm-2" for="legal_representative_wechatid-id">*
<div class="form-group">
<label class="control-label col-sm-2" for="legal_representative_wechatid-id">
Wechat ID</label>
<div class="col-sm-8" ng-if="role !='compliance'">
<input class="form-control" ng-model="partner.legal_representative_wechatid"
required
name="legal_representative_wechatid" id="legal_representative_wechatid-id"
maxlength="50">
</div>
<div class="col-sm-8" ng-if="role =='compliance'">
<div class="col-sm-8">
<input class="form-control" ng-model="partner.legal_representative_wechatid"
name="legal_representative_wechatid" id="legal_representative_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.legal_representative_wechatid.$error"
ng-if="partnerForm.legal_representative_wechatid.$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>
@ -836,28 +813,14 @@
Characters(including symbols and spaces)</p>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.marketing_wechatid.$invalid && partnerForm.marketing_wechatid.$dirty}">
<label class="control-label col-sm-2" for="marketing_wechatid-id">*
<div class="form-group">
<label class="control-label col-sm-2" for="marketing_wechatid-id">
Wechat ID</label>
<div class="col-sm-8" ng-if="role !='compliance'">
<input class="form-control" ng-model="partner.marketing_wechatid"
required
name="marketing_wechatid" id="marketing_wechatid-id"
maxlength="50">
</div>
<div class="col-sm-8" ng-if="role =='compliance'">
<div class="col-sm-8">
<input class="form-control" ng-model="partner.marketing_wechatid"
name="marketing_wechatid" id="marketing_wechatid-id"
maxlength="50">
</div>
<div ng-messages="partnerForm.marketing_wechatid.$error"
ng-if="partnerForm.marketing_wechatid.$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>

Write Preview
Loading…
Cancel
Save