|
|
@@ -66,16 +66,15 @@
|
|
|
where aao.org_id = #{orgId} and aao.source_type = '02'
|
|
|
and ai.activity_type = #{activityType}
|
|
|
and ai.del_flag = '0' and ai.status = '0'
|
|
|
- and aci.is_show_app_buy_page = 'Y'
|
|
|
</if>
|
|
|
<if test="orgId == null">
|
|
|
where ai.activity_type = #{activityType}
|
|
|
and ai.del_flag = '0' and ai.status = '0'
|
|
|
- and aci.is_show_app_buy_page = 'Y'
|
|
|
</if>
|
|
|
<if test="isNewUser != null and isNewUser != ''">
|
|
|
and aci.can_only_new_user = #{isNewUser}
|
|
|
</if>
|
|
|
+ and ai.end_date >= now()
|
|
|
</select>
|
|
|
<select id="selectActivityDiscountList"
|
|
|
resultType="com.yiqi.activity.domain.vo.weapp.WeAppActivityDiscountQueryVO">
|
|
|
@@ -86,7 +85,7 @@
|
|
|
left join activity_discount_info adi on ai.id = adi.activity_id
|
|
|
left join activity_apply_org aao on ai.id = aao.activity_id
|
|
|
where ai.activity_type = #{activityType} and aao.org_id = #{orgId} and aao.source_type = '02'
|
|
|
- and ai.del_flag = '0' and ai.status = '0' and adi.del_flag = '0'
|
|
|
+ and ai.del_flag = '0' and ai.status = '0' and adi.del_flag = '0' and ai.end_date >= now()
|
|
|
</select>
|
|
|
<select id="selectActivityRechargeList"
|
|
|
resultType="com.yiqi.activity.domain.vo.weapp.WeAppActivityRechargeQueryVO">
|
