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

add 100%

Browse Source
master
luoyang 8 years ago
parent 1a4d406f03
commit 93a4ff7bed
5 changed files with 58 additions and 62 deletions
Show Stats Download Patch File Download Diff File

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

@ -334,8 +334,8 @@ public interface ClientManager {
void sendHfEmailNotice(JSONObject order); void sendHfEmailNotice(JSONObject order);
void updateAllPartnerPassword(String clientMoniker, List<String> emails); void subRpayMerchantApplication(String clientMoniker,JSONObject merchantInfo, JSONObject manager);
void subRpayMerchantApplication(String clientMoniker, JSONObject manager); void updateAllPartnerPassword(String clientMoniker, List<String> emails);
} }

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

@ -3575,33 +3575,32 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
} }
@Override @Override
public void subRpayMerchantApplication(String clientMoniker, JSONObject manager) { public void subRpayMerchantApplication(String clientMoniker, JSONObject merchantInfo,JSONObject manager) {
JSONObject client = getClientInfoByMoniker(clientMoniker); JSONObject client = getClientInfoByMoniker(clientMoniker);
if (client == null) { if (client == null) {
throw new InvalidShortIdException(); throw new InvalidShortIdException();
} }
checkOrgPermission(manager, client); checkOrgPermission(manager, client);
List<JSONObject> listByshortName = sysRpayMerchantApplyMapper.listByShortName(client.getIntValue("client_id"),client.getString("short_name")); List<JSONObject> listByshortName = sysRpayMerchantApplyMapper.listByShortName(client.getIntValue("client_id"),merchantInfo.getString("company_shortname"));
if (listByshortName.size()>0) { // if (listByshortName.size()>0) {
throw new BadRequestException("请修改【" + clientMoniker + "】的Company shortName信息（请避免和Rpay+商务号列表内的Company Short Name重复）"); // throw new BadRequestException("请修改【" + clientMoniker + "】的Company shortName信息（请避免和Rpay+商务号列表内的Company Short Name重复）");
} // }
SubRpayMerchantInfo subRpayMerchantInfo = JSONObject.toJavaObject(client, SubRpayMerchantInfo.class); SubRpayMerchantInfo subRpayMerchantInfo = JSONObject.toJavaObject(merchantInfo, SubRpayMerchantInfo.class);
subRpayMerchantInfo.CheckEmpty(); subRpayMerchantInfo.CheckEmpty();
JSONObject rpayMerchantInfo = rpayApi.registerMerchant(client.getIntValue("client_id"), subRpayMerchantInfo); JSONObject rpayMerchantInfo = rpayApi.registerMerchant(client.getIntValue("client_id"), subRpayMerchantInfo);
if (rpayMerchantInfo != null) { if (rpayMerchantInfo != null) {
JSONObject merchantApply = new JSONObject(); merchantInfo.put("merchant_id", rpayMerchantInfo.getString("rpay_order_id"));
merchantApply.put("merchant_id", rpayMerchantInfo.getString("rpay_order_id")); merchantInfo.put("client_id", client.getString("client_id"));
merchantApply.put("client_id", client.getString("client_id")); merchantInfo.put("create_time", new Date());
merchantApply.put("create_time", new Date()); merchantInfo.put("operator", manager.getString("display_name"));
merchantApply.put("operator", manager.getString("display_name")); merchantInfo.put("sub_merchant_id", rpayMerchantInfo.getString("merchantId"));
merchantApply.put("sub_merchant_id", rpayMerchantInfo.getString("merchantId")); merchantInfo.put("business_category", client.getString("royalpayindustry"));
merchantApply.put("business_category", client.getString("royalpayindustry")); merchantInfo.put("merchant_shortname", merchantInfo.getString("company_shortname"));
merchantApply.put("merchant_shortname", client.getString("short_name")); sysRpayMerchantApplyMapper.insertRpayMerchantApply(merchantInfo);
sysRpayMerchantApplyMapper.insertRpayMerchantApply(merchantApply);
clientMapper.updateRpayEnterpriseId(client.getIntValue("client_id"), rpayMerchantInfo.getString("merchantId")); clientMapper.updateRpayEnterpriseId(client.getIntValue("client_id"), rpayMerchantInfo.getString("merchantId"));
}else { }else {
throw new BadRequestException("请求失败"); throw new BadRequestException("请求失败");

4
src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
Unescape View File

@ -564,8 +564,8 @@ public class PartnerManageController {
} }
@ManagerMapping(value = "/{clientMoniker}/registRpaySubMerchantId", method = RequestMethod.POST, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN}) @ManagerMapping(value = "/{clientMoniker}/registRpaySubMerchantId", method = RequestMethod.POST, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN})
public void subRpayMerchantApplication(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { public void subRpayMerchantApplication(@PathVariable String clientMoniker,@RequestBody JSONObject merchantInfo,@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
clientManager.subRpayMerchantApplication(clientMoniker, manager); clientManager.subRpayMerchantApplication(clientMoniker, merchantInfo,manager);
} }

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

@ -3209,17 +3209,13 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}); });
return; return;
} }
var option = [];
angular.forEach(form, function (item, key) { angular.forEach(form, function (item, key) {
if(item !=null) { if(item !=null) {
if(item.$name !=null) { if(item.$name !=null) {
merchantInfo[key] = item.$modelValue; merchantInfo[key] = item.$modelValue;
console.log("++++" + item.$name + "++++" + item.$modelValue);
} }
} }
}); });
// var str = angular.toJson(form, true);
// console.log("----------" + str);
$http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/registRpaySubMerchantId', merchantInfo).then(function (resp) { $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/registRpaySubMerchantId', merchantInfo).then(function (resp) {
$scope.apply_sub_merchant_id = resp.data; $scope.apply_sub_merchant_id = resp.data;
@ -3233,7 +3229,11 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$state.reload(); $state.reload();
} }
}, function (resp) { }, function (resp) {
$scope.errmsg = resp.data.message; commonDialog.alert({
title: 'Error',
content: resp.data.message,
type: 'error'
});
}) })
} }
}]); }]);

73
src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
Unescape View File

@ -7,13 +7,12 @@
<div class="panel-body"> <div class="panel-body">
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group" <div class="form-group"
ng-class="{'has-error':subForm.merchant_name.$invalid && subForm.merchant_name.$dirty}"> ng-class="{'has-error':subForm.company_name.$invalid && subForm.company_name.$dirty}">
<div class="alert alert-danger" ng-if="errmsg" ng-bind="errmsg"></div> <label class="control-label col-sm-3" for="company_name_input">* Company Name</label>
<label class="control-label col-sm-3" for="merchant_name_input">* Company Name</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.company_name" <input class="form-control" ng-model="subMerchantInfo.company_name"
type="text" name="company_name" id="merchant_name_input" required maxlength="50"> type="text" name="company_name" id="company_name_input" required maxlength="50">
<div ng-messages="subForm.merchant_name.$error" ng-if="subForm.merchant_name.$dirty"> <div ng-messages="subForm.company_name.$error" ng-if="subForm.company_name.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p> <p class="small text-danger" ng-message="required">Required Field</p>
<p class="small text-danger" ng-message="maxlength">Length is more than 50</p> <p class="small text-danger" ng-message="maxlength">Length is more than 50</p>
</div> </div>
@ -21,7 +20,7 @@
</div> </div>
<div class="form-group" <div class="form-group"
ng-class="{'has-error':subForm.merchant_id.$invalid && subForm.merchant_id.$dirty}"> ng-class="{'has-error':subForm.business_name.$invalid && subForm.business_name.$dirty}">
<label class="control-label col-sm-3" for="business_name_input">* Business Name</label> <label class="control-label col-sm-3" for="business_name_input">* Business Name</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.business_name" <input class="form-control" ng-model="subMerchantInfo.business_name"
@ -58,42 +57,42 @@
<label class="control-label col-sm-3" for="description_input">* Company description</label> <label class="control-label col-sm-3" for="description_input">* Company description</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.description" <input class="form-control" ng-model="subMerchantInfo.description"
type="text" name="description" id="description_input" required maxlength="256" MINLENGTH="10"> type="text" name="description" id="description_input" required maxlength="256">
<div ng-messages="subForm.description.$error" ng-if="subForm.description.$dirty"> <div ng-messages="subForm.description.$error" ng-if="subForm.description.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p> <p class="small text-danger" ng-message="required">Required Field</p>
<p class="small text-danger" ng-message="maxlength">Length is more than 256</p> <p class="small text-danger" ng-message="maxlength">Length is more than 256</p>
<p class="small text-danger" ng-message="minlength">Length is less than 10</p>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group" ng-class="{'has-error':subForm.abn.$invalid && subForm.abn.$dirty}"> <div class="form-group"
<label class="control-label col-sm-3" for="abn_input">abn</label> ng-class="{'has-error':subForm.abn.$invalid && subForm.abn.$dirty}">
<label class="control-label col-sm-3" for="abn_input">* abn</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.abn" <input class="form-control" ng-model="subMerchantInfo.abn"
type="text" name="abn" id="abn_input"> type="text" name="abn" id="abn_input" required maxlength="256">
<div ng-messages="subForm.abn.$error" ng-if="subForm.abn.$dirty"> <div ng-messages="subForm.abn.$error" ng-if="subForm.abn.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p> <p class="small text-danger" ng-message="required">Required Field</p>
<p class="small text-danger" ng-message="maxlength">Length is more than 10</p>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group" ng-class="{'has-error':subForm.acn.$invalid && subForm.acn.$dirty}"> <div class="form-group"
<label class="control-label col-sm-3" for="acn_input">acn</label> ng-class="{'has-error':subForm.acn.$invalid && subForm.acn.$dirty}">
<label class="control-label col-sm-3" for="acn_input">* acn</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.acn" <input class="form-control" ng-model="subMerchantInfo.acn"
type="text" name="acn" id="acn_input"> type="text" name="acn" id="acn_input" required maxlength="256">
<div ng-messages="subForm.acn.$error" ng-if="subForm.acn.$dirty"> <div ng-messages="subForm.acn.$error" ng-if="subForm.acn.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p> <p class="small text-danger" ng-message="required">Required Field</p>
<p class="small text-danger" ng-message="maxlength">Length is more than 10</p>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group" <div class="form-group"
ng-class="{'has-error':subForm.business_structure.$invalid && subForm.business_structure.$dirty}"> ng-class="{'has-error':subForm.business_structure.$invalid && subForm.business_structure.$dirty}">
<label class="control-label col-sm-3" for="business-structure-input">Business Structure</label> <label class="control-label col-sm-3" for="business-structure-input">* Business Structure</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select class="form-control" name="business_structure" ng-model="subMerchantInfo.business_structure" <select class="form-control" name="business_structure" ng-model="subMerchantInfo.business_structure"
id="business-structure-input" id="business-structure-input"
@ -109,7 +108,7 @@
<label class="control-label col-sm-3" for="company_phone_input">* Company Phone</label> <label class="control-label col-sm-3" for="company_phone_input">* Company Phone</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.company_phone" <input class="form-control" ng-model="subMerchantInfo.company_phone"
type="tel" name="company_phone" id="company_phone_input" required> type="tel" name="company_phone" id="company_phone_input" required maxlength="256">
<div ng-messages="subForm.company_phone.$error" ng-if="subForm.company_phone.$dirty"> <div ng-messages="subForm.company_phone.$error" ng-if="subForm.company_phone.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p> <p class="small text-danger" ng-message="required">Required Field</p>
</div> </div>
@ -118,10 +117,10 @@
</div> </div>
<div class="form-group" ng-class="{'has-error':subForm.contact_name.$invalid && subForm.contact_name.$dirty}"> <div class="form-group" ng-class="{'has-error':subForm.contact_name.$invalid && subForm.contact_name.$dirty}">
<label class="control-label col-sm-3" for="contact_name_input">Contact Name</label> <label class="control-label col-sm-3" for="contact_name_input">* Contact Name</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.contact_person" <input class="form-control" ng-model="subMerchantInfo.contact_person"
type="text" name="contact_name" id="contact_name_input"> type="text" name="contact_name" id="contact_name_input" required maxlength="256">
<div ng-messages="subForm.contact_name.$error" ng-if="subForm.contact_name.$dirty"> <div ng-messages="subForm.contact_name.$error" ng-if="subForm.contact_name.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p> <p class="small text-danger" ng-message="required">Required Field</p>
</div> </div>
@ -129,10 +128,10 @@
</div> </div>
<div class="form-group" ng-class="{'has-error':subForm.contact_phone.$invalid && subForm.contact_phone.$dirty}"> <div class="form-group" ng-class="{'has-error':subForm.contact_phone.$invalid && subForm.contact_phone.$dirty}">
<label class="control-label col-sm-3" for="contact_phone_input">Contact Phone</label> <label class="control-label col-sm-3" for="contact_phone_input">* Contact Phone</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.contact_phone" <input class="form-control" ng-model="subMerchantInfo.contact_phone"
type="text" name="contact_phone" id="contact_phone_input"> type="text" name="contact_phone" id="contact_phone_input" required maxlength="256">
<div ng-messages="subForm.contact_phone.$error" ng-if="subForm.contact_phone.$dirty"> <div ng-messages="subForm.contact_phone.$error" ng-if="subForm.contact_phone.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p> <p class="small text-danger" ng-message="required">Required Field</p>
</div> </div>
@ -140,10 +139,10 @@
</div> </div>
<div class="form-group" ng-class="{'has-error':subForm.contact_email.$invalid && subForm.contact_email.$dirty}"> <div class="form-group" ng-class="{'has-error':subForm.contact_email.$invalid && subForm.contact_email.$dirty}">
<label class="control-label col-sm-3" for="contact_email_input">Contact Email</label> <label class="control-label col-sm-3" for="contact_email_input">* Contact Email</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.contact_email" <input class="form-control" ng-model="subMerchantInfo.contact_email"
type="text" name="contact_email" id="contact_email_input"> type="text" name="contact_email" id="contact_email_input" required maxlength="256">
<div ng-messages="subForm.contact_email.$error" ng-if="subForm.contact_email.$dirty"> <div ng-messages="subForm.contact_email.$error" ng-if="subForm.contact_email.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p> <p class="small text-danger" ng-message="required">Required Field</p>
</div> </div>
@ -151,22 +150,22 @@
</div> </div>
<div class="form-group" ng-class="{'has-error':subForm.country.$invalid && subForm.country.$dirty}"> <div class="form-group" ng-class="{'has-error':subForm.country.$invalid && subForm.country.$dirty}">
<label class="control-label col-sm-3" for="country_input">Company country</label> <label class="control-label col-sm-3" for="country_input">* Company country</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.country" <input class="form-control" ng-model="subMerchantInfo.country"
type="text" name="country" id="country_input"> type="text" name="country" id="country_input" required maxlength="256">
<div ng-messages="subForm.country.$error" ng-if="subForm.country.$dirty"> <div ng-messages="subForm.country.$error" ng-if="subForm.country.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p> <p class="small text-danger" ng-message="required">Required Field</p>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group" ng-class="{'has-error':subForm.company_address.$invalid && subForm.company_address.$dirty}"> <div class="form-group" ng-class="{'has-error':subForm.address.$invalid && subForm.address.$dirty}">
<label class="control-label col-sm-3" for="company_address_input">Company address</label> <label class="control-label col-sm-3" for="company_address_input">* Company address</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.address" <input class="form-control" ng-model="subMerchantInfo.address"
type="text" name="address" id="company_address_input"> type="text" name="address" id="company_address_input" required maxlength="256">
<div ng-messages="subForm.company_address.$error" ng-if="subForm.company_address.$dirty"> <div ng-messages="subForm.address.$error" ng-if="subForm.address.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p> <p class="small text-danger" ng-message="required">Required Field</p>
<p class="small text-danger" ng-message="maxlength">Length is more than 50</p> <p class="small text-danger" ng-message="maxlength">Length is more than 50</p>
</div> </div>
@ -174,34 +173,32 @@
</div> </div>
<div class="form-group" ng-class="{'has-error':subForm.suburb.$invalid && subForm.suburb.$dirty}"> <div class="form-group" ng-class="{'has-error':subForm.suburb.$invalid && subForm.suburb.$dirty}">
<label class="control-label col-sm-3" for="company_suburb_input">suburb</label> <label class="control-label col-sm-3" for="company_suburb_input">* suburb</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.suburb" <input class="form-control" ng-model="subMerchantInfo.suburb"
type="text" name="suburb" id="company_suburb_input"> type="text" name="suburb" id="company_suburb_input" required maxlength="256">
<div ng-messages="subForm.suburb.$error" ng-if="subForm.suburb.$dirty"> <div ng-messages="subForm.suburb.$error" ng-if="subForm.suburb.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p> <p class="small text-danger" ng-message="required">Required Field</p>
<p class="small text-danger" ng-message="maxlength">Length is more than 10</p>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group" ng-class="{'has-error':subForm.postcode.$invalid && subForm.postcode.$dirty}"> <div class="form-group" ng-class="{'has-error':subForm.postcode.$invalid && subForm.postcode.$dirty}">
<label class="control-label col-sm-3" for="company_postcode_input">postCode</label> <label class="control-label col-sm-3" for="company_postcode_input">* postCode</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.postcode" <input class="form-control" ng-model="subMerchantInfo.postcode"
type="text" name="postcode" id="company_postcode_input"> type="text" name="postcode" id="company_postcode_input" required maxlength="256">
<div ng-messages="subForm.postcode.$error" ng-if="subForm.postcode.$dirty"> <div ng-messages="subForm.postcode.$error" ng-if="subForm.postcode.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p> <p class="small text-danger" ng-message="required">Required Field</p>
<p class="small text-danger" ng-message="maxlength">Length is more than 10</p>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group" ng-class="{'has-error':subForm.state.$invalid && subForm.state.$dirty}"> <div class="form-group" ng-class="{'has-error':subForm.state.$invalid && subForm.state.$dirty}">
<label class="control-label col-sm-3" for="state_input">state</label> <label class="control-label col-sm-3" for="state_input">* state</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.state" <input class="form-control" ng-model="subMerchantInfo.state"
type="text" name="state" id="state_input"> type="text" name="state" id="state_input" required maxlength="256">
<div ng-messages="subForm.state.$error" ng-if="subForm.state.$dirty"> <div ng-messages="subForm.state.$error" ng-if="subForm.state.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p> <p class="small text-danger" ng-message="required">Required Field</p>
<p class="small text-danger" ng-message="maxlength">Length is more than 10</p> <p class="small text-danger" ng-message="maxlength">Length is more than 10</p>

Write Preview
Loading…
Cancel
Save