diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java index ad96c9484..3b30fc510 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java @@ -233,6 +233,11 @@ public class WxCouponPasswordController extends BaseController { }catch(Exception e) { return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF.getCode(),"卡号或者卡密错误."); } + + if (password.getStatus().intValue() == EnumCouponPasswordStatus.CANCEL.getCode().intValue()) { + return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF.getCode(),"卡已作废."); + } + WxCoupon coupon = couponService.getById(password.getCouponId(),password.getTenantId()); if (coupon == null) { return new ResultData(ErrorCode.COUPON_IS_EMPTY); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 04e87ec66..1767017fa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -1796,7 +1796,7 @@ public class WxCouponServiceImpl implements WxCouponService { //下架拼团券 wxOrderService.updateOrderGroupStatusByCouponId(couponId, tenantInfo, EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); // 卡下架后,转赠找不到卡相关信息,所以修改卡转赠状态为不可转赠 - wxCardInfoMapper.updateTransferStatusByCouponId(couponId); + //wxCardInfoMapper.updateTransferStatusByCouponId(couponId); // 卡券下架,未使用的卡密要下架 couponPasswordMapper.disableByCouponId(couponId);