diff --git a/app/Controller/v3/GoodsRecommendController.php b/app/Controller/v3/GoodsRecommendController.php index e96b29f..2763cbc 100644 --- a/app/Controller/v3/GoodsRecommendController.php +++ b/app/Controller/v3/GoodsRecommendController.php @@ -47,7 +47,6 @@ class GoodsRecommendController extends BaseController break; case Tabs::APPLET_INDEX_OFFICE: $categoryIds = [97,98]; - var_dump('ids', $categoryIds); // 查询出三级分类 $goodsCategoryIds = GoodsCategory::query()->whereIn('category_id', $categoryIds)->pluck('id'); $builder = $builder->where(function ($query) use ($categoryIds, $goodsCategoryIds) { diff --git a/app/Service/v3/Implementations/ActivityService.php b/app/Service/v3/Implementations/ActivityService.php index 3f3cfc4..3eea246 100644 --- a/app/Service/v3/Implementations/ActivityService.php +++ b/app/Service/v3/Implementations/ActivityService.php @@ -28,11 +28,11 @@ class ActivityService implements ActivityServiceInterface { $builder = GoodsActivity::query() ->with(['store']) - ->where(['type' => $type]); - - if ($marketId != -1) { - $builder = $builder->where('market_id', $marketId); - } + ->where(['type' => $type]) + ->where(function ($query) use ($marketId) { + $query->whereJsonContains("market_ids", [(string)$marketId]) + ->orWhereJsonLength("market_ids", '=', 0); + }); return $builder->get()->toArray(); } diff --git a/app/Service/v3/Implementations/WithdrawalListService.php b/app/Service/v3/Implementations/WithdrawalListService.php index 7ed2c9d..36c2d8c 100644 --- a/app/Service/v3/Implementations/WithdrawalListService.php +++ b/app/Service/v3/Implementations/WithdrawalListService.php @@ -27,7 +27,7 @@ class WithdrawalListService implements WithdrawalListServiceInterface if(!empty($startTime) && !empty($endTime)){ $builder->whereBetween('created_at',[$startTime,$endTime]); } - $paginate = $builder->paginate($pagesize); + $paginate = $builder->orderBy('created_at', 'desc')->paginate($pagesize); $orders = $paginate->toArray(); return ['has_more_pages' => $paginate->hasMorePages(), 'orders' => $orders['data']]; }