|
|
@@ -123,7 +123,6 @@ class ThemeService
|
|
|
$goodsList[$goodsKey]['lineation_price'] = 0;
|
|
|
}
|
|
|
}
|
|
|
- dump($goodsList);die;
|
|
|
$content[$moduleKey]['content']['data'] = $goodsList;
|
|
|
break;
|
|
|
//选项卡组件 todo 选项卡的data是多维数据
|
|
|
@@ -160,12 +159,20 @@ class ThemeService
|
|
|
$orderField = implode(',', $goodsIds);
|
|
|
|
|
|
$goodsList = Goods::where(['id' => $goodsIds,'status'=>GoodsEnum::STATUS_SELL])
|
|
|
- ->field('id,name,image,virtual_sales_num+sales_num as sales_num,min_price as sell_price,min_lineation_price as lineation_price')
|
|
|
+ ->field('id,name,image,virtual_sales_num+sales_num as sales_num,min_price as sell_price,min_lineation_price as lineation_price,0 as is_multi_gauge')
|
|
|
->orderRaw("field(id,$orderField)")
|
|
|
->limit($limit)
|
|
|
->select()
|
|
|
->toArray();
|
|
|
|
|
|
+ foreach($goodsList as &$gv){
|
|
|
+ $goods_item_count = GoodsItem::where(['goods_id'=>$gv['id']])->count();
|
|
|
+ if($goods_item_count > 1){
|
|
|
+ $gv['is_multi_gauge'] = 1;
|
|
|
+ }else{
|
|
|
+ $gv['is_multi_gauge'] = 0;
|
|
|
+ }
|
|
|
+ }
|
|
|
//是否显示划线加
|
|
|
$showPrice = ConfigService::get('goods_set', 'show_price', 1);
|
|
|
if(0 == $showPrice){
|
|
|
@@ -307,7 +314,14 @@ class ThemeService
|
|
|
$content[$moduleKey]['content']['data'] = [];
|
|
|
break;
|
|
|
}
|
|
|
-
|
|
|
+ foreach($goodsList as &$gv){
|
|
|
+ $goods_item_count = GoodsItem::where(['goods_id'=>$gv['id']])->count();
|
|
|
+ if($goods_item_count > 1){
|
|
|
+ $gv['is_multi_gauge'] = 1;
|
|
|
+ }else{
|
|
|
+ $gv['is_multi_gauge'] = 0;
|
|
|
+ }
|
|
|
+ }
|
|
|
$activityIds = array_column($goodsList,'activity_id');
|
|
|
$goodsIds = array_column($goodsList,'goods_id');
|
|
|
$salesList = TeamGoodsItem::where(['team_id'=>$activityIds,'goods_id'=>$goodsIds])
|
|
|
@@ -377,7 +391,14 @@ class ThemeService
|
|
|
$content[$moduleKey]['content']['data'] = [];
|
|
|
break;
|
|
|
}
|
|
|
-
|
|
|
+ foreach($goodsList as &$gv){
|
|
|
+ $goods_item_count = GoodsItem::where(['goods_id'=>$gv['id']])->count();
|
|
|
+ if($goods_item_count > 1){
|
|
|
+ $gv['is_multi_gauge'] = 1;
|
|
|
+ }else{
|
|
|
+ $gv['is_multi_gauge'] = 0;
|
|
|
+ }
|
|
|
+ }
|
|
|
//销量
|
|
|
$activityIds = array_column($goodsList,'activity_id');
|
|
|
$goodsIds = array_column($goodsList,'goods_id');
|