|
|
@@ -142,8 +142,8 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
|
|
|
// .selectAs(TextbookSubscriptionItem::getPrice, TextbookInstockroomListVo::getActualPrice)
|
|
|
// .selectAs(TextbookSubscriptionItem::getDiscount, TextbookInstockroomListVo::getDiscount)
|
|
|
.selectAs(Textbook::getPrice, TextbookInstockroomListVo::getPrice)
|
|
|
- .select("ifnull(t2.discount, t.discount) as discount,")
|
|
|
- .select("ifnull(t2.price, t.price) as actual_price,")
|
|
|
+ .select("ifnull(t2.discount, t.discount) as discount")
|
|
|
+ .select("ifnull(t2.price, t.price) as actual_price")
|
|
|
.leftJoin(Textbook.class, Textbook::getId, TextbookSubscriptionItem::getTextbookId)
|
|
|
|
|
|
.leftJoin(TextbookWarehouseRecord.class, TextbookWarehouseRecord::getDataItemId, TextbookSubscriptionItem::getId)
|