fix:商品价格

controller/chart/my_chart.go

@@ -41,12 +41,12 @@ func GetMyChartChassify(c *gin.Context) {
 
 	publicClassify, privateClassify, err := chart.GetUserChartClassifyListByCondition(userInfo, publicCondition, privateCondition)
 	if err != nil {
-		response.Fail("获取图表分类失败, Err:" + err.Error(), c)
+		response.Fail("获取图表分类失败, Err:"+err.Error(), c)
 		return
 	}
 
-	respData := &my_chart.MyChartClassifyListResp {
-		PublicClassify: publicClassify,
+	respData := &my_chart.MyChartClassifyListResp{
+		PublicClassify:  publicClassify,
 		PrivateClassify: privateClassify,
 	}
 	response.OkData("获取成功", respData, c)
@@ -81,7 +81,7 @@ func GetMyChartList(c *gin.Context) {
 	privateCondition := make(map[string]interface{})
 	publicClassify, privateClassify, err := chart.GetUserChartClassifyListByCondition(userInfo, publicCondition, privateCondition)
 	if err != nil {
-		response.FailMsg("获取失败", "获取图表分类信息失败, Err:" + err.Error(), c)
+		response.FailMsg("获取失败", "获取图表分类信息失败, Err:"+err.Error(), c)
 		return
 	}
 
@@ -100,7 +100,7 @@ func GetMyChartList(c *gin.Context) {
 	} else if reqKeywords != "" {
 		// 关键词
 		condition += " AND b.chart_name LIKE ?"
-		pars = append(pars, "%" + reqKeywords + "%")
+		pars = append(pars, "%"+reqKeywords+"%")
 		// 搜索自己权限内的图表
 		classifyIds := make([]int, 0)
 		for i := 0; i < len(publicClassify); i++ {
@@ -129,7 +129,7 @@ func GetMyChartList(c *gin.Context) {
 
 	list, err := myChartModel.GetMyChartListByCondition(condition, pars, page, limit)
 	if err != nil {
-		response.FailMsg("获取失败", "获取图库列表失败, Err:" + err.Error(), c)
+		response.FailMsg("获取失败", "获取图库列表失败, Err:"+err.Error(), c)
 		return
 	}
 
@@ -179,10 +179,10 @@ func MoveMyChart(c *gin.Context) {
 	myChassify, err := my_chart_classify.GetClassifyById(req.MyChartClassifyId)
 	if err != nil {
 		if err == utils.ErrNoRow {
-			response.FailMsg("操作失败", "图表分类信息有误, Err:" + err.Error(), c)
+			response.FailMsg("操作失败", "图表分类信息有误, Err:"+err.Error(), c)
 			return
 		}
-		response.FailMsg("操作失败", "获取图表分类信息失败, Err:" + err.Error(), c)
+		response.FailMsg("操作失败", "获取图表分类信息失败, Err:"+err.Error(), c)
 		return
 	}
 	if myChassify.AdminID != adminId {
@@ -196,14 +196,14 @@ func MoveMyChart(c *gin.Context) {
 	if req.PrevMyChartId <= 0 {
 		firstMapItem, err := myChartClassifyMappingModel.GetMyChartSort(adminId, req.MyChartClassifyId, 0)
 		if err != nil {
-			response.FailMsg("操作失败", "获取图表排序失败4001, Err:" + err.Error(), c)
+			response.FailMsg("操作失败", "获取图表排序失败4001, Err:"+err.Error(), c)
 			return
 		}
 		if firstMapItem.Sort <= 0 {
 			firstSort := step / float64(2)
 			err = myChartClassifyMappingModel.MyChartMove(firstSort, adminId, firstMapItem.MyChartId, firstMapItem.MyChartClassifyId)
 			if err != nil {
-				response.FailMsg("操作失败", "移动失败4001, Err:" + err.Error(), c)
+				response.FailMsg("操作失败", "移动失败4001, Err:"+err.Error(), c)
 				return
 			}
 			newSort = step / float64(4)
@@ -213,14 +213,14 @@ func MoveMyChart(c *gin.Context) {
 	} else if req.NextMyChartId <= 0 {
 		latestMapItem, err := myChartClassifyMappingModel.GetMyChartSort(adminId, req.MyChartClassifyId, 1)
 		if err != nil {
-			response.FailMsg("操作失败", "获取图表排序失败4002, Err:" + err.Error(), c)
+			response.FailMsg("操作失败", "获取图表排序失败4002, Err:"+err.Error(), c)
 			return
 		}
 		if latestMapItem.Sort <= 0 {
 			latestSort := step / float64(2)
 			err = myChartClassifyMappingModel.MyChartMove(latestSort, adminId, latestMapItem.MyChartId, latestMapItem.MyChartClassifyId)
 			if err != nil {
-				response.FailMsg("操作失败", "移动失败4002, Err:" + err.Error(), c)
+				response.FailMsg("操作失败", "移动失败4002, Err:"+err.Error(), c)
 				return
 			}
 			newSort = step / float64(4)
@@ -230,12 +230,12 @@ func MoveMyChart(c *gin.Context) {
 	} else {
 		preMapItem, err := myChartClassifyMappingModel.GetMyChartClassifyMapping(adminId, req.PrevMyChartId, req.MyChartClassifyId)
 		if err != nil {
-			response.FailMsg("操作失败", "获取上级图表关联信息失败, Err:" + err.Error(), c)
+			response.FailMsg("操作失败", "获取上级图表关联信息失败, Err:"+err.Error(), c)
 			return
 		}
 		nextMapItem, err := myChartClassifyMappingModel.GetMyChartClassifyMapping(adminId, req.NextMyChartId, req.MyChartClassifyId)
 		if err != nil {
-			response.FailMsg("操作失败", "获取下级图表关联信息失败, Err:" + err.Error(), c)
+			response.FailMsg("操作失败", "获取下级图表关联信息失败, Err:"+err.Error(), c)
 			return
 		}
 		newSort = (preMapItem.Sort + nextMapItem.Sort) / 2
@@ -243,7 +243,7 @@ func MoveMyChart(c *gin.Context) {
 	if newSort >= 0 {
 		err = myChartClassifyMappingModel.MyChartMove(newSort, adminId, req.MyChartId, req.MyChartClassifyId)
 		if err != nil {
-			response.FailMsg("操作失败", "移动失败4003, Err:" + err.Error(), c)
+			response.FailMsg("操作失败", "移动失败4003, Err:"+err.Error(), c)
 			return
 		}
 	}
@@ -310,7 +310,7 @@ func MoveMyChartClassify(c *gin.Context) {
 			response.FailMsg("操作失败", "该图表分类信息有误, Err:", c)
 			return
 		}
-		response.FailMsg("操作失败", "获取图表信息失败" + err.Error(), c)
+		response.FailMsg("操作失败", "获取图表信息失败"+err.Error(), c)
 		return
 	}
 	if myChassify.AdminID != adminId {
@@ -323,7 +323,7 @@ func MoveMyChartClassify(c *gin.Context) {
 	if req.PrevClassifyId > 0 {
 		prevClassify, err := my_chart_classify.GetClassifyByIdAndAdminId(adminId, req.PrevClassifyId)
 		if err != nil {
-			response.FailMsg("操作失败", "移动失败, 获取上一个兄弟节点分类信息失败, Err:" + err.Error(), c)
+			response.FailMsg("操作失败", "移动失败, 获取上一个兄弟节点分类信息失败, Err:"+err.Error(), c)
 			return
 		}
 
@@ -332,7 +332,7 @@ func MoveMyChartClassify(c *gin.Context) {
 			// 下一个兄弟节点
 			nextClassify, err := my_chart_classify.GetClassifyByIdAndAdminId(adminId, req.NextClassifyId)
 			if err != nil {
-				response.FailMsg("操作失败", "移动失败, 获取下一个兄弟节点分类信息失败, Err:" + err.Error(), c)
+				response.FailMsg("操作失败", "移动失败, 获取下一个兄弟节点分类信息失败, Err:"+err.Error(), c)
 				return
 			}
 			// 如果上一个兄弟与下一个兄弟的排序权重是一致的，那么需要将下一个兄弟（以及下个兄弟的同样排序权重）的排序权重+2，自己变成上一个兄弟的排序权重+1
@@ -356,7 +356,7 @@ func MoveMyChartClassify(c *gin.Context) {
 	} else {
 		firstClassify, err := my_chart_classify.GetFirstClassifyByAdminId(adminId)
 		if err != nil && err != utils.ErrNoRow {
-			response.FailMsg("操作失败", "移动失败, 获取获取当前账号下的排序第一条的分类信息失败, Err:" + err.Error(), c)
+			response.FailMsg("操作失败", "移动失败, 获取获取当前账号下的排序第一条的分类信息失败, Err:"+err.Error(), c)
 			return
 		}
 
@@ -375,7 +375,7 @@ func MoveMyChartClassify(c *gin.Context) {
 	if len(updateCol) > 0 {
 		err = my_chart_classify.UpdateClassifySort(adminId, myChassify.MyChartClassifyId, myChassify.Sort, myChassify.ModifyTime)
 		if err != nil {
-			response.FailMsg("操作失败", "更新图表分类排序失败, Err:" + err.Error(), c)
+			response.FailMsg("操作失败", "更新图表分类排序失败, Err:"+err.Error(), c)
 			return
 		}
 	}
@@ -434,7 +434,7 @@ func GetChartBeforeAndNext(c *gin.Context) {
 			response.Fail("图表已被删除，请刷新当前页面", c)
 			return
 		}
-		response.FailMsg("获取失败", "获取我的图表信息失败, Err:" + err.Error(), c)
+		response.FailMsg("获取失败", "获取我的图表信息失败, Err:"+err.Error(), c)
 		return
 	}
 
@@ -468,7 +468,7 @@ func GetChartBeforeAndNext(c *gin.Context) {
 		privateCondition := make(map[string]interface{})
 		publicClassify, privateClassify, err := chart.GetUserChartClassifyListByCondition(userInfo, publicCondition, privateCondition)
 		if err != nil {
-			response.FailMsg("获取失败", "获取图表分类失败, Err:" + err.Error(), c)
+			response.FailMsg("获取失败", "获取图表分类失败, Err:"+err.Error(), c)
 			return
 		}
 		// 合并公共及私有分类
@@ -496,25 +496,25 @@ func GetChartBeforeAndNext(c *gin.Context) {
 			beforeClassifyIdStr := strconv.Itoa(classifyList[beforeClassifyIndex].MyChartClassifyId)
 			beforeClassifyChartList, tempErr := myChartClassifyMappingModel.GetMyChartSortInfoList(beforeClassifyIdStr, 1)
 			if tempErr != nil {
-				response.FailMsg("获取失败", "获取上一个分类图表信息失败4101, Err:" + tempErr.Error(), c)
+				response.FailMsg("获取失败", "获取上一个分类图表信息失败4101, Err:"+tempErr.Error(), c)
 				return
 			}
 			// 上一个分类没有图则继续向上取最后一张直到所取的分类为第一个分类，依旧无图则到顶
-			SearchPrevChart:
-				if len(beforeClassifyChartList) > 0 {
-					beforeChart = beforeClassifyChartList[0]
-				} else {
-					beforeClassifyIndex -= 1
-					if beforeClassifyIndex >= 0 {
-						beforeClassifyIdStr = strconv.Itoa(classifyList[beforeClassifyIndex].MyChartClassifyId)
-						beforeClassifyChartList, tempErr = myChartClassifyMappingModel.GetMyChartSortInfoList(beforeClassifyIdStr, 1)
-						if tempErr != nil {
-							response.FailMsg("获取失败", "获取上一个分类图表信息失败4102, Err:" + tempErr.Error(), c)
-							return
-						}
-						goto SearchPrevChart
+		SearchPrevChart:
+			if len(beforeClassifyChartList) > 0 {
+				beforeChart = beforeClassifyChartList[0]
+			} else {
+				beforeClassifyIndex -= 1
+				if beforeClassifyIndex >= 0 {
+					beforeClassifyIdStr = strconv.Itoa(classifyList[beforeClassifyIndex].MyChartClassifyId)
+					beforeClassifyChartList, tempErr = myChartClassifyMappingModel.GetMyChartSortInfoList(beforeClassifyIdStr, 1)
+					if tempErr != nil {
+						response.FailMsg("获取失败", "获取上一个分类图表信息失败4102, Err:"+tempErr.Error(), c)
+						return
 					}
+					goto SearchPrevChart
 				}
+			}
 		}
 		// 若图表为分类最后一张，则取下一个分类第一张作为下一张返回
 		afterClassifyIndex := currentClassifyIndex + 1
@@ -522,25 +522,25 @@ func GetChartBeforeAndNext(c *gin.Context) {
 			afterClassifyIdStr := strconv.Itoa(classifyList[afterClassifyIndex].MyChartClassifyId)
 			afterClassifyChartList, tempErr := myChartClassifyMappingModel.GetMyChartSortInfoList(afterClassifyIdStr, 2)
 			if tempErr != nil {
-				response.FailMsg("获取失败", "获取下一个分类图表信息失败4103, Err:" + tempErr.Error(), c)
+				response.FailMsg("获取失败", "获取下一个分类图表信息失败4103, Err:"+tempErr.Error(), c)
 				return
 			}
 			// 下一个分类没有图则继续向下取第一张直到所取的分类为最后一个分类，依旧无图则到底
-			SearchNextChart:
-				if len(afterClassifyChartList) > 0 {
-					afterChart = afterClassifyChartList[0]
-				} else {
-					afterClassifyIndex += 1
-					if afterClassifyIndex <= lastClassifyIndex {
-						afterClassifyIdStr = strconv.Itoa(classifyList[afterClassifyIndex].MyChartClassifyId)
-						afterClassifyChartList, tempErr = myChartClassifyMappingModel.GetMyChartSortInfoList(afterClassifyIdStr, 2)
-						if tempErr != nil {
-							response.FailMsg("获取失败", "获取下一个分类图表信息失败4104, Err:" + tempErr.Error(), c)
-							return
-						}
-						goto SearchNextChart
+		SearchNextChart:
+			if len(afterClassifyChartList) > 0 {
+				afterChart = afterClassifyChartList[0]
+			} else {
+				afterClassifyIndex += 1
+				if afterClassifyIndex <= lastClassifyIndex {
+					afterClassifyIdStr = strconv.Itoa(classifyList[afterClassifyIndex].MyChartClassifyId)
+					afterClassifyChartList, tempErr = myChartClassifyMappingModel.GetMyChartSortInfoList(afterClassifyIdStr, 2)
+					if tempErr != nil {
+						response.FailMsg("获取失败", "获取下一个分类图表信息失败4104, Err:"+tempErr.Error(), c)
+						return
 					}
+					goto SearchNextChart
 				}
+			}
 		}
 	}
 
@@ -552,6 +552,7 @@ func GetChartBeforeAndNext(c *gin.Context) {
 		beforeResp.Sort = int(beforeChart.Sort)
 		beforeResp.UniqueCode = beforeChart.UniqueCode
 		beforeResp.ChartInfoId = beforeChart.ChartInfoId
+		beforeResp.ChartInfoSource = beforeChart.ChartInfoSource
 		if beforeIndex < 0 {
 			beforeResp.Switch = 1
 		}
@@ -563,6 +564,7 @@ func GetChartBeforeAndNext(c *gin.Context) {
 		afterResp.Sort = int(afterChart.Sort)
 		afterResp.UniqueCode = afterChart.UniqueCode
 		afterResp.ChartInfoId = afterChart.ChartInfoId
+		beforeResp.ChartInfoSource = beforeChart.ChartInfoSource
 		if afterIndex > lastIndex {
 			afterResp.Switch = 1
 		}
@@ -573,4 +575,4 @@ func GetChartBeforeAndNext(c *gin.Context) {
 	}
 
 	response.OkData("获取成功", resp, c)
-}
+}

models/tables/chart_info/query.go

@@ -73,6 +73,7 @@ type ChartSaveItem struct {
 
 type ChartSortInfo struct {
 	ChartInfoId         int    `description:"图表ID"`
+	ChartInfoSource     int    `description:"1：ETA图库；2：商品价格"`
 	MyChartId           int    `description:"我的图表ID"`
 	MyChartClassifyId   int    `description:"我的图表分类ID"`
 	MyChartClassifyName string `description:"我的图表分类名称"`

models/tables/my_chart_classify_mapping/query.go

@@ -26,12 +26,13 @@ func GetMyChartClassifyMapping(adminId, myChartId, myChartClassifyId int) (item
 }
 
 type MyChartSortInfo struct {
-	ChartInfoId			int		`description:"图表ID"`
-	MyChartId			int		`description:"我的图表ID"`
-	MyChartClassifyId	int		`description:"我的图表分类ID"`
-	MyChartClassifyName	string	`description:"我的图表分类名称"`
-	UniqueCode			string	`description:"图表唯一编码"`
-	Sort				float64	`description:"排序"`
+	ChartInfoId         int     `description:"图表ID"`
+	ChartInfoSource     int     `description:"1：ETA图库；2：商品价格"`
+	MyChartId           int     `description:"我的图表ID"`
+	MyChartClassifyId   int     `description:"我的图表分类ID"`
+	MyChartClassifyName string  `description:"我的图表分类名称"`
+	UniqueCode          string  `description:"图表唯一编码"`
+	Sort                float64 `description:"排序"`
 }
 
 // GetClassifyChartSort 获取指定分类图表排序
@@ -54,6 +55,7 @@ func GetMyChartSortInfoList(myChartClassifyId string, sort int) (item []*MyChart
 				a.my_chart_classify_id,
 				a.sort,
 				c.chart_info_id,
+				c.source as chart_info_source,
 				c.unique_code,
 				d.my_chart_classify_name
 			FROM
@@ -67,7 +69,7 @@ func GetMyChartSortInfoList(myChartClassifyId string, sort int) (item []*MyChart
 			WHERE
 				1 = 1
 			AND a.my_chart_classify_id = ? `
-			//GROUP BY c.chart_info_id `
+	//GROUP BY c.chart_info_id `
 	if sort == 1 {
 		sql += ` ORDER BY sort DESC `
 	} else {
@@ -76,4 +78,4 @@ func GetMyChartSortInfoList(myChartClassifyId string, sort int) (item []*MyChart
 	err = global.MYSQL["data"].Raw(sql, myChartClassifyId).Scan(&item).Error
 
 	return
-}
+}