|
...
|
...
|
@@ -45,6 +45,7 @@ class Goods extends Model |
|
|
|
extract($params);
|
|
|
|
$where = [
|
|
|
|
'status' => 'up',
|
|
|
|
'id' => ['>',1], //现把ID为1的商品固定作为海报商品
|
|
|
|
];
|
|
|
|
//排序字段
|
|
|
|
if (isset($order) && $order !== '') {
|
|
...
|
...
|
@@ -475,6 +476,7 @@ class Goods extends Model |
|
|
|
$new_sku_price[$s] = $k;
|
|
|
|
$new_sku_price[$s]['stock'] = 0;
|
|
|
|
$new_sku_price[$s]['sales'] = 0;
|
|
|
|
$new_sku_price[$s]['groupon_price'] = $k['price'];
|
|
|
|
foreach ($activity_goods_sku_price as $c) {
|
|
|
|
if ($k['id'] == $c['sku_price_id']) {
|
|
|
|
// 采用活动的 规格内容
|
...
|
...
|
|
