|
|
@@ -9,20 +9,20 @@ use common\components\util;
|
|
|
|
|
|
class PicService extends BaseService
|
|
|
{
|
|
|
-
|
|
|
+
|
|
|
public static $baseFile = '\biz\goods\classes\PicClass';
|
|
|
-
|
|
|
- public static function getPicList($where)
|
|
|
+
|
|
|
+ public static function getPicList($where, $takeCategoryId)
|
|
|
{
|
|
|
$data = PicClass::getList('*', $where, 'inTurn DESC,addTime DESC');
|
|
|
$list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
|
|
|
if (empty($list)) {
|
|
|
return $data;
|
|
|
}
|
|
|
- $data['list'] = PicClass::groupPicBaseInfo($list);
|
|
|
+ $data['list'] = PicClass::groupPicBaseInfo($list, $takeCategoryId);
|
|
|
return $data;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
public static function addPic($data)
|
|
|
{
|
|
|
PicClass::addPic();
|
|
|
@@ -39,8 +39,8 @@ class PicService extends BaseService
|
|
|
public static function getPic($info)
|
|
|
{
|
|
|
$id = $info['id'];
|
|
|
- $hasCategory = PicCategoryService::getPicHasCategory($id);
|
|
|
- $info['categoryIdList'] = $hasCategory;
|
|
|
+ $hasCategoryId = PicCategoryService::getPicHasCategoryId($id);
|
|
|
+ $info['categoryIdList'] = $hasCategoryId;
|
|
|
$info = business::formatPic($info);
|
|
|
return $info;
|
|
|
}
|