Merge branch 'master' of http://119.23.72.7/mushishixian/search_server into dev

service/parity_service.go

 package service
 
 import (
+	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/gogf/gf/util/gconv"
 	"github.com/iancoleman/orderedmap"
@@ -10,6 +11,7 @@ import (
 	"search_server/pkg/config"
 	"search_server/pkg/es"
 	"search_server/service/query"
+	"search_server/service/transformer"
 	"sort"
 	"strconv"
 	"strings"
@@ -109,18 +111,29 @@ func (qs *ParityService) GetParity(ctx *gin.Context) (results model.LyResponse)
 				break;
 		    }
 		}
-
-		slic = append(slic,model.DullGoodsData{
+		if tprice == 0 {  //不符合梯度价跳过比价
+			continue;
+		}
+        //转换价格
+		dullGoodsData,err := transformer.MetGoodsInfo(ctx,model.DullGoodsData{
 			ApiGoods:v,
 			GoodsUrl: GoodsUrl,
 			BrandUrl: BrandUrl,
 			Attrs: attrs[v.GoodsId],
 			Tprice: tprice,  //对应梯度价格
 		})
+
+		if err != nil {
+			fmt.Println(err)
+		}
+
+		slic = append(slic,dullGoodsData)
 	}
 
 	sort.Sort(DullGoodsData(slic))
 
+
+
 	allCount := len(slic)  //总条数
 	//分页计算
 	page := ctx.Request.FormValue("page")

update.sh

@@ -3,13 +3,13 @@
 cd /data/golang/search_server
 git reset --hard HEAD
 git pull origin dev
+chmod +x /data/golang/search_server/update.sh
 filename="/data/golang/search_server/cmd/http/http"
 rm -f $filename
 export GO111MODULE=on
 go env -w GOPROXY=https://goproxy.cn,direct
 go build -o /data/golang/search_server/cmd/http/http   /data/golang/search_server/cmd/http/http_server.go
 chmod +x /data/golang/search_server/cmd/http/http
-chmod +x /data/golang/search_server/update.sh
 supervisorctl  restart  go_search_server_9008:*