重构-我审核的机会

@@ -1678,9 +1678,8 @@ func MyApproveChance(header *protocol.RequestHeader, request *protocol.MyApprove
 // 我的收藏
 // 我的收藏
 func MyCollectChance(header *protocol.RequestHeader, request *protocol.MyCollectChanceRequest) (rsp *protocol.MyCollectChanceResponse, err error) {
 func MyCollectChance(header *protocol.RequestHeader, request *protocol.MyCollectChanceRequest) (rsp *protocol.MyCollectChanceResponse, err error) {
 	var (
 	var (
-		myChances []protocol.ChanceCollectItemOrm
+		ormItems []protocol.ChanceCollectItemOrm
 		total    int
 		total    int
-		provider  *protocol.BaseUserInfo
 		favorite *models.ChanceFavorite
 		favorite *models.ChanceFavorite
 	)
 	)
 	if request.LastId > 0 {
 	if request.LastId > 0 {
@@ -1690,7 +1689,7 @@ func MyCollectChance(header *protocol.RequestHeader, request *protocol.MyCollect
 		}
 		}
 		request.LastId = favorite.CollectTime.Unix()
 		request.LastId = favorite.CollectTime.Unix()
 	}
 	}
-	if total, err = models.GetChanceCollect(header.UserId, request.LastId, request.PageSize, &myChances); err != nil {
+	if total, err = models.GetChanceCollect(header.UserId, request.LastId, request.PageSize, &ormItems); err != nil {
 		if err == orm.ErrNoRows {
 		if err == orm.ErrNoRows {
 			err = nil
 			err = nil
 			return
 			return
@@ -1699,61 +1698,62 @@ func MyCollectChance(header *protocol.RequestHeader, request *protocol.MyCollect
 		return
 		return
 	}
 	}
 	rsp = &protocol.MyCollectChanceResponse{Total: total}
 	rsp = &protocol.MyCollectChanceResponse{Total: total}
-	for i := 0; i < len(myChances); i++ {
-		chance := myChances[i]
+	for i := 0; i < len(ormItems); i++ {
+		ormItem := ormItems[i]
 		commItem := &protocol.CommonListItem{}
 		commItem := &protocol.CommonListItem{}
-		commItem.ReviewStatus = chance.ReviewStatus
-		commItem.ChanceId = chance.ChanceId
-		if len(chance.SourceContent) == 0 || chance.ChanceEnableStatus == 0 { //机会删除
-			commItem.ChanceStatus = protocol.ChanceStatusDelete
-		}
-		if chance.Status == models.ChanceStatusClose { //机会关闭
-			commItem.ChanceStatus = protocol.ChanceStatusClose
-		}
-
-		if chance.ChanceUserId > 0 {
-			if provider, err = agg.GetUserBaseInfo(chance.ChanceUserId, header.CompanyId); err != nil {
-				commItem.ChanceStatus = protocol.ChanceStatusDelete
-				log.Error(err)
-				//return
-			} else {
-				item := protocol.ChanceItem{
-					Id:           chance.ChanceId,
-					Provider:     provider,
-					CreateTime:   chance.CreateTime.Unix() * 1000,
-					PublicStatus: chance.PublishStatus,
-				}
-				jsonUnmarshal(chance.SourceContent, &item.FormList)
-				item.FormList = clearEmptyForm(item.FormList)
-				jsonUnmarshal(chance.Images, &item.Pictures)
-				jsonUnmarshal(chance.Voices, &item.Speechs)
-				jsonUnmarshal(chance.Videos, &item.Videos)
-				commItem.Chance = item
-			}
-		}
-
-		commItem.ReviewStatus = chance.ReviewStatus
+		commItem.Chance, commItem.ChanceStatus = agg.SetChanceItem(header, ormItem.CommChanceItemOrm)
+		commItem.ReviewStatus = ormItem.ReviewStatus
+		commItem.ChanceId = ormItem.ChanceId
+		//if len(ormItem.SourceContent) == 0 || ormItem.ChanceEnableStatus == 0 { //机会删除
+		//	commItem.ChanceStatus = protocol.ChanceStatusDelete
+		//}
+		//if ormItem.Status == models.ChanceStatusClose { //机会关闭
+		//	commItem.ChanceStatus = protocol.ChanceStatusClose
+		//}
+		//
+		//if ormItem.ChanceUserId > 0 {
+		//	if provider, err = agg.GetUserBaseInfo(ormItem.ChanceUserId, header.CompanyId); err != nil {
+		//		commItem.ChanceStatus = protocol.ChanceStatusDelete
+		//		log.Error(err)
+		//		//return
+		//	} else {
+		//		item := protocol.ChanceItem{
+		//			Id:           ormItem.ChanceId,
+		//			Provider:     provider,
+		//			CreateTime:   ormItem.CreateTime.Unix() * 1000,
+		//			PublicStatus: ormItem.PublishStatus,
+		//		}
+		//		jsonUnmarshal(ormItem.SourceContent, &item.FormList)
+		//		item.FormList = clearEmptyForm(item.FormList)
+		//		jsonUnmarshal(ormItem.Images, &item.Pictures)
+		//		jsonUnmarshal(ormItem.Voices, &item.Speechs)
+		//		jsonUnmarshal(ormItem.Videos, &item.Videos)
+		//		commItem.Chance = item
+		//	}
+		//}
+		//
+		//commItem.ReviewStatus = ormItem.ReviewStatus
 		{
 		{
 			var chanceData = protocol.ChanceData{
 			var chanceData = protocol.ChanceData{
-				ThumbsUpTotal: chance.ZanTotal,
-				CommentTotal:  chance.CommentTotal,
-				PageViewTotal: chance.ViewTotal,
+				ThumbsUpTotal: ormItem.ZanTotal,
+				CommentTotal:  ormItem.CommentTotal,
+				PageViewTotal: ormItem.ViewTotal,
 			}
 			}
-			chanceData.IsThumbsUp, chanceData.IsCollect, _ = getChanceMarkFlag(header, chance.ChanceId)
+			chanceData.IsThumbsUp, chanceData.IsCollect, _ = getChanceMarkFlag(header, ormItem.ChanceId)
 			commItem.ChanceData = chanceData
 			commItem.ChanceData = chanceData
 		}
 		}
 		{
 		{
 			//做一次查询 查回所有的模板数据
 			//做一次查询 查回所有的模板数据
-			commItem.ChanceTemplate = getTemplate(chance.TemplateId)
-			commItem.ChanceType = getChanceType(chance.ChanceTypeId)
+			commItem.ChanceTemplate = getTemplate(ormItem.TemplateId)
+			commItem.ChanceType = getChanceType(ormItem.ChanceTypeId)
 		}
 		}
 		{
 		{
 			collect := protocol.CollectData{
 			collect := protocol.CollectData{
-				Id:          chance.CollectId,
-				CollectTime: chance.CollectTime.Unix() * 1000,
+				Id:          ormItem.CollectId,
+				CollectTime: ormItem.CollectTime.Unix() * 1000,
 			}
 			}
-			if collect.CollectTime <= 0 && chance.UpdateTime.Unix() > 0 {
-				collect.CollectTime = chance.UpdateTime.Unix() * 1000
+			if collect.CollectTime <= 0 && ormItem.UpdateTime.Unix() > 0 {
+				collect.CollectTime = ormItem.UpdateTime.Unix() * 1000
 			}
 			}
 			//收藏数据
 			//收藏数据
 			commItem.CollectData = collect
 			commItem.CollectData = collect