Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Goodup.php

@@ -131,8 +131,15 @@ class Goodup extends Base
         $count = Db::name('good_basic')->where($where)->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
-        $list = Db::name('good_basic')->where($where)->page($page,$size)->order("addtime desc")->select();
+        $list = Db::name('good_basic')->where($where)->page($page,$size)->order("addtime desc")->select()->toArray();
         $data=[];
+
+        //查询一下这些spucode是否在平台上成功上线
+        $exam_statuss = Db::name('good_platform')
+            ->whereIn('spuCode',array_column($list,'spuCode'))
+            ->where(['is_del'=>0,'exam_status'=>6])//exam_status==6表示上线审核成功
+            ->column('id','spuCode');
+
         foreach ($list as $value){
                 $value["cat_info"]= made($value['cat_id'],[]);
                 $brand=Db::name("brand")->where(["id"=>$value['brand_id']])->find();
@@ -145,6 +152,12 @@ class Goodup extends Base
                 $value['supplier_name']=isset($supplier['name'])?$supplier['name']:"";
                 $value['exclusive']=makeExcluse($value['is_exclusive']);
                 $value['noble_name']=isset($value['noble_metal'])&&$value['noble_metal']!=0?$this->noble[$value['noble_metal']] :"";
+                
+                //如果一个spucode在任意平台上线，那么就视为它上线，即手动把它的is_online值改为1
+                if (!empty($exam_statuss) && isset($exam_statuss[$value['spuCode']])) {
+                    $value['is_online'] = 1;
+                }
+
                 $data[]=$value;
         }
         return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);

app/admin/route/app.php

@@ -164,7 +164,7 @@ Route::rule("addrall","admin/Addr/all");
 Route::rule("goodlist","admin/Good/list");
 Route::rule("goodwarn","admin/Good/SetWarn");
 Route::rule("goodstatus","admin/Good/SetStatus");
-Route::rule("goodstat","admin/Good/Stat");
+Route::rule("goodstat","admin/Good/Stat");//库存概况
 Route::rule("goodstock","admin/Good/GetStock");
 Route::rule("goodall","admin/Good/all");
 Route::rule("getstockgod","admin/Good/GetStockGod");
@@ -335,7 +335,7 @@ Route::rule('businessstatus','admin/Business/status');
 Route::rule('businesssinfo','admin/Business/info');
 Route::rule('businesstitle','admin/Business/title');
 
-Route::rule('gooduplist','admin/Goodup/list');
+Route::rule('gooduplist','admin/Goodup/list');//商品列表
 
 Route::rule('unitcreate','admin/Unit/create');
 Route::rule('unitlist','admin/Unit/list');
@@ -344,7 +344,7 @@ Route::rule('unitdelete','admin/Unit/del');
 Route::rule('unitstatus','admin/Unit/status');
 
 Route::rule('goodupcreate','admin/Goodup/create');
-Route::rule('gooduplist','admin/Goodup/list');
+//Route::rule('gooduplist','admin/Goodup/list');
 Route::rule('goodupeditinfo','admin/Goodup/editinfo');
 Route::rule('goodupinfo','admin/Goodup/info');
 Route::rule('goodupeditfee','admin/Goodup/editfee');