From 6d568ce5b6cf682e07db658aaefe82710aadded0 Mon Sep 17 00:00:00 2001 From: masterspirit Date: Mon, 27 Aug 2018 00:51:36 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E5=88=B8][=E4=BF=AE=E6=94=B9]:bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=98=BE=E7=A4=BA?= =?UTF-8?q?channels?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/controller/WxCouponController.java | 11 +++++++++-- .../service/impl/WxCouponChannelServiceImpl.java | 14 ++++++++++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java index d760e923d..7e341e8bc 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java @@ -63,6 +63,11 @@ public class WxCouponController extends BaseController page = wxCouponService.listAsPage(wxCoupon, pageNum, pageSize); } List wxCouponList = page.getList(); + + if(wxCouponList.isEmpty()){ + return new ResultData(page); + } + List ids = wxCouponList.stream().map(p->p.getId()).collect(Collectors.toList()); WxCouponChannel wxCouponChannel = new WxCouponChannel(); wxCouponChannel.setTenantId(getTenantId()); @@ -77,7 +82,9 @@ public class WxCouponController extends BaseController if(groupBy.get(temp.getId())!=null){ List channels=new ArrayList<>(); for (WxCouponChannel tempchannel:groupBy.get(temp.getId())) { - channels.add(tempchannel.getTargetAd()); + if(!channels.contains(tempchannel.getTargetAd())) { + channels.add(tempchannel.getTargetAd()); + } } String sss = JSON.toJSONString(channels); temp.setChannels(sss); @@ -171,7 +178,7 @@ public class WxCouponController extends BaseController public ResultData sendList(@ModelAttribute WxCoupon wxCoupon,Integer pageNum, Integer pageSize) { if (null == wxCoupon) wxCoupon = new WxCoupon(); wxCoupon.setTenantId(getTenantId()); - wxCoupon.setStatus(1); + wxCoupon.setStatus(0); PageInfo page = null; page = wxCouponService.findCanSendList(wxCoupon, pageNum, pageSize); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java index e0d098ac7..b13d7f46e 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java @@ -62,9 +62,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { } @Override - @Transactional public void addBatch(String[] ids,String[] channelId,String tanantId,Date beginTime,Date endTime) { - for (String targetIdstr:channelId) { Integer targetId = Integer.parseInt(targetIdstr); for (String couponidstr:ids) { @@ -78,6 +76,18 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { @Transactional public void addCuponChannel(Long couponid,Integer channelId,String tanantId,Date beginTime,Date endTime){ + + WxCouponChannel wxCouponChannelQuery = new WxCouponChannel(); + wxCouponChannelQuery.setTenantId(tanantId); + wxCouponChannelQuery.setCouponId(couponid); + wxCouponChannelQuery.setTargetAd(channelId); + wxCouponChannelQuery.setStatus(0); + List wxCouponChannels = wxCouponChannelMapper.findList(wxCouponChannelQuery); + if(wxCouponChannels.size()>0){ + logger.debug(couponid+"已经投放过了"); + return; + } + WxCoupon wxCoupon = wxCouponService.getById(couponid); if(wxCoupon.getStatus()!=0) { logger.debug(wxCoupon.getId()+"状态不对");