From be194fa15059067aa583e0e46e09cbfb08423383 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sun, 30 Sep 2018 23:25:23 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7=E7=A6=81=E7=94=A8=E5=88=B8?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxCouponController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java index c232b149e..7d18a0990 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java @@ -9,6 +9,7 @@ import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxMerchant; import com.iformall.enums.EnumCouponStatus; +import com.iformall.enums.EnumMerchantStatus; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponService; import com.iformall.service.WxMerchantService; @@ -146,9 +147,11 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { WxCoupon c = wxCouponService.getById(id); + WxMerchant merchant = wxMerchantService.getById(c.getMerchantId()); + if(merchant.getStatus().equals(EnumMerchantStatus.NOT_VALID.getCode())) + return new ResultData(Result.ERROR, "此券的商户已禁用"); WxCounponDto dto = new WxCounponDto(); org.springframework.beans.BeanUtils.copyProperties(c, dto); - WxMerchant merchant = wxMerchantService.getById(c.getMerchantId()); dto.setWxMerchant(merchant); return new ResultData(Result.SUCCESS, "查询成功", dto); }