gy
This commit is contained in:
@@ -705,12 +705,8 @@ 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)
|
||||||
@@ -719,22 +715,14 @@ 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
|
|
||||||
}
|
|
||||||
} 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 beego.BConfig.RunMode == "prod" {
|
if v.EarningType == model.EarningTypePoints {
|
||||||
if v.EarningType == model.EarningTypePoints {
|
|
||||||
saleInfo.RealEarningPrice += v.NewEarningPrice
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
saleInfo.RealEarningPrice += v.NewEarningPrice
|
saleInfo.RealEarningPrice += v.NewEarningPrice
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user