From 734e7b3d5f3d5c3725ec441a221429b5a028f965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 12 Nov 2020 08:41:20 +0800 Subject: [PATCH] ordersale --- business/jxcallback/orderman/orderman_ext.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 4339f379c..52c6d3129 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -707,7 +707,8 @@ 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 { + if v.EarningType == model.EarningTypeQuote { + // && v.VendorID != model.VendorIDJD && v.CityCode != 510100 { saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count) } } else { @@ -723,7 +724,8 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID if k == 0 { saleInfo.EarningPrice = v.NewEarningPrice 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 } } else { @@ -736,7 +738,8 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID flagVendorOrderID = v.VendorOrderID saleInfo.EarningPrice += v.NewEarningPrice 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 } } else {