|
@@ -93,6 +93,7 @@
|
|
|
) tmp
|
|
) tmp
|
|
|
left join activity_shop ach on ach.id = tmp.activity_shop_id
|
|
left join activity_shop ach on ach.id = tmp.activity_shop_id
|
|
|
left join activity a on ach.activity_id = a.id
|
|
left join activity a on ach.activity_id = a.id
|
|
|
|
|
+ where a.del_flag = '0'
|
|
|
group by tmp.goods_id
|
|
group by tmp.goods_id
|
|
|
) ga on ga.goods_id = g.goods_id
|
|
) ga on ga.goods_id = g.goods_id
|
|
|
where gsr.shop_id = #{shopId}
|
|
where gsr.shop_id = #{shopId}
|