Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/CatPlat.php

@@ -352,7 +352,7 @@ use think\App;class CatPlat extends Base{
 
     public function checkGood($catid,$sale_rate){
         $good =Db::name("platform_youzan")->alias("a")->leftJoin("good_basic b","a.spuCode=b.spuCode")
-        ->where(["b.cat_id"=>$catid,"a.exam_status"=>6,"a.is_del"=>0])->field("a.spuCode,a.skuCode,a.start_sale_num,final_price")
+        ->where(["b.cat_id"=>$catid,"a.exam_status"=>6,"a.is_del"=>0])->field("a.spuCode,a.skuCode,b.good_name,a.start_sale_num,final_price")
         ->select()->toArray();
         $spucode=[];
         if(!empty($good)){
@@ -364,7 +364,8 @@ use think\App;class CatPlat extends Base{
                        continue;
                  }
                }
-               $spucode[]=$value['skuCode'];
+               $temp=["skuCode"=>$value['skuCode'],"good_name"=>$value['good_name'],"spuCode"=>$value['good_name']];
+               $spucode[]=$temp;
             }
         }
         return $spucode;