From 87c280ec48b9cf8f70dbea78b74f9cdff6e8a37d Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 29 Jul 2019 11:44:28 +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][=E5=88=87=E6=8D=A2=E7=A0=8D=E4=BB=B7=E5=92=8C?= =?UTF-8?q?=E6=8B=BC=E5=9B=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxCouponChannelController.java | 4 ++++ .../com/iformall/service/impl/WxCouponChannelServiceImpl.java | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) 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) {