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

aa

Browse Source
This commit is contained in:
苏尹岚
2020-12-31 09:02:40 +08:00
parent d8c8a36063
commit c8af8bd800
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -724,8 +724,8 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
if k == 0 { if k == 0 {
saleInfo.EarningPrice = v.NewEarningPrice saleInfo.EarningPrice = v.NewEarningPrice
if beego.BConfig.RunMode == "prod" || beego.BConfig.RunMode == "beta" { if beego.BConfig.RunMode == "prod" || beego.BConfig.RunMode == "beta" {
if v.EarningType == model.EarningTypePoints && !isLongTime { if v.EarningType == model.EarningTypePoints {
if storeDetail.VendorPayPercentage != 0 { if storeDetail.VendorPayPercentage != 0 && !isLongTime {
saleInfo.RealEarningPrice += 0 saleInfo.RealEarningPrice += 0
} else { } else {
saleInfo.RealEarningPrice += v.NewEarningPrice saleInfo.RealEarningPrice += v.NewEarningPrice
@@ -741,8 +741,8 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
flagVendorOrderID = v.VendorOrderID flagVendorOrderID = v.VendorOrderID
saleInfo.EarningPrice += v.NewEarningPrice saleInfo.EarningPrice += v.NewEarningPrice
if beego.BConfig.RunMode == "prod" || beego.BConfig.RunMode == "beta" { if beego.BConfig.RunMode == "prod" || beego.BConfig.RunMode == "beta" {
if v.EarningType == model.EarningTypePoints && !isLongTime { if v.EarningType == model.EarningTypePoints {
if storeDetail.VendorPayPercentage != 0 { if storeDetail.VendorPayPercentage != 0 && !isLongTime {
saleInfo.RealEarningPrice += 0 saleInfo.RealEarningPrice += 0
} else { } else {
// && v.VendorID != model.VendorIDJD && v.CityCode != 510100 // && v.VendorID != model.VendorIDJD && v.CityCode != 510100