|
|
@@ -209,6 +209,7 @@ class Activity extends Base
|
|
|
->where($where)
|
|
|
->page($page,$size)
|
|
|
->order("a.addtime desc")
|
|
|
+ ->field("a.*,ifnull(b.status,0) tax_status")
|
|
|
->select()
|
|
|
->toArray();
|
|
|
|
|
|
@@ -232,8 +233,6 @@ class Activity extends Base
|
|
|
$tmp = $userCommon->handle('getCodeAndName',['code'=>$all_code]);
|
|
|
$depart = get_company_name_by_uid( array_unique(array_column($list,'order_createrid')));
|
|
|
$data=[];
|
|
|
- $taxspcu = GoodTax::where('spuCode',"in",array_column($list,"spuCode"))
|
|
|
- ->column('status',"spuCode");
|
|
|
//分类/规格/品牌 等字段取出对应文字
|
|
|
$goodbasice = Db::name('good_basic')->where(['spuCode'=>array_column($list,"spuCode")])->column('status',"spuCode");
|
|
|
$good_online = Db::name('good_platform')->where(['spuCode'=>array_column($list,"spuCode")])->column('id',"spuCode");
|
|
|
@@ -241,7 +240,6 @@ class Activity extends Base
|
|
|
$value['cat_info']= made($value['cat_id'],[]);
|
|
|
$value['is_basic']=$goodbasice[$value['spuCode']]??null;
|
|
|
$value['order_creater_depart']=$depart[$value['order_createrid']]??'';
|
|
|
- $value['tax_status']=$taxspcu[$value['spuCode']]??'0';
|
|
|
$value['is_online']=isset($good_online[$value['spuCode']])?1:0;
|
|
|
|
|
|
$value['platform_name'] = $all_platform[$value['platform_id']]??'';//isset($platform['platform_name']) ? $platform['platform_name']:"";
|
