|
|
@@ -57,7 +57,7 @@ class ProductController extends BaseController
|
|
|
$where['shopId'] = $shopId;
|
|
|
$where['delStatus'] = 0;
|
|
|
|
|
|
- $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC,'actualSold' => SORT_DESC], "*");
|
|
|
+ $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], "*");
|
|
|
$itemInfoData = ProductClass::groupProductInfo($itemInfoData);
|
|
|
//常用的itemIds
|
|
|
$oftenItemIds = [];
|
|
|
@@ -386,6 +386,7 @@ class ProductController extends BaseController
|
|
|
|
|
|
$post['sjId'] = $this->sjId;
|
|
|
$post['adminId'] = $this->adminId;
|
|
|
+ $post['shopId'] = $this->shopId;
|
|
|
ProductClass::addProduct($post);
|
|
|
util::complete('添加成功');
|
|
|
}
|