beta
This commit is contained in:
@@ -708,8 +708,11 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
|
||||
//成都菜市
|
||||
if beego.BConfig.RunMode == "prod" {
|
||||
if v.EarningType == model.EarningTypeQuote {
|
||||
// && v.VendorID != model.VendorIDJD && v.CityCode != 510100 {
|
||||
saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count)
|
||||
if v.VendorID == model.VendorIDJD && v.CityCode == 510100 {
|
||||
saleInfo.RealEarningPrice += 0
|
||||
} else {
|
||||
saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if v.OrderPayPercentage == 100 {
|
||||
@@ -725,8 +728,11 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
|
||||
saleInfo.EarningPrice = v.NewEarningPrice
|
||||
if beego.BConfig.RunMode == "prod" {
|
||||
if v.EarningType == model.EarningTypePoints {
|
||||
// && v.VendorID != model.VendorIDJD && v.CityCode != 510100 {
|
||||
saleInfo.RealEarningPrice += v.NewEarningPrice
|
||||
if v.VendorID == model.VendorIDJD && v.CityCode == 510100 {
|
||||
saleInfo.RealEarningPrice += 0
|
||||
} else {
|
||||
saleInfo.RealEarningPrice += v.NewEarningPrice
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if v.OrderPayPercentage < 100 {
|
||||
@@ -739,8 +745,12 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
|
||||
saleInfo.EarningPrice += v.NewEarningPrice
|
||||
if beego.BConfig.RunMode == "prod" {
|
||||
if v.EarningType == model.EarningTypePoints {
|
||||
// && v.VendorID != model.VendorIDJD && v.CityCode != 510100
|
||||
saleInfo.RealEarningPrice += v.NewEarningPrice
|
||||
if v.VendorID == model.VendorIDJD && v.CityCode == 510100 {
|
||||
saleInfo.RealEarningPrice += 0
|
||||
} else {
|
||||
// && v.VendorID != model.VendorIDJD && v.CityCode != 510100
|
||||
saleInfo.RealEarningPrice += v.NewEarningPrice
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if v.OrderPayPercentage < 100 {
|
||||
|
||||
Reference in New Issue
Block a user