PhysicalStock

service/service_ly.go

@@ -340,7 +340,7 @@ func (ls *LyService) LyGoodsDetail(ctx context.Context, params RequestParams, go
 			sku.LadderPriceResult = []int{}
 			sku.LadderPriceResult = []int{}
 		}
 		}
 
 
-		sku.Stock, sku.StockJd, sku = ls.GetStock(sku)
+		sku = ls.GetStock(sku)
 
 
 		//判断是否可以购买
 		//判断是否可以购买
 		sku.IsBuy = ls.GetIsBuy(sku)
 		sku.IsBuy = ls.GetIsBuy(sku)

service/service_ly_common.go

@@ -276,7 +276,7 @@ func (ls *LyService) GetIsBuy(sku model.LySku) (isBuy int) {
 }
 }
 
 
 // 获取库存
 // 获取库存
-func (ls *LyService) GetStock(sku model.LySku) (stock_all int64, jd_stock int64, skuResult model.LySku) {
+func (ls *LyService) GetStock(sku model.LySku) (skuResult model.LySku) {
 
 
 	//获取新的在途库存信息
 	//获取新的在途库存信息
 	sku.OnwayStock = ls.getOnwayStock(sku.GoodsId)
 	sku.OnwayStock = ls.getOnwayStock(sku.GoodsId)
@@ -316,7 +316,9 @@ func (ls *LyService) GetStock(sku model.LySku) (stock_all int64, jd_stock int64,
 		jdStockLockStr, _ := redis.String(redisCon.Do("HGET", "sku_lock_stock_jd", sku.GoodsId)) //京东锁库数量
 		jdStockLockStr, _ := redis.String(redisCon.Do("HGET", "sku_lock_stock_jd", sku.GoodsId)) //京东锁库数量
 		jd_stock_t = gconv.Int64(jdStockShiwuStr) - gconv.Int64(jdStockLockStr)
 		jd_stock_t = gconv.Int64(jdStockShiwuStr) - gconv.Int64(jdStockLockStr)
 	}
 	}
-	return stock_all_t, jd_stock_t, sku
+	sku.Stock = stock_all_t
+	sku.StockJd = jd_stock_t
+	return sku
 }
 }
 
 
 // 合并spu的信息
 // 合并spu的信息