|
@@ -103,9 +103,10 @@
|
|
|
AND a.productId = #{productId}
|
|
|
</select>
|
|
|
<select id="getCollageProduct" resultType="com.caimei365.commodity.model.po.HeheCollageProductPo">
|
|
|
- select chcp.skuId,chcp.productId, chcp.price, chcp.limitedNum, chcp.unlimitedFlag, chcp.memberNum
|
|
|
+ select chcs.skuId,chcp.productId, chcs.collagePrice as price, chcp.limitedNum, chcp.unlimitedFlag, chcp.memberNum
|
|
|
from cm_hehe_collage_product chcp
|
|
|
- where chcp.skuId = #{skuId}
|
|
|
+ left join cm_hehe_collage_sku chcs on chcp.productId=chcs.productId
|
|
|
+ where chcs.skuId = #{skuId}
|
|
|
and chcp.status = 1
|
|
|
ORDER BY price ASC
|
|
|
LIMIT 1
|
|
@@ -149,10 +150,11 @@
|
|
|
and if(permanentFlag = 1, true, NOW() <![CDATA[ <= ]]> endTime)
|
|
|
</select>
|
|
|
<select id="getDiscountPrice" resultType="com.caimei365.commodity.model.po.HeheDiscountPricePo">
|
|
|
- select a.discountPrice, a.productId, chda.offlineTime
|
|
|
+ select chds.discountPrice, a.productId, chda.offlineTime
|
|
|
from hehe_discount_activity_product a
|
|
|
- left join cm_hehe_discount_activity chda on a.activityId = chda.id
|
|
|
- where a.skuId = #{skuId}
|
|
|
+ left join cm_hehe_discount_activity_sku chds on a.productId=chds.productId
|
|
|
+ left join cm_hehe_discount_activity chda on a.activityId = chda.id
|
|
|
+ where chds.skuId = #{skuId}
|
|
|
and a.status = 1
|
|
|
and NOW() between chda.onlineTime and chda.offlineTime
|
|
|
order by discountPrice asc
|