From 7bd1047470a0600e7697cca4c10023560d98c5e6 Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 9 Apr 2019 13:55:12 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=B8=9A=E6=80=81][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84=E4=B8=9A?= =?UTF-8?q?=E6=80=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxBusinessController.java | 14 +------------- .../iformall/controller/WxBusinessController.java | 9 --------- .../iformall/service/impl/WxCouponServiceImpl.java | 1 + 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java index bb60f20ad..23ba282fb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java @@ -39,19 +39,7 @@ public class WxBusinessController extends BaseController { final PageInfo page = wxBusinessService.listAsPage(wxBusiness, pageNum, pageSize); return new ResultData(page); } - - @ApiOperation("成长值业态列表接口") - @GetMapping("busListForScore") - @SystemControllerLog(description = "成长值-业态-列表") - public ResultData getList() { - logger.debug("[" + getIpAddr() + "] WxBusinessController::getList"); - WxBusiness wxBusiness = new WxBusiness(); - final List busList = wxBusinessService.getList(wxBusiness); - // 业态 全部 不返回 - List busList2 = busList.stream().filter(b -> !b.getId().equals(0L)).collect(Collectors.toList()); - return new ResultData(busList2); - } - + @ApiOperation("业态全列表接口") @GetMapping("allist") @SystemControllerLog(description = "业态-全列表") diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java index 5845683ed..8f4b2fef3 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java @@ -40,15 +40,6 @@ public class WxBusinessController extends BaseController { return new ResultData(page); } - @ApiOperation("成长值业态列表接口") - @GetMapping("busListForScore") - public ResultData getList(@ModelAttribute WxBusiness wxBusiness) { - if (null == wxBusiness) wxBusiness = new WxBusiness(); - final List busList = wxBusinessService.getList(wxBusiness); - // 业态 全部 不返回 - List busList2 = busList.stream().filter(b -> !b.getId().equals(0L)).collect(Collectors.toList()); - return new ResultData(busList2); - } @ApiOperation("业态全列表接口") @GetMapping("allist") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 5b36ad415..059520007 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -314,6 +314,7 @@ public class WxCouponServiceImpl implements WxCouponService { //下架所有投放频道 wxCouponChannelService .updateStatusByCouponId(record.getId(), record.getTenantId(), EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()); + //下架所有场景投放 wxCouponSendService .updateStatusByCouponId(record.getId(), record.getTenantId(), EnumCouponSendStatus.INVALID.getCode()); //下架所有已砍价券