From 04969c614865c64714565dac6c4e01fba89e340c Mon Sep 17 00:00:00 2001 From: dy-hu Date: Wed, 26 Jun 2024 15:05:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E5=B8=83=E9=80=89=E6=8B=A9=E5=AE=9A?= =?UTF-8?q?=E4=BB=B7=E6=8D=86=E7=BB=91=E5=95=86=E5=93=81=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=B9=B3=E5=8F=B0=E4=B8=8A=E6=9E=B6=E5=95=86?= =?UTF-8?q?=E5=93=81=E4=B8=9A=E5=8A=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop/cereshop/app/controller/index/RenovationController.java | 2 ++ .../com/shop/cereshop/app/param/canvas/CanvasProductParam.java | 6 ++++++ .../main/resources/mybatis/mapper/price/CerePriceProductDAO.xml | 8 +++++++- 3 files changed, 15 insertions(+), 1 deletion(-) 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}