kobe6258 4 сар өмнө
parent
commit
81709db154

+ 33 - 13
facade/instance/ht_mini_facade.go

@@ -33,25 +33,27 @@ type HTRequest struct {
 	ChartInfoId int
 	ChartName   string
 	ChartImage  string
+	SourceType  string
+	SourceId    int
 }
 
-func (ht *HTMiniFacade) Collect(data facade.BaseRequest) (err error) {
-	chartInfo, err := models.GetChartInfoByUniqueCode(data.UniqueCode)
+func dealChartInfo(baseReq facade.BaseRequest) (request HTRequest, err error) {
+	chartInfo, err := models.GetChartInfoByUniqueCode(baseReq.UniqueCode)
 	if err != nil {
 		utils.FileLog.Error("收藏失败,获取图表信息失败:%v", err.Error())
-		return err
+		return
 	}
-	url := fmt.Sprintf("%s%s", utils.GetMiniUrl(target), bookMarkUrl)
-	param := HTRequest{
-		BaseRequest: data,
+	request = HTRequest{
+		BaseRequest: baseReq,
 		ChartImage:  chartInfo.ChartImage,
 		ChartInfoId: chartInfo.ChartInfoId,
 		ChartName:   chartInfo.ChartName,
+		SourceType:  "chart",
+		SourceId:    chartInfo.ChartInfoId,
 	}
-	resp, err := ht.Post(url, param, data.Auth)
-	if err != nil {
-		utils.FileLog.Error("收藏失败,err:%v,resp:%v", err, resp)
-	}
+	return
+}
+func parseResult(resp string) (err error) {
 	var response HTResponse
 	err = json.Unmarshal([]byte(resp), &response)
 	if err != nil {
@@ -63,13 +65,31 @@ func (ht *HTMiniFacade) Collect(data facade.BaseRequest) (err error) {
 	}
 	return
 }
-func (ht *HTMiniFacade) UnCollect(data facade.BaseRequest) (err error) {
+func (ht *HTMiniFacade) Collect(req facade.BaseRequest) (err error) {
+	param, err := dealChartInfo(req)
+	if err != nil {
+		utils.FileLog.Error("收藏失败,获取图表信息失败:%v", err.Error())
+		return err
+	}
+	url := fmt.Sprintf("%s%s", utils.GetMiniUrl(target), bookMarkUrl)
+	resp, err := ht.Post(url, param, req.Auth)
+	if err != nil {
+		utils.FileLog.Error("收藏失败,err:%v,resp:%v", err, resp)
+	}
+	return parseResult(resp)
+}
+func (ht *HTMiniFacade) UnCollect(req facade.BaseRequest) (err error) {
+	param, err := dealChartInfo(req)
+	if err != nil {
+		utils.FileLog.Error("收藏失败,获取图表信息失败:%v", err.Error())
+		return err
+	}
 	url := fmt.Sprintf("%s%s", utils.GetMiniUrl(target), unBookMarkUrl)
-	resp, err := ht.Post(url, data, data.Auth)
+	resp, err := ht.Post(url, param, req.Auth)
 	if err != nil {
 		utils.FileLog.Error("取消收藏失败,err:%v,resp:%v", err, resp)
 	}
-	return
+	return parseResult(resp)
 }
 func init() {
 	facade.RegisterMiniFacade(target, &HTMiniFacade{