Merge branch 'web_sannong_fr'

app/JsonRpc/NewsService.php

@@ -1917,14 +1917,14 @@ class NewsService implements NewsServiceInterface
      *  */
     public function getWebsiteshop(array $data): array
     {
-        $input['id'] = $data['id'];
-        $input['website_id'] = $data['website_id'];
-        $catid = $data['catid'];
-        $data = json_decode($input['id'] ?? '', true) ?? [];
-        $result['goods'] = array_map(function ($item) use ($input) {
+        $input['id'] = $data['id']; 
+        $input['website_id'] = $data['website_id']; 
+        $catid = $data['catid']; 
+        $data = json_decode($input['id'] ?? '', true) ?? []; 
+        $result['goods'] = array_map(function ($item) use ($input) { 
             // 检查parent元素是否存在且不是undefined
-            if (isset($item['level']) && $item['level'] != 'undefined' && $item['level'] != "") {
-                list($Levelid, $goodStart, $goodNum) = explode(',', $item['level']);
+            if (isset($item['level']) && $item['level'] != 'undefined' && $item['level']!= "") {
+                list($Levelid, $goodStart,$goodNum) = explode(',', $item['level']);
                 $website = $input['website_id'];
                 $query = Good::where('good.status', 2)
                     ->where('good.website_id', $website);
@@ -1932,38 +1932,29 @@ class NewsService implements NewsServiceInterface
                     case 1:
                     case 2:
                     case 3:
-                        $goods = $query->where(function ($q) use ($Levelid) {
-                            $q->whereRaw("JSON_CONTAINS(good.level, '" . intval($Levelid) . "') = 0")
-                                ->orWhereRaw("JSON_CONTAINS(good.level, '\"" . intval($Levelid) . "\"') = 0");
+                        $goods = $query->where(function($q) use ($Levelid) {
+                            $q->whereRaw("JSON_CONTAINS(good.level, '". intval($Levelid). "') = 0")
+                              ->orWhereRaw("JSON_CONTAINS(good.level, '\"". intval($Levelid). "\"') = 0");
                         });
                         break;
                     case 4:
                         $goods = $query;
                         break;
                     case 5:
-                        $goods = $query->where('type_id', 1);
+                        $goods = $query->where('type_id',1);
                         break;
                     case 6:
-                        $goods = $query->where('type_id', 2);
-
+                        $goods = $query->where('type_id',2);
+                            
                         break;
                     default:
                         return [];
                 }
                 $all_goods = $goods
-                    ->select(
-                        'good.id',
-                        'good.name',
-                        'good.imgurl',
-                        'good.description',
-                        'good.updated_at',
-                        'good.catid',
-                        'good.type_id',
-                        'good.price',
-                        'good.level',
-                        'good.website_id'
-                    )
-                    ->orderBy('updated_at', 'desc')
+                    ->select('good.id', 'good.name', 'good.imgurl', 'good.description',
+                     'good.updated_at', 'good.catid','good.type_id','good.price','good.level',
+                     'good.website_id')
+                    ->orderBy('updated_at','desc')
                     ->offset($goodStart)
                     ->limit($goodNum)
                     ->get();
@@ -2025,9 +2016,9 @@ class NewsService implements NewsServiceInterface
         $web['website_id'] = $website;
         $goods = Good::where('website_id', $website)
             ->where('status', 2)
-            ->select('good.id as good_id', 'name', 'imgurl', 'description', 'updated_at', 'catid', 'type_id', 'website_id')
+            ->select('good.id as good_id', 'name','imgurl','description','updated_at','catid','type_id','website_id')
             ->latest('updated_at')
-            ->offset(($data['page'] - 1) * $data['pageSize'])
+            ->offset(($data['page']-1)*$data['pageSize'])
             ->limit($data['pageSize'])
             ->get();
         
@@ -2056,8 +2047,8 @@ class NewsService implements NewsServiceInterface
             'goods' => $goods,
         ];
         // $resul['goods'] = $goods;
-        if (empty($result)) {
-            return Result::error("查询失败", 0);
+        if(empty($result)){
+            return Result::error("查询失败", 0); 
         }
         return Result::success($result);
     }