Merge branch 'master' into dev

service/service_ly.go

@@ -175,12 +175,6 @@ func (ls *LyService) LyGoodsDetail(ctx context.Context, params RequestParams, go
 		//获取新的在途库存信息
 		sku.OnwayStock = ls.getOnwayStock(sku.GoodsId)
 
-		//获取新的限制库存信息
-		has, limitStock := ls.getLimitStock(sku.GoodsId)
-		if has {
-			sku.Stock = int64(limitStock)
-		}
-
 		//格式化为对象返回
 		if sku.StockInfo == nil {
 			type StockInfoResult struct {
@@ -328,7 +322,11 @@ func (ls *LyService) LyGoodsDetail(ctx context.Context, params RequestParams, go
 
 		//获取关税以及价格转换
 		sku = ls.GetTariffAndPrice(sku)
-
+		//获取新的限制库存信息
+		has, limitStock := ls.getLimitStock(sku.GoodsId)
+		if has {
+			sku.Stock = int64(limitStock)
+		}
 		//最后一步,将sku的全部信息放到有序map里面
 		GoodsRes.Store(goodsId, sku)
 		//(*goodsRes)[goodsId] = A