This commit is contained in:
苏尹岚
2020-11-09 15:27:22 +08:00
parent 0e2b692adc
commit 96d364fac4

View File

@@ -705,8 +705,12 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
} }
saleInfoMap[index] = saleInfo saleInfoMap[index] = saleInfo
} }
if v.EarningType == model.EarningTypeQuote { if beego.BConfig.RunMode == "prod" {
saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count) if v.EarningType == model.EarningTypeQuote {
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)
@@ -715,14 +719,22 @@ 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 v.EarningType == model.EarningTypePoints { if beego.BConfig.RunMode == "prod" {
if v.EarningType == model.EarningTypePoints {
saleInfo.RealEarningPrice += v.NewEarningPrice
}
} else {
saleInfo.RealEarningPrice += v.NewEarningPrice saleInfo.RealEarningPrice += v.NewEarningPrice
} }
} }
} else { } else {
flagVendorOrderID = v.VendorOrderID flagVendorOrderID = v.VendorOrderID
saleInfo.EarningPrice += v.NewEarningPrice saleInfo.EarningPrice += v.NewEarningPrice
if v.EarningType == model.EarningTypePoints { if beego.BConfig.RunMode == "prod" {
if v.EarningType == model.EarningTypePoints {
saleInfo.RealEarningPrice += v.NewEarningPrice
}
} else {
saleInfo.RealEarningPrice += v.NewEarningPrice saleInfo.RealEarningPrice += v.NewEarningPrice
} }
} }