Merge branch 'phoenix' of http://120.24.33.109:11081/hyzjshwo/lanzu_api_hyperf into phoenix

app/Controller/v3/GoodsRecommendController.php

@@ -80,7 +80,7 @@ class GoodsRecommendController extends BaseController
         }
 
         $builder->select(''.$goodsTable.'.*')->addSelect([''.$goodsTable.'.sales as total_sales']);
-        $paginate = $builder->groupBy(''.$goodsTable.'.id')->paginate($pagesize);
+        $paginate = $builder->groupBy(''.$goodsTable.'.id')->inRandomOrder()->paginate($pagesize);
         $goods = $paginate->toArray();
         return $this->success(['has_more_pages' => $paginate->hasMorePages(), 'tab_data' => $goods['data']]);
 

app/Service/v3/Implementations/OrderListService.php

@@ -61,6 +61,11 @@ class OrderListService implements OrderListServiceInterface
         // 清除badge
         $this->badgeService->clearUserOrder($userId, $tab);
 
+        co(function () use ($userId) {
+            // 自动取消超时订单
+            $this->autoCancel($userId);
+        });
+
         $paginate = $builder->orderBy('created_at', 'desc')->paginate($pagesize);
         $orders = $paginate->toArray();
         return ['has_more_pages' => $paginate->hasMorePages(), 'orders' => $orders['data']];
@@ -188,4 +193,12 @@ class OrderListService implements OrderListServiceInterface
         $orders = $paginate->toArray();
         return ['has_more_pages' => $paginate->hasMorePages(), 'orders' => $orders['data']];
     }
+
+    public function autoCancel($userId)
+    {
+        return OrderMain::query()
+            ->where(['user_id' => $userId])
+            ->where('created_at', '<', time()-900)
+            ->update(['state' => OrderState::CANCELED]);
+    }
 }

app/Service/v3/Implementations/SearchService.php

@@ -87,7 +87,7 @@ class SearchService implements SearchServiceInterface
         }
 
         $builder->select(''.$goodsTable.'.*')->addSelect([''.$goodsTable.'.sales as total_sales']);
-        $paginate = $builder->groupBy(''.$goodsTable.'.id')->paginate($params['pagesize']);
+        $paginate = $builder->groupBy(''.$goodsTable.'.id')->inRandomOrder()->paginate($params['pagesize']);
         $goods = $paginate->toArray();
         return ['has_more_pages' => $paginate->hasMorePages(), 'goods' => $goods['data']];
     }
@@ -137,7 +137,7 @@ class SearchService implements SearchServiceInterface
                     break;
             }
         }
-        $paginate = $builder->groupBy(''.$storeTable.'.id')->paginate($params['pagesize']);
+        $paginate = $builder->groupBy(''.$storeTable.'.id')->inRandomOrder()->paginate($params['pagesize']);
         $stores = $paginate->map(function ($item, $key) {
             $item->goods;
             return $item;