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

改价实际上是改活动价？

Browse Source
This commit is contained in:
苏尹岚
2020-08-18 17:00:13 +08:00
parent 055bf5dc8a
commit baf83d0ad0
4 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
business/jxstore/act/act.go
View File

@@ -1528,14 +1528,15 @@ func ChangeJxPriceByDiscountAct(ctx *jxcontext.Context) {
ModelIDCULD: model.ModelIDCULD{ ModelIDCULD: model.ModelIDCULD{
ID: actStoreSku2.MapID, ID: actStoreSku2.MapID,
}, },
// ActID: actStoreSku2.ActID, ActID: actStoreSku2.ActID,
// OriginalPrice: actStoreSku2.OriginalPrice, StoreID: actStoreSku2.StoreID,
// StoreID: actStoreSku2.StoreID, SkuID: actStoreSku2.SkuID,
// SkuID: actStoreSku2.SkuID, TrendPrcie: actStoreSku2.TrendPrcie,
// TrendPrcie: actStoreSku2.TrendPrcie, TrendType: actStoreSku2.TrendType,
// TrendType: actStoreSku2.TrendType, ActualActPrice: actStoreSku2.ActualActPrice,
VendorPrice: actStoreSku2.VendorPrice,
} }
storeSkus, _ := dao.GetStoresSkusInfo(db, []int{actStoreSku.StoreID}, []int{actStoreSku.SkuID}) storeSkus, _ := dao.GetStoresSkusInfo(db, []int{actStoreSkuMap.StoreID}, []int{actStoreSkuMap.SkuID})
if len(storeSkus) == 0 { if len(storeSkus) == 0 {
continue continue
} }
@@ -1550,7 +1551,7 @@ func ChangeJxPriceByDiscountAct(ctx *jxcontext.Context) {
if storeSku.Stock == 0 { if storeSku.Stock == 0 {
continue continue
} }
actualStockOut, err = dao.GetOrderStoreSkusCount(db, actStoreSku.StoreID, actStoreSku.SkuID, time.Now().Add(-time.Minute*10), time.Now()) actualStockOut, err = dao.GetOrderStoreSkusCount(db, actStoreSkuMap.StoreID, actStoreSkuMap.SkuID, time.Now().Add(-time.Minute*10), time.Now())
dao.Begin(db) dao.Begin(db)
defer func() { defer func() {
if r := recover(); r != nil || err != nil { if r := recover(); r != nil || err != nil {
@@ -1563,12 +1564,14 @@ func ChangeJxPriceByDiscountAct(ctx *jxcontext.Context) {
//第一档时间内 //第一档时间内
if (time.Now().Hour() >= 10 && time.Now().Hour() < 20) || (time.Now().Hour() == 20 && time.Now().Minute() < 1) { if (time.Now().Hour() >= 10 && time.Now().Hour() < 20) || (time.Now().Hour() == 20 && time.Now().Minute() < 1) {
pricePercentage = 0.02 pricePercentage = 0.02
actualPrice = utils.Float64TwoInt64(float64(actStoreSku.OriginalPrice) * pricePercentage) actualPrice = utils.Float64TwoInt64(float64(actStoreSkuMap.VendorPrice) * pricePercentage)
if actStoreSku.TrendType == model.TrendTypeUp { if actStoreSkuMap.TrendType == model.TrendTypeUp {
storeSku.JxPrice = storeSku.JxPrice + int(actualPrice) actStoreSkuMap.ActualActPrice = actStoreSkuMap.ActualActPrice + actualPrice
} else if actStoreSku.TrendType == model.TrendTypeDown { // storeSku.JxPrice = storeSku.JxPrice + int(actualPrice)
storeSku.JxPrice = storeSku.JxPrice - int(actualPrice) } else if actStoreSkuMap.TrendType == model.TrendTypeDown {
stock := checkPriceDefendOrderByPrice(db, storeSku.StoreID, storeSku.SkuID, storeSku.Stock, storeSku.JxPrice) actStoreSkuMap.ActualActPrice = actStoreSkuMap.ActualActPrice - actualPrice
// storeSku.JxPrice = storeSku.JxPrice - int(actualPrice)
stock := checkPriceDefendOrderByPrice(db, storeSku.StoreID, storeSku.SkuID, storeSku.Stock, int(actStoreSkuMap.ActualActPrice))
if stock != -1 { if stock != -1 {
storeSku.Stock = stock storeSku.Stock = stock
if _, err = dao.UpdateEntity(db, storeSku, "Stock"); err != nil { if _, err = dao.UpdateEntity(db, storeSku, "Stock"); err != nil {
@@ -1576,56 +1579,56 @@ func ChangeJxPriceByDiscountAct(ctx *jxcontext.Context) {
} }
} }
} }
if storeSku.JxPrice >= int(actStoreSku.OriginalPrice) { if actStoreSkuMap.ActualActPrice >= actStoreSkuMap.VendorPrice {
storeSku.JxPrice = int(actStoreSku.OriginalPrice) actStoreSkuMap.ActualActPrice = actStoreSkuMap.VendorPrice
} }
//判断活动的折扣类型是最低价还是最低折扣(第一档) //判断活动的折扣类型是最低价还是最低折扣(第一档)
if act.DiscountType == model.ActDiscountTypePrice { if act.DiscountType == model.ActDiscountTypePrice {
minJxPrice = int64(act.DiscountValue1) minJxPrice = int64(act.DiscountValue1)
} else if act.DiscountType == model.ActDiscountTypePercentage { } else if act.DiscountType == model.ActDiscountTypePercentage {
minJxPrice = actStoreSku.OriginalPrice * int64(act.DiscountValue1) / 100 minJxPrice = actStoreSkuMap.VendorPrice * int64(act.DiscountValue1) / 100
} }
if storeSku.JxPrice <= int(minJxPrice) { if actStoreSkuMap.ActualActPrice <= minJxPrice {
storeSku.JxPrice = int(minJxPrice) actStoreSkuMap.ActualActPrice = minJxPrice
}
if _, err = dao.UpdateEntity(db, storeSku, "JxPrice"); err != nil {
dao.Rollback(db)
} }
// if _, err = dao.UpdateEntity(db, actStoreSkuMap, "ActualActPrice"); err != nil {
// dao.Rollback(db)
// }
//C >= 2N 涨价趋势，最高涨价到无折扣 //C >= 2N 涨价趋势，最高涨价到无折扣
if actualStockOut >= 2*shouldStockOut { if actualStockOut >= 2*shouldStockOut {
actStoreSku.TrendType = model.TrendTypeUp actStoreSkuMap.TrendType = model.TrendTypeUp
} else if actualStockOut < shouldStockOut/2 { //C <= N/2 降价趋势，最低降价到设置到最低折扣 } else if actualStockOut < shouldStockOut/2 { //C <= N/2 降价趋势，最低降价到设置到最低折扣
actStoreSku.TrendType = model.TrendTypeDown actStoreSkuMap.TrendType = model.TrendTypeDown
} else { } else {
actStoreSku.TrendType = model.TrendTypeNothing actStoreSkuMap.TrendType = model.TrendTypeNothing
} }
actStoreSku.TrendPrcie = int(actualPrice) actStoreSkuMap.TrendPrcie = int(actualPrice)
if _, err = dao.UpdateEntity(db, actStoreSku, "TrendType", "TrendPrcie"); err != nil { if _, err = dao.UpdateEntity(db, actStoreSkuMap, "ActualActPrice", "TrendType", "TrendPrcie"); err != nil {
dao.Rollback(db) dao.Rollback(db)
} }
} else { //第二档时间内 } else { //第二档时间内
pricePercentage = 0.1 pricePercentage = 0.1
actualPrice = utils.Float64TwoInt64(float64(actStoreSku.OriginalPrice) * pricePercentage) actualPrice = utils.Float64TwoInt64(float64(actStoreSkuMap.VendorPrice) * pricePercentage)
//判断活动的折扣类型是最低价还是最低折扣（第二档） //判断活动的折扣类型是最低价还是最低折扣（第二档）
if act.DiscountType == model.ActDiscountTypePrice { if act.DiscountType == model.ActDiscountTypePrice {
minJxPrice = int64(act.DiscountValue2) minJxPrice = int64(act.DiscountValue2)
} else if act.DiscountType == model.ActDiscountTypePercentage { } else if act.DiscountType == model.ActDiscountTypePercentage {
minJxPrice = actStoreSku.OriginalPrice * int64(act.DiscountValue2) / 100 minJxPrice = actStoreSkuMap.VendorPrice * int64(act.DiscountValue2) / 100
} }
if storeSku.JxPrice == int(minJxPrice) { if actStoreSkuMap.ActualActPrice == minJxPrice {
actStoreSku.TrendType = model.TrendTypeNothing actStoreSkuMap.TrendType = model.TrendTypeNothing
} else { } else {
actStoreSku.TrendType = model.TrendTypeDown actStoreSkuMap.TrendType = model.TrendTypeDown
} }
actStoreSku.TrendPrcie = int(actualPrice) actStoreSkuMap.TrendPrcie = int(actualPrice)
if _, err = dao.UpdateEntity(db, actStoreSku, "TrendType", "TrendPrcie"); err != nil { // if _, err = dao.UpdateEntity(db, actStoreSkuMap, "TrendType", "TrendPrcie"); err != nil {
dao.Rollback(db) // dao.Rollback(db)
// }
actStoreSkuMap.ActualActPrice = actStoreSkuMap.ActualActPrice - actualPrice
if actStoreSkuMap.ActualActPrice <= minJxPrice {
actStoreSkuMap.ActualActPrice = minJxPrice
} }
storeSku.JxPrice = storeSku.JxPrice - int(actualPrice) if _, err = dao.UpdateEntity(db, actStoreSkuMap, "ActualActPrice", "TrendType", "TrendPrcie"); err != nil {
if storeSku.JxPrice <= int(minJxPrice) {
storeSku.JxPrice = int(minJxPrice)
}
if _, err = dao.UpdateEntity(db, storeSku, "JxPrice"); err != nil {
dao.Rollback(db) dao.Rollback(db)
} }
//22:00 恢复库存为100 //22:00 恢复库存为100
@@ -1634,7 +1637,6 @@ func ChangeJxPriceByDiscountAct(ctx *jxcontext.Context) {
if _, err = dao.UpdateEntity(db, storeSku, "Stock"); err != nil { if _, err = dao.UpdateEntity(db, storeSku, "Stock"); err != nil {
dao.Rollback(db) dao.Rollback(db)
} }
// dao.SetStoreSkuSyncStatus(db, model.VendorIDJD, []int{storeSku.StoreID}, []int{storeSku.SkuID}, model.SyncFlagStockMask)
} }
} }
dao.Commit(db) dao.Commit(db)

2
business/model/act.go
View File

@@ -228,6 +228,8 @@ type ActStoreSku2 struct {
SpecQuality float32 `json:"-"` SpecQuality float32 `json:"-"`
SpecUnit string `json:"-"` SpecUnit string `json:"-"`
Comment string `json:"-"` Comment string `json:"-"`
TrendType int `json:"trendType"` //折扣活动使用，涨跌趋势，1为涨，2为跌，0为不动
TrendPrcie int `json:"trendPrice"` //涨跌具体多少
} }
type StoreSkuAct struct { type StoreSkuAct struct {

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

@@ -83,7 +83,7 @@ func GetActStoreSkuVendorList(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs
sql := fmt.Sprintf(` sql := fmt.Sprintf(`
SELECT SQL_CALC_FOUND_ROWS SELECT SQL_CALC_FOUND_ROWS
t1.*, t1.*,
t2.id map_id, t2.vendor_id, t2.vendor_act_id, t2.sync_status, t2.actual_act_price, t2.vendor_price, t2.id map_id, t2.vendor_id, t2.vendor_act_id, t2.sync_status, t2.actual_act_price, t2.vendor_price, t2.trend_type, t2.trend_price,
t3.vendor_store_id, t3.vendor_store_id,
CASE t2.vendor_id CASE t2.vendor_id
WHEN 0 THEN WHEN 0 THEN

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

@@ -1368,8 +1368,8 @@ func UpdateActPrice4StoreSkuNameNew(db *DaoDB, storeIDs, skuIDs []int, skuNamesI
v.ActID = actStoreSku.ActID v.ActID = actStoreSku.ActID
v.ActType = actStoreSku.Type v.ActType = actStoreSku.Type
v.EarningPrice = int(jxutils.CaculateSkuEarningPrice(int64(v.BindPrice), int64(v.ActPrice), skuName.PayPercentage)) v.EarningPrice = int(jxutils.CaculateSkuEarningPrice(int64(v.BindPrice), int64(v.ActPrice), skuName.PayPercentage))
// v.TrendType = actStoreSku.TrendType v.TrendType = actStoreSku.TrendType
// v.TrendPrice = actStoreSku.TrendPrcie v.TrendPrice = actStoreSku.TrendPrcie
} }
if actStoreSku := actStoreSkuMap4EarningPrice.GetActStoreSku(skuName.StoreID, v.SkuID, -1); actStoreSku != nil { if actStoreSku := actStoreSkuMap4EarningPrice.GetActStoreSku(skuName.StoreID, v.SkuID, -1); actStoreSku != nil {
v.EarningPrice = int(actStoreSku.EarningPrice) v.EarningPrice = int(actStoreSku.EarningPrice)