liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eee

Browse Source
This commit is contained in:
苏尹岚
2020-03-19 16:37:39 +08:00
parent b6126857cc
commit 7ee1bedb8f
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/jxcallback/orderman/orderman_ext.go
View File

@@ -669,8 +669,8 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
saleInfo.ShopPrice += v.ShopPrice * int64(v.Count) saleInfo.ShopPrice += v.ShopPrice * int64(v.Count)
saleInfo.VendorPrice += v.VendorPrice * int64(v.Count) saleInfo.VendorPrice += v.VendorPrice * int64(v.Count)
saleInfo.SalePrice += v.SalePrice * int64(v.Count) saleInfo.SalePrice += v.SalePrice * int64(v.Count)
saleInfo.EarningPrice += v.EarningPrice * int64(v.Count) // saleInfo.EarningPrice += v.EarningPrice * int64(v.Count)
saleInfo.EarningPrice2 = v.EarningPrice2 saleInfo.EarningPrice = v.EarningPrice2
universalOrderID := jxutils.ComposeUniversalOrderID(v.VendorOrderID, v.VendorID) universalOrderID := jxutils.ComposeUniversalOrderID(v.VendorOrderID, v.VendorID)
if orderMap[universalOrderID] == nil { if orderMap[universalOrderID] == nil {
@@ -745,9 +745,9 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
saleInfo.ShopPrice += v.ShopPrice saleInfo.ShopPrice += v.ShopPrice
saleInfo.VendorPrice += v.VendorPrice saleInfo.VendorPrice += v.VendorPrice
saleInfo.SalePrice += v.SalePrice saleInfo.SalePrice += v.SalePrice
saleInfo.EarningPrice += v.EarningPrice // saleInfo.EarningPrice += v.EarningPrice
saleInfo.Count++ saleInfo.Count++
saleInfo.EarningPrice2 = v.EarningPrice2 saleInfo.EarningPrice = v.EarningPrice2
} }
for _, v := range saleInfoMap { for _, v := range saleInfoMap {
saleInfoList = append(saleInfoList, v) saleInfoList = append(saleInfoList, v)

3
business/model/dao/dao_order.go
View File

@@ -43,8 +43,7 @@ type OrderSkuWithActualPayPrice struct {
StoreID int `orm:"column(store_id)" json:"storeID"` // 外部系统里记录的 jxstoreid StoreID int `orm:"column(store_id)" json:"storeID"` // 外部系统里记录的 jxstoreid
Status int `json:"status"` // 参见OrderStatus*相关的常量定义 Status int `json:"status"` // 参见OrderStatus*相关的常量定义
PayPercentage int `json:"payPercentage"` PayPercentage int `json:"payPercentage"`
EarningPrice2 int64 `json:"earningPrice2"`
} }
type tGoodsAndOrder struct { type tGoodsAndOrder struct {