|
|
@@ -17,7 +17,8 @@ func SendMsg(this message.SendMsgRequest) (int64, string) {
|
|
|
defer orm.Close()
|
|
|
err := orm.Begin()
|
|
|
fmt.Println(err)
|
|
|
- count, _ := orm.Table("conversation").Where("user_id = ? or user_id = ?", this.ReceiveUserId, this.SendUserId).Count()
|
|
|
+ count, _ := orm.Table("conversation").Where("receive_id = ? and send_id = ?", this.ReceiveUserId, this.SendUserId).Count()
|
|
|
+
|
|
|
if count < 1 {
|
|
|
sql1 := `INSERT INTO conversation(appid,` + "`key`" + `,user_id,receive_id,receive_name,send_id,send_name,sort,createtime)
|
|
|
values ('%s','','%s','%s','%s','%s','%s',0,'%s');`
|
|
|
@@ -31,7 +32,7 @@ func SendMsg(this message.SendMsgRequest) (int64, string) {
|
|
|
}
|
|
|
sql2 := `INSERT INTO conversation(appid,` + "`key`" + `,user_id,receive_id,receive_name,send_id,send_name,sort,createtime)
|
|
|
values ('%s','','%s','%s','%s','%s','%s',0,'%s');`
|
|
|
- sql2 = fmt.Sprintf(sql2, this.Appid, this.ReceiveUserId, this.ReceiveUserId, this.ReceiveName, this.SendUserId, this.SendName, time.Now().Format("2006-01-02 15:04:05"))
|
|
|
+ sql2 = fmt.Sprintf(sql2, this.Appid, this.ReceiveUserId, this.SendUserId, this.SendName, this.ReceiveUserId, this.ReceiveName, time.Now().Format("2006-01-02 15:04:05"))
|
|
|
//_, err = orm.Table("conversation").Insert(&conversation)
|
|
|
_, err = orm.Exec(sql2)
|
|
|
if err != nil {
|
|
|
@@ -42,7 +43,7 @@ func SendMsg(this message.SendMsgRequest) (int64, string) {
|
|
|
}
|
|
|
sql := `INSERT INTO message(appid,receive_userid,receive_name,send_userid,send_name,title,content,msg_type,link,cite_id,createtime,isRead,isdel)
|
|
|
values ("%s",'%s','%s','%s','%s','%s','%s','%d','%s',0,'%s',0,1);`
|
|
|
- sql = fmt.Sprintf(sql, this.Appid,this.ReceiveUserId,this.ReceiveName, this.SendUserId, this.SendName,this.Title,this.Content,this.MsgType,this.Link, time.Now().Format("2006-01-02 15:04:05"))
|
|
|
+ sql = fmt.Sprintf(sql, this.Appid, this.ReceiveUserId, this.ReceiveName, this.SendUserId, this.SendName, this.Title, this.Content, this.MsgType, this.Link, time.Now().Format("2006-01-02 15:04:05"))
|
|
|
//_, err = orm.Table("conversation").Insert(&conversation)
|
|
|
_, err = orm.Table("message").Exec(sql)
|
|
|
if err != nil {
|
|
|
@@ -77,7 +78,7 @@ func FindUserMsg(this message.FindUserMsgReq) message.FindUserMsgRes {
|
|
|
//log.Println("数据：", messages)
|
|
|
for _, v := range messages {
|
|
|
data.Data = append(data.Data, &message.Messages{
|
|
|
- Id: int64(v.Id),
|
|
|
+ Id: v.Id,
|
|
|
Appid: v.AppId,
|
|
|
ReceiveUserId: v.ReceiveUserid,
|
|
|
ReceiveName: v.ReceiveName,
|
