ordersale
This commit is contained in:
@@ -707,7 +707,8 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
|
|||||||
}
|
}
|
||||||
//成都菜市
|
//成都菜市
|
||||||
if beego.BConfig.RunMode == "prod" {
|
if beego.BConfig.RunMode == "prod" {
|
||||||
if v.EarningType == model.EarningTypeQuote && v.VendorID != model.VendorIDJD && v.CityCode != 510100 {
|
if v.EarningType == model.EarningTypeQuote {
|
||||||
|
// && v.VendorID != model.VendorIDJD && v.CityCode != 510100 {
|
||||||
saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count)
|
saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -723,7 +724,8 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
|
|||||||
if k == 0 {
|
if k == 0 {
|
||||||
saleInfo.EarningPrice = v.NewEarningPrice
|
saleInfo.EarningPrice = v.NewEarningPrice
|
||||||
if beego.BConfig.RunMode == "prod" {
|
if beego.BConfig.RunMode == "prod" {
|
||||||
if v.EarningType == model.EarningTypePoints && v.VendorID != model.VendorIDJD && v.CityCode != 510100 {
|
if v.EarningType == model.EarningTypePoints {
|
||||||
|
// && v.VendorID != model.VendorIDJD && v.CityCode != 510100 {
|
||||||
saleInfo.RealEarningPrice += v.NewEarningPrice
|
saleInfo.RealEarningPrice += v.NewEarningPrice
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -736,7 +738,8 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
|
|||||||
flagVendorOrderID = v.VendorOrderID
|
flagVendorOrderID = v.VendorOrderID
|
||||||
saleInfo.EarningPrice += v.NewEarningPrice
|
saleInfo.EarningPrice += v.NewEarningPrice
|
||||||
if beego.BConfig.RunMode == "prod" {
|
if beego.BConfig.RunMode == "prod" {
|
||||||
if v.EarningType == model.EarningTypePoints && v.VendorID != model.VendorIDJD && v.CityCode != 510100 {
|
if v.EarningType == model.EarningTypePoints {
|
||||||
|
// && v.VendorID != model.VendorIDJD && v.CityCode != 510100
|
||||||
saleInfo.RealEarningPrice += v.NewEarningPrice
|
saleInfo.RealEarningPrice += v.NewEarningPrice
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user