Merge branch 'dev' into we7

app/Http/Controllers/Api/V1/AlbumBossController.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: 思维定制
+ * Date: 2019/4/11
+ * Time: 17:41
+ */
+
+namespace App\Http\Controllers\Api\V1;
+
+
+use App\Services\Base\ErrorCode;
+
+class AlbumBossController extends Controller
+{
+
+}

app/Http/Controllers/Api/V1/AlbumController.php

@@ -2365,7 +2365,20 @@ class AlbumController extends Controller
             if($goods){
                 $style = AlbumProductStyleModel::where([['store_id',$store_id],['id',$goods->style]])->first();
                 $cat = AlbumCatModel::where([['store_id',$store_id],['id',$goods->cat_id]])->first();
-                $arr[] = ['name'=>$goods->name,'time'=>date('Y-m-d H:i',strtotime($val['created_at'])),'style'=>$style->name,'cat'=>$cat->name];
+                $arr[] = ['name'=>$goods->name,'time'=>date('Y-m-d H:i',strtotime($val['created_at'])), 'style'=>$style->name, 'cat'=>$cat->name, 'thumb'=>$goods->thumb];
+                if (isset($arr[date('Y-m-d H:i', strtotime($val['created_at']))])) {
+                    if (isset($arr[date('Y-m-d H:i', strtotime($val['created_at']))][$goods->id])) {
+                        $arr[date('Y-m-d H:i', strtotime($val['created_at']))][$goods->id]['times']++;
+                    } else {
+                        $arr[date('Y-m-d H:i', strtotime($val['created_at']))][$goods->id] = [
+                            'name' => $goods->name,
+                            'style' => $style->name,
+                            'cat' => $style->name,
+                            'thumb' => $goods->thumb,
+                            'times' => 1
+                        ];
+                    }
+                }
             }
         }
         return $this->api($arr,0,'success');