diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/ShopCouponDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/ShopCouponDTO.java index 042c9336..3d1027a5 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/ShopCouponDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/ShopCouponDTO.java @@ -63,7 +63,7 @@ public class ShopCouponDTO implements Serializable { private String title; /** - * 可用门店类型:all-所有门店,custom-指定门店 + * 可用门店类型:only-仅本店;all-所有门店,custom-指定门店 */ private String useShopType; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java index 794bc49b..61b13a00 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java @@ -59,7 +59,7 @@ public class ShopCoupon implements Serializable { private String title; /** - * 可用门店类型:all-所有门店,custom-指定门店 + * 可用门店类型:only-仅本店;all-所有门店,custom-指定门店 */ private String useShopType; diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopSyncServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopSyncServiceImpl.java index 52b51587..3edc4a66 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopSyncServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopSyncServiceImpl.java @@ -1303,6 +1303,12 @@ public class ShopSyncServiceImpl implements ShopSyncService { return; } ShopCoupon couponSource = couponService.getById(couponId); + if (couponSource == null) { + return; + } + if ("only".equals(couponSource.getUseShopType())) { + return; + } List ids = new ArrayList<>(); if ("all".equals(couponSource.getUseShopType())) { QueryWrapper queryWrapper = new QueryWrapper();