From bba161b721ff9e1ae46cda3f306b0b54db674469 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 13 Oct 2022 10:38:32 +0800 Subject: [PATCH] =?UTF-8?q?//=E4=B8=8B=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxCouponChannelController.java | 8 -------- .../iformall/controller/WxCouponChannelController.java | 8 -------- 2 files changed, 16 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java index c15171959..b94a8ed31 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -89,14 +89,6 @@ public class WxCouponChannelController extends BaseController { public ResultData update(@RequestBody WxCouponChannel wxCouponChannel) { logger.debug("[" + getIpAddr() + "] WxCouponChannelController::update"); wxCouponChannel.updateTenantInfo(getTenantInfo()); - if(wxCouponChannel.getCouponId() == null){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"couponId为空"); - } - WxCoupon wxCoupon = wxCouponService.getById(wxCouponChannel.getCouponId(),wxCouponChannel.getTenantId()); - if(wxCoupon == null || EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode().equals(wxCoupon.getStatus())){ - return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"此券不存在或已过期"); - } - wxCouponChannel.setMakeMerchantId(wxCoupon.getMakeMerchantId()); ResultData resultData = wxCouponChannelService.saveOrUpdate(wxCouponChannel); WxCouponChannel couponChannel = (WxCouponChannel)resultData.data; //生成二维码 diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index b88fbc7ee..d5d2384cf 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -76,14 +76,6 @@ public class WxCouponChannelController extends BaseController { public ResultData update(@RequestBody WxCouponChannel wxCouponChannel) { logger.debug("[" + getIpAddr() + "] WxCouponChannelController::update"); wxCouponChannel.updateTenantInfo(getTenantInfo()); - if(wxCouponChannel.getCouponId() == null){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"couponId为空"); - } - WxCoupon wxCoupon = wxCouponService.getById(wxCouponChannel.getCouponId(),wxCouponChannel.getTenantId()); - if(wxCoupon == null || EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode().equals(wxCoupon.getStatus())){ - return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"此券不存在或已过期"); - } - wxCouponChannel.setMakeMerchantId(wxCoupon.getMakeMerchantId()); ResultData resultData = wxCouponChannelService.saveOrUpdate(wxCouponChannel); WxCouponChannel couponChannel = (WxCouponChannel)resultData.data;