ad

app/admin/controller/Activity.php

@@ -229,7 +229,7 @@ class Activity extends Base
         $data=[];
         //分类/规格/品牌 等字段取出对应文字
         $goodbasice = Db::name('good_basic')->where(['spuCode'=>array_column($list,"spuCode")])->column('status',"spuCode");
-        $good_online = Db::name('good_basic')->where(['spuCode'=>array_column($list,"spuCode")])->column('id',"spuCode");
+        $good_online = Db::name('good_platform')->where(['spuCode'=>array_column($list,"spuCode")])->column('id',"spuCode");
         foreach ($list as $value){
             $value['cat_info']= made($value['cat_id'],[]);
             $value['is_basic']=$goodbasice[$value['spuCode']]??null;

app/admin/controller/Sale.php

@@ -4579,13 +4579,17 @@ class Sale extends Base
             $price = Db::name("gold_price1")->where(["type" => $order['noble_metal'], "status" => 1, "is_del" => 0])->order("addtime desc")->find();
 
         }
-
+			$depart = get_company_name_by_uid($order['order_createrid']);
         $userCommon = \app\admin\common\User::getIns();
         $supplier = $userCommon->handle('sInfo',['code'=>$order['supplierNo']]);
 //        $supplier = Db::name("supplier")->where(["code" => $order['supplierNo']])->find();
         $order['supplier_name'] = isset($supplier['data']['name']) ? $supplier['data']['name'] : "";
         $order['cgder'] = isset($supplier['data']['person']) ? $supplier['data']['person'] : "";
         $order['cgderid'] = isset($supplier['data']['personid']) ? $supplier['data']['personid'] : "";
+        $order['order_creater_depart'] = $depart;
+        $is_online= Db::name('good_platform')->where(['spuCode'=>$order['spuCode']])->findOrEmpty();
+        $order['is_online'] = empty($is_online)?0:1;
+        $value['is_basic']= Db::name('good_basic')->where(['spuCode'=>$order['spuCode']])->value("status",null);
         $palt = Db::name("platform")->where(["id" => $order['platform_id']])->find();
         $order['platform_name'] = isset($palt['platform_name']) ? $palt['platform_name'] : "";