diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java index 8ac08bf23..5fc0877ad 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java @@ -95,9 +95,9 @@ public class WxCouponPasswordController extends BaseController { if (coupon.getStatus().equals(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode())) { return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF); } - if (coupon.getPrice() <= 0) { - return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF.getCode(),"卡面值未设置,请联系管理员."); - } +// if (coupon.getPrice() <= 0) { +// return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF.getCode(),"卡面值未设置,请联系管理员."); +// } // 卡密领取卡券 Integer pwdStatus = couponPassword.getStatus(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index aaeb2149f..dff4f6140 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1507,6 +1507,8 @@ public class WxOrderServiceImpl implements WxOrderService { if (null != couponPassWord) { cardInfo.setCouponPasswordId(couponPassWord.getId()); cardInfo.setCouponPassword(couponPassWord.getPassword()); + //后置卡券可能没有面额 + cardInfo.setAmount(couponPassWord.getPrice()); } cardInfo.setCUserId(user.getId()); cardInfo.setOwnerUserId(user.getId());