From ecb1b12525163b6114fb24d528ddc5997c58d06b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 17 Jan 2020 08:38:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A2=84=E8=AD=A6=E5=88=A9?=
 =?UTF-8?q?=E6=B6=A6=E5=85=AC=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/scheduler/defsch/defsch.go | 2 +-
 business/jxstore/misc/misc.go                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 200244fc3..a4ee3ac0c 100644
--- 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
 		}
diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index cf14db6d3..72af30326 100644
--- 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{