From ee12283d4d42d77f6ab7a0d825cb5f016496fad2 Mon Sep 17 00:00:00 2001 From: dy-hu Date: Wed, 26 Jun 2024 15:00:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E3=80=81=E5=95=86=E5=AE=B6=E4=BC=98=E6=83=A0=E5=88=B8=E5=95=86?= =?UTF-8?q?=E5=93=81=E6=9F=A5=E8=AF=A2=E5=A4=84=E7=90=86=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E5=95=86=E5=93=81=E4=B8=9A=E5=8A=A1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/shop/cereshop/app/param/coupon/ActivityParam.java | 8 ++++++++ .../service/activity/impl/CereBuyerCouponlServiceImpl.java | 2 ++ .../mybatis/mapper/activity/CereBuyerCouponDAO.xml | 14 ++++++++++++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/param/coupon/ActivityParam.java b/cereshop-app/src/main/java/com/shop/cereshop/app/param/coupon/ActivityParam.java index 29e23a9..93f4d60 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/param/coupon/ActivityParam.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/param/coupon/ActivityParam.java @@ -30,4 +30,12 @@ public class ActivityParam extends PageParam { */ @ApiModelProperty(value = "店铺优惠券id") private Long shopCouponId; + + /** + * 商家id + */ + @ApiModelProperty(value = "商家id") + private String project; + + } diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/activity/impl/CereBuyerCouponlServiceImpl.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/activity/impl/CereBuyerCouponlServiceImpl.java index 855eac2..0b469ac 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/service/activity/impl/CereBuyerCouponlServiceImpl.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/activity/impl/CereBuyerCouponlServiceImpl.java @@ -21,6 +21,7 @@ import com.shop.cereshop.app.service.buyer.CereBuyerShopCouponService; import com.shop.cereshop.app.service.buyer.CereBuyerUserService; import com.shop.cereshop.app.service.coupon.CereShopCouponService; import com.shop.cereshop.app.service.redis.CereRedisKeyServcice; +import com.shop.cereshop.app.utils.ContextUtil; import com.shop.cereshop.commons.constant.CoReturnFormat; import com.shop.cereshop.commons.constant.CreditOptTypeEnum; import com.shop.cereshop.commons.constant.IntegerEnum; @@ -262,6 +263,7 @@ public class CereBuyerCouponlServiceImpl implements CereBuyerCouponService { @Override public Page getCouponProducts(ActivityParam param) throws CoBusinessException { + param.setProject(ContextUtil.getProject()); PageHelper.startPage(param.getPage(), param.getPageSize()); List list = null; if (!EmptyUtils.isLongEmpty(param.getActivityId())) { diff --git a/cereshop-app/src/main/resources/mybatis/mapper/activity/CereBuyerCouponDAO.xml b/cereshop-app/src/main/resources/mybatis/mapper/activity/CereBuyerCouponDAO.xml index 809a937..8b662fb 100644 --- a/cereshop-app/src/main/resources/mybatis/mapper/activity/CereBuyerCouponDAO.xml +++ b/cereshop-app/src/main/resources/mybatis/mapper/activity/CereBuyerCouponDAO.xml @@ -63,7 +63,12 @@ LEFT JOIN cere_shop_order g ON f.order_id=g.order_id and g.state in (2,3,4) where a.product_id in (SELECT b.product_id from cere_activity_sign a,cere_sign_product b where a.sign_id=b.sign_id and a.activity_id=#{activityId}) - and a.shelve_state=1 + + and a.plat_shelve_state=1 + + + and a.shelve_state=1 + GROUP BY a.product_id @@ -79,7 +84,12 @@ LEFT JOIN cere_order_product f ON b.sku_id=f.sku_id LEFT JOIN cere_shop_order g ON f.order_id=g.order_id and g.state in (2,3,4) where a.product_id in (SELECT product_id from cere_shop_coupon_detail where shop_coupon_id=#{shopCouponId}) - and a.shelve_state=1 + + and a.plat_shelve_state=1 + + + and a.shelve_state=1 + GROUP BY a.product_id