Explorar el Código

fix:完善图表收藏

zqbao hace 9 meses
padre
commit
3b07fb709d
Se han modificado 3 ficheros con 18 adiciones y 4 borrados
  1. 1 1
      controllers/chart.go
  2. 15 1
      controllers/my_chart.go
  3. 2 2
      services/chart.go

+ 1 - 1
controllers/chart.go

@@ -71,7 +71,7 @@ func (this *ChartController) Detail() {
 		return
 	}
 
-	result, err := services.GetChartDetail(chartInfoId)
+	result, err := services.GetChartDetail(chartInfoId, "")
 	if err != nil {
 		br.Msg = "获取图表详情失败"
 		br.ErrMsg = "获取图表详情失败,Err:" + err.Error()

+ 15 - 1
controllers/my_chart.go

@@ -38,6 +38,20 @@ func (this *MyChartController) Collect() {
 		br.Msg = "用户没有权限收藏"
 		return
 	}
+	if req.ChartInfoId == 0 {
+		chartResp, err := services.GetChartDetail(req.ChartInfoId, req.UniqueCode)
+		if err != nil {
+			br.Msg = "收藏失败"
+			br.Msg = "获取图表信息失败,系统错误,Err:" + err.Error()
+			return
+		}
+		if chartResp.Ret != 200 {
+			br.Msg = chartResp.Msg
+			br.ErrMsg = chartResp.ErrMsg
+			return
+		}
+		req.ChartInfoId = chartResp.Data.ChartInfoId
+	}
 	count, err := models.GetMyChartCount(user.UserId, req.UniqueCode)
 	if err != nil {
 		br.Msg = "收藏失败"
@@ -250,7 +264,7 @@ func (this *MyChartController) Detail() {
 		return
 	}
 
-	result, err := services.GetChartDetail(chartInfoId)
+	result, err := services.GetChartDetail(chartInfoId, "")
 	if err != nil {
 		br.Msg = "获取图表详情失败"
 		br.ErrMsg = "获取图表详情失败,Err:" + err.Error()

+ 2 - 2
services/chart.go

@@ -24,9 +24,9 @@ func GetChartList(currentIndex, pageSize int) (resp *resp2.ChartResp[resp2.Chart
 
 }
 
-func GetChartDetail(chartInfoId int) (resp *resp2.ChartResp[resp2.ChartInfoView], err error) {
+func GetChartDetail(chartInfoId int, uniqueCode string) (resp *resp2.ChartResp[resp2.ChartInfoView], err error) {
 	url := utils.ETA_MINI_BRIDGE_URL + "/chart/detail?"
-	url += fmt.Sprintf("ChartInfoId=%d", chartInfoId)
+	url += fmt.Sprintf("ChartInfoId=%d&UniqueCode=%s", chartInfoId, uniqueCode)
 	fmt.Println(url)
 	body, err := HttpGet(url)
 	if err != nil {