Merge branch 'ysx-mrq需求-20230710' into dev

go.mod

@@ -45,7 +45,6 @@ require (
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	sigs.k8s.io/yaml v1.2.0 // indirect
 	sigs.k8s.io/yaml v1.2.0 // indirect
-	github.com/shopspring/decimal v1.0.1
 
 
 )
 )
 
 

model/ly_sku.go

@@ -6,7 +6,7 @@ import (
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/gjson"
 )
 )
 
 
-//联营sku结构体
+// 联营sku结构体
 type LySku struct {
 type LySku struct {
 	LadderPrice       []LadderPrice `json:"-"`
 	LadderPrice       []LadderPrice `json:"-"`
 	SpuId             string        `json:"spu_id"`
 	SpuId             string        `json:"spu_id"`
@@ -31,6 +31,7 @@ type LySku struct {
 	Packing           string        `json:"packing"`
 	Packing           string        `json:"packing"`
 	GoodsId           string        `json:"goods_id"`
 	GoodsId           string        `json:"goods_id"`
 	GoodsName         string        `json:"goods_name"`
 	GoodsName         string        `json:"goods_name"`
+	SkuName           string        `json:"sku_name"`
 	BrandName         string        `json:"brand_name"`
 	BrandName         string        `json:"brand_name"`
 	SupplierName      string        `json:"supplier_name"`
 	SupplierName      string        `json:"supplier_name"`
 	Attrs             interface{}   `json:"attrs"`
 	Attrs             interface{}   `json:"attrs"`
@@ -131,7 +132,7 @@ type StockInfo struct {
 	Stock            int    `json:"stock" bson:"stock"`
 	Stock            int    `json:"stock" bson:"stock"`
 }
 }
 
 
-//为什么不直接映射到结构,而要用gjson,因为redis存的数据结构不一定正常,可能类型不一致
+// 为什么不直接映射到结构,而要用gjson,因为redis存的数据结构不一定正常,可能类型不一致
 func InitSkuData(sku string) (data LySku) {
 func InitSkuData(sku string) (data LySku) {
 	goodsSn := gjson.Get(sku, "goods_sn").String()
 	goodsSn := gjson.Get(sku, "goods_sn").String()
 	data.GoodsSn = goodsSn
 	data.GoodsSn = goodsSn
@@ -148,15 +149,18 @@ func InitSkuData(sku string) (data LySku) {
 	goodsStatus := gjson.Get(sku, "goods_status").Int()
 	goodsStatus := gjson.Get(sku, "goods_status").Int()
 	data.GoodsStatus = goodsStatus
 	data.GoodsStatus = goodsStatus
 
 
+	supplierId := gjson.Get(sku, "supplier_id").Int()
+	data.SupplierId = supplierId
+
 	goodsName := gjson.Get(sku, "goods_name").String()
 	goodsName := gjson.Get(sku, "goods_name").String()
 	data.GoodsName = goodsName
 	data.GoodsName = goodsName
 
 
+	skuName := gjson.Get(sku, "goods_name").String()
+	data.SkuName = skuName
+
 	goodsType := gjson.Get(sku, "goods_type").Int()
 	goodsType := gjson.Get(sku, "goods_type").Int()
 	data.GoodsType = goodsType
 	data.GoodsType = goodsType
 
 
-	supplierId := gjson.Get(sku, "supplier_id").Int()
-	data.SupplierId = supplierId
-
 	encoded := gjson.Get(sku, "encoded").String()
 	encoded := gjson.Get(sku, "encoded").String()
 	data.Encoded = encoded
 	data.Encoded = encoded
 
 
@@ -226,7 +230,7 @@ func InitSkuData(sku string) (data LySku) {
 	return
 	return
 }
 }
 
 
-//获取联营商品的阶梯价
+// 获取联营商品的阶梯价
 func getLadderPrice(ladderPriceStr string) (ladderPrice []LadderPrice) {
 func getLadderPrice(ladderPriceStr string) (ladderPrice []LadderPrice) {
 	ladderPriceArr := gjson.Parse(ladderPriceStr).Array()
 	ladderPriceArr := gjson.Parse(ladderPriceStr).Array()
 	for _, price := range ladderPriceArr {
 	for _, price := range ladderPriceArr {
@@ -247,7 +251,7 @@ func getLadderPrice(ladderPriceStr string) (ladderPrice []LadderPrice) {
 	return
 	return
 }
 }
 
 
-//获取原始价格
+// 获取原始价格
 func getOriginPrice(ladderPriceStr string) (ladderPrice []OriginPrice) {
 func getOriginPrice(ladderPriceStr string) (ladderPrice []OriginPrice) {
 	ladderPriceArr := gjson.Parse(ladderPriceStr).Array()
 	ladderPriceArr := gjson.Parse(ladderPriceStr).Array()
 	for _, price := range ladderPriceArr {
 	for _, price := range ladderPriceArr {

service/service_ly_common.go

@@ -184,7 +184,7 @@ func (ls *LyService) GetExtendFee(supplierId int64, canal string) interface{} {
 //获取系数
 //获取系数
 func (ls *LyService) GetCoefficientAndPrice(sku model.LySku) model.LySku {
 func (ls *LyService) GetCoefficientAndPrice(sku model.LySku) model.LySku {
 	if len(sku.LadderPrice) == 0 {
 	if len(sku.LadderPrice) == 0 {
-		sku.Original = nil
+		//sku.Original = nil
 		return sku
 		return sku
 	}
 	}
 	flag := 0
 	flag := 0