图库优化

app/shop/controllers/PicController.php

@@ -11,7 +11,7 @@ use common\components\util;
 
 class PicController extends BaseController
 {
-	
+
 	//图库列表 shish 2019.12.7
 	public function actionList()
 	{

biz/goods/classes/PicClass.php

@@ -11,10 +11,10 @@ use biz\base\classes\BaseClass;
 
 class PicClass extends BaseClass
 {
-	
+
 	public static $baseFile = '\biz\goods\models\Pic';
-	
-	// $takeCategoryId 是否带上这个图片的所有分类
+
+	// takeCategoryId 是否带上图片的所有分类
 	public static function groupPicBaseInfo($list, $takeCategoryId = false)
 	{
 		$categoryList = [];
@@ -30,7 +30,7 @@ class PicClass extends BaseClass
 		}
 		return $list;
 	}
-	
+
 	//排序最前面的值 shish 2019.12.8
 	public static function getTopNum($merchantId)
 	{
@@ -38,5 +38,5 @@ class PicClass extends BaseClass
 		$num = isset($top['inTurn']) ? $top['inTurn'] : 0;
 		return $num;
 	}
-	
+
 }

biz/goods/services/PicCategoryService.php

@@ -8,11 +8,11 @@ use biz\goods\classes\PicClass;
 
 class PicCategoryService extends BaseService
 {
-
+	
 	public static $baseFile = '\biz\goods\classes\PicCategoryClass';
-
+	
 	//图库列表 shish 2019.12.7
-	public static function getPicList($where)
+	public static function getPicList($where, $takeCategoryId)
 	{
 		$data = PicCategoryClass::getList('*', $where, 'inTurn DESC');
 		$list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
@@ -21,15 +21,15 @@ class PicCategoryService extends BaseService
 		}
 		$picIdList = array_column($list, 'picId');
 		$picInfoList = PicClass::getByIds($picIdList);
-		$data['list'] = PicClass::groupPicBaseInfo($picInfoList);
+		$data['list'] = PicClass::groupPicBaseInfo($picInfoList, $takeCategoryId);
 		return $data;
 	}
-	
+
 	//获取图库分类 shish 2019.12.8
 	public static function getPicHasCategoryId($id)
 	{
 		$list = PicCategoryClass::getAllByCondition(['picId' => $id], null, 'id', 'categoryId');
 		return !empty($list) ? array_keys($list) : [];
 	}
-
+	
 }