gy
This commit is contained in:
@@ -705,8 +705,14 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
|
||||
}
|
||||
saleInfoMap[index] = saleInfo
|
||||
}
|
||||
if v.EarningType == model.EarningTypeQuote {
|
||||
saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count)
|
||||
if beego.BConfig.RunMode == "prod" {
|
||||
if v.EarningType == model.EarningTypeQuote {
|
||||
saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count)
|
||||
}
|
||||
} else {
|
||||
if v.PayPercentage == 100 {
|
||||
saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count)
|
||||
}
|
||||
}
|
||||
saleInfo.ShopPrice += v.ShopPrice * int64(v.Count)
|
||||
saleInfo.VendorPrice += v.VendorPrice * int64(v.Count)
|
||||
@@ -715,15 +721,27 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
|
||||
if v.VendorOrderID == flagVendorOrderID {
|
||||
if k == 0 {
|
||||
saleInfo.EarningPrice = v.NewEarningPrice
|
||||
if v.EarningType == model.EarningTypePoints {
|
||||
saleInfo.RealEarningPrice += v.NewEarningPrice
|
||||
if beego.BConfig.RunMode == "prod" {
|
||||
if v.EarningType == model.EarningTypePoints {
|
||||
saleInfo.RealEarningPrice += v.NewEarningPrice
|
||||
}
|
||||
} else {
|
||||
if v.PayPercentage < 100 {
|
||||
saleInfo.RealEarningPrice += v.NewEarningPrice
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
flagVendorOrderID = v.VendorOrderID
|
||||
saleInfo.EarningPrice += v.NewEarningPrice
|
||||
if v.EarningType == model.EarningTypePoints {
|
||||
saleInfo.RealEarningPrice += v.NewEarningPrice
|
||||
if beego.BConfig.RunMode == "prod" {
|
||||
if v.EarningType == model.EarningTypePoints {
|
||||
saleInfo.RealEarningPrice += v.NewEarningPrice
|
||||
}
|
||||
} else {
|
||||
if v.PayPercentage < 100 {
|
||||
saleInfo.RealEarningPrice += v.NewEarningPrice
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user