|
@@ -44,7 +44,11 @@
|
|
|
ach.limit_value
|
|
ach.limit_value
|
|
|
from activity_shop ach
|
|
from activity_shop ach
|
|
|
left join activity a on a.id = ach.activity_id
|
|
left join activity a on a.id = ach.activity_id
|
|
|
- where ach.shop_id = #{shopId}
|
|
|
|
|
|
|
+ where
|
|
|
|
|
+ a.enable_flag = '1'
|
|
|
|
|
+ and now() >= a.start_time
|
|
|
|
|
+ and now() <![CDATA[<=]]> a.end_time
|
|
|
|
|
+ and ach.shop_id = #{shopId}
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<select id="getActivityByShopIds" resultType="com.sqx.modules.activity.vo.ShopActivityVO">
|
|
<select id="getActivityByShopIds" resultType="com.sqx.modules.activity.vo.ShopActivityVO">
|