From 52046da5dc9026019fbf878f9856d9b7733a5ac4 Mon Sep 17 00:00:00 2001 From: masterspirit Date: Sun, 26 Aug 2018 17:13:02 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9=E5=88=B8=E7=8A=B6=E6=80=81]?= =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E5=88=B8=E7=8A=B6=E6=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/controller/WxCouponController.java | 12 ++++++++---- .../java/com/simple/domain/po/WxCouponChannel.java | 10 ++++++++++ .../service/impl/WxCouponChannelServiceImpl.java | 1 + .../main/resources/mapper/WxCouponChannelMapper.xml | 12 ++++++++++++ 4 files changed, 31 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 7df4bbc68..a96ce4631 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java @@ -66,17 +66,21 @@ public class WxCouponController extends BaseController List ids = wxCouponList.stream().map(p->p.getId()).collect(Collectors.toList()); WxCouponChannel wxCouponChannel = new WxCouponChannel(); wxCouponChannel.setTenantId(getTenantId()); - wxCouponChannel.setIds(ids); + wxCouponChannel.setCouponIds(ids); //上架状态 List list = wxCouponChannelService.listAsPage(wxCouponChannel,1,5).getList(); if(!list.isEmpty()){ Map> groupBy = list.stream().collect(Collectors.groupingBy(WxCouponChannel::getCouponId)); for (WxCoupon temp:wxCouponList) { - List channels=new ArrayList<>(); + List channels=new ArrayList<>(); if(groupBy.get(temp.getId())!=null){ - String sss = JSON.toJSONString(groupBy.get(temp.getId())); - temp.setChannels(sss); + for (WxCouponChannel tempchannel:groupBy.get(temp.getId())) { + channels.add(tempchannel.getTargetAd()); + } + } + String sss = JSON.toJSONString(channels); + temp.setChannels(sss); } } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponChannel.java index 7c2152792..e18bb0fe5 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponChannel.java @@ -17,6 +17,9 @@ public class WxCouponChannel implements Serializable { @Transient protected List ids; + @Transient + protected List couponIds; + @Transient protected String sortColumns; @@ -151,6 +154,13 @@ public class WxCouponChannel implements Serializable { public void setUpdateDate(Date _updateDate) { updateDate = _updateDate; } + public List getCouponIds() { + return couponIds; + } + + public void setCouponIds(List couponIds) { + this.couponIds = couponIds; + } 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 270f60cb4..24cd6c59a 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java @@ -82,6 +82,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { wxCouponService.saveOrUpdate(wxCoupon); } WxCouponChannel wxCouponChannel = new WxCouponChannel(); + wxCouponChannel.setStatus(0); wxCouponChannel.setBeginTime(beginTime); wxCouponChannel.setEndTime(endTime); wxCouponChannel.setCouponId(couponid); diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 16800c95f..2ce097744 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -95,6 +95,12 @@ #{idItem} + + and coupon_id in + + #{couponIdsItem} + + order by ${sortColumns} @@ -102,6 +108,12 @@ select from wx_coupon_channel + + +