From 95f0853752dd2423fac9a4443ed4b98cfdcc592c 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, 19 Mar 2020 17:45:48 +0800 Subject: [PATCH] neweraningprice/100 --- business/jxcallback/orderman/orderman_ext.go | 2 +- business/jxutils/jxutils.go | 2 +- business/model/dao/dao_order.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index b7a496dbb..312f9cf6a 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -1205,7 +1205,7 @@ func GetMatterStoreOrderCount(ctx *jxcontext.Context, storeID int) (result *Orde } orderTime = *orderPay.PayFinishedAt } else { - orderTime = time.Now().AddDate(0, 0, -7) + orderTime = time.Now().AddDate(0, -1, 0) flag = true } sql2 := ` diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go index 37c03ff91..97a011585 100644 --- a/business/jxutils/jxutils.go +++ b/business/jxutils/jxutils.go @@ -542,7 +542,7 @@ func RefreshOrderSkuRelated(order *model.GoodsOrder) *model.GoodsOrder { func RefreshOrderEarningPrice2(order *model.GoodsOrder, payPercentage int) *model.GoodsOrder { if payPercentage <= 50 { - order.NewEarningPrice = order.TotalShopMoney * int64((100 - payPercentage/2)) / 10000 + order.NewEarningPrice = order.TotalShopMoney * int64((100 - payPercentage/2)) / 100 } else { order.NewEarningPrice = order.EarningPrice } diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index 8b3ab2dae..4bd813a3f 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -26,8 +26,8 @@ type StoresOrderSaleInfo struct { SalePrice int64 `json:"salePrice"` ActualPayPrice int64 `json:"actualPayPrice"` - EarningPrice int64 `json:"earningPrice"` // 预估结算给门店老板的钱 - EarningPrice2 int64 `json:"earningPrice2"` // 预估结算给门店老板的钱(新规则) + EarningPrice int64 `json:"earningPrice"` // 预估结算给门店老板的钱 + NewEarningPrice int64 `json:"newEarningPrice"` // 预估结算给门店老板的钱(新规则) DistanceFreightMoney int64 `json:"distanceFreightMoney"` // 商户承担的远距离配送费（当前只有京东到家有值） WaybillTipMoney int64 `json:"waybillTipMoney"` // 京西加的平台配送小费