|
@@ -398,7 +398,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
|
|
|
if (Objects.equals(userCoupon.getBusinessId(), param.getOrderId()) || userCoupon.getStatus() == 0) {
|
|
if (Objects.equals(userCoupon.getBusinessId(), param.getOrderId()) || userCoupon.getStatus() == 0) {
|
|
|
FsCoupon coupon = couponService.selectFsCouponByCouponId(userCoupon.getCouponId());
|
|
FsCoupon coupon = couponService.selectFsCouponByCouponId(userCoupon.getCouponId());
|
|
|
FsPackage fsPackage = fsPackageOrderMapper.selectFsPackageByOrderId(param.getOrderId());
|
|
FsPackage fsPackage = fsPackageOrderMapper.selectFsPackageByOrderId(param.getOrderId());
|
|
|
- if (coupon.getProjectId() != null && coupon.getProjectId().equals(fsPackage.getProjectId())) {
|
|
|
|
|
|
|
+ if (coupon.getProjectId() != null && !coupon.getProjectId().equals(fsPackage.getProjectId())) {
|
|
|
throw new CustomException("优惠券项目与套餐包不匹配");
|
|
throw new CustomException("优惠券项目与套餐包不匹配");
|
|
|
}
|
|
}
|
|
|
if (coupon.getCouponType().equals(1)) {
|
|
if (coupon.getCouponType().equals(1)) {
|
|
@@ -2066,7 +2066,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
|
|
|
if (coupon.getLimitTime() != null && coupon.getLimitTime().before(new Date())) {
|
|
if (coupon.getLimitTime() != null && coupon.getLimitTime().before(new Date())) {
|
|
|
return R.error("优惠券已过期");
|
|
return R.error("优惠券已过期");
|
|
|
}
|
|
}
|
|
|
- if (coupon.getProjectId() != null && coupon.getProjectId().equals(fsPackage.getProjectId())) {
|
|
|
|
|
|
|
+ if (coupon.getProjectId() != null && !coupon.getProjectId().equals(fsPackage.getProjectId())) {
|
|
|
return R.error("优惠券项目与套餐包不匹配");
|
|
return R.error("优惠券项目与套餐包不匹配");
|
|
|
}
|
|
}
|
|
|
userCoupon = fsUserCouponMapper.selectByCouponIdAndUserId(param.getCouponId(), param.getUserId());
|
|
userCoupon = fsUserCouponMapper.selectByCouponIdAndUserId(param.getCouponId(), param.getUserId());
|