diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/param/activity/ActivitySignGetProductParam.java b/cereshop-business/src/main/java/com/shop/cereshop/business/param/activity/ActivitySignGetProductParam.java index d39eae8..1985f1a 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/param/activity/ActivitySignGetProductParam.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/param/activity/ActivitySignGetProductParam.java @@ -18,7 +18,7 @@ import lombok.Data; public class ActivitySignGetProductParam extends PageParam { /** - * 店铺id + * 店铺id(实际为商家id) */ @ApiModelProperty(value = "店铺id") private Long shopId; diff --git a/cereshop-business/src/main/resources/mybatis/mapper/activity/CereActivitySignDAO.xml b/cereshop-business/src/main/resources/mybatis/mapper/activity/CereActivitySignDAO.xml index 605fb3b..e453a1c 100644 --- a/cereshop-business/src/main/resources/mybatis/mapper/activity/CereActivitySignDAO.xml +++ b/cereshop-business/src/main/resources/mybatis/mapper/activity/CereActivitySignDAO.xml @@ -287,7 +287,7 @@ LEFT JOIN (SELECT a.product_id,a.product_image from cere_product_image a,cere_shop_product b where a.product_id=b.product_id GROUP BY a.product_id) d ON a.product_id=d.product_id LEFT JOIN cere_product_classify e ON a.classify_id=e.classify_id - where a.shop_id=#{shopId} and a.shelve_state = 1 + where a.shelve_state = 1 and a.shop_id in (select shop_id from cere_platform_shop where business_id = #{shopId}) and a.product_id like concat('%',#{search},'%') @@ -295,7 +295,7 @@ and a.product_name like concat('%',#{search},'%') - and (a.classify_id=#{classifyId} or e.classify_level_hierarchy like concat('%/',#{classifyId},'%')) + and (a.classify_business_id=#{classifyId} or e.classify_level_hierarchy like concat('%/',#{classifyId},'%')) and a.shop_group_id=#{groupId}