From 6276cf09ff2d0e331c9e5e71ce4fa102a43cd183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 27 Oct 2020 09:29:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E6=8F=90=E9=86=92?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E5=9F=8E=E5=B8=82=E5=92=8C=E9=97=A8=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxutils/weixinmsg/weixinmsg.go | 29 ++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/business/jxutils/weixinmsg/weixinmsg.go b/business/jxutils/weixinmsg/weixinmsg.go
index a0d2d1a80..8ba885553 100644
--- a/business/jxutils/weixinmsg/weixinmsg.go
+++ b/business/jxutils/weixinmsg/weixinmsg.go
@@ -202,8 +202,13 @@ func NotifyNewOrder(order *model.GoodsOrder) (err error) {
 		globals.SugarLogger.Infof("NotifyNewOrder orderID:%s is not solid", order.VendorOrderID)
 		return nil
 	}
+	suffix := ""
+	storeDetail, err := dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID)
+	if err == nil && storeDetail != nil {
+		suffix = storeDetail.CityName + "," + storeDetail.Name
+	}
 	sb := new(strings.Builder)
-	sb.WriteString("老板，")
+	sb.WriteString(suffix + "老板，")
 	sb.WriteString(order.ConsigneeName)
 	sb.WriteString("购买了商品")
 	sb.WriteString(getOrderDetailBrief(order))
@@ -314,7 +319,12 @@ func NotifyUserApplyCancel(order *model.GoodsOrder, cancelReason string) (err er
 		globals.SugarLogger.Infof("NotifyUserApplyCancel orderID:%s is not solid", order.VendorOrderID)
 		return nil
 	}
-	title := "老板，您有订单申请取消！请及时联系客户处理！"
+	suffix := ""
+	storeDetail, err := dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID)
+	if err == nil && storeDetail != nil {
+		suffix = storeDetail.CityName + "," + storeDetail.Name
+	}
+	title := suffix + "老板，您有订单申请取消！请及时联系客户处理！"
 	data := map[string]interface{}{
 		"first": map[string]interface{}{
 			"value": title,
@@ -391,7 +401,12 @@ func NotifyOrderCanceled(order *model.GoodsOrder) (err error) {
 		globals.SugarLogger.Infof("NotifyOrderCanceled orderID:%s is not solid", order.VendorOrderID)
 		return nil
 	}
-	title := fmt.Sprintf("老板，您的订单%s第%d号订单, %s被取消了！", model.VendorChineseNames[order.VendorID], order.OrderSeq, order.VendorOrderID)
+	suffix := ""
+	storeDetail, err := dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID)
+	if err == nil && storeDetail != nil {
+		suffix = storeDetail.CityName + "," + storeDetail.Name
+	}
+	title := fmt.Sprintf(suffix+"老板，您的订单%s第%d号订单, %s被取消了！", model.VendorChineseNames[order.VendorID], order.OrderSeq, order.VendorOrderID)
 	data := map[string]interface{}{
 		"first": map[string]interface{}{
 			"value": title,
@@ -426,9 +441,13 @@ func NotifyOrderCanceled(order *model.GoodsOrder) (err error) {
 
 func PushJDBadCommentToWeiXin(comment *legacymodel.JxBadComments, isBadComment bool, order *model.GoodsOrder) (err error) {
 	globals.SugarLogger.Debugf("PushJDBadCommentToWeiXin orderID:%s", comment.OrderId)
-
+	suffix := ""
+	storeDetail, err := dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID)
+	if err == nil && storeDetail != nil {
+		suffix = storeDetail.CityName + "," + storeDetail.Name
+	}
 	sb := new(strings.Builder)
-	sb.WriteString(fmt.Sprintf("你收到了%s客户(", model.VendorChineseNames[int(utils.Str2Int64WithDefault(comment.OrderFlag, 0))]))
+	sb.WriteString(fmt.Sprintf(suffix+"你收到了%s客户(", model.VendorChineseNames[int(utils.Str2Int64WithDefault(comment.OrderFlag, 0))]))
 	sb.WriteString(comment.Userphone)
 	sb.WriteString(")的一条")
 	sb.WriteString(utils.Int2Str(comment.Score))