|
|
@@ -157,8 +157,8 @@ public class advertiseAction extends ActionSupport implements ServletRequestAwar
|
|
|
List<Advertise> open = advertiseService.queryOpenAdvertise();
|
|
|
if (open!=null){
|
|
|
List<Integer> ids = open.stream().map(Advertise::getId).collect(Collectors.toList());
|
|
|
- if (open.size()>=3 && advertise.getJumpWay().equals("小程序") && !ids.contains(advertise.getId()) && advertise.getState()==1){
|
|
|
- resultjson.put("message", "小程序最多开启三个广告");
|
|
|
+ if (open.size()>=3 && !ids.contains(advertise.getId()) && advertise.getState()==1){
|
|
|
+ resultjson.put("message", "最多开启三个广告");
|
|
|
resultjson.put("code", 500);
|
|
|
ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
|
|
|
return null;
|
|
|
@@ -238,8 +238,8 @@ public class advertiseAction extends ActionSupport implements ServletRequestAwar
|
|
|
List<Advertise> open = advertiseService.queryOpenAdvertise();
|
|
|
if (open!=null){
|
|
|
List<Integer> ids = open.stream().map(Advertise::getId).collect(Collectors.toList());
|
|
|
- if (open.size()>=3 && advertise.getJumpWay().equals("小程序") && !ids.contains(advertise.getId()) && advertise.getState()==1){
|
|
|
- resultjson.put("message", "小程序最多开启三个广告");
|
|
|
+ if (open.size()>=3 && !ids.contains(advertise.getId()) && advertise.getState()==1){
|
|
|
+ resultjson.put("message", "最多开启三个广告");
|
|
|
resultjson.put("code", 500);
|
|
|
ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
|
|
|
return null;
|
|
|
@@ -383,14 +383,14 @@ public class advertiseAction extends ActionSupport implements ServletRequestAwar
|
|
|
List<Advertise> open = advertiseService.queryOpenAdvertise();
|
|
|
if (open!=null){
|
|
|
List<Integer> ids = open.stream().map(Advertise::getId).collect(Collectors.toList());
|
|
|
- if (open.size()>=3 && advertise.getJumpWay().equals("小程序") && !ids.contains(advertise.getId()) && state==1){
|
|
|
- resultJson.put("message", "小程序最多开启三个广告");
|
|
|
+ if (open.size()>=3 && !ids.contains(advertise.getId()) && state==1){
|
|
|
+ resultJson.put("message", "最多开启三个广告");
|
|
|
resultJson.put("code", 500);
|
|
|
ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
|
|
|
return null;
|
|
|
}
|
|
|
}
|
|
|
- int m = advertiseService.updateState(id,state);
|
|
|
+ int m = advertiseService.updateState(id,state,TimeExchange.getTime());
|
|
|
if (m>0){
|
|
|
resultJson.put("message", "操作成功");
|
|
|
resultJson.put("code", 200);
|