Commit 4f331a22 by mushishixian

锁定结果排序

parent 057d86dd
Showing with 41 additions and 34 deletions
...@@ -15,7 +15,7 @@ urls = http://192.168.2.232:9200,http://192.168.2.232:9200 ...@@ -15,7 +15,7 @@ urls = http://192.168.2.232:9200,http://192.168.2.232:9200
index_name = future,rochester,tme,verical,element14,digikey,chip1stop,aipco,arrow,alliedelec,avnet,mouser,zhuanmai,peigenesis,powell,rs,buerklin,liexin_ziying index_name = future,rochester,tme,verical,element14,digikey,chip1stop,aipco,arrow,alliedelec,avnet,mouser,zhuanmai,peigenesis,powell,rs,buerklin,liexin_ziying
search_supplier = future,rochester,tme,verical,element14,digikey,chip1stop,aipco,arrow,alliedelec,avnet,mouser,peigenesis,powell,rs,buerklin,zhuanmai search_supplier = future,rochester,tme,verical,element14,digikey,chip1stop,aipco,arrow,alliedelec,avnet,mouser,peigenesis,powell,rs,buerklin,zhuanmai
hk_delivery_type_supplier = future,rochester,tme,verical,element14,digikey,chip1stop,aipco,arrow,alliedelec,avnet,mouser,peigenesis,powell,rs,buerklin hk_delivery_type_supplier = future,rochester,tme,verical,element14,digikey,chip1stop,aipco,arrow,alliedelec,avnet,mouser,peigenesis,powell,rs,buerklin
attr_index = goods_map2 attr_index = goods_map
[database] [database]
user_name = root user_name = root
......
...@@ -5,6 +5,7 @@ import ( ...@@ -5,6 +5,7 @@ import (
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
"search_server/pkg/config" "search_server/pkg/config"
"search_server/protopb/bom" "search_server/protopb/bom"
"strings"
) )
func GetGoodsInfo(goodsIdsStr string) (goodsList []*bom.GoodsModel, err error) { func GetGoodsInfo(goodsIdsStr string) (goodsList []*bom.GoodsModel, err error) {
...@@ -19,41 +20,47 @@ func GetGoodsInfo(goodsIdsStr string) (goodsList []*bom.GoodsModel, err error) { ...@@ -19,41 +20,47 @@ func GetGoodsInfo(goodsIdsStr string) (goodsList []*bom.GoodsModel, err error) {
} }
//先判断返回的data是不是字典,不是字典代表可能是返回字符串了 //先判断返回的data是不是字典,不是字典代表可能是返回字符串了
if gjson.Get(resp.String(), "data").IsObject() { if gjson.Get(resp.String(), "data").IsObject() {
for _, data := range gjson.Get(resp.String(), "data").Map() { //排序操作
//还要去判断是否是bool goodsIdList := strings.Split(goodsIdsStr, ",")
if data.IsObject() { for _, goodsId := range goodsIdList {
var goods bom.GoodsModel for _, data := range gjson.Get(resp.String(), "data").Map() {
goods.GoodsName = data.Get("goods_name").String() if goodsId == data.Get("goods_id").String() {
goods.GoodsId = data.Get("goods_id").String() //还要去判断是否是bool
goods.BrandId = data.Get("goods_id").Int() if data.IsObject() {
goods.Pdf = data.Get("pdf").String() var goods bom.GoodsModel
goods.Stock = data.Get("stock").Int() goods.GoodsName = data.Get("goods_name").String()
goods.Mpq = data.Get("mpq").Int() goods.GoodsId = data.Get("goods_id").String()
goods.Moq = data.Get("moq").Int() goods.BrandId = data.Get("goods_id").Int()
goods.SupplierName = data.Get("supplier_name").String() goods.Pdf = data.Get("pdf").String()
goods.BrandName = data.Get("brand_name").String() goods.Stock = data.Get("stock").Int()
goods.HkDeliveryType = data.Get("hk_delivery_time").String() goods.Mpq = data.Get("mpq").Int()
goods.CnDeliveryTime = data.Get("cn_delivery_time").String() goods.Moq = data.Get("moq").Int()
goods.IsBuy = data.Get("is_buy").Int() goods.SupplierName = data.Get("supplier_name").String()
goods.Mpl = data.Get("mpl").Int() goods.BrandName = data.Get("brand_name").String()
goods.Encap = data.Get("encap").String() goods.HkDeliveryType = data.Get("hk_delivery_time").String()
goods.SupplierId = data.Get("supplier_id").Int() goods.CnDeliveryTime = data.Get("cn_delivery_time").String()
goods.Status = data.Get("status").Int() goods.IsBuy = data.Get("is_buy").Int()
goods.GoodsType = data.Get("goods_type").Int() goods.Mpl = data.Get("mpl").Int()
goods.AcType = data.Get("ac_type").Int() goods.Encap = data.Get("encap").String()
var ladderPrice []*bom.LADDER_PRICE goods.SupplierId = data.Get("supplier_id").Int()
for _, price := range data.Get("ladder_price").Array() { goods.Status = data.Get("status").Int()
var ladder bom.LADDER_PRICE goods.GoodsType = data.Get("goods_type").Int()
ladder = bom.LADDER_PRICE{ goods.AcType = data.Get("ac_type").Int()
Purchases: price.Get("purchases").Int(), var ladderPrice []*bom.LADDER_PRICE
PriceUs: float32(price.Get("price_us").Float()), for _, price := range data.Get("ladder_price").Array() {
PriceCn: float32(price.Get("price_cn").Float()), var ladder bom.LADDER_PRICE
PriceAc: float32(price.Get("price_ac").Float()), ladder = bom.LADDER_PRICE{
Purchases: price.Get("purchases").Int(),
PriceUs: float32(price.Get("price_us").Float()),
PriceCn: float32(price.Get("price_cn").Float()),
PriceAc: float32(price.Get("price_ac").Float()),
}
ladderPrice = append(ladderPrice, &ladder)
}
goods.LadderPrice = ladderPrice
goodsList = append(goodsList, &goods)
} }
ladderPrice = append(ladderPrice, &ladder)
} }
goods.LadderPrice = ladderPrice
goodsList = append(goodsList, &goods)
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment