|
@@ -363,13 +363,15 @@ class ChatController extends BaseController
|
|
return $this->fail(200001);
|
|
return $this->fail(200001);
|
|
}
|
|
}
|
|
|
|
|
|
- $data = WxChat::where(function ($query) use ($uid, $oid) {
|
|
|
|
- $query->where('user_id', $uid)
|
|
|
|
- ->where('object_id', $oid);
|
|
|
|
- })
|
|
|
|
- ->orWhere(function ($query) use ($uid, $oid) {
|
|
|
|
- $query->where('user_id', $oid)
|
|
|
|
- ->where('object_id', $uid);
|
|
|
|
|
|
+ $data = WxChat::where(function($query) use ($uid, $oid) {
|
|
|
|
+ $query->where(function ($query) use ($uid, $oid) {
|
|
|
|
+ $query->where('user_id', $uid)
|
|
|
|
+ ->where('object_id', $oid);
|
|
|
|
+ })
|
|
|
|
+ ->orWhere(function ($query) use ($uid, $oid) {
|
|
|
|
+ $query->where('user_id', $oid)
|
|
|
|
+ ->where('object_id', $uid);
|
|
|
|
+ });
|
|
})
|
|
})
|
|
->where('expand_type','!=',9) //排除问答聊天,因为要独立
|
|
->where('expand_type','!=',9) //排除问答聊天,因为要独立
|
|
->orderByRaw('id DESC')
|
|
->orderByRaw('id DESC')
|
|
@@ -813,13 +815,15 @@ class ChatController extends BaseController
|
|
return $this->fail(200001);
|
|
return $this->fail(200001);
|
|
}
|
|
}
|
|
|
|
|
|
- $data = WxChat::where(function ($query) use ($uid, $oid) {
|
|
|
|
- $query->where('user_id', $uid)
|
|
|
|
- ->where('object_id', $oid);
|
|
|
|
- })
|
|
|
|
- ->orWhere(function ($query) use ($uid, $oid) {
|
|
|
|
- $query->where('user_id', $oid)
|
|
|
|
- ->where('object_id', $uid);
|
|
|
|
|
|
+ $data = WxChat::where(function($query) use ($uid, $oid) {
|
|
|
|
+ $query->where(function ($query) use ($uid, $oid) {
|
|
|
|
+ $query->where('user_id', $uid)
|
|
|
|
+ ->where('object_id', $oid);
|
|
|
|
+ })
|
|
|
|
+ ->orWhere(function ($query) use ($uid, $oid) {
|
|
|
|
+ $query->where('user_id', $oid)
|
|
|
|
+ ->where('object_id', $uid);
|
|
|
|
+ });
|
|
})
|
|
})
|
|
->where('expand_type',9) //只要问答订单的
|
|
->where('expand_type',9) //只要问答订单的
|
|
->where('expand_id',$ask_order_id) //只要问答订单的
|
|
->where('expand_id',$ask_order_id) //只要问答订单的
|