From 7ee1bedb8fb4fcfd47cc23fb43b894cf1cbe80a3 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, 19 Mar 2020 16:37:39 +0800
Subject: [PATCH] eee

---
 business/jxcallback/orderman/orderman_ext.go | 8 ++++----
 business/model/dao/dao_order.go              | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index 1b15815af..1e52774a4 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -669,8 +669,8 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
 			saleInfo.ShopPrice += v.ShopPrice * int64(v.Count)
 			saleInfo.VendorPrice += v.VendorPrice * int64(v.Count)
 			saleInfo.SalePrice += v.SalePrice * int64(v.Count)
-			saleInfo.EarningPrice += v.EarningPrice * int64(v.Count)
-			saleInfo.EarningPrice2 = v.EarningPrice2
+			// saleInfo.EarningPrice += v.EarningPrice * int64(v.Count)
+			saleInfo.EarningPrice = v.EarningPrice2
 
 			universalOrderID := jxutils.ComposeUniversalOrderID(v.VendorOrderID, v.VendorID)
 			if orderMap[universalOrderID] == nil {
@@ -745,9 +745,9 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
 		saleInfo.ShopPrice += v.ShopPrice
 		saleInfo.VendorPrice += v.VendorPrice
 		saleInfo.SalePrice += v.SalePrice
-		saleInfo.EarningPrice += v.EarningPrice
+		// saleInfo.EarningPrice += v.EarningPrice
 		saleInfo.Count++
-		saleInfo.EarningPrice2 = v.EarningPrice2
+		saleInfo.EarningPrice = v.EarningPrice2
 	}
 	for _, v := range saleInfoMap {
 		saleInfoList = append(saleInfoList, v)
diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index 8ab89944b..4c2e93703 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -43,8 +43,7 @@ type OrderSkuWithActualPayPrice struct {
 	StoreID int `orm:"column(store_id)" json:"storeID"` // 外部系统里记录的 jxstoreid
 	Status  int `json:"status"`                         // 参见OrderStatus*相关的常量定义
 
-	PayPercentage int   `json:"payPercentage"`
-	EarningPrice2 int64 `json:"earningPrice2"`
+	PayPercentage int `json:"payPercentage"`
 }
 
 type tGoodsAndOrder struct {