|
|
@@ -26,19 +26,42 @@ class GoodsLogic extends BaseLogic
|
|
|
public static function detail($id,$type){
|
|
|
if($type == 'category'){
|
|
|
$goods = Goods::where('goods_category_id',$id)->visible([
|
|
|
- 'id','goods_image','goods_video',
|
|
|
- 'goods_number','good_unit','base_service_fee',
|
|
|
- 'service_total','service_fee','service_image','fee_schedule','warranty_period'
|
|
|
+ 'id','goods_image','goods_name','goods_banner_images','good_unit','base_service_fee',
|
|
|
+ 'service_total','service_fee','service_image','fee_schedule','warranty_period','goods_payment_type'
|
|
|
])->select()->toArray();
|
|
|
}else{
|
|
|
$goods_category_id = Goods::where('id',$id)->value('goods_category_id');
|
|
|
$goods = Goods::where('goods_category_id',$goods_category_id)->visible([
|
|
|
- 'id','goods_image','goods_video',
|
|
|
- 'goods_number','good_unit','base_service_fee',
|
|
|
- 'service_total','service_fee','service_image','fee_schedule','warranty_period'
|
|
|
+ 'id','goods_image','goods_name','goods_banner_images','good_unit','base_service_fee',
|
|
|
+ 'service_total','service_fee','service_image','fee_schedule','warranty_period','goods_payment_type'
|
|
|
])->select()->toArray();
|
|
|
}
|
|
|
|
|
|
+ if(!empty($goods)){
|
|
|
+ $data = [];
|
|
|
+ foreach ($goods as $key => $value) {
|
|
|
+ if($value['goods_payment_type'] == '2'){
|
|
|
+ $coupon = ($value['service_total']-$value['service_fee'])>0?'秒杀减'.$value['service_total']-$value['service_fee']:'';
|
|
|
+ }
|
|
|
+ $data[] = [
|
|
|
+ 'id'=>$value['id'],
|
|
|
+ 'goods_image'=>$value['goods_image'],
|
|
|
+ 'goods_name'=>$value['goods_name'],
|
|
|
+ 'goods_banner_images'=>!empty($value['goods_banner_images']) ? explode(',',$value['goods_banner_images']) : [],
|
|
|
+ 'goods_payment_type'=>$value['goods_payment_type'],
|
|
|
+ 'base_service_fee'=>$value['base_service_fee'],
|
|
|
+ 'service_total'=>$value['service_total'],
|
|
|
+ 'service_fee'=>$value['service_fee'],
|
|
|
+ 'coupon'=>!empty($coupon)?$coupon:'',
|
|
|
+ 'service_image'=>$value['service_image'],
|
|
|
+ 'warranty_period'=>$value['warranty_period'],
|
|
|
+ 'fee_schedule'=>$value['fee_schedule']
|
|
|
+ ];
|
|
|
+ }
|
|
|
+
|
|
|
+ $goods = $data;
|
|
|
+ }
|
|
|
+
|
|
|
return $goods;
|
|
|
}
|
|
|
|
|
|
@@ -46,7 +69,7 @@ class GoodsLogic extends BaseLogic
|
|
|
{
|
|
|
return Goods::where('is_hot', '=', 1)
|
|
|
->with('goodsCategory')
|
|
|
- ->visible(['id','goods_name','goods_category_id','goods_image','goods_video','goodsCategory'])
|
|
|
+ ->visible(['id','goods_name','goods_image'])
|
|
|
->order(['top_weight' => 'desc', 'id' => 'desc'])
|
|
|
->select()->toArray();
|
|
|
}
|