Merge branch 'dev' of http://git.ichunt.net/q578953158/go_sku_server into dev

cmd/http/http_server.go

@@ -4,9 +4,11 @@ import (
 	"flag"
 	"flag"
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin"
 	"github.com/micro/go-micro/v2/web"
 	"github.com/micro/go-micro/v2/web"
+	"github.com/syyongx/php2go"
 	"go_sku_server/boot"
 	"go_sku_server/boot"
 	"go_sku_server/pkg/config"
 	"go_sku_server/pkg/config"
 	"go_sku_server/routes"
 	"go_sku_server/routes"
+	"go_sku_server/service"
 )
 )
 
 
 func main() {
 func main() {
@@ -16,21 +18,23 @@ func main() {
 	if err := boot.Boot(path); err != nil {
 	if err := boot.Boot(path); err != nil {
 		panic(err)
 		panic(err)
 	}
 	}
+	Self_supplier_code_str := config.Get("web.self_supplier_code").String()
+	service.Self_supplier_code = php2go.Explode(",", Self_supplier_code_str)
 
 
 	gin.SetMode(config.Get("web.mode").String())
 	gin.SetMode(config.Get("web.mode").String())
 	r := routes.InitRouter()
 	r := routes.InitRouter()
 	port := config.Get("web.port").String()
 	port := config.Get("web.port").String()
 	//web改成micro 就是grpc,并直接注册到etcd里面
 	//web改成micro 就是grpc,并直接注册到etcd里面
-	service := web.NewService(
+	serviceT := web.NewService(
 		web.Name("go.micro.api.http.search"),
 		web.Name("go.micro.api.http.search"),
 		web.Handler(r),
 		web.Handler(r),
 		web.Address(":"+port),
 		web.Address(":"+port),
 	)
 	)
 
 
-	if err := service.Init(); err != nil {
+	if err := serviceT.Init(); err != nil {
 		panic(err)
 		panic(err)
 	}
 	}
-	if err := service.Run(); err != nil {
+	if err := serviceT.Run(); err != nil {
 		panic(err)
 		panic(err)
 	}
 	}
 
 

cmd/http_server.go

@@ -4,9 +4,11 @@ import (
 	"flag"
 	"flag"
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin"
 	"github.com/micro/go-micro/v2/web"
 	"github.com/micro/go-micro/v2/web"
+	"github.com/syyongx/php2go"
 	"go_sku_server/boot"
 	"go_sku_server/boot"
 	"go_sku_server/pkg/config"
 	"go_sku_server/pkg/config"
 	"go_sku_server/routes"
 	"go_sku_server/routes"
+	"go_sku_server/service"
 )
 )
 
 
 func main() {
 func main() {
@@ -16,6 +18,8 @@ func main() {
 	if err := boot.Boot(path); err != nil {
 	if err := boot.Boot(path); err != nil {
 		panic(err)
 		panic(err)
 	}
 	}
+	Self_supplier_code_str := config.Get("web.self_supplier_code").String()
+	service.Self_supplier_code = php2go.Explode(",", Self_supplier_code_str)
 
 
 	gin.SetMode(config.Get("web.mode").String())
 	gin.SetMode(config.Get("web.mode").String())
 	r := routes.InitRouter()
 	r := routes.InitRouter()

conf/dev/config.ini

@@ -3,6 +3,8 @@
 port = 60014
 port = 60014
 mode = debug
 mode = debug
 cors_domain = http://bom.liexin.com
 cors_domain = http://bom.liexin.com
+;专营自营
+self_supplier_code =L0012413,L0017764,L0018319,L0018562
 
 
 [message]
 [message]
 api_domain = http://api.ichunt.com/msg/sendMessageByAuto
 api_domain = http://api.ichunt.com/msg/sendMessageByAuto
@@ -16,3 +18,5 @@ SEARCH_API_MONITOR = 6d0fa85e01a02c39347d011ae973fd21b76c6c7ce582d3ea470c6b65a31
 [spu_server]
 [spu_server]
 ;api_domain =  http://192.168.2.72:8005
 ;api_domain =  http://192.168.2.72:8005
 api_domain =  http://localhost:8005
 api_domain =  http://localhost:8005
+
+

service/service_ly_common.go

@@ -19,6 +19,8 @@ import (
 	_ "gopkg.in/mgo.v2/bson"
 	_ "gopkg.in/mgo.v2/bson"
 )
 )
 
 
+var Self_supplier_code []string //所有自营的编码
+
 // 获取图片信息
 // 获取图片信息
 func (ls *LyService) GetGoodsImages(sku model.LySku, spu string) model.LySku {
 func (ls *LyService) GetGoodsImages(sku model.LySku, spu string) model.LySku {
 	//图片
 	//图片
@@ -262,7 +264,7 @@ func (ls *LyService) GetStock(sku model.LySku) (stock int64) {
 	}
 	}
 	//这里还有一个逻辑
 	//这里还有一个逻辑
 	//如果是寄售的数据(source=12),获取的库存还要减去锁库的库存
 	//如果是寄售的数据(source=12),获取的库存还要减去锁库的库存
-	if sku.Source == 12 {
+	if sku.Source == 12 || php2go.InArray(sku.Canal, Self_supplier_code) {
 		//获取锁库库存
 		//获取锁库库存
 		redisCon := gredis.Conn("search_r")
 		redisCon := gredis.Conn("search_r")
 		stockStr, _ := redis.String(redisCon.Do("HGET", "sku_lock_stock", sku.GoodsId))
 		stockStr, _ := redis.String(redisCon.Do("HGET", "sku_lock_stock", sku.GoodsId))