diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/constant/MarketConstants.java b/cash-common/cash-common-tools/src/main/java/com/czg/constant/MarketConstants.java new file mode 100644 index 000000000..af3125e15 --- /dev/null +++ b/cash-common/cash-common-tools/src/main/java/com/czg/constant/MarketConstants.java @@ -0,0 +1,16 @@ +package com.czg.constant; + +/** + * market 常量 + * @author yjjie + * @date 2025/12/11 18:22 + */ +public interface MarketConstants { + + class Num { + /** + * 不限数量 + */ + public static final int NOT_LIMIT = -10086; + } +} diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java index b952a298e..1c12461d9 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java @@ -3,6 +3,7 @@ package com.czg.service.market.service.impl; import com.alibaba.fastjson2.JSONObject; import com.czg.account.entity.ShopUser; import com.czg.account.service.ShopUserService; +import com.czg.constant.MarketConstants; import com.czg.exception.CzgException; import com.czg.market.dto.ChatCouponDTO; import com.czg.market.dto.MkShopCouponGiftDTO; @@ -59,8 +60,8 @@ public class ChatCouponServiceImpl extends ServiceImpl giftCoupons = couponGiftService.getCouponGiftBySourceId(consumerCoupon.getId(), 3); @@ -76,10 +76,10 @@ public class MkShopConsumerCouponServiceImpl extends ServiceImpl= giftCoupon.getNum()) { - boolean canReceive = consumerCoupon.getGetLimit() == -10086; + if (consumerCoupon.getLeftNum() == MarketConstants.Num.NOT_LIMIT || consumerCoupon.getLeftNum() >= giftCoupon.getNum()) { + boolean canReceive = consumerCoupon.getGetLimit() == MarketConstants.Num.NOT_LIMIT; // 限量发放,校验用户已经发放数量 - if (consumerCoupon.getGetLimit() != -10086) { + if (consumerCoupon.getGetLimit() != MarketConstants.Num.NOT_LIMIT) { long count = recordService.count(new QueryWrapper().eq(MkShopCouponRecord::getShopId, shopId) .eq(MkShopCouponRecord::getShopUserId, shopUserId) .eq(MkShopCouponRecord::getSourceId, consumerCoupon.getId())); @@ -99,7 +99,7 @@ public class MkShopConsumerCouponServiceImpl extends ServiceImpl