diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index b05be1ad1..115b93a70 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -1,6 +1,7 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; +import com.iformall.common.ErrorCode; import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.vo.WxCouponChannelVo; @@ -102,6 +103,9 @@ public class WxCouponChannelController extends BaseController { public ResultData change(@ModelAttribute WxCouponChannel wxCouponChannel) { if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); wxCouponChannel.setTenantId(getTenantId()); + if (wxCouponChannel.getCouponId() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponId不能为空"); + } 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); 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 8e0be7bcb..50be841b3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -138,7 +138,9 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { @Override public WxCouponChannelVo change(WxCouponChannel record) { - return wxCouponChannelMapper.findVoList(record).parallelStream().findAny().orElseGet(null); + return wxCouponChannelMapper.findVoList(record).parallelStream() + .filter(wxCouponChannelVo -> !wxCouponChannelVo.getCouponId().equals(record.getCouponId())) + .findAny().orElseGet(null); } private boolean isCouponMerchantValid(Long couponId) {