Refactor code

internal/rpc/friend/firend.go

@@ -101,11 +101,12 @@ func (s *friendServer) AddFriend(ctx context.Context, req *pbFriend.AddFriendReq
 	}
 
 	//Establish a latest relationship in the friend request table
-	friendRequest := db.FriendRequest{ReqMsg: req.ReqMsg}
+	friendRequest := db.FriendRequest{ReqMsg: req.ReqMsg, HandleResult: 0}
 	utils.CopyStructFields(&friendRequest, req.CommID)
 	// {openIM001 openIM002 0 test add friend 0001-01-01 00:00:00 +0000 UTC   0001-01-01 00:00:00 +0000 UTC }]
 	log.NewDebug(req.CommID.OperationID, "UpdateFriendApplication args ", friendRequest)
-	err := imdb.InsertFriendApplication(&friendRequest)
+	//err := imdb.InsertFriendApplication(&friendRequest)
+	err := imdb.InsertFriendApplication(&friendRequest, map[string]interface{}{"handle_result": 0})
 	if err != nil {
 		log.NewError(req.CommID.OperationID, "UpdateFriendApplication failed ", err.Error(), friendRequest)
 		return &pbFriend.AddFriendResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil

pkg/common/db/mysql_model/im_mysql_model/friend_request_model.go

@@ -71,15 +71,18 @@ func UpdateFriendApplication(friendRequest *db.FriendRequest) error {
 		friendRequest.FromUserID, friendRequest.ToUserID).Update(&friendRequest).Error
 }
 
-func InsertFriendApplication(friendRequest *db.FriendRequest) error {
+func InsertFriendApplication(friendRequest *db.FriendRequest, args map[string]interface{}) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
 	}
 
 	friendRequest.CreateTime = time.Now()
-	u := dbConn.Table("friend_requests").Where("from_user_id=? and to_user_id=?",
-		friendRequest.FromUserID, friendRequest.ToUserID).Update(&friendRequest)
+	u := dbConn.Model(&friendRequest).Updates(args)
+	//u := dbConn.Table("friend_requests").Where("from_user_id=? and to_user_id=?",
+	// friendRequest.FromUserID, friendRequest.ToUserID).Update(&friendRequest)
+	//u := dbConn.Table("friend_requests").Where("from_user_id=? and to_user_id=?",
+	//	friendRequest.FromUserID, friendRequest.ToUserID).Update(&friendRequest)
 	if u.RowsAffected != 0 {
 		return nil
 	}