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 {