This commit is contained in:
苏尹岚
2020-12-31 09:02:40 +08:00
parent d8c8a36063
commit c8af8bd800

View File

@@ -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