update

app/Http/Controllers/Admin/BookController.php

@@ -140,7 +140,17 @@ class BookController extends BaseController
             // 输出
             $list = $list->paginate($all['page_size'] ?? 20);
         }
-        return $this->success($list);
+        // 总数
+        $chart['total'] = Book::count();
+        // 可借阅
+        $chart['borrowable'] = Book::where('status', 0)->count();
+        // 已借阅
+        $chart['borrowed'] = Book::where('status', 1)->count();
+        // 维护中
+        $chart['maintaining'] = Book::where('status', 2)->count();
+        // 分类数据
+        $category = Book::pluck('category')->collapse()->unique()->values();
+        return $this->success(compact('chart', 'category', 'list'));
     }
 
     /**

app/Http/Controllers/Mobile/SupplyDemandController.php

@@ -223,6 +223,21 @@ class SupplyDemandController extends CommonController
         if (empty($model)) {
             return $this->fail([ResponseCode::ERROR_BUSINESS, '供需数据不存在']);
         }
+        // 增加view_count
+        $model->increment('contact_count');
+        $model->save();
+        // 判断是否有会话，没有则创建
+        $dialogue = Dialogue::where('user_id', $this->getUserId())
+            ->where('supply_demand_id', $all['supply_demand_id'])
+            ->first();
+        if (empty($dialogue)) {
+            // 创建一条会话
+            $dialogue = Dialogue::create([
+                'user_id' => $this->getUserId(),
+                'to_user_id' => $model->user_id,
+                'supply_demand_id' => $all['supply_demand_id']
+            ]);
+        }
         // 每天限制私信次数限制
         $message_limit = Config::getValueByKey('message_limit');
         $messageToday = Message::where('user_id', $this->getUserId())
@@ -244,19 +259,17 @@ class SupplyDemandController extends CommonController
         }
         // 创建消息
         Message::create([
+            'dialogue_id' => $dialogue->id,
             'user_id' => $this->getUserId(),
             'to_user_id' => $all['to_user_id'],
             'supply_demand_id' => $all['supply_demand_id'],
             'content' => $all['content'],
             'is_read' => 0
         ]);
-        // 增加view_count
-        $model->increment('contact_count');
-        $model->save();
-        // 创建会话
-        $where = [];
-        $data = [];
-        Dialogue::updateOrCreate([]);
+        // 更新会话最后发言
+        $dialogue->last_content = $all['content'];
+        $dialogue->last_datetime = date('Y-m-d H:i:s');
+        $dialogue->save();
         return $this->success('删除成功');
     }
 
@@ -332,7 +345,7 @@ class SupplyDemandController extends CommonController
                 $query->select('id', 'nickname', 'name', 'headimgurl');
             }
         ])->where(function ($query) use ($all) {
-
+            $query->where('user_id',$this->getUserId())->orWhere('to_user_id',$this->getUserId());
         })->orderBy($all['sort_name'] ?? 'id', $all['sort_type'] ?? 'desc')
             ->paginate($all['page_size'] ?? 20);
         return $this->success(compact('dialogue'));

routes/api.php

@@ -173,9 +173,7 @@ Route::group(["namespace" => "Admin", "prefix" => "admin"], function () {
         Route::get('supply-demand/destroy', [\App\Http\Controllers\Admin\SupplyDemandController::class, "destroy"]);
         Route::get('supply-demand/chart', [\App\Http\Controllers\Admin\SupplyDemandController::class, "chart"]);
 
-
         // 图书管理
-        Route::get('book/other', [\App\Http\Controllers\Admin\BookController::class, "other"]);
         Route::get('book/index', [\App\Http\Controllers\Admin\BookController::class, "index"]);
         Route::get('book/show', [\App\Http\Controllers\Admin\BookController::class, "show"]);
         Route::post('book/save', [\App\Http\Controllers\Admin\BookController::class, "save"]);