Merge branch 'master' into dev

service/service_ly_common.go

@@ -266,8 +266,9 @@ func (ls *LyService) GetStock(sku model.LySku) (stock int64) {
 		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))
 		stock, _ = strconv.ParseInt(stockStr, 10, 64)
 		stock, _ = strconv.ParseInt(stockStr, 10, 64)
+		return sku.Stock - stock
 	}
 	}
-	return
+	return sku.Stock
 }
 }
 
 
 // 合并spu的信息
 // 合并spu的信息