diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/controller/shop/ShopController.java b/cereshop-app/src/main/java/com/shop/cereshop/app/controller/shop/ShopController.java index 010aabe..eade8ea 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/controller/shop/ShopController.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/controller/shop/ShopController.java @@ -15,6 +15,7 @@ import com.shop.cereshop.app.param.shop.ShopPosterParam; import com.shop.cereshop.app.service.business.CereBusinessBuyerUserService; import com.shop.cereshop.app.service.buyer.CereBuyerUserService; import com.shop.cereshop.app.service.shop.CerePlatformShopService; +import com.shop.cereshop.app.utils.ContextUtil; import com.shop.cereshop.commons.constant.CoReturnFormat; import com.shop.cereshop.commons.domain.business.CereBusinessBuyerUser; import com.shop.cereshop.commons.domain.buyer.CereBuyerUser; @@ -65,6 +66,7 @@ public class ShopController { //根据token查询用户信息 user=cereBuyerUserService.findByToken(token); } + param.setProject(ContextUtil.getProject()); Shop shop= cerePlatformShopservice.getShopProducts(param,user); return new Result(shop, CoReturnFormat.SUCCESS); } @@ -139,6 +141,7 @@ public class ShopController { //根据token查询用户信息 user=cereBuyerUserService.findByToken(token); } + param.setProject(ContextUtil.getProject()); String sharePicUrl = cerePlatformShopservice.getSharePic(param,user); Result result = new Result(); result.setCode(CoReturnFormat.SUCCESS); diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/param/product/PageProductParam.java b/cereshop-app/src/main/java/com/shop/cereshop/app/param/product/PageProductParam.java index 856e6c4..8db428a 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/param/product/PageProductParam.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/param/product/PageProductParam.java @@ -23,4 +23,6 @@ public class PageProductParam extends PageParam { @ApiModelProperty(value = "时间戳") private Long timestamp; + @ApiModelProperty(value = "商家id") + private String project; } diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/param/shop/ShopParam.java b/cereshop-app/src/main/java/com/shop/cereshop/app/param/shop/ShopParam.java index 7fd0bb6..146aa11 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/param/shop/ShopParam.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/param/shop/ShopParam.java @@ -71,4 +71,10 @@ public class ShopParam extends PageParam { */ @ApiModelProperty(value = "最大价格") private BigDecimal maxMoney; + + /** + * 商家id + */ + @ApiModelProperty(value = "商家id") + private String project; } diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/param/shop/ShopPosterParam.java b/cereshop-app/src/main/java/com/shop/cereshop/app/param/shop/ShopPosterParam.java index 52b54df..0251990 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/param/shop/ShopPosterParam.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/param/shop/ShopPosterParam.java @@ -37,4 +37,10 @@ public class ShopPosterParam { */ @ApiModelProperty(value = "分销员id") private Long distributorId; + + /** + * 商家id + */ + @ApiModelProperty(value = "商家id") + private String project; } diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereShopProductServiceImpl.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereShopProductServiceImpl.java index f048901..d923985 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereShopProductServiceImpl.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereShopProductServiceImpl.java @@ -1184,6 +1184,7 @@ public class CereShopProductServiceImpl implements CereShopProductService { @Override public Page getRandomSortProduct(PageProductParam param) { + param.setProject(ContextUtil.getProject()); PageHelper.startPage(param.getPage(),param.getPageSize()); List list = cereShopProductDAO.getRandomSortProduct(param); if(!EmptyUtils.isEmpty(list)){ 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 10c7eb3..a21cc02 100644 --- a/cereshop-app/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml +++ b/cereshop-app/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml @@ -837,7 +837,13 @@ 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 LEFT JOIN (SELECT SUM(number) number,sku_id,order_id from cere_order_product GROUP BY sku_id) f ON b.sku_id=f.sku_id - where a.shelve_state=1 and d.state=1 + where d.state=1 + + and a.plat_shelve_state=1 + + + and a.shelve_state=1 + ORDER BY aes_encrypt(a.product_id, #{timestamp}), a.update_time DESC, a.create_time DESC diff --git a/cereshop-app/src/main/resources/mybatis/mapper/shop/CerePlatformShopDAO.xml b/cereshop-app/src/main/resources/mybatis/mapper/shop/CerePlatformShopDAO.xml index d523df2..c5009dc 100644 --- a/cereshop-app/src/main/resources/mybatis/mapper/shop/CerePlatformShopDAO.xml +++ b/cereshop-app/src/main/resources/mybatis/mapper/shop/CerePlatformShopDAO.xml @@ -291,7 +291,13 @@ LEFT JOIN cere_shop_group sg ON a.shop_group_id = sg.shop_group_id LEFT JOIN (SELECT SUM(a.number) number,a.sku_id,a.order_id from cere_order_product a, cere_shop_order b where a.order_id=b.order_id and b.state in (2,3,4) GROUP BY sku_id) f ON b.sku_id=f.sku_id - where a.shop_id=#{shopId} and a.shelve_state=1 and d.state=1 + where a.shop_id=#{shopId} and d.state=1 + + and a.plat_shelve_state=1 + + + and a.shelve_state=1 + and a.product_name like concat('%',#{search},'%')