ad

app/admin/controller/Activity.php

@@ -9,11 +9,11 @@ use think\facade\Db;
 
 class Activity extends Base
 {
-
+    public $noble=[];
     public function __construct(App $app)
     {
         parent::__construct($app);
-
+        $this->noble=\think\facade\Config::get("noble");
     }
     public function list(){
         $page = isset($this->post['page']) && $this->post['page'] !==""? intval($this->post['page']):"1";
@@ -431,20 +431,43 @@ class Activity extends Base
           return error_show(1004,"参数skuCode不能为空");
       }
       $where=['a.is_del'=>0,"b.is_del"=>0,"a.status"=>6,"b.status"=>1,"b.skuCode"=>$skuCode];
+      $condition=['a.skuCode' =>$skuCode,"a.is_del"=>0,'a.exam_status'=>6];
       $company =  isset($this->post['companyNo'])&&$this->post['companyNo']!=""?trim($this->post['companyNo']):"";
       if($company!=""){
           $where['a.company_id'] = $company;
+          $condition['companyNo'] = $company;
+
       }
         $plat =isset($this->post['platform_id'])&&$this->post['platform_id']!=""?intval($this->post['platform_id'])
             :"";
       if($plat!==""){
           $where['a.platform_code'] = $plat;
+          $condition['platform_code'] = $plat;
       }
+        $good =  Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')
+            ->where($condition)->select()->toArray();
+      $goodlist=[];
+        if(!empty($good)){
+            foreach ($good as $value){
+                $temp=[];
+                $stock =Db::name("good_stock")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->sum('usable_stock');
+                $temp['stock_num'] = intval($stock);
+                $temp['skuCode']=$value['skuCode'];
+                $temp['spuCode']=$value['spuCode'];
+                $temp['is_stock']=$value['is_stock'];
+                $temp['good_name']=$value['good_name'];
+                $temp['good_img']=$value['good_img'];
+                $temp['good_info_img']=$value['good_info_img'];
+                $temp['noble_metal']=$value['noble_metal'];
+                $temp['noble_name']=$value['noble_metal']!=0?$this->noble[$value['noble_metal']]:"";
+                $goodlist[]=$temp;
+            }
+        }
       $list =  Db::name('good_activity')->alias("a")
             ->join("activity_info b","b.activity_code=a.activity_code","left")
             ->where($where)->field('b.id,a.activity_name,a.activity_code,a.is_stock,a.start,a.end,b.skuCode,b.good_name,b.activity_stock,
             b.cost_price,b.moq_num,b.sale_price,b.activity_price')->select()->toArray();
-      return app_show(0,"获取成功",$list);
+      return app_show(0,"获取成功",["act"=>$list,"good"=>$goodlist]);
     }