From d954e783d0b7407be9d58e9f46842ebe33a2e531 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Mon, 11 Aug 2025 10:07:43 +0800
Subject: [PATCH 1/3] update

---
 app/Http/Controllers/Mobile/SupplyDemandController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Mobile/SupplyDemandController.php b/app/Http/Controllers/Mobile/SupplyDemandController.php
index 61a9199..d01220d 100755
--- a/app/Http/Controllers/Mobile/SupplyDemandController.php
+++ b/app/Http/Controllers/Mobile/SupplyDemandController.php
@@ -256,7 +256,9 @@ class SupplyDemandController extends CommonController
                 'supply_demand_id' => $all['supply_demand_id'] ?? 0
             ]);
             // 增加联系次数
-            SupplyDemand::where('id', $all['supply_demand_id'])->increment('contact_count');
+            if (isset($all['supply_demand_id'])) {
+                SupplyDemand::where('id', $all['supply_demand_id'])->increment('contact_count');
+            }
         }
         if (isset($all['supply_demand_id'])) {
             $now = date('Y-m-d');

From 45a0cd5370d1cf0439f10a62c77ba29e8b750e8d Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Mon, 11 Aug 2025 10:12:56 +0800
Subject: [PATCH 2/3] update

---
 app/Http/Controllers/Mobile/SupplyDemandController.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/Http/Controllers/Mobile/SupplyDemandController.php b/app/Http/Controllers/Mobile/SupplyDemandController.php
index d01220d..3221734 100755
--- a/app/Http/Controllers/Mobile/SupplyDemandController.php
+++ b/app/Http/Controllers/Mobile/SupplyDemandController.php
@@ -259,6 +259,12 @@ class SupplyDemandController extends CommonController
             if (isset($all['supply_demand_id'])) {
                 SupplyDemand::where('id', $all['supply_demand_id'])->increment('contact_count');
             }
+        } else {
+            // 存在对话，如果也存在供需信息id，则更新供需id到最新
+            if (isset($all['supply_demand_id'])) {
+                $dialogue->supply_demand_id = $all['supply_demand_id'];
+                $dialogue->save();
+            }
         }
         if (isset($all['supply_demand_id'])) {
             $now = date('Y-m-d');

From 20e0730f95aa871ff13959c05d082f4eeaf53507 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Mon, 11 Aug 2025 10:18:10 +0800
Subject: [PATCH 3/3] update

---
 app/Http/Controllers/Mobile/SupplyDemandController.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Mobile/SupplyDemandController.php b/app/Http/Controllers/Mobile/SupplyDemandController.php
index 3221734..f27a268 100755
--- a/app/Http/Controllers/Mobile/SupplyDemandController.php
+++ b/app/Http/Controllers/Mobile/SupplyDemandController.php
@@ -343,9 +343,11 @@ class SupplyDemandController extends CommonController
             return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]);
         }
         // 获取会话id
-        $dialogue = Dialogue::where('user_id', $this->getUserId())
-            ->where('to_user_id', $all['to_user_id'])
-            ->first();
+        $dialogue = Dialogue::where(function ($query) use ($all) {
+            $query->where('user_id', $this->getUserId())->where('to_user_id', $all['to_user_id']);
+        })->orWhere(function ($query) use ($all) {
+            $query->where('user_id', $all['to_user_id'])->where('to_user_id', $this->getUserId());
+        })->first();
         if (empty($dialogue)) {
             return $this->fail([ResponseCode::ERROR_BUSINESS, '会话不存在']);
         }