|
|
@@ -303,7 +303,7 @@ class ProductController extends BaseController
|
|
|
$itemInfoData = [];
|
|
|
if ($requestType == 'hasStockList') {
|
|
|
//有库存的花材列表
|
|
|
- $field = 'id,py,cover,name,classId,itemId,price,skPrice,hjPrice,stock,onStock,cost,addPrice,hjAddPrice,skMore';
|
|
|
+ $field = 'id,py,cover,name,classId,itemId,price,skPrice,hjPrice,stock,onStock,cost,avCost,addPrice,hjAddPrice,skMore';
|
|
|
$itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
|
|
|
if (!empty($itemInfoData)) {
|
|
|
foreach ($itemInfoData as $key => $val) {
|
|
|
@@ -334,7 +334,7 @@ class ProductController extends BaseController
|
|
|
$itemInfoData = ProductClass::bookItemGroup($itemInfoData, $level);
|
|
|
} elseif ($requestType == 'itemList') {
|
|
|
//花材列表
|
|
|
- $field = 'id,py,cover,name,cost,itemId,classId,skPrice,variety,price,hjPrice,discountPrice,hjDiscountPrice,skDiscountPrice,stock,onStock,actualSold,status,ratio,ratioType,presell,frontHide,auth,reachNum,reachNumDiscount,addPrice,hjAddPrice,skMore';
|
|
|
+ $field = 'id,py,cover,name,cost,avCost,itemId,classId,skPrice,variety,price,hjPrice,discountPrice,hjDiscountPrice,skDiscountPrice,stock,onStock,actualSold,status,ratio,ratioType,presell,frontHide,auth,reachNum,reachNumDiscount,addPrice,hjAddPrice,skMore';
|
|
|
$itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
|
|
|
$itemInfoData = ProductClass::itemListGroup($itemInfoData, $level);
|
|
|
} elseif ($requestType == 'cgStaffList') {
|