|
@@ -47,11 +47,11 @@ class Service extends Base
|
|
|
}
|
|
}
|
|
|
$param['openid'] = $request->user['openid'];
|
|
$param['openid'] = $request->user['openid'];
|
|
|
$list = $this->service->setModel()->getList($param,null,true,['last','avatar'],['last' => function($data,$resp) use($param){
|
|
$list = $this->service->setModel()->getList($param,null,true,['last','avatar'],['last' => function($data,$resp) use($param){
|
|
|
- $last = (new SaasChatMsg)->where("poi_id",$resp['poi_id'])->where("openid",$param['openid'])->order("create_at desc")->field("content,create_at,type")->findOrEmpty();
|
|
|
|
|
|
|
+ $last = (new SaasChatMsg)->where(['poi_id' => $resp['poi_id'],'openid' => $param['openid'],'is_user' => 0])->order("create_at desc")->field("content,create_at,type")->findOrEmpty();
|
|
|
if ($last->isEmpty()) {
|
|
if ($last->isEmpty()) {
|
|
|
- return ['type' => "text","content"=>"无",'num' => 0,"create_at"=> formatTime(date("Y-m-d H:i:s",time()))];
|
|
|
|
|
|
|
+ return ['type' => "text","content"=>"-",'num' => 0,"create_at"=> formatTime(date("Y-m-d H:i:s",time()))];
|
|
|
}
|
|
}
|
|
|
- return ["content"=> $last['content'],'num' => 0,"create_at"=> formatTime($last['create_at']),'type' => $last['type']];
|
|
|
|
|
|
|
+ return ["content"=> str_cut_ellipsis($last['content'],12),'num' => 0,"create_at"=> formatTime($last['create_at']),'type' => $last['type']];
|
|
|
},'avatar' => function(){
|
|
},'avatar' => function(){
|
|
|
return "https://washmy.oss-cn-guangzhou.aliyuncs.com/storage/20260511/23627b2cb8f73a8a90b95c31d726e6ecad0cbb9a.png";
|
|
return "https://washmy.oss-cn-guangzhou.aliyuncs.com/storage/20260511/23627b2cb8f73a8a90b95c31d726e6ecad0cbb9a.png";
|
|
|
}]);
|
|
}]);
|
|
@@ -96,6 +96,7 @@ class Service extends Base
|
|
|
"poi_id" => $store['poi_id'],
|
|
"poi_id" => $store['poi_id'],
|
|
|
"poi_name" => $store['poi_name'],
|
|
"poi_name" => $store['poi_name'],
|
|
|
"openid" => $request->user['openid'],
|
|
"openid" => $request->user['openid'],
|
|
|
|
|
+ "nickname" => $request->user['nickname'],
|
|
|
"service_id" => $service['id'],
|
|
"service_id" => $service['id'],
|
|
|
"order" => $param['order']??'',
|
|
"order" => $param['order']??'',
|
|
|
"goods" => $param['goods']??'',
|
|
"goods" => $param['goods']??'',
|
|
@@ -104,6 +105,7 @@ class Service extends Base
|
|
|
} else {
|
|
} else {
|
|
|
$chatStore->service_id = $service['id'];
|
|
$chatStore->service_id = $service['id'];
|
|
|
$chatStore->order = $param['order']??'';
|
|
$chatStore->order = $param['order']??'';
|
|
|
|
|
+ $chatStore->nickname = $request->user['nickname'];
|
|
|
$chatStore->goods = $param['goods']??'';
|
|
$chatStore->goods = $param['goods']??'';
|
|
|
$chatStore->last_at = getDateFull();
|
|
$chatStore->last_at = getDateFull();
|
|
|
$chatStore->save();
|
|
$chatStore->save();
|