|
|
@@ -1384,11 +1384,12 @@
|
|
|
class_grade_user cgu
|
|
|
LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
|
|
|
LEFT JOIN goods g on og.goods_id = g.goods_id
|
|
|
- LEFT JOIN major m on g.major_id = m.id
|
|
|
+ LEFT JOIN class_grade cg on cg.grade_id = cgu.grade_id
|
|
|
WHERE
|
|
|
cgu.user_id = #{userId}
|
|
|
- AND cgu.period_status = 1
|
|
|
- AND m.category_name = '必修'
|
|
|
+ AND cgu.period_status = -1
|
|
|
+ AND (unix_timestamp(now()) BETWEEN cg.class_start_time and cg.class_end_time)
|
|
|
and g.business_id = #{businessId}
|
|
|
+ and g.goods_id != #{goodsId}
|
|
|
</select>
|
|
|
</mapper>
|