|
@@ -232,7 +232,7 @@ class ProductController extends BaseController
|
|
|
$where['status'] = 2;
|
|
$where['status'] = 2;
|
|
|
$where['delStatus'] = 0;
|
|
$where['delStatus'] = 0;
|
|
|
$where['removeStatus'] = 0;
|
|
$where['removeStatus'] = 0;
|
|
|
- $field = 'id,py,cover,name,cost,itemId,classId,addPrice,skPrice,discountPrice,skMore,variety,price,stock,presell,status';
|
|
|
|
|
|
|
+ $field = 'id,py,cover,name,cost,itemId,classId,addPrice,skPrice,bigUnit,smallUnit,ratio,ratioType,discountPrice,skMore,variety,price,stock,presell,status';
|
|
|
$itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
|
|
$itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
|
|
|
$itemInfoData = ProductClass::simpleGroup($itemInfoData, $level);
|
|
$itemInfoData = ProductClass::simpleGroup($itemInfoData, $level);
|
|
|
} elseif ($requestType == 'stopList') {
|
|
} elseif ($requestType == 'stopList') {
|
|
@@ -246,7 +246,7 @@ class ProductController extends BaseController
|
|
|
//删除花材列表
|
|
//删除花材列表
|
|
|
$where['delStatus'] = 1;
|
|
$where['delStatus'] = 1;
|
|
|
$where['removeStatus'] = 1;
|
|
$where['removeStatus'] = 1;
|
|
|
- $field = 'id,py,cover,name,cost,itemId,classId,addPrice,skPrice,discountPrice,skMore,variety,price,stock,presell,status';
|
|
|
|
|
|
|
+ $field = 'id,py,cover,name,cost,itemId,classId,addPrice,skPrice,bigUnit,smallUnit,ratio,ratioType,discountPrice,skMore,variety,price,stock,presell,status';
|
|
|
$itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
|
|
$itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
|
|
|
$itemInfoData = ProductClass::simpleGroup($itemInfoData, $level);
|
|
$itemInfoData = ProductClass::simpleGroup($itemInfoData, $level);
|
|
|
} elseif ($requestType == 'check') {
|
|
} elseif ($requestType == 'check') {
|
