Merge branch 'needs/chart_collect_20230131'

controller/chart/chart_info.go

@@ -67,7 +67,7 @@ func GetChartInfoDetail(c *gin.Context) {
 	chartInfo, err = chartInfoModel.GetChartInfoViewById(chartInfoId)
 	if err != nil {
 		if err == utils.ErrNoRow {
-			response.Fail("图表不存在，请刷新页面", c)
+			response.Custom(4003, "图表不存在，请刷新页面", c)
 			return
 		}
 		response.FailMsg("获取失败", "获取图表信息失败, Err:"+err.Error(), c)

controller/my_chart/my_chart.go

@@ -221,7 +221,7 @@ func (this *MyChartController) Collect(c *gin.Context) {
 	response.OkData("操作成功", collectId, c)
 }
 
-// 取消收藏 CollectCancel
+// CollectCancel 取消收藏
 func (this *MyChartController) CollectCancel(c *gin.Context) {
 	var req request.MyChartCollectCancelReq
 	if c.ShouldBind(&req) != nil {
@@ -250,19 +250,19 @@ func (this *MyChartController) CollectCancel(c *gin.Context) {
 	userId := int(userInfo.UserID)
 
 	// 获取图表信息
-	chartInfo, e := chartInfoModel.GetChartInfoViewByUniqueCode(req.UniqueCode)
-	if e != nil {
-		response.FailMsg("操作失败", "UniqueCode获取图表信息失败, Err:"+e.Error(), c)
-		return
-	}
-	if chartInfo.ChartInfoId <= 0 {
-		response.FailMsg("操作失败", "图表信息有误", c)
-		return
-	}
+	//chartInfo, e := chartInfoModel.GetChartInfoViewByUniqueCode(req.UniqueCode)
+	//if e != nil {
+	//	response.FailMsg("操作失败", "UniqueCode获取图表信息失败, Err:"+e.Error(), c)
+	//	return
+	//}
+	//if chartInfo.ChartInfoId <= 0 {
+	//	response.FailMsg("操作失败", "图表信息有误", c)
+	//	return
+	//}
 
-	cond := `user_id = ? AND chart_info_id = ?`
+	cond := `user_id = ? AND unique_code = ?`
 	pars := make([]interface{}, 0)
-	pars = append(pars, userId, chartInfo.ChartInfoId)
+	pars = append(pars, userId, req.UniqueCode)
 	ob := new(yb_my_chart.YbMyChart)
 	// 此处可能出现同一个报告两个同样的图表均有"取消收藏"按钮，点击第一个取消之后再点击第二个会报错，此时进行一个友好的提示"已取消收藏"
 	item, e := ob.FetchByCondition(cond, pars)
@@ -337,34 +337,34 @@ func (this *MyChartController) IsCollect(c *gin.Context) {
 	// 获取用户信息
 	userInfo, e := userService.GetUserInfoByToken(req.Authorization)
 	if e != nil {
-		response.FailMsg("操作失败", "Token获取有效用户失败, Err: "+e.Error(), c)
+		response.FailMsg("获取失败", "Token获取有效用户失败, Err: "+e.Error(), c)
 		return
 	}
 	if userInfo.UserID <= 0 {
-		response.FailMsg("操作失败", "Token获取有效用户失败", c)
+		response.FailMsg("获取失败", "Token获取有效用户失败", c)
 		return
 	}
 	userId := int(userInfo.UserID)
 
 	// 获取图表信息
-	chartInfo, e := chartInfoModel.GetChartInfoViewByUniqueCode(req.UniqueCode)
-	if e != nil {
-		response.FailMsg("操作失败", "UniqueCode获取图表信息失败, Err:"+e.Error(), c)
-		return
-	}
-	if chartInfo.ChartInfoId <= 0 {
-		response.FailMsg("操作失败", "图表信息有误", c)
-		return
-	}
+	//chartInfo, e := chartInfoModel.GetChartInfoViewByUniqueCode(req.UniqueCode)
+	//if e != nil {
+	//	response.FailMsg("操作失败", "UniqueCode获取图表信息失败, Err:"+e.Error(), c)
+	//	return
+	//}
+	//if chartInfo.ChartInfoId <= 0 {
+	//	response.FailMsg("操作失败", "图表信息有误", c)
+	//	return
+	//}
 
 	// 是否已收藏
 	ob := new(yb_my_chart.YbMyChart)
-	cond := `user_id = ? AND chart_info_id = ?`
+	cond := `user_id = ? AND unique_code = ?`
 	pars := make([]interface{}, 0)
-	pars = append(pars, userId, chartInfo.ChartInfoId)
+	pars = append(pars, userId, req.UniqueCode)
 	exists, e := ob.FetchByCondition(cond, pars)
 	if e != nil && e != utils.ErrNoRow {
-		response.FailMsg("操作失败", "获取用户图表失败, Err: "+e.Error(), c)
+		response.FailMsg("获取失败", "获取用户图表失败, Err: "+e.Error(), c)
 		return
 	}
 	isCollect := false