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

gy

Browse Source
This commit is contained in:
苏尹岚
2020-11-09 15:29:05 +08:00
parent 96d364fac4
commit 32ed7d2f11
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -705,13 +705,9 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
} }
saleInfoMap[index] = saleInfo saleInfoMap[index] = saleInfo
} }
if beego.BConfig.RunMode == "prod" {
if v.EarningType == model.EarningTypeQuote { if v.EarningType == model.EarningTypeQuote {
saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count) saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count)
} }
} else {
saleInfo.RealEarningPrice += v.NewEarningPrice
}
saleInfo.ShopPrice += v.ShopPrice * int64(v.Count) saleInfo.ShopPrice += v.ShopPrice * int64(v.Count)
saleInfo.VendorPrice += v.VendorPrice * int64(v.Count) saleInfo.VendorPrice += v.VendorPrice * int64(v.Count)
saleInfo.SalePrice += v.SalePrice * int64(v.Count) saleInfo.SalePrice += v.SalePrice * int64(v.Count)
@@ -719,24 +715,16 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
if v.VendorOrderID == flagVendorOrderID { if v.VendorOrderID == flagVendorOrderID {
if k == 0 { if k == 0 {
saleInfo.EarningPrice = v.NewEarningPrice saleInfo.EarningPrice = v.NewEarningPrice
if beego.BConfig.RunMode == "prod" {
if v.EarningType == model.EarningTypePoints { if v.EarningType == model.EarningTypePoints {
saleInfo.RealEarningPrice += v.NewEarningPrice saleInfo.RealEarningPrice += v.NewEarningPrice
} }
} else {
saleInfo.RealEarningPrice += v.NewEarningPrice
}
} }
} else { } else {
flagVendorOrderID = v.VendorOrderID flagVendorOrderID = v.VendorOrderID
saleInfo.EarningPrice += v.NewEarningPrice saleInfo.EarningPrice += v.NewEarningPrice
if beego.BConfig.RunMode == "prod" {
if v.EarningType == model.EarningTypePoints { if v.EarningType == model.EarningTypePoints {
saleInfo.RealEarningPrice += v.NewEarningPrice saleInfo.RealEarningPrice += v.NewEarningPrice
} }
} else {
saleInfo.RealEarningPrice += v.NewEarningPrice
}
} }
universalOrderID := jxutils.ComposeUniversalOrderID(v.VendorOrderID, v.VendorID) universalOrderID := jxutils.ComposeUniversalOrderID(v.VendorOrderID, v.VendorID)