Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/Goodup.php

@@ -749,8 +749,8 @@ class Goodup extends BaseController
         $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
         Db::startTrans();
         try {
-            if($data['status']==3){
-                $online = Db::name("good_platform")->where(["spuCode"=>$supcode,"is_online"=>0,"status"=>0, "is_del"=>0])->save(["is_online"=>0,"status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
+            if($data['status']==3 && $status==1){
+                $online = Db::name("good_platform")->where(["spuCode"=>$supcode,"is_online"=>0,"status"=>0, "is_del"=>0])->save(["is_online"=>0,"exam_status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
             }
             $data['status']=$status;
             $data['updatetime']=date("Y-m-d H:i:s");
@@ -906,8 +906,40 @@ class Goodup extends BaseController
         $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
         $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
         $data=[];
+        $isonline=[];
         foreach ($spuCode as $value){
             $count = Db::name("good_nake")->where(["spuCode"=>$value,"is_del"=>0])->count();
+            $ist =Db::name("good_platform")->where(["spuCode"=>$value,"platform_code"=>$platform,"is_del"=>0])->find();
+            if($ist){
+                $god=Db::name("good_basic")->where(["spuCode"=>$value,"is_del"=>0])->find();
+                if($god){
+                    $tp=[];
+                    $tp['spuCode']=$value;
+                    $tp['good_name']=$god['good_name'];
+                    $tp['good_img']=$god['good_img'];
+                    $tp['exam_status']=$ist['exam_status'];
+                    $spec = Db::name("good_spec")->where(["spuCode"=>$value,"is_del"=>0])->select()->toArray();
+                    $speclist=[];
+                    if(!empty($spec)){
+                        foreach ($spec as $val){
+                            $temp=[];
+                            $temp['id']=$val['id'];
+                            $temp['spuCode']=$val['spuCode'];
+                            $temp['spec_id']=$val['spec_id'];
+                            $temp['spec_value_id']=$val['spec_value_id'];
+                            $temp['is_del']=$val['is_del'];
+                            $sp = Db::name("specs")->where(["id"=>$val['spec_id']])->find();
+                            $temp['spec_name']=isset($sp["spec_name"]) ? $sp["spec_name"]:"";
+                            $spv = Db::name("spec_value")->where(["id"=>$val['spec_value_id']])->find();
+                            $temp['spec_value']=isset($spv["spec_value"]) ? $spv["spec_value"]:"";
+                            $speclist[]=$temp;
+                        }
+                    }
+                    $tp["speclist"]=empty($speclist)?[]:$speclist;
+                    $isonline[]=$tp;
+                }
+
+            }
             $data[]=[
                 "spuCode"=>$value,
                 "skuCode"=>makeNo("SKU"),
@@ -924,6 +956,9 @@ class Goodup extends BaseController
                 "updatetime"=>date("Y-m-d H:i:s")
             ];
         }
+        if(!empty($isonline)){
+            return app_show(1009,"存在已上线产品",$isonline);
+        }
         Db::startTrans();
         $create =Db::name("good_platform")->insertAll($data);
         if($create){
@@ -1068,15 +1103,12 @@ class Goodup extends BaseController
                 $lemp['min_num'] = $value['min_num'];
                 $lemp['max_num'] = 0;
                 $lemp['sale_price'] = $value['sale_price'];
-//                $lemp['origin_price'] = $value['origin_price'];
                 $lemp['market_price'] = $value['market_price'];
                 $lemp['market_platform'] = $value['market_platform'];
-//                $lemp['origin_rate'] = $value['origin_rate'];
                 $lemp['status'] = $value['status'];
                 $lemp['is_del'] = isset($value['is_del'])?$value['is_del']:0;
                 isset($value["id"])&&$value["id"]!=""?"": $lemp['addtime'] = date("Y-m-d H:i:s");
                 $lemp['updatetime'] =date("Y-m-d H:i:s");
-               // var_dump(isset($value["id"]));
                 $count = Db::name("good_ladder")->save($lemp);
                 if($count==false){
                     Db::rollback();
@@ -1142,4 +1174,60 @@ class Goodup extends BaseController
         $data = Db::name("good_proof")->where($where)->page($page,$size)->order("addtime desc")->select();
         return app_show(0,"获取成功",['list'=>$data,"count"=>$count]);
     }
+
+    /**
+     *
+     */
+    public function againOnline(){
+        $skuCode = isset($this->post['skuCode'])&&$this->post['skuCode']!==""?trim($this->post['skuCode']):"";
+        if($skuCode===""){
+            return error_show(1004,"参数skuCode不能为空");
+        }
+        $platform = Db::name("good_platform")->where(["skuCode"=>$skuCode,"is_del"=>0])->find();
+        if($platform==false){
+            return error_show(1004,"未找到数据");
+        }
+
+        if($platform["exam_status"]!=7&&$platform["exam_status"]!=8){
+            return error_show(1004,"商品状态有误");
+        }
+        $nake =Db::name("good_nake")->where(["spuCode"=>$platform['spuCode'],"is_del"=>0])->select()->toArray();
+        $platform['exam_status'] = empty($nake)?1:2;
+        $platform['updatetime'] = date("Y-m-d H:i:s");
+        $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
+        if($token==''){
+            return error_show(1005,"参数token不能为空");
+        }
+        $user =GetUserInfo($token);
+        if(empty($user)||$user['code']!=0){
+            return error_show(1002,"用户数据不存在");
+        }
+        $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
+        $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
+      Db::startTrans();
+        try {
+            $save =Db::name("good_platform")->save($platform);
+            if($save){
+                $data=[
+                    "code"=>$platform['skuCode'],
+                    "type"=>2,
+                    "exam_status"=>$platform['exam_status'] ,
+                    "exam_id"=>$createrid,
+                    "exam_name"=>$creater,
+                    "exam_remark"=>'',
+                    "addtime"=>date("Y-m-d H:i:s")
+                ];
+                $inr=Db::name("good_exam")->insert($data);
+                if($inr){
+                    Db::commit();
+                    return app_show(0,"审核成功");
+                }
+            }
+            Db::rollback();
+            return error_show(1004,"审核失败");
+        }catch (\Exception $e){
+            Db::rollback();
+            return error_show(1004,$e->getMessage());
+        }
+    }
 }

app/admin/controller/Keepbrand.php

@@ -84,15 +84,15 @@ class Keepbrand extends BaseController
         $page = isset($this->post['page']) && $this->post['page'] !== "" ? intval($this->post['page']) :"1";
         $size = isset($this->post['size']) && $this->post['size'] !== "" ? intval($this->post['size']) :"10";
         $where=[['a.is_del',"=",0]];
-        $gyscode = isset($this->post['gyscode']) && $this->post['gyscode'] !=="" ? intval($this->post['gyscode']):"";
+        $gyscode = isset($this->post['gyscode']) && $this->post['gyscode'] !=="" ? trim($this->post['gyscode']):"";
         if($gyscode!=""){
             $where[]=['a.gyscode',"like","%$gyscode%"];
         }
-        $name = isset($this->post['name']) && $this->post['name'] !=="" ? intval($this->post['name']):"";
+        $name = isset($this->post['name']) && $this->post['name'] !=="" ? trim($this->post['name']):"";
         if($name!=""){
             $where[]=['b.name',"like","%$name%"];
         }
-        $registerCode = isset($this->post['registerCode']) && $this->post['registerCode'] !=="" ? intval($this->post['registerCode']):"";
+        $registerCode = isset($this->post['registerCode']) && $this->post['registerCode'] !=="" ? trim($this->post['registerCode']):"";
         if($registerCode!=""){
             $where[]=['b.registerCode',"like","%$registerCode%"];
         }
@@ -104,7 +104,8 @@ class Keepbrand extends BaseController
         $list = Db::name('brand_book')->alias('a')
             ->join("supplier b","a.gyscode=b.code","left")
             ->join("brand c","a.brand_id=c.id","left")
-            ->where($where)->page($page,$size)->field("a.*,c.brand_name")->order("addtime desc")->select();
+            ->where($where)->page($page,$size)->field("a.*,c.brand_name,b.name as supplier_name")->order("addtime desc")
+            ->select();
         return app_show(0,"获取成功",['list'=>$list,'count'=>$count]);
     }
     public function info(){

app/admin/route/app.php

@@ -357,6 +357,7 @@ Route::rule('goodupexam','admin/Goodup/online_exam');
 Route::rule('goodupeditladder','admin/Goodup/editladder');
 Route::rule('goodexam','admin/Goodup/exam');
 Route::rule('goodinfo','admin/Good/info');
+Route::rule('againonline','admin/Goodup/againOnline');
 
 Route::rule('goodproof','admin/Goodup/prooflist');