From 6782b3ae0ac1db3e76a7b0e66ad658491140bca6 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 26 Mar 2019 19:12:49 +0800 Subject: [PATCH] =?UTF-8?q?[banner=E6=9B=B4=E6=96=B0=E6=A3=80=E6=9F=A5][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=B7=BB=E5=8A=A0=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxCampaignController.java | 10 ++++------ .../iformall/service/impl/WxCampaignServiceImpl.java | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java index cd66ca593..fb5e847d7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java @@ -96,13 +96,11 @@ public class WxCampaignController extends BaseController { @PostMapping("updateStatus") public ResultData updateStatus(@RequestBody WxCampaign wxCampaign) { logger.debug("[" + getIpAddr() + "] WxCampaignController::updateStatus"); - if(wxCampaign.getType() == null) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "type不能为空"); - } + WxCampaign campaign = wxCampaignService.getById(wxCampaign.getId()); // check coupon 状态 - if (wxCampaign.getType().equals(EnumCampaignType.STABLE.getCode())) { - if (wxCampaign.getStatus().equals(EnumCampaignStatus.STATUS_THROW_IN.getCode())) { - List ids = JSONArray.parseArray(wxCampaign.getCouponIds(), String.class); + if (campaign.getType().equals(EnumCampaignType.STABLE.getCode())) { + if (campaign.getStatus().equals(EnumCampaignStatus.STATUS_THROW_IN.getCode())) { + List ids = JSONArray.parseArray(campaign.getCouponIds(), String.class); for (String couponIdStr : ids) { Long couponId = Long.parseLong(couponIdStr); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java index 9ff9f74a7..e9bb25868 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -181,7 +181,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { WxCoupon wxCoupon = wxCouponService.getById(couponId); if (wxCoupon == null) { - throw new MallinkException(ErrorCode.COUPON_IS_EMPTY); + return; } if (wxCoupon.getStatus() != EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()) { return;