From a64bda4b0032af00b705bc2b809726493e63ac4b Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 29 Jul 2019 11:06:29 +0800 Subject: [PATCH] =?UTF-8?q?[C=E7=AB=AF=E9=A6=96=E9=A1=B5][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=8D=A2=E4=B8=80=E6=8D=A2=E6=8B=BC=E5=9B=A2?= =?UTF-8?q?=E5=92=8C=E7=A0=8D=E4=BB=B7]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponChannelController.java | 15 +++++++++++++++ .../iformall/service/WxCouponChannelService.java | 3 ++- .../service/impl/WxCouponChannelServiceImpl.java | 7 +++++-- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index fcb49e1c3..b05be1ad1 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -95,4 +95,19 @@ public class WxCouponChannelController extends BaseController { }); } } + + + @ApiOperation("分页列表接口") + @GetMapping("change") + public ResultData change(@ModelAttribute WxCouponChannel wxCouponChannel) { + if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); + wxCouponChannel.setTenantId(getTenantId()); + wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); + wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); + wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC); + WxCouponChannelVo vo = wxCouponChannelService.change(wxCouponChannel); + return new ResultData(vo); + } + + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java index 28d030b91..70974113c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java @@ -3,7 +3,6 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCouponChannel; -import com.iformall.domain.po.WxMerchant; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponChannelVo; @@ -71,4 +70,6 @@ public interface WxCouponChannelService { void updateStatusByCouponId(Long couponId,String tenantId,int status); + WxCouponChannelVo change(WxCouponChannel wxCouponChannel); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index 111e98205..8e0be7bcb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -7,7 +7,6 @@ import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; -import com.iformall.domain.po.WxMerchant; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponChannelAddVo; import com.iformall.domain.vo.WxCouponChannelVo; @@ -17,7 +16,6 @@ import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.mapper.WxCouponMerchantMapper; import com.iformall.mapper.WxMerchantMapper; import com.iformall.service.*; -import org.checkerframework.checker.units.qual.A; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -138,6 +136,11 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { wxCouponChannelMapper.updateStatusByCouponId(wxCouponChannel); } + @Override + public WxCouponChannelVo change(WxCouponChannel record) { + return wxCouponChannelMapper.findVoList(record).parallelStream().findAny().orElseGet(null); + } + private boolean isCouponMerchantValid(Long couponId) { Map paramMap = new HashMap<>(); paramMap.put("productId",couponId);