From 3f98af6a112e65c6c4a235f65fc64168a5e1e72c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 23 Dec 2019 10:45:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=A9=E6=B6=A6=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jxcallback/scheduler/defsch/defsch.go     | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 49db17696..56b791344 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -1321,20 +1321,17 @@ func isOrderCanSwitch2SelfDeliver(order *model.GoodsOrder) (isCan bool) {
 //订单预计利润若低于0，则向门店运营负责人发送钉钉消息
 func OrderProfitWarning(order *model.GoodsOrder) {
 	var (
-		operatorName string
-		noticeMsg    string
-		profit       float64
-		storeID      int
+		operatorName  string
+		operatorPhone string
+		noticeMsg     string
+		profit        float64
+		storeID       int
 	)
 	db := dao.GetDB()
 	if order == nil {
 		return
 	}
-	if order.JxStoreID == 0 {
-		storeID = order.StoreID
-	} else {
-		storeID = order.JxStoreID
-	}
+	storeID = jxutils.GetShowStoreIDFromOrder(order)
 	storeDetail, err := dao.GetStoreDetail(db, storeID, order.VendorID)
 	if storeDetail != nil && err == nil {
 		payPercentage := storeDetail.PayPercentage
@@ -1344,13 +1341,15 @@ func OrderProfitWarning(order *model.GoodsOrder) {
 			profit = utils.Str2Float64(utils.Int64ToStr(order.TotalShopMoney*int64(payPercentage)/200)) / 100
 		}
 		if profit < 0 {
-			if storeDetail.OperatorName != "" {
+			if storeDetail.OperatorPhone != "" {
 				operatorName = storeDetail.OperatorName
-			} else if storeDetail.OperatorName2 != "" {
+				operatorPhone = storeDetail.OperatorPhone
+			} else if storeDetail.OperatorPhone2 != "" {
 				operatorName = storeDetail.OperatorName2
+				operatorPhone = storeDetail.OperatorPhone2
 			}
 			noticeMsg = fmt.Sprintf("订单号：[%v]，利润 ：[%v]，运营负责人：[%v]", order.VendorOrderID, profit, operatorName)
-			user, err := dao.GetUserByID(db, "name", operatorName)
+			user, err := dao.GetUserByID(db, "mobile", operatorPhone)
 			if user != nil && err == nil {
 				ddmsg.SendUserMessage(dingdingapi.MsgTyeText, user.UserID, "警告！此订单利润低于0", noticeMsg)
 			}