ll

app/admin/controller/Activity.php

@@ -167,7 +167,7 @@ class Activity extends BaseController
             $data=[
                 "activity_name"=>$activity_name,
                 "activity_code"=>$activity_code,
-                "is_main"=>"0",
+                "is_stock"=>$is_stock,
                 "start"=>$activity_start,
                 "end"=>$activity_end,
                 "platform_code"=>$platform_code,
@@ -302,7 +302,61 @@ class Activity extends BaseController
             return error_show(1004,$e->getMessage());
         }
     }
+
     public  function  exam(){
+        $good_list= isset($this->post['good_list'])&&!empty($this->post['good_list']) ?$this->post['good_list']:"";
+        if($good_list==""){
+            return error_show(1004,"参数good_list不能为空");
+        }
+        $activity_code= isset($this->post['activity_code'])&&$this->post['activity_code']!=="" ?trim($this->post['activity_code']):"";
+        if($activity_code==""){
+            return error_show(1004,"参数activity_code不能为空");
+        }
+        $activity = Db::name("good_activity")->where(["activity_code"=>$activity_code,"is_del"=>0])->find();
+        if($activity==false){
+            return error_show(1004,"未找到活动数据");
+        }
+        Db::startTrans();
+        try{
+            foreach ($good_list as $value){
+                $temp=[];
+                $temp["id"]=$value['id'];
+                $temp["status"]=$value['status'];
+                $temp["remark"]=$value['remark'];
+                $temp["updatetime"]=date("Y-m-d H:i:s");
+                $up=Db::name("activity_info")->save($temp);
+                if($up==false){
+                    Db::rollback();
+                    return error_show(1004,"商品数据更新失败");
+                }
+            }
+            $activity['status']=4;
+            $activity['updatetime']=date("Y-m-d H:i:s");
+            $act = Db::name("good_activity")->save($activity);
+            if($act){
+                Db::commit();
+                return error_show(0,"商品数据审核成功");
+            }else{
+                Db::rollback();
+                return error_show(1004,"商品数据审核失败");
+            }
 
+        }catch (\Exception $e){
+            Db::rollback();
+            return error_show(1004,$e->getMessage());
+        }
+    }
+
+    public function  info(){
+        $activity_code= isset($this->post['activity_code'])&&$this->post['activity_code']!=="" ?trim($this->post['activity_code']):"";
+        if($activity_code==""){
+            return error_show(1004,"参数activity_code不能为空");
+        }
+        $activity = Db::name("good_activity")->where(["activity_code"=>$activity_code,"is_del"=>0])->find();
+        if($activity==false){
+            return error_show(1004,"未找到活动数据");
+        }
+        $activity_info =Db::name("activity_info")->where(["activity_code"=>$activity_code,"is_del"=>0])->select();
+        $activity['info']=empty($activity_info)?[]:$activity_info;
     }
 }

app/admin/controller/Goodup.php

@@ -130,7 +130,7 @@ class Goodup extends BaseController
             return error_show(1004,"参数packing_list不能为空");
         }
         $good_bar = isset($this->post['good_bar'])&&$this->post['good_bar']!==""? trim($this->post['good_bar']):"";
-        $supply_area = isset($this->post['supply_area'])&&$this->post['supply_area']!==""? trim($this->post['supply_area']):"";
+        $supply_area = isset($this->post['supply_area'])&&$this->post['supply_area']!==""? intval($this->post['supply_area']):"";
         if($supply_area===""){
             return error_show(1004,"参数supply_area不能为空");
         }
@@ -234,7 +234,7 @@ class Goodup extends BaseController
                 "sample_fee"=>$sample_fee,
                 "good_img"=>$good_img,
                 "good_thumb_img"=>$good_thumb_img,
-                "good_info_img"=>$good_info_img,
+                "good_info_img"=>json_encode($good_info_img),
                 "cert_fee"=>$cert_fee,
                 "packing_fee"=>$packing_fee,
                 "cost_fee"=>$cost_fee,
@@ -399,15 +399,15 @@ class Goodup extends BaseController
             return error_show(1004,"参数packing_list不能为空");
         }
         $good_bar = isset($this->post['good_bar'])&&$this->post['good_bar']!==""? trim($this->post['good_bar']):"";
-        $supply_area = isset($this->post['supply_area'])&&$this->post['supply_area']!==""? trim($this->post['supply_area']):"";
+        $supply_area = isset($this->post['supply_area'])&&$this->post['supply_area']!==""? intval($this->post['supply_area']):"";
         if($supply_area===""){
             return error_show(1004,"参数supply_area不能为空");
         }
-        $delivery_place = isset($this->post['delivery_place'])&&$this->post['delivery_place']!==""? trim($this->post['delivery_place']):"";
+        $delivery_place = isset($this->post['delivery_place'])&&$this->post['delivery_place']!==""? $this->post['delivery_place']:"";
         if($delivery_place===""){
             return error_show(1004,"参数delivery_place不能为空");
         }
-        $origin_place = isset($this->post['origin_place'])&&$this->post['origin_place']!==""? trim($this->post['origin_place']):"";
+        $origin_place = isset($this->post['origin_place'])&&$this->post['origin_place']!==""? $this->post['origin_place']:"";
         if($origin_place===""){
             return error_show(1004,"参数origin_place不能为空");
         }
@@ -470,7 +470,7 @@ class Goodup extends BaseController
             "sample_fee"=>$sample_fee,
             "good_img"=>$good_img,
             "good_thumb_img"=>$good_thumb_img,
-            "good_info_img"=>$good_info_img
+            "good_info_img"=>json_encode($good_info_img)
             ];
             $up = Db::name("good_basic")->where(["spuCode"=>$supcode,"is_del"=>0])->save($temp);
             if($up){
@@ -569,6 +569,8 @@ class Goodup extends BaseController
         if($data==false){
             return error_show(1004,"未找到商品数据");
         }
+        $unit =Db::name("unit")->where(["unit"=>$data['good_unit']])->find();
+        $data['unit_id'] = isset($unit['id'])?$unit['id']:0;
         $spec = Db::name("good_spec")->where(["spuCode"=>$supcode,"is_del"=>0])->select();
         $data["speclist"]=empty($spec)?[]:$spec;
         return app_show(0,"获取成功",$data);
@@ -614,15 +616,11 @@ class Goodup extends BaseController
         if($online_remark===""){
             return error_show(1004,"参数online_remark不能为空");
         }
-        $company_id= isset($this->post['company_id'])&&$this->post['company_id']!==""? intval($this->post['company_id']):"";
-        if($company_id===""){
-            return error_show(1004,"参数company_id不能为空");
-        }
+
         $data=[
             "spuCode"=>$spuCode,
             "skuCode"=>$skucode,
             "platform_id"=>$platform,
-            "company_id"=>$company_id,
             "online_reason"=>$online_reason,
             "online_remark"=>$online_remark,
             "exam_status"=>0,

app/admin/route/app.php

@@ -350,3 +350,8 @@ Route::rule('platforminfo','admin/Platform/info');
 Route::rule('platformdelete','admin/Platform/del');
 Route::rule('platformstatus','admin/Platform/status');
 
+Route::rule('actcreate','admin/Activity/create');
+Route::rule('actcost','admin/Activity/cost');
+Route::rule('activity','admin/Activity/activity');
+Route::rule('actexam','admin/Activity/exam');
+