From 6a3732a715bdb2fadafed61e6597931fc51cd2bb Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Fri, 10 Feb 2023 11:48:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E7=A3=8B=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/friend/api_cross_qiecuo.go |  9 +++++----
 modules/friend/model_qiecuo.go     | 11 ++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/modules/friend/api_cross_qiecuo.go b/modules/friend/api_cross_qiecuo.go
index 862f3d6e6..3a6fd732b 100644
--- a/modules/friend/api_cross_qiecuo.go
+++ b/modules/friend/api_cross_qiecuo.go
@@ -24,9 +24,13 @@ func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.FriendQiecuoReq)
 		code = pb.ErrorCode_UserOffline
 		return
 	}
+	qr, err := this.moduleFriend.ModelFriendQiecuo.createQiecuoRecord(session.GetUserId(), req.TargetUid)
+	if err != nil {
+		code = pb.ErrorCode_DBError
+		return
+	}
 
 	//判断是否已发送切磋请求
-	qr := this.moduleFriend.ModelFriendQiecuo.getQiecuo(session.GetUserId())
 	if qr == nil {
 		code = pb.ErrorCode_FriendQiecuoTimeout
 		return
@@ -44,9 +48,6 @@ func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.FriendQiecuoReq)
 		return
 	}
 
-	//保存切磋请求10s
-	this.moduleFriend.ModelFriendQiecuo.createQiecuoRecord(session.GetUserId(), req.TargetUid)
-
 	resp := &pb.FriendQiecuoResp{
 		TargetUid: req.TargetUid,
 		Uid:       session.GetUserId(),
diff --git a/modules/friend/model_qiecuo.go b/modules/friend/model_qiecuo.go
index 0f444765e..d228bcc66 100644
--- a/modules/friend/model_qiecuo.go
+++ b/modules/friend/model_qiecuo.go
@@ -37,20 +37,21 @@ func (this *ModelFriendQiecuo) getQiecuo(uid string) *pb.QiecuoRecord {
 }
 
 // 保存切磋记录
-func (this *ModelFriendQiecuo) createQiecuoRecord(uid, targetUid string) error {
+func (this *ModelFriendQiecuo) createQiecuoRecord(uid, targetUid string) (*pb.QiecuoRecord, error) {
 	qr := this.getQiecuo(uid)
 	if qr == nil {
-		if err := this.Add(uid, &pb.QiecuoRecord{
+		r := &pb.QiecuoRecord{
 			Uid:       uid,
 			TargetId:  targetUid,
 			Timestamp: configure.Now().Unix(),
-		}); err != nil {
+		}
+		if err := this.Add(uid, r); err != nil {
 			this.moduleFriend.Errorln(err)
-			return err
+			return nil, err
 		}
 	}
 
-	return nil
+	return qr, nil
 }
 
 // 更新切磋记录