营业数据

This commit is contained in:
苏尹岚
2020-07-28 11:55:52 +08:00
parent c4ea35efa0
commit 3943fa9314

View File

@@ -708,13 +708,17 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
if v.VendorOrderID == flagVendorOrderID { if v.VendorOrderID == flagVendorOrderID {
if k == 0 { if k == 0 {
saleInfo.EarningPrice = v.NewEarningPrice saleInfo.EarningPrice = v.NewEarningPrice
if v.EarningType == model.EarningTypePoints {
saleInfo.RealEarningPrice += v.NewEarningPrice saleInfo.RealEarningPrice += v.NewEarningPrice
} }
}
} else { } else {
flagVendorOrderID = v.VendorOrderID flagVendorOrderID = v.VendorOrderID
saleInfo.EarningPrice += v.NewEarningPrice saleInfo.EarningPrice += v.NewEarningPrice
if v.EarningType == model.EarningTypePoints {
saleInfo.RealEarningPrice += v.NewEarningPrice saleInfo.RealEarningPrice += v.NewEarningPrice
} }
}
universalOrderID := jxutils.ComposeUniversalOrderID(v.VendorOrderID, v.VendorID) universalOrderID := jxutils.ComposeUniversalOrderID(v.VendorOrderID, v.VendorID)
if orderMap[universalOrderID] == nil { if orderMap[universalOrderID] == nil {