From cfeefe2dc6afca9627accca9d2ba11e157fbc4b9 Mon Sep 17 00:00:00 2001
From: yovinchen <gzh298255@gmail.com>
Date: Sat, 7 Oct 2023 14:41:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=9F=A5=E8=AF=A2(=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E9=94=99=E8=AF=AF)=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ActivityInfoServiceImpl.java   |  2 --
 .../resources/mapper/ActivityInfoMapper.xml     | 17 ++++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/guigu-ssyx-parent/service/service-activity/src/main/java/com/atguigu/ssyx/activity/service/impl/ActivityInfoServiceImpl.java b/guigu-ssyx-parent/service/service-activity/src/main/java/com/atguigu/ssyx/activity/service/impl/ActivityInfoServiceImpl.java
index b3f020c..df2c3db 100644
--- a/guigu-ssyx-parent/service/service-activity/src/main/java/com/atguigu/ssyx/activity/service/impl/ActivityInfoServiceImpl.java
+++ b/guigu-ssyx-parent/service/service-activity/src/main/java/com/atguigu/ssyx/activity/service/impl/ActivityInfoServiceImpl.java
@@ -216,6 +216,4 @@ public class ActivityInfoServiceImpl extends ServiceImpl<ActivityInfoMapper, Act
         });
         return result;
     }
-
-
 }
diff --git a/guigu-ssyx-parent/service/service-activity/src/main/resources/mapper/ActivityInfoMapper.xml b/guigu-ssyx-parent/service/service-activity/src/main/resources/mapper/ActivityInfoMapper.xml
index 4d5b3da..c1e351e 100644
--- a/guigu-ssyx-parent/service/service-activity/src/main/resources/mapper/ActivityInfoMapper.xml
+++ b/guigu-ssyx-parent/service/service-activity/src/main/resources/mapper/ActivityInfoMapper.xml
@@ -58,18 +58,21 @@
 
     <!--//根据skuId进行查询，查询sku对应活动里面规则列表-->
     <select id="findActivityRule" resultMap="ActivityRuleMap">
-        select DISTINCT rule.id,
-                        info.activity_type as activityType,
-                        rule.activity_id,
-                        rule.condition_amount,
-                        rule.condition_num,
-                        rule.benefit_amount,
-                        rule.benefit_discount
+        select rule.id,
+               info.activity_type as activityType,
+               rule.activity_id,
+               rule.condition_amount,
+               rule.condition_num,
+               rule.benefit_amount,
+               rule.benefit_discount
         from activity_info info
                  inner join activity_sku sku on info.id = sku.activity_id
                  inner join activity_rule rule on info.id = rule.activity_id
         where sku.sku_id = #{skuId}
           and now() between info.start_time and info.end_time
+          and sku.is_deleted = 0
+          and info.is_deleted = 0
+          and rule.is_deleted = 0
         order by rule.condition_amount desc
     </select>