订单预警利润公式修改

2020-01-17 08:38:44 +08:00
parent 8480cf8ea5
commit ecb1b12525
2 changed files with 3 additions and 3 deletions
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -1376,7 +1376,7 @@ func OrderProfitWarning(order *model.GoodsOrder) {
 	if storeDetail != nil && err == nil {
 		payPercentage := storeDetail.PayPercentage
 		if payPercentage >= 50 {
-			profit = utils.Str2Float64(utils.Int64ToStr(order.TotalShopMoney-order.EarningPrice-order.DistanceFreightMoney-order.WaybillTipMoney)) / 100
+			profit = utils.Str2Float64(utils.Int64ToStr(order.TotalShopMoney-order.EarningPrice)) / 100
 		} else {
 			profit = utils.Str2Float64(utils.Int64ToStr(order.TotalShopMoney*int64(payPercentage)/200)) / 100
 		}
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -40,11 +40,11 @@ var (
 	priceReferTimeList = []string{
 		"01:00:00",
 	}
-	createStorePriceTimeList = []string{
+	checkCookieList = []string{
 		"08:00:00",
 		"18:00:00",
 	}
-	checkCookieList = []string{
+	createStorePriceTimeList = []string{ 
 		"02:00:00",
 	}
 	refreshPageActTimeList = []string{