From c8af8bd800fb6482cda3b818e821d52249feed37 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, 31 Dec 2020 09:02:40 +0800 Subject: [PATCH] aa --- business/jxcallback/orderman/orderman_ext.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index f5c46c0cc..aea8af10b 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -724,8 +724,8 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID if k == 0 { saleInfo.EarningPrice = v.NewEarningPrice if beego.BConfig.RunMode == "prod" || beego.BConfig.RunMode == "beta" { - if v.EarningType == model.EarningTypePoints && !isLongTime { - if storeDetail.VendorPayPercentage != 0 { + if v.EarningType == model.EarningTypePoints { + if storeDetail.VendorPayPercentage != 0 && !isLongTime { saleInfo.RealEarningPrice += 0 } else { saleInfo.RealEarningPrice += v.NewEarningPrice @@ -741,8 +741,8 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID flagVendorOrderID = v.VendorOrderID saleInfo.EarningPrice += v.NewEarningPrice if beego.BConfig.RunMode == "prod" || beego.BConfig.RunMode == "beta" { - if v.EarningType == model.EarningTypePoints && !isLongTime { - if storeDetail.VendorPayPercentage != 0 { + if v.EarningType == model.EarningTypePoints { + if storeDetail.VendorPayPercentage != 0 && !isLongTime { saleInfo.RealEarningPrice += 0 } else { // && v.VendorID != model.VendorIDJD && v.CityCode != 510100