diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/controller/index/RenovationController.java b/cereshop-app/src/main/java/com/shop/cereshop/app/controller/index/RenovationController.java index d8519ac..e47f12d 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/controller/index/RenovationController.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/controller/index/RenovationController.java @@ -15,6 +15,7 @@ import com.shop.cereshop.app.service.discount.CereShopDiscountService; import com.shop.cereshop.app.service.groupwork.CereShopGroupWorkService; import com.shop.cereshop.app.service.price.CerePriceProductService; import com.shop.cereshop.app.service.seckill.CereShopSeckillService; +import com.shop.cereshop.app.utils.ContextUtil; import com.shop.cereshop.commons.constant.CoReturnFormat; import com.shop.cereshop.commons.domain.common.Page; import com.shop.cereshop.commons.exception.CoBusinessException; @@ -94,6 +95,7 @@ public class RenovationController { @GetMapping("getPriceProducts") @ApiOperation(value = "画布选择定价捆绑商品数据") public Result> getPriceProducts(CanvasProductParam param) throws CoBusinessException{ + param.setProject(ContextUtil.getProject()); Page page=cerePriceProductService.getPriceProducts(param); return new Result(page); } diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/param/canvas/CanvasProductParam.java b/cereshop-app/src/main/java/com/shop/cereshop/app/param/canvas/CanvasProductParam.java index 03d75b2..4cb5d2b 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/param/canvas/CanvasProductParam.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/param/canvas/CanvasProductParam.java @@ -48,4 +48,10 @@ public class CanvasProductParam extends PageParam { */ @ApiModelProperty(value = "商品id数组") private List ids; + + /** + * 商家id + */ + @ApiModelProperty(value = "商家id") + private String project; } diff --git a/cereshop-app/src/main/resources/mybatis/mapper/price/CerePriceProductDAO.xml b/cereshop-app/src/main/resources/mybatis/mapper/price/CerePriceProductDAO.xml index ed13c27..3928895 100644 --- a/cereshop-app/src/main/resources/mybatis/mapper/price/CerePriceProductDAO.xml +++ b/cereshop-app/src/main/resources/mybatis/mapper/price/CerePriceProductDAO.xml @@ -58,7 +58,13 @@ cere_order_product a,cere_shop_order b where a.order_id=b.order_id and b.state in (2,3,4) GROUP BY a.product_id,b.buyer_user_id) a GROUP BY a.product_id) x ON a.product_id=x.product_id - where s.shelve_state=1 + where 1=1 + + and s.plat_shelve_state=1 + + + and s.shelve_state=1 + and s.shop_id=#{shopId}