Merge remote-tracking branch 'origin/test' into test

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;
 

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;
 

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<Long> ids = new ArrayList<>();
         if ("all".equals(couponSource.getUseShopType())) {
             QueryWrapper queryWrapper = new QueryWrapper();