diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/dao/product/CereShopProductDAO.java b/cereshop-app/src/main/java/com/shop/cereshop/app/dao/product/CereShopProductDAO.java index c94f1fe..f8e6d27 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/dao/product/CereShopProductDAO.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/dao/product/CereShopProductDAO.java @@ -73,7 +73,7 @@ public interface CereShopProductDAO extends BaseMapper { List getRandomSortProduct(PageProductParam param); - List findRandom4ShopProducts(Long shopId); + List findRandom4ShopProducts(Long shopId, String project); int selectFictitiousNumber(Long productId); diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/collect/impl/CereBuyerCollectServiceImpl.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/collect/impl/CereBuyerCollectServiceImpl.java index d73984f..ce26659 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/service/collect/impl/CereBuyerCollectServiceImpl.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/collect/impl/CereBuyerCollectServiceImpl.java @@ -141,7 +141,7 @@ public class CereBuyerCollectServiceImpl implements CereBuyerCollectService { List list=cereBuyerCollectDAO.getAllShop(user.getBuyerUserId(),param.getSearch()); PageInfo pageInfo=new PageInfo<>(list); list.forEach(a -> { - a.setProductList(cereShopProductDAO.findRandom4ShopProducts(a.getShopId())); + a.setProductList(cereShopProductDAO.findRandom4ShopProducts(a.getShopId(), user.getProject())); }); Page page=new Page(pageInfo.getList(),pageInfo.getTotal()); return page; diff --git a/cereshop-app/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml b/cereshop-app/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml index a21cc02..e833345 100644 --- a/cereshop-app/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml +++ b/cereshop-app/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml @@ -859,7 +859,14 @@ 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) c ON a.product_id=c.product_id LEFT JOIN cere_platform_shop d ON a.shop_id=d.shop_id - where d.state=1 and a.shelve_state=1 and a.shop_id = #{shopId} + where d.state=1 + + and a.plat_shelve_state=1 + + + and a.shelve_state=1 + + and a.shop_id = #{shopId} ORDER BY a.update_time DESC LIMIT 4