|
@@ -140,20 +140,22 @@ class Good extends Base
|
|
|
$page = $page >= $total ? $total : $page;
|
|
|
$list = Db::name('good')
|
|
|
->alias("a")
|
|
|
- ->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_id,a.cat_id,a.good_name,a.good_img,a.good_info_img,a.good_thumb_img,
|
|
|
- b.createrid,a.is_exclusive,a.brand_id,a.supplierNo,a.good_unit,a.noble_metal,a.companyNo,a.spuCode,a.good_type,b.creater,b.addtime,
|
|
|
- b.updatetime,b.exam_status,a.createrid purchase_id,a.creater purchase,u.itemid,a.is_stock,s.name as supplier_name")
|
|
|
+ ->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_id,a.cat_id,a.good_name,a.good_img,a.good_info_img,a.good_thumb_img,b.createrid,a.is_exclusive,a.brand_id,a.supplierNo,a.good_unit,a.noble_metal,a.companyNo,a.spuCode,a.good_type,b.creater,b.addtime,b.updatetime,b.exam_status,a.createrid purchase_id,a.creater purchase,a.is_stock,s.name as supplier_name")
|
|
|
//成本表里的创建人,也是线上商品的采购人,为了防止混淆,给creater取个别名
|
|
|
->leftJoin("good_platform b","a.spuCode=b.spuCode")
|
|
|
->leftJoin("supplier s","a.supplierNo=s.code")
|
|
|
// ->leftJoin("good_basic gb","gb.spuCode=a.spuCode")
|
|
|
- ->leftJoin("depart_user u", "u.uid=b.createrid AND u.is_del=0")
|
|
|
->leftJoin("platform p","p.id=b.platform_code")
|
|
|
->where('p.platform_type',0)//只筛选非对接平台的商品
|
|
|
->where($where)
|
|
|
->page($page,$size)
|
|
|
->order("b.addtime desc")
|
|
|
- ->cursor();
|
|
|
+ ->select()
|
|
|
+ ->toArray();
|
|
|
+
|
|
|
+ $all_createrid = array_column($list,'createrid');
|
|
|
+ $item = get_company_name_by_uid($all_createrid);
|
|
|
+
|
|
|
$data=[];
|
|
|
foreach ($list as $value){
|
|
|
$value['cat_info']= made($value['cat_id'],[]);
|
|
@@ -189,7 +191,7 @@ class Good extends Base
|
|
|
}
|
|
|
$value['specinfo']=$speclist;
|
|
|
$value['noble_name']=isset($value['noble_metal'])&&$value['noble_metal']!=0?$this->noble[$value['noble_metal']] :"";
|
|
|
- $value['company_name'] = implode('/', array_column(GetPart($value['itemid']), 'name'));
|
|
|
+ $value['company_name'] = $item[$value['createrid']]??'';
|
|
|
|
|
|
//是否具有编辑权限
|
|
|
$value['is_allow_update'] = 0;
|
|
@@ -270,13 +272,17 @@ class Good extends Base
|
|
|
$param['page'] = $param['page'] >= $total ? $total : $param['page'];
|
|
|
$list = Db::name('platform_youzan')
|
|
|
->alias("b")
|
|
|
- ->field("b.skuCode,b.platform_id platform_code,b.plat_code,b.id as platform_youzan_id,a.cat_id,a.good_name,a.good_img,a.good_info_img,a.good_thumb_img,b.createrid,a.is_exclusive,a.brand_id,a.supplierNo,a.good_unit,a.noble_metal,a.companyNo,a.spuCode,a.good_type,b.creater,b.addtime,b.updatetime,b.exam_status,a.createrid purchase_id,a.creater purchase,u.itemid")//成本表里的创建人,也是线上商品的采购人,为了防止混淆,给creater取个别名
|
|
|
+ ->field("b.skuCode,b.platform_id platform_code,b.plat_code,b.id as platform_youzan_id,a.cat_id,a.good_name,a.good_img,a.good_info_img,a.good_thumb_img,b.createrid,a.is_exclusive,a.brand_id,a.supplierNo,a.good_unit,a.noble_metal,a.companyNo,a.spuCode,a.good_type,b.creater,b.addtime,b.updatetime,b.exam_status,a.createrid purchase_id,a.creater purchase")//成本表里的创建人,也是线上商品的采购人,为了防止混淆,给creater取个别名
|
|
|
->leftJoin("good_basic a", "a.spuCode=b.spuCode")
|
|
|
- ->leftJoin("depart_user u", "u.uid=a.createrid AND u.is_del=0")
|
|
|
->where($where)
|
|
|
->page($param['page'], $param['size'])
|
|
|
->order("b.addtime desc")
|
|
|
- ->cursor();
|
|
|
+ ->select()
|
|
|
+ ->toArray();
|
|
|
+
|
|
|
+ $all_createrid = array_column($list,'createrid');
|
|
|
+ $item = get_company_name_by_uid($all_createrid);
|
|
|
+
|
|
|
$data = [];
|
|
|
foreach ($list as $value) {
|
|
|
$value['cat_info'] = made($value['cat_id'], []);
|
|
@@ -312,7 +318,7 @@ class Good extends Base
|
|
|
}
|
|
|
$value['specinfo'] = $speclist;
|
|
|
$value['noble_name'] = isset($value['noble_metal']) && $value['noble_metal'] != 0 ? $this->noble[$value['noble_metal']] : "";
|
|
|
- $value['company_name'] = implode('/', array_column(GetPart($value['itemid']), 'name'));
|
|
|
+ $value['company_name'] = $item[$value['createrid']]??'';
|
|
|
|
|
|
//是否具有编辑权限
|
|
|
$value['is_allow_update'] = 0;
|