|
@@ -93,7 +93,7 @@ func (b MessaggeService) SaveMessage(in *messagecenter.MessageEntity) (errorCode
|
|
|
if in.ItemType == 4 || in.ItemType == 5 || in.ItemType == 6 {
|
|
|
//客服或者机器人聊天
|
|
|
if in.OwnType == 1 {
|
|
|
- // (用户发送)客服接收信息
|
|
|
+ // (用户发送)客服接受
|
|
|
messageMailBox["own_type"] = 1
|
|
|
messageMailBox["send_user_type"] = 2
|
|
|
messageMailBox["receive_user_type"] = 1
|
|
@@ -101,13 +101,17 @@ func (b MessaggeService) SaveMessage(in *messagecenter.MessageEntity) (errorCode
|
|
|
messageMailBox["send_user_id"] = in.NewUserId
|
|
|
messageMailBox["receive_user_id"] = in.ReceiveId
|
|
|
} else {
|
|
|
- //用户接收信息(客服发送)
|
|
|
+ //客服发送(用户接收信息)
|
|
|
messageMailBox["own_type"] = 2
|
|
|
messageMailBox["send_user_type"] = 1
|
|
|
messageMailBox["receive_user_type"] = 2
|
|
|
messageMailBox["own_id"] = in.ReceiveId
|
|
|
messageMailBox["send_user_id"] = in.SendId
|
|
|
messageMailBox["receive_user_id"] = in.ReceiveId
|
|
|
+ if in.ItemType == 4 {
|
|
|
+ messageMailBox["receive_user_id"] = in.NewUserId
|
|
|
+ messageMailBox["own_id"] = in.NewUserId
|
|
|
+ }
|
|
|
}
|
|
|
} else {
|
|
|
messageMailBox["own_type"] = 2
|
|
@@ -139,7 +143,7 @@ func (b MessaggeService) SaveMessage(in *messagecenter.MessageEntity) (errorCode
|
|
|
if in.ItemType == 4 || in.ItemType == 5 || in.ItemType == 6 {
|
|
|
//客服或者机器人聊天
|
|
|
if in.OwnType == 1 {
|
|
|
- //用户发送信息自己保存(接受者为客服)
|
|
|
+ //用户发送(用户接受)
|
|
|
messageMailBox["own_type"] = 2
|
|
|
messageMailBox["send_user_type"] = 2
|
|
|
messageMailBox["receive_user_type"] = 1
|
|
@@ -147,13 +151,16 @@ func (b MessaggeService) SaveMessage(in *messagecenter.MessageEntity) (errorCode
|
|
|
messageMailBox["send_user_id"] = in.NewUserId
|
|
|
messageMailBox["receive_user_id"] = in.ReceiveId
|
|
|
} else {
|
|
|
- //客服发送信息(接受者用户)
|
|
|
+ //客服发送信息(用户接受)
|
|
|
messageMailBox["own_type"] = 1
|
|
|
messageMailBox["send_user_type"] = 1
|
|
|
messageMailBox["receive_user_type"] = 2
|
|
|
messageMailBox["own_id"] = in.SendId
|
|
|
messageMailBox["send_user_id"] = in.SendId
|
|
|
messageMailBox["receive_user_id"] = in.ReceiveId
|
|
|
+ if in.ItemType == 4 {
|
|
|
+ messageMailBox["receive_user_id"] = in.NewUserId
|
|
|
+ }
|
|
|
}
|
|
|
} else {
|
|
|
messageMailBox["own_type"] = 2
|
|
@@ -214,9 +221,12 @@ func (b MessaggeService) FindMessage(in *messagecenter.MessageReq) (*[]map[strin
|
|
|
//自己头像处理
|
|
|
if in.UserType == 2 && count > 0 {
|
|
|
userData := Mysql.FindOne("base_user", map[string]interface{}{"id": in.NewUserId}, "headimg", "")
|
|
|
- for key := range *data {
|
|
|
- (*data)[key]["ownImg"] = (*userData)["headimg"]
|
|
|
+ if userData != nil {
|
|
|
+ for key := range *data {
|
|
|
+ (*data)[key]["ownImg"] = (*userData)["headimg"]
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
updateMap := map[string]interface{}{}
|
|
|
if len(*data) > 0 {
|