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

Accept Merge Request #139: (yonghui -> mark)

Browse Source 
Merge Request: 中位价计算方式修改，乘除替换
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/139
This commit is contained in:
苏尹岚
2020-01-13 16:46:39 +08:00
parent c03702dacf fa899540f9
commit 1630d0eac9
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2392,10 +2392,10 @@ func RefershStoreSkusMidPrice(ctx *jxcontext.Context, storeIDs []int) (err error
return err return err
} }
if len(priceReferList) > 0 { if len(priceReferList) > 0 {
if storeSku.UnitPrice > priceReferList[0].MidUnitPrice*payPercentage/100 { if storeSku.UnitPrice > priceReferList[0].MidUnitPrice/payPercentage*100 {
skuBindInfo := &StoreSkuBindInfo{ skuBindInfo := &StoreSkuBindInfo{
NameID: priceReferList[0].NameID, NameID: priceReferList[0].NameID,
UnitPrice: priceReferList[0].MidUnitPrice * payPercentage / 100, UnitPrice: priceReferList[0].MidUnitPrice / payPercentage * 100,
} }
skuBindInfos = append(skuBindInfos, skuBindInfo) skuBindInfos = append(skuBindInfos, skuBindInfo)
} }
@@ -3013,7 +3013,7 @@ func FocusStoreSkusBySku(ctx *jxcontext.Context, skuBindInfos []*StoreSkuBindInf
} }
priceReferList, _ := dao.GetPriceReferSnapshotNoPage(db, []int{store.CityCode}, nil, []int{skuList[0].NameID}, utils.Time2Date(time.Now().AddDate(0, 0, -1))) priceReferList, _ := dao.GetPriceReferSnapshotNoPage(db, []int{store.CityCode}, nil, []int{skuList[0].NameID}, utils.Time2Date(time.Now().AddDate(0, 0, -1)))
if len(priceReferList) > 0 { if len(priceReferList) > 0 {
price = priceReferList[0].MidUnitPrice * payPercentage / 100 price = priceReferList[0].MidUnitPrice / payPercentage * 100
} }
} }
skuBindSkuInfo := &StoreSkuBindSkuInfo{ skuBindSkuInfo := &StoreSkuBindSkuInfo{
@@ -3121,7 +3121,7 @@ func AutoFocusStoreSkusForTopSkus(ctx *jxcontext.Context, isAsync, isContinueWhe
} }
priceReferList, err := dao.GetPriceReferSnapshotNoPage(db, []int{vv.CityCode}, nil, []int{vv.ID}, utils.Time2Date(time.Now().AddDate(0, 0, -1))) priceReferList, err := dao.GetPriceReferSnapshotNoPage(db, []int{vv.CityCode}, nil, []int{vv.ID}, utils.Time2Date(time.Now().AddDate(0, 0, -1)))
if err == nil && len(priceReferList) > 0 { if err == nil && len(priceReferList) > 0 {
storeSkuBindInfo.UnitPrice = priceReferList[0].MidUnitPrice * payPercentage / 100 storeSkuBindInfo.UnitPrice = priceReferList[0].MidUnitPrice / payPercentage * 100
} }
skuBindInfoList = append(skuBindInfoList, storeSkuBindInfo) skuBindInfoList = append(skuBindInfoList, storeSkuBindInfo)
} }

5
business/jxstore/report/report.go
View File

@@ -107,9 +107,12 @@ func BeginSavePriceRefer(ctx *jxcontext.Context, cityCodes, skuIDs []int, isAsyn
return result, err return result, err
} }
for _, v := range storeList { for _, v := range storeList {
if v.PayPercentage < 50 {
continue
}
var tList []*tStoreSkuBindAndSkuName var tList []*tStoreSkuBindAndSkuName
sql := ` sql := `
SELECT DISTINCT b.city_code, a.store_id, Round(a.unit_price/IF(b.pay_percentage < 50 , 70, b.pay_percentage) * 100) AS unit_price, c.name_id SELECT DISTINCT b.city_code, a.store_id, Round(a.unit_price * IF(b.pay_percentage < 50 , 70, b.pay_percentage) / 100) AS unit_price, c.name_id
FROM store_sku_bind a FROM store_sku_bind a
JOIN store b ON b.id = a.store_id AND b.deleted_at = ? AND b.status != ? JOIN store b ON b.id = a.store_id AND b.deleted_at = ? AND b.status != ?
JOIN sku c ON c.id = a.sku_id JOIN sku c ON c.id = a.sku_id

2
business/model/dao/store.go
View File

@@ -574,7 +574,7 @@ func GetStorePriceScore(db *DaoDB, storeIDs, vendorIDs []int, fromScore, toScore
func GetStorePriceScoreSnapshot(db *DaoDB, snapDate time.Time) (storePriceScoreSnapshot []*model.StorePriceScoreSnapshot, err error) { func GetStorePriceScoreSnapshot(db *DaoDB, snapDate time.Time) (storePriceScoreSnapshot []*model.StorePriceScoreSnapshot, err error) {
sql := ` sql := `
SELECT c.store_id,ROUND(count(c.unit_price/IF(d.pay_percentage < 50 , 70, d.pay_percentage)*100 <= a.mid_unit_price or NULL)/count(*)*100,2) score SELECT c.store_id,ROUND(count(c.unit_price * IF(d.pay_percentage < 50 , 70, d.pay_percentage) / 100 <= a.mid_unit_price or NULL)/count(*)*100,2) score
FROM price_refer_snapshot a FROM price_refer_snapshot a
JOIN store_sku_bind c ON c.sku_id = a.sku_id AND c.status = ? AND c.deleted_at = ? JOIN store_sku_bind c ON c.sku_id = a.sku_id AND c.status = ? AND c.deleted_at = ?
JOIN store d ON c.store_id = d.id AND d.city_code = a.city_code AND d.deleted_at = ? AND d.status != ? JOIN store d ON c.store_id = d.id AND d.city_code = a.city_code AND d.deleted_at = ? AND d.status != ?