From af6b9414c9d4aba7ab2b7d7e17db75a17393e4db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 27 Aug 2020 15:13:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/event.go |  6 ++++--
 controllers/event.go        | 19 +++++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/business/model/dao/event.go b/business/model/dao/event.go
index f343fe577..ad4cce5d6 100644
--- a/business/model/dao/event.go
+++ b/business/model/dao/event.go
@@ -146,9 +146,11 @@ func GetImMessageRecord(db *DaoDB, vendorOrderID, userID string, storeID, vendor
 	sql := `
 		SELECT * 
 		  FROM im_message_record
-		 WHERE 1 = 1 
+		 WHERE deleted_at = ? 
 	`
-	sqlParams := []interface{}{}
+	sqlParams := []interface{}{
+		utils.DefaultTimeValue,
+	}
 	if vendorOrderID != "" {
 		sql += " AND vendor_order_id = ?"
 		sqlParams = append(sqlParams, vendorOrderID)
diff --git a/controllers/event.go b/controllers/event.go
index 298bbd83f..6e656b0c1 100644
--- a/controllers/event.go
+++ b/controllers/event.go
@@ -5,6 +5,8 @@ import (
 	"net/http"
 	"time"
 
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+
 	"git.rosy.net.cn/jx-callback/globals"
 
 	"git.rosy.net.cn/jx-callback/business/model/dao"
@@ -130,13 +132,19 @@ func (c *EventController) TestWebsocket() {
 	//将当前客户端放入map中
 	clients[ws] = true
 
-	m := &model.ImMessageRecord{
-		VendorID: 111111,
+	//聊天记录
+	db := dao.GetDB()
+	_, _, err = jxcontext.New(nil, c.GetString("token"), c.Ctx.ResponseWriter, c.Ctx.Request)
+	if err != nil {
+		msg := &CallResult{
+			Code: model.ErrCodeGeneralFailed,
+			Desc: err.Error(),
+		}
+		ws.WriteJSON(&msg)
 	}
+	records, _ := dao.GetImMessageRecord(db, c.GetString("vendorOrderID"), "", 0, -1)
 	// 把消息 写入通道
-	broadcast <- []*model.ImMessageRecord{
-		m,
-	}
+	broadcast <- records
 
 	c.EnableRender = false //Beego不启用渲染
 
@@ -151,7 +159,6 @@ func (c *EventController) TestWebsocket() {
 		} else {
 			//接受消息 业务逻辑
 			broadcast <- s
-			db := dao.GetDB()
 			for _, v := range s {
 				dao.WrapAddIDCULDEntity(v, "")
 				dao.CreateEntity(db, v)