|
|
@@ -164,17 +164,18 @@
|
|
|
p.`name` AS `name`,
|
|
|
p.mainImage AS image,
|
|
|
p.productCode,
|
|
|
- p.price,
|
|
|
+ cs.price,
|
|
|
cshd.originalPrice AS originalPrice,
|
|
|
- p.unit AS unit,
|
|
|
+ cs.unit AS unit,
|
|
|
p.priceFlag,
|
|
|
- p.ladderPriceFlag AS ladderFlag,
|
|
|
+ cs.ladderPriceFlag AS ladderFlag,
|
|
|
p.includedTax AS includedTax,
|
|
|
p.invoiceType AS invoiceType,
|
|
|
p.taxPoint AS taxRate,
|
|
|
p.productCategory,
|
|
|
p.validFlag AS validFlag
|
|
|
FROM product p
|
|
|
+ left join cm_sku cs on p.productID=cs.productId
|
|
|
LEFT JOIN cm_second_hand_detail cshd ON p.productID = cshd.productID
|
|
|
WHERE p.productCategory = 2
|
|
|
AND p.productID = #{productId}
|
|
|
@@ -196,11 +197,12 @@
|
|
|
SELECT op.ProductID AS productId,
|
|
|
op.skuId AS skuId,
|
|
|
op.num AS number,
|
|
|
- p.minBuyNumber AS min,
|
|
|
+ cs.minBuyNumber AS min,
|
|
|
p.`name` AS `name`,
|
|
|
p.mainImage AS image,
|
|
|
p.validFlag AS validFlag
|
|
|
FROM cm_order_product op
|
|
|
+ left join cm_sku cs on op.skuID=cs.skuId
|
|
|
LEFT JOIN product p ON op.productID = p.productID
|
|
|
WHERE orderID = #{orderID}
|
|
|
GROUP BY op.ProductID
|
