Wesmiler

app/Http/Controllers/Api/v1/IndexController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\v1;
 
 use App\Http\Controllers\Api\webApp;
 use App\Services\Api\ArticleService;
+use App\Services\Api\OrderService;
 use App\Services\Api\SupervisorsService;
 use App\Services\Common\AdService;
 use App\Services\Common\NoticeService;
@@ -45,7 +46,6 @@ class IndexController extends webApp
                     'withdraw_open' => ConfigService::make()->getConfigByCode('withdraw_open', 0),
                     'withdraw_min' => ConfigService::make()->getConfigByCode('withdraw_min', 0),
                     'withdraw_fee' => ConfigService::make()->getConfigByCode('withdraw_fee', 0),
-                    'notices' => NoticeService::make()->getRecommandList(),
                 ];
                 RedisService::set($cacheKey, $config, 3600);
             }
@@ -81,6 +81,20 @@ class IndexController extends webApp
     }
 
     /**
+     * 订单公告
+     * @return array
+     */
+    public function notices()
+    {
+        try {
+            return showJson(1010, true, \App\Services\Api\NoticeService::make()->getDataList());
+        } catch (\Exception $exception) {
+            $error = ['data' => $exception->getTrace(), 'err' => $exception->getMessage()];
+            return showJson(1046, false, $error);
+        }
+    }
+
+    /**
      * 验证更新
      * @return array
      */

app/Services/Api/NoticeService.php

@@ -54,16 +54,16 @@ class NoticeService extends BaseService
      * @param int $num
      * @return array|mixed
      */
-    public function getDataList($num = 9)
+    public function getDataList($num = 30, $type=2)
     {
-        $cacheKey = "caches:index:notices";
+        $cacheKey = "caches:index:notices_{$type}";
         $datas = RedisService::get($cacheKey);
         if($datas){
             return $datas;
         }
 
-        $datas =  $this->model->where(['status'=>1,'mark'=>1])
-            ->select(['id','title','create_time','content','status'])
+        $datas =  $this->model->where(['type'=>$type,'status'=>1,'mark'=>1])
+            ->select(['id','title','type','create_time','content','status'])
             ->limit($num)
             ->get();
         $datas = $datas? $datas->toArray() : [];

app/Services/Api/OrderService.php

@@ -13,10 +13,7 @@ namespace App\Services\Api;
 
 use App\Models\GoodsModel;
 use App\Models\GoodsSkuModel;
-use App\Models\MeetingModel;
-use App\Models\MeetingRecordsModel;
 use App\Models\MemberModel;
-use App\Models\OrderCommissionModel;
 use App\Models\OrderGoodsModel;
 use App\Models\OrderModel;
 use App\Models\StoreModel;
@@ -1086,4 +1083,9 @@ class OrderService extends BaseService
             return false;
         }
     }
+
+    public function getNewsOrder($limit = 30)
+    {
+
+    }
 }

routes/api.php

@@ -52,8 +52,7 @@ Route::prefix('v1')->middleware('web.login')->group(function() {
     // 配置和首页数据
     Route::get('/config', [\App\Http\Controllers\Api\v1\IndexController::class, 'config']);
     Route::get('/index/data', [\App\Http\Controllers\Api\v1\IndexController::class, 'data']);
-    Route::get('/index/industry', [\App\Http\Controllers\Api\v1\IndexController::class, 'industry']);
-    Route::post('/article/consult', [\App\Http\Controllers\Api\v1\ArticleController::class, 'consult']);
+    Route::get('/index/notices', [\App\Http\Controllers\Api\v1\IndexController::class, 'notices']);
 
 
     // 用户信息