Merge branch 'develop'

# Conflicts:
#	pom.xml
#	src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
#	src/main/ui/static/incrementalService/templates/partner_incremental_service.html
master
luoyang 5 years ago
commit 86a4566606

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

@ -19,6 +19,7 @@ public class AppActBean {
private String act_img; private String act_img;
private String active_date; private String active_date;
private String expire_date; private String expire_date;
private String partner_black_list;
public JSONObject toJsonParam(){ public JSONObject toJsonParam(){
@ -28,6 +29,7 @@ public class AppActBean {
params.put("show_type",show_type); params.put("show_type",show_type);
params.put("act_img",act_img); params.put("act_img",act_img);
params.put("is_valid",is_valid); params.put("is_valid",is_valid);
params.put("partner_black_list", partner_black_list);
if (active_date != null) { if (active_date != null) {
try { try {
Date fromDate = DateUtils.parseDate(active_date, DATE_PATTERNS); Date fromDate = DateUtils.parseDate(active_date, DATE_PATTERNS);
@ -110,4 +112,12 @@ public class AppActBean {
public void setIs_valid(boolean is_valid) { public void setIs_valid(boolean is_valid) {
this.is_valid = is_valid; this.is_valid = is_valid;
} }
public String getPartner_black_list() {
return partner_black_list;
}
public void setPartner_black_list(String partner_black_list) {
this.partner_black_list = partner_black_list;
}
} }

@ -1584,6 +1584,13 @@ public class RetailAppServiceImp implements RetailAppService {
JSONObject latestAct = appActService.getAppActPopup(); JSONObject latestAct = appActService.getAppActPopup();
if (latestAct != null) { if (latestAct != null) {
if (StringUtils.isNotBlank(latestAct.getString("partner_black_list"))) {
JSONObject client = clientManager.getClientInfo(clientId);
String[] blackList = latestAct.getString("partner_black_list").split(",");
if (client == null || Arrays.asList(blackList).contains(client.getString("client_moniker"))) {
return result;
}
}
latestAct.put("id", latestAct.getString("act_id")); latestAct.put("id", latestAct.getString("act_id"));
latestAct.put("url", latestAct.getString("act_url")); latestAct.put("url", latestAct.getString("act_url"));
latestAct.put("title", latestAct.getString("act_name")); latestAct.put("title", latestAct.getString("act_name"));

@ -87,6 +87,13 @@
ng-model="actDetail.act_url"> ng-model="actDetail.act_url">
</div> </div>
</div> </div>
<div class="form-group">
<label class="control-label col-xs-4 col-sm-2" for="actDetail.act_url">商户黑名单(英文逗号隔开)</label>
<div class="col-xs-8 col-sm-4">
<Textarea type="text" class="form-control"
ng-model="actDetail.partner_black_list"/>
</div>
</div>
<div class="col-xs-12"> <div class="col-xs-12">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-success" type="button" ng-click="submit(appActForm)"> <button class="btn btn-success" type="button" ng-click="submit(appActForm)">

Loading…
Cancel
Save