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

neweraningprice/100

Browse Source
This commit is contained in:
苏尹岚
2020-03-19 17:45:48 +08:00
parent c53102acd7
commit 95f0853752
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1205,7 +1205,7 @@ func GetMatterStoreOrderCount(ctx *jxcontext.Context, storeID int) (result *Orde
} }
orderTime = *orderPay.PayFinishedAt orderTime = *orderPay.PayFinishedAt
} else { } else {
orderTime = time.Now().AddDate(0, 0, -7) orderTime = time.Now().AddDate(0, -1, 0)
flag = true flag = true
} }
sql2 := ` sql2 := `

2
business/jxutils/jxutils.go
View File

@@ -542,7 +542,7 @@ func RefreshOrderSkuRelated(order *model.GoodsOrder) *model.GoodsOrder {
func RefreshOrderEarningPrice2(order *model.GoodsOrder, payPercentage int) *model.GoodsOrder { func RefreshOrderEarningPrice2(order *model.GoodsOrder, payPercentage int) *model.GoodsOrder {
if payPercentage <= 50 { if payPercentage <= 50 {
order.NewEarningPrice = order.TotalShopMoney * int64((100 - payPercentage/2)) / 10000 order.NewEarningPrice = order.TotalShopMoney * int64((100 - payPercentage/2)) / 100
} else { } else {
order.NewEarningPrice = order.EarningPrice order.NewEarningPrice = order.EarningPrice
} }

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

@@ -26,8 +26,8 @@ type StoresOrderSaleInfo struct {
SalePrice int64 `json:"salePrice"` SalePrice int64 `json:"salePrice"`
ActualPayPrice int64 `json:"actualPayPrice"` ActualPayPrice int64 `json:"actualPayPrice"`
EarningPrice int64 `json:"earningPrice"` // 预估结算给门店老板的钱 EarningPrice int64 `json:"earningPrice"` // 预估结算给门店老板的钱
EarningPrice2 int64 `json:"earningPrice2"` // 预估结算给门店老板的钱(新规则) NewEarningPrice int64 `json:"newEarningPrice"` // 预估结算给门店老板的钱(新规则)
DistanceFreightMoney int64 `json:"distanceFreightMoney"` // 商户承担的远距离配送费（当前只有京东到家有值） DistanceFreightMoney int64 `json:"distanceFreightMoney"` // 商户承担的远距离配送费（当前只有京东到家有值）
WaybillTipMoney int64 `json:"waybillTipMoney"` // 京西加的平台配送小费 WaybillTipMoney int64 `json:"waybillTipMoney"` // 京西加的平台配送小费