|
|
@@ -30,20 +30,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
SELECT sa.*,(SELECT COUNT(sap.id) FROM `tb_seckill_activity_product` sap WHERE sa.id = sap.seckill_id) productNum
|
|
|
FROM `tb_seckill_activity` sa
|
|
|
<where>
|
|
|
- sa.shop_id = #{vo.shop_id}
|
|
|
- <if test="vo.name != null and vo.name != ''">
|
|
|
- AND sa.`name` LIKE CONCAT('%',#{vo.name},'%')
|
|
|
+ sa.shop_id = #{bo.shop_id}
|
|
|
+ <if test="bo.name != null and bo.name != ''">
|
|
|
+ AND sa.`name` LIKE CONCAT('%',#{bo.name},'%')
|
|
|
</if>
|
|
|
- <if test="vo.active_state!=null and vo.active_state!= '' and vo.active_state==0">
|
|
|
+ <if test="bo.activeState!=null and bo.activeState!= '' and bo.activeState==0">
|
|
|
AND (start_time > DATE_FORMAT(NOW(),'%Y-%m-%d')
|
|
|
OR (start_time <= DATE_FORMAT(NOW(),'%Y-%m-%d') AND DATE_FORMAT(NOW(),'%Y-%m-%d') <= end_time
|
|
|
AND CONCAT(DATE_FORMAT(NOW(),'%Y-%m-%d'),' ',start_hour) >= NOW()))
|
|
|
</if>
|
|
|
- <if test="vo.active_state!=null and vo.active_state!= '' and vo.active_state==1">
|
|
|
+ <if test="bo.activeState!=null and bo.activeState!= '' and bo.activeState==1">
|
|
|
AND start_time <= DATE_FORMAT(NOW(),'%Y-%m-%d') AND DATE_FORMAT(NOW(),'%Y-%m-%d') <= end_time
|
|
|
AND CONCAT(DATE_FORMAT(NOW(),'%Y-%m-%d'),' ',start_hour) <= NOW() AND NOW() <= CONCAT(DATE_FORMAT(NOW(),'%Y-%m-%d'),' ',end_hour)
|
|
|
</if>
|
|
|
- <if test="vo.active_state!=null and vo.active_state!= '' and vo.active_state==2">
|
|
|
+ <if test="bo.activeState!=null and bo.activeState!= '' and bo.activeState==2">
|
|
|
AND (end_time <= DATE_FORMAT(NOW(),'%Y-%m-%d')
|
|
|
OR (start_time <= DATE_FORMAT(NOW(),'%Y-%m-%d') AND DATE_FORMAT(NOW(),'%Y-%m-%d') <= end_time
|
|
|
AND CONCAT(DATE_FORMAT(NOW(),'%Y-%m-%d'),' ',end_hour) <= NOW()))
|