Merge branch 'dev' of http://gitlab.fjmaimaimai.com/mmm-go/opp into dev

@@ -57,6 +57,9 @@ var errmessge ErrorMap = map[int]string{
 
 
 	5510: "评分配置不存在,请联系管理员",
 	5510: "评分配置不存在,请联系管理员",
 	5511: "发现分计算不一致,请重新提交",
 	5511: "发现分计算不一致,请重新提交",
+
+	//评论相关
+	5601: "评论不存在",
 }
 }
 
 
 const (
 const (

@@ -63,10 +63,13 @@ func SympathyAction(header *protocol.RequestHeader, request *protocol.SympathyAc
 		exists         bool
 		exists         bool
 		chanceFavoirte *models.ChanceFavorite
 		chanceFavoirte *models.ChanceFavorite
 		chance         *models.Chance
 		chance         *models.Chance
+		comment        *models.Comment
 		chanceType     int
 		chanceType     int
 		incre          int    = 1
 		incre          int    = 1
 		table          string = "comment"
 		table          string = "comment"
 		message        string = protocol.MessageZanComment
 		message        string = protocol.MessageZanComment
+		sourceId       int64
+		userId         int64
 	)
 	)
 	rsp = &protocol.SympathyActionResponse{}
 	rsp = &protocol.SympathyActionResponse{}
 	if chanceFavoirte, err = models.GetChanceFavorite(header.UserId, header.CompanyId, request.Id, request.SourceType); err != nil && err != orm.ErrNoRows {
 	if chanceFavoirte, err = models.GetChanceFavorite(header.UserId, header.CompanyId, request.Id, request.SourceType); err != nil && err != orm.ErrNoRows {
@@ -76,11 +79,26 @@ func SympathyAction(header *protocol.RequestHeader, request *protocol.SympathyAc
 	if request.SourceType == protocol.SourceTypeChance {
 	if request.SourceType == protocol.SourceTypeChance {
 		message = protocol.MessageZanChance
 		message = protocol.MessageZanChance
 		if chance, err = models.GetChanceById(request.Id); err != nil {
 		if chance, err = models.GetChanceById(request.Id); err != nil {
-			log.Error("机会不存在", err)
+			log.Error(request.Id, "机会不存在", err)
+			err = protocol.NewErrWithMessage(5101)
 			return
 			return
 		}
 		}
+		sourceId = chance.Id
+		userId = chance.UserId
 		chanceType = chance.ChanceTypeId
 		chanceType = chance.ChanceTypeId
 		table = "chance"
 		table = "chance"
+	} else if request.SourceType == protocol.SourceTypeComment {
+		if comment, err = models.GetCommentById(request.Id); err != nil {
+			log.Error(request.Id, "评论不存在", err)
+			err = protocol.NewErrWithMessage(5601)
+			return
+		}
+		sourceId = comment.Id
+		userId = comment.UserId
+	} else {
+		log.Error(request.SourceType, "type error")
+		err = protocol.NewErrWithMessage(2)
+		return
 	}
 	}
 	if chanceFavoirte != nil {
 	if chanceFavoirte != nil {
 		exists = true
 		exists = true
@@ -138,10 +156,10 @@ END:
 		if request.SympathyType == protocol.UnMarkFlag {
 		if request.SympathyType == protocol.UnMarkFlag {
 			incre = -1
 			incre = -1
 			//删除点赞消息
 			//删除点赞消息
-			agg.DeleteSendedMsg(chance.Id, protocol.SourceTypeChance, chance.UserId, protocol.MsgTypeThumbUp)
+			agg.DeleteSendedMsg(sourceId, request.SourceType, userId, protocol.MsgTypeThumbUp)
 		} else {
 		} else {
 			//发送点赞消息
 			//发送点赞消息
-			agg.SendMsg(chance.UserId, fmt.Sprintf("%v", chance.UserId), chance.CompanyId, chance.Id, 1, message, protocol.MsgTypeThumbUp)
+			agg.SendMsg(userId, fmt.Sprintf("%v", userId), header.CompanyId, request.Id, 1, message, protocol.MsgTypeThumbUp)
 		}
 		}
 		if !utils.ExecuteSqlByRoll(true, agg.GetIncrementSql(table, "zan_total", incre, request.Id)) {
 		if !utils.ExecuteSqlByRoll(true, agg.GetIncrementSql(table, "zan_total", incre, request.Id)) {
 			//
 			//