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

Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark

Browse Source
This commit is contained in:
gazebo
2019-12-24 21:01:22 +08:00
parent 4f3e97268f c124acc53a
commit bc5baf2a7c
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
business/jxstore/cms/store_sku.go
View File

@@ -892,9 +892,9 @@ func uniqueStoreNameBind(skuBindInfos []*StoreSkuBindInfo) (outSkuBindInfos []*S
} }
func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs []int, skuBindInfos []*StoreSkuBindInfo, isScale bool) (needSyncSkus []int, err error) { func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs []int, skuBindInfos []*StoreSkuBindInfo, isScale bool) (needSyncSkus []int, err error) {
if len(storeIDs)*len(skuBindInfos) > maxStoreNameBind2 { // if len(storeIDs)*len(skuBindInfos) > maxStoreNameBind2 {
return nil, fmt.Errorf("门店商品信息大于%d", maxStoreNameBind2) // return nil, fmt.Errorf("门店商品信息大于%d", maxStoreNameBind2)
} // }
storeIDs = uniqueStoreIDs(storeIDs) storeIDs = uniqueStoreIDs(storeIDs)
skuBindInfos = uniqueStoreNameBind(skuBindInfos) skuBindInfos = uniqueStoreNameBind(skuBindInfos)
@@ -2235,8 +2235,8 @@ func GetTopSkusByCityCode(ctx *jxcontext.Context, cityCode, storeID int) (skuNam
} }
for _, v := range skuNameAndPlace { for _, v := range skuNameAndPlace {
if skuNameMap[v.ID] != nil { if skuNameMap[v.ID] != nil {
midPrice, err := dao.GetMidPriceByNameID(db, cityCode, v.ID, utils.Time2Date(time.Now().AddDate(0, 0, -1))) midPrice, _ := dao.GetMidPriceByNameID(db, cityCode, v.ID, utils.Time2Date(time.Now().AddDate(0, 0, -1)))
if err == nil { if midPrice != 0 {
v.Price = midPrice v.Price = midPrice
} }
v.Type = skuNameMap[v.ID].BrandID v.Type = skuNameMap[v.ID].BrandID

16
business/model/dao/store_sku.go
View File

@@ -929,7 +929,7 @@ func UpdateStoreSkuBindSyncStatusForExPrefix(db *DaoDB, vendorIDs []int) (num in
for _, v := range vendorIDs { for _, v := range vendorIDs {
fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[v]) fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[v])
sql += ` %s_sync_status = %s_sync_status | ?,` sql += ` %s_sync_status = %s_sync_status | ?,`
fmtParams = append(fmtParams, fieldPrefix) fmtParams = append(fmtParams, fieldPrefix, fieldPrefix)
sqlParams = append(sqlParams, model.SyncFlagModifiedMask) sqlParams = append(sqlParams, model.SyncFlagModifiedMask)
} }
} else { } else {
@@ -1084,7 +1084,7 @@ func GetTopSkusByCityCode(db *DaoDB, cityCode int, orderCreate time.Time) (skuNa
JOIN place e ON e.code = d.city_code JOIN place e ON e.code = d.city_code
WHERE 1=1 WHERE 1=1
AND b.sale_price > ? AND b.sale_price > ?
AND a.created_at BETWEEN ? and NOW() AND a.order_created_at BETWEEN ? and NOW()
GROUP BY 2,3,4 GROUP BY 2,3,4
ORDER BY count DESC ORDER BY count DESC
` `
@@ -1352,7 +1352,7 @@ func GetMidPriceByNameID(db *DaoDB, cityCode, skuNameID int, snapDate time.Time)
skuMap = make(map[int]int) skuMap = make(map[int]int)
) )
sql := ` sql := `
SELECT a.mid_price bind_price,a.sku_id,b.spec_quality SELECT a.mid_price bind_price,a.sku_id,b.spec_quality sku_spec_quality
FROM price_refer_snapshot a FROM price_refer_snapshot a
JOIN sku b ON a.sku_id = b.id JOIN sku b ON a.sku_id = b.id
JOIN sku_name c ON c.id = b.name_id JOIN sku_name c ON c.id = b.name_id
@@ -1369,10 +1369,12 @@ func GetMidPriceByNameID(db *DaoDB, cityCode, skuNameID int, snapDate time.Time)
if err != nil { if err != nil {
return 0, err return 0, err
} }
for _, v := range storeSkuExt { if len(storeSkuExt) > 0 {
price = model.SpecialSpecQuality / int(utils.Float64TwoInt64(float64(v.SkuSpecQuality))) * v.BindPrice for _, v := range storeSkuExt {
if skuMap[skuNameID] < price { price = model.SpecialSpecQuality / int(utils.Float64TwoInt64(float64(v.SkuSpecQuality))) * v.BindPrice
skuMap[skuNameID] = price if skuMap[skuNameID] < price {
skuMap[skuNameID] = price
}
} }
} }
return skuMap[skuNameID], err return skuMap[skuNameID], err