From 5f0a9dd2bda6080bed41ffb2af353262244b68b0 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:46:43 +0800
Subject: [PATCH] beta

---
 business/jxcallback/orderman/orderman_ext.go | 22 ++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index 52c6d3129..92a0744b3 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -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 {