diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponChannelController.java index 949b18516..bbf87cc2b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -2,13 +2,18 @@ package com.iformall.controller; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; +import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxCouponChannelDto; import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.vo.WxCouponChannelVo; +import com.iformall.enums.EnumCouponChannelStatus; +import com.iformall.enums.EnumCouponStatus; import com.iformall.service.WxCouponChannelService; +import com.iformall.service.WxCouponService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -31,6 +36,9 @@ public class WxCouponChannelController extends BaseController { @Autowired private WxCouponChannelService wxCouponChannelService; + @Autowired + private WxCouponService wxCouponService; + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @@ -54,20 +62,26 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setTenantId(getUser().getTenantId()); if (wxCouponChannel.getCouponId() != null && wxCouponChannel.getStatus() != null) { WxCouponChannel orignal = wxCouponChannelService.getById(wxCouponChannel.getId()); - if (orignal.getStatus().equals(1) && wxCouponChannel.getStatus().equals(0)) { + if (orignal.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()) + && wxCouponChannel.getStatus().equals(EnumCouponChannelStatus.STATUS_THROW_IN.getCode())) { + + WxCoupon wxCoupon = wxCouponService.getById(orignal.getCouponId()); + if (wxCoupon == null) + return new ResultData(ErrorCode.COUPON_IS_EMPTY); + if (wxCoupon.getStatus().equals(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF)) + return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF); + //查找是否该券 在该频道有其他上架 WxCouponChannel query = new WxCouponChannel(); query.setTenantId(orignal.getTenantId()); query.setCouponId(orignal.getCouponId()); - query.setStatus(0);//已上架 + query.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());//已上架 query.setTargetAd(orignal.getTargetAd()); List list = wxCouponChannelService.listAsPage(query, 1, 1).getList(); if (list != null && list.size() > 0) { - //不能修改 - return new ResultData(Result.ERROR, "不允许同一个券,多个投放"); + return new ResultData(ErrorCode.COUPON_CHANNEL_IS_EXISTED); } } - } wxCouponChannelService.saveOrUpdate(wxCouponChannel); return new ResultData();