|
@@ -32,9 +32,9 @@
|
|
|
prp.supplierId as shopId,
|
|
|
pr.seen as seen
|
|
|
from cm_promotions pr
|
|
|
- left join cm_promotions_product prp on pr.id = prp.promotionsId
|
|
|
+ left join cm_promotions_product prp on pr.id = prp.promotionsId
|
|
|
where (prp.productId = #{productId} or
|
|
|
- prp.supplierId = (select p.shopID,p.productType from product p where p.productID = #{productId})
|
|
|
+ prp.supplierId = (select p.shopID from product p where p.productID = #{productId})
|
|
|
)
|
|
|
and (pr.status = 1 or (pr.status = 2 and (NOW() between pr.beginTime and pr.endTime)))
|
|
|
and pr.delFlag not in (1, 2)
|