Commit 70fa074a by hcy

并发问题

parent 64ff5f14
Showing with 20 additions and 13 deletions
...@@ -103,6 +103,7 @@ func (ss *SpuService) SetInit(redisLySkuArr map[string]string, zyGoodsId, lyGood ...@@ -103,6 +103,7 @@ func (ss *SpuService) SetInit(redisLySkuArr map[string]string, zyGoodsId, lyGood
for goods_id, info := range redisLySkuArr { for goods_id, info := range redisLySkuArr {
supplierId := gjson.Get(info, "supplier_id").Int() supplierId := gjson.Get(info, "supplier_id").Int()
supplierIdStr := gconv.String(supplierId)
source := gjson.Get(info, "source").Int() source := gjson.Get(info, "source").Int()
canal := gjson.Get(info, "canal").String() canal := gjson.Get(info, "canal").String()
...@@ -114,8 +115,8 @@ func (ss *SpuService) SetInit(redisLySkuArr map[string]string, zyGoodsId, lyGood ...@@ -114,8 +115,8 @@ func (ss *SpuService) SetInit(redisLySkuArr map[string]string, zyGoodsId, lyGood
if canal != "" { if canal != "" {
canals = append(canals, canal) canals = append(canals, canal)
} }
if supplierId != 17 && !php2go.InArray(supplierId, supplierIds) { if supplierId != 17 && !php2go.InArray(supplierIdStr, supplierIds) {
supplierIds = append(supplierIds, gconv.String(supplierId)) supplierIds = append(supplierIds, supplierIdStr)
} }
if php2go.InArray(supplierId, []int{7, 13, 1688, 17}) { if php2go.InArray(supplierId, []int{7, 13, 1688, 17}) {
needRawGoodsIds = append(needRawGoodsIds, goods_id) needRawGoodsIds = append(needRawGoodsIds, goods_id)
...@@ -144,15 +145,16 @@ func (ss *SpuService) SetInit(redisLySkuArr map[string]string, zyGoodsId, lyGood ...@@ -144,15 +145,16 @@ func (ss *SpuService) SetInit(redisLySkuArr map[string]string, zyGoodsId, lyGood
GoodsLabelTags = gredis.Hmget("default_r", "goods_source_tags", []string{"0", "1", "2", "3", "4", "5", "6"}) GoodsLabelTags = gredis.Hmget("default_r", "goods_source_tags", []string{"0", "1", "2", "3", "4", "5", "6"})
//批量获取原始编码 //批量获取原始编码
if needRawGoodsIds != nil { if len(needRawGoodsIds) > 0 {
AllSkuRawMap = gredis.Hmget("default_r", "sku_raw_map", needRawGoodsIds) AllSkuRawMap = gredis.Hmget("default_r", "sku_raw_map", needRawGoodsIds)
} }
//批量获取锁库信息 //批量获取锁库信息
if zyGoodsId != nil { if len(zyGoodsId) > 0 {
AllSkuLockMap = gredis.Hmget("default_r", "sku_lock_stock", zyGoodsId) //所有锁库信息 AllSkuLockMap = gredis.Hmget("default_r", "sku_lock_stock", zyGoodsId) //所有锁库信息
} }
//查询附加费 //查询附加费
if needExtendFeeId != nil { if len(needExtendFeeId) > 0 {
AllExtendFee = make(map[string]interface{})
redisFeeArr := gredis.Hmget("default_r", "supp_extend_fee", needExtendFeeId) redisFeeArr := gredis.Hmget("default_r", "supp_extend_fee", needExtendFeeId)
for keyOne, feeone := range redisFeeArr { for keyOne, feeone := range redisFeeArr {
if feeone == "" { if feeone == "" {
...@@ -177,7 +179,8 @@ func (ss *SpuService) SetInit(redisLySkuArr map[string]string, zyGoodsId, lyGood ...@@ -177,7 +179,8 @@ func (ss *SpuService) SetInit(redisLySkuArr map[string]string, zyGoodsId, lyGood
} }
} }
//获取供应商货期 //获取供应商货期
if canals != nil { //专营货期 AllDelivery = make(map[string]map[string]string, 0)
if len(canals) > 0 { //专营货期
supplierRatios := gredis.Hmget("default_r", "supp_ratio", canals) supplierRatios := gredis.Hmget("default_r", "supp_ratio", canals)
for dkey, supplierRatio := range supplierRatios { for dkey, supplierRatio := range supplierRatios {
if supplierRatio == "" { if supplierRatio == "" {
...@@ -200,24 +203,28 @@ func (ss *SpuService) SetInit(redisLySkuArr map[string]string, zyGoodsId, lyGood ...@@ -200,24 +203,28 @@ func (ss *SpuService) SetInit(redisLySkuArr map[string]string, zyGoodsId, lyGood
} }
} }
} }
if supplierIds != nil { //代购货期 if len(supplierIds) > 0 { //代购货期
supplierRatios := gredis.Hmget("default_r", "SUPPLIER_REDIS_INFO_", supplierIds) supplierRatios := gredis.Hmget("default_r", "SUPPLIER_REDIS_INFO_", supplierIds)
for dkey, sinfo := range supplierRatios { for dkey, sinfo := range supplierRatios {
cnDelivery := gjson.Get(sinfo, "cn_delivery").String() cnDelivery := gjson.Get(sinfo, "cn_delivery").String()
hkDelivery := gjson.Get(sinfo, "hk_delivery").String() hkDelivery := gjson.Get(sinfo, "hk_delivery").String()
if cnDelivery != "" || hkDelivery != "" { if cnDelivery != "" || hkDelivery != "" {
AllDelivery[dkey]["cn_delivery"] = cnDelivery AllDelivery[dkey] = map[string]string{
AllDelivery[dkey]["hk_delivery"] = hkDelivery "cn_delivery": cnDelivery,
return "hk_delivery": hkDelivery,
}
} else { } else {
AllDelivery[dkey]["cn_delivery"] = "" AllDelivery[dkey] = map[string]string{
AllDelivery[dkey]["hk_delivery"] = "" "cn_delivery": "",
"hk_delivery": "",
}
} }
} }
} }
//批量获取联营tags-标签 //批量获取联营tags-标签
if lyGoodsId != nil { if len(lyGoodsId) > 0 {
AllLyGoodsTag = make(map[string]model.GoodsTag, 0)
goodsTagArr := gredis.Hmget("default_r", "goods_tag", lyGoodsId) goodsTagArr := gredis.Hmget("default_r", "goods_tag", lyGoodsId)
var tags []int var tags []int
for goods_id, goodsTagsStr := range goodsTagArr { for goods_id, goodsTagsStr := range goodsTagArr {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment