|
|
|
@@ -11,6 +11,7 @@ import com.iformall.domain.po.base.BaseEntity; |
|
|
|
import com.iformall.domain.vo.WxCardSpendVo; |
|
|
|
import com.iformall.domain.vo.WxCouponOrderCVo; |
|
|
|
import com.iformall.enums.EnumCardInfoStatus; |
|
|
|
import com.iformall.enums.EnumCouponPasswordStatus; |
|
|
|
import com.iformall.enums.EnumCouponStatus; |
|
|
|
import com.iformall.enums.EnumCreditLockedStatus; |
|
|
|
import com.iformall.enums.EnumMerchantStatus; |
|
|
|
@@ -197,6 +198,11 @@ public class WxCardPayController extends BaseController { |
|
|
|
if (EnumYesOrNo.YES.getCode().intValue() == couponPassword.getIsStop().intValue()) { |
|
|
|
return new ResultData(ErrorCode.CARD_IS_NOT_FOUND.getCode(),"卡已被禁用."); |
|
|
|
} |
|
|
|
|
|
|
|
if (EnumCouponPasswordStatus.CANCEL.getCode().intValue() == couponPassword.getStatus().intValue()) { |
|
|
|
return new ResultData(ErrorCode.CARD_IS_NOT_FOUND.getCode(),"卡已作废."); |
|
|
|
} |
|
|
|
|
|
|
|
if (couponPassword.getPrice().intValue() <= 0 ) { |
|
|
|
return new ResultData(ErrorCode.CARD_IS_NOT_FOUND.getCode(),"卡密面额未设置."); |
|
|
|
} |
|
|
|
@@ -205,10 +211,6 @@ public class WxCardPayController extends BaseController { |
|
|
|
if (coupon == null) { |
|
|
|
return new ResultData(ErrorCode.COUPON_IS_EMPTY); |
|
|
|
} |
|
|
|
if (coupon.getStatus().equals(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode())) { |
|
|
|
logger.error("此券已作废:" + coupon.getId()); |
|
|
|
return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF); |
|
|
|
} |
|
|
|
//实体卡兑换后再次使用 |
|
|
|
WxCardInfo cardInfo = wxCardInfoService.getByCouponPasswordId(couponPassword.getId(), coupon); |
|
|
|
if (null == cardInfo) { |
|
|
|
|