liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- GetPromotionSkuPriceMap不与EarningPrice相关

Browse Source
This commit is contained in:
gazebo
2019-06-21 10:32:20 +08:00
parent 16cf42718a
commit 9d01bddc65
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/orderman/order.go
View File

@@ -317,7 +317,7 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.
if skuPriceMap != nil { if skuPriceMap != nil {
if skuID := jxutils.GetSkuIDFromOrderSku(v); skuID > 0 /*&& v.StoreSubName != ""*/ { if skuID := jxutils.GetSkuIDFromOrderSku(v); skuID > 0 /*&& v.StoreSubName != ""*/ {
index := dao.GenSkuPriceMapKey(jxStoreID, v.SkuID) index := dao.GenSkuPriceMapKey(jxStoreID, v.SkuID)
if skuPriceMap[index] != nil { if skuPriceMap[index] != nil && skuPriceMap[index].EarningPrice > 0 {
v.EarningPrice = int64(skuPriceMap[index].EarningPrice) v.EarningPrice = int64(skuPriceMap[index].EarningPrice)
} }
} }

8
business/model/dao/promotion.go
View File

@@ -50,11 +50,9 @@ func GetPromotionSkuPriceMap(db *DaoDB, vendorID int, storeIDs, skuIDs []int, fr
} }
skuPriceMap = make(map[int64]*PromotionStoreSku) skuPriceMap = make(map[int64]*PromotionStoreSku)
for _, v := range skuPriceList { for _, v := range skuPriceList {
if v.EarningPrice > 0 { index := GenSkuPriceMapKey(v.StoreID, v.SkuID)
index := GenSkuPriceMapKey(v.StoreID, v.SkuID) if true /*skuPriceMap[index] == nil || v.EarningPrice < skuPriceMap[index].EarningPrice*/ {
if skuPriceMap[index] == nil || v.EarningPrice < skuPriceMap[index].EarningPrice { skuPriceMap[index] = v
skuPriceMap[index] = v
}
} }
} }
return skuPriceMap, err return skuPriceMap, err