|
@@ -1051,7 +1051,7 @@ class Events
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//开启一个会话
|
|
//开启一个会话
|
|
|
- private static function BeginTalk($kfuid, $uid, $group, $serviceid = 0, $userInfo = false, $isChangeKF = 0)
|
|
|
|
|
|
|
+ private static function BeginTalk($kfuid, $uid, $group, $serviceid = 0, $userInfo = false, $isChangeKF = 0, $oldChatLog = [])
|
|
|
{
|
|
{
|
|
|
|
|
|
|
|
$serviceid = intval($serviceid);
|
|
$serviceid = intval($serviceid);
|
|
@@ -1151,7 +1151,7 @@ class Events
|
|
|
'data' => [
|
|
'data' => [
|
|
|
'user_info' => $userInfo,
|
|
'user_info' => $userInfo,
|
|
|
'conversationId' => $serviceid,
|
|
'conversationId' => $serviceid,
|
|
|
- 'history' => [],
|
|
|
|
|
|
|
+ 'history' => $oldChatLog,
|
|
|
'evaluate_id' => 0,
|
|
'evaluate_id' => 0,
|
|
|
]
|
|
]
|
|
|
];
|
|
];
|
|
@@ -1733,6 +1733,7 @@ class Events
|
|
|
|
|
|
|
|
/////////取消原有会话,开启新会话
|
|
/////////取消原有会话,开启新会话
|
|
|
$oldlog = self::$db->select('*')->from('ws_service_log')->where('servicelog_id=:servicelog_id ')->bindValues(['servicelog_id' => $serviceid])->orderByDESC(['servicelog_id'])->row();
|
|
$oldlog = self::$db->select('*')->from('ws_service_log')->where('servicelog_id=:servicelog_id ')->bindValues(['servicelog_id' => $serviceid])->orderByDESC(['servicelog_id'])->row();
|
|
|
|
|
+ $oldChatLog = self::$db->query("SELECT * FROM `ws_chat_log` where `servicelog_id`= '$serviceid' order by `time_line`");
|
|
|
if (!$oldlog) {
|
|
if (!$oldlog) {
|
|
|
self::DebugOut('changeOtherhKeFu exit5...');
|
|
self::DebugOut('changeOtherhKeFu exit5...');
|
|
|
return false;
|
|
return false;
|
|
@@ -1745,7 +1746,7 @@ class Events
|
|
|
///更新redis数据
|
|
///更新redis数据
|
|
|
self::updteKfTasksByservicd($fromkfuid, $serviceid, $user_info['client_id'], 0);
|
|
self::updteKfTasksByservicd($fromkfuid, $serviceid, $user_info['client_id'], 0);
|
|
|
|
|
|
|
|
- self:: BeginTalk($toukfid, $uid, $groupidto, 0, $user_info, 1);
|
|
|
|
|
|
|
+ self:: BeginTalk($toukfid, $uid, $groupidto, 0, $user_info, 1, $oldChatLog);
|
|
|
self::servicetrutoother('OUT', $fromkfuid, $toukfid, $serviceid, $uid);
|
|
self::servicetrutoother('OUT', $fromkfuid, $toukfid, $serviceid, $uid);
|
|
|
$newUserInfo = json_decode(self::$redis->hget(self::USERINFOKEY, $uid), true);
|
|
$newUserInfo = json_decode(self::$redis->hget(self::USERINFOKEY, $uid), true);
|
|
|
self::servicetrutoother('IN', $toukfid, $fromkfuid, $newUserInfo['serverid'], $uid);
|
|
self::servicetrutoother('IN', $toukfid, $fromkfuid, $newUserInfo['serverid'], $uid);
|