|
|
@@ -59,7 +59,7 @@
|
|
|
b.name AS "productName",
|
|
|
CASE b.costCheckFlag
|
|
|
WHEN 1 THEN b.`costPrice`
|
|
|
- WHEN 2 THEN b.`costProportional` * b.`price1` / 100
|
|
|
+ WHEN 2 THEN b.`costProportional` * b.`price` / 100
|
|
|
END AS "costPrice"
|
|
|
FROM repeat_purchase_price a
|
|
|
<include refid="repeatPurchasePriceJoins"/>
|
|
|
@@ -91,13 +91,7 @@
|
|
|
AND a.delFlag = 0
|
|
|
and b.productCategory = 1
|
|
|
</where>
|
|
|
- <choose>
|
|
|
- <when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
|
|
- ORDER BY ${page.orderBy} desc
|
|
|
- </when>
|
|
|
- <otherwise>
|
|
|
- </otherwise>
|
|
|
- </choose>
|
|
|
+ ORDER BY a.createTime DESC
|
|
|
</select>
|
|
|
|
|
|
|
