From aa48911a351439a0d076697734ce2b12972d7a4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E7=9A=87?= <236220500@qq.com>
Date: Wed, 27 May 2020 22:53:03 +0800
Subject: [PATCH] 1

---
 .../ic/activity/listener/GenerateQRCodeListener.java   |  1 +
 .../mapper/activity/PmnActivityInstanceDOMapper.xml    | 10 ++--------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/activity/listener/GenerateQRCodeListener.java b/src/main/java/com/kiisoo/ic/activity/listener/GenerateQRCodeListener.java
index b698a40..033b6fd 100644
--- a/src/main/java/com/kiisoo/ic/activity/listener/GenerateQRCodeListener.java
+++ b/src/main/java/com/kiisoo/ic/activity/listener/GenerateQRCodeListener.java
@@ -13,6 +13,7 @@ import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper;
 import com.kiisoo.ic.store.service.PoiStoreService;
 import com.kiisoo.ic.store.service.PoiStoreStaffService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
diff --git a/src/main/resources/mapper/activity/PmnActivityInstanceDOMapper.xml b/src/main/resources/mapper/activity/PmnActivityInstanceDOMapper.xml
index 45f2581..f891f05 100644
--- a/src/main/resources/mapper/activity/PmnActivityInstanceDOMapper.xml
+++ b/src/main/resources/mapper/activity/PmnActivityInstanceDOMapper.xml
@@ -93,16 +93,10 @@ select * from pmn_activity_promotion_param where id in(select param_id from pmn_
             and t.status = #{status}
         </if>
         <if test="startDate != null">
-            and t.create_time >= #{startDate}
+            and t.begin_time <![CDATA[ >= ]]> #{startDate}
         </if>
         <if test="endDate != null">
-            and t.create_time <![CDATA[ <= ]]> #{endDate}
-        </if>
-        <if test="beginTime != null">
-            and t.begin_time >= #{beginTime}
-        </if>
-        <if test="endTime != null">
-            and t.end_time <![CDATA[ <= ]]> #{endTime}
+            and t.end_time <![CDATA[ <= ]]> #{endDate}
         </if>
         and t.status &lt;&gt; 4
         order by create_time desc