diff --git a/business/jxutils/weixinmsg/weixinmsg.go b/business/jxutils/weixinmsg/weixinmsg.go index c57dfa70b..89cbff530 100644 --- a/business/jxutils/weixinmsg/weixinmsg.go +++ b/business/jxutils/weixinmsg/weixinmsg.go @@ -262,6 +262,11 @@ func NotifyWaybillStatus(bill *model.Waybill, order *model.GoodsOrder, isBillAlr return nil } var title string + suffix := "" + storeDetail, err := dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, "") + if err == nil && storeDetail != nil { + suffix = storeDetail.CityName + "," + storeDetail.Name + } templateID := "" remark := "" titleColor := "" @@ -292,7 +297,7 @@ func NotifyWaybillStatus(bill *model.Waybill, order *model.GoodsOrder, isBillAlr if templateID != "" { data := map[string]interface{}{ "first": map[string]interface{}{ - "value": title, + "value": suffix + title, "color": titleColor, }, "keyword1": map[string]interface{}{ @@ -367,10 +372,15 @@ func NotifyOrderChanged(order *model.GoodsOrder) (err error) { if order.VendorID == model.VendorIDELM { return nil } + 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("您有订单的信息已被修改") data := map[string]interface{}{ "first": map[string]interface{}{ - "value": title, + "value": suffix + title, "color": WX_NEW_ORDER_TEMPLATE_COLOR, }, "keyword1": map[string]interface{}{ @@ -624,7 +634,11 @@ func NotifyAfsOrderStatus(afsOrder *model.AfsOrder) (err error) { if afsOrder.VendorID == model.VendorIDELM { return nil } - + suffix := "" + storeDetail, err := dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromAfsOrder(afsOrder), afsOrder.VendorID, "") + if err == nil && storeDetail != nil { + suffix = storeDetail.CityName + "," + storeDetail.Name + } var templateID, comment string if afsOrder.Status == model.AfsOrderStatusWait4Approve { templateID = WX_AFS_ORDER_WAIT4APPROVE_TEMPLATE_ID @@ -642,7 +656,7 @@ func NotifyAfsOrderStatus(afsOrder *model.AfsOrder) (err error) { data := map[string]interface{}{ "first": map[string]interface{}{ - "value": fmt.Sprintf("%s 第%d号订单, %s", model.VendorChineseNames[afsOrder.VendorID], order.OrderSeq, afsOrder.VendorOrderID), + "value": suffix + fmt.Sprintf("%s 第%d号订单, %s", model.VendorChineseNames[afsOrder.VendorID], order.OrderSeq, afsOrder.VendorOrderID), "color": WX_HIGHLEVEL_TEMPLATE_COLOR2, }, "keyword1": map[string]interface{}{ @@ -813,13 +827,17 @@ func NotifyAdjustOrder(order *model.GoodsOrder) (err error) { if order.VendorID == model.VendorIDELM { return nil } - + suffix := "" + storeDetail, err := dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, "") + if err == nil && storeDetail != nil { + suffix = storeDetail.CityName + "," + storeDetail.Name + } if !model.IsOrderSolid(order) { globals.SugarLogger.Infof("NotifyAdjustOrder orderID:%s is not solid", order.VendorOrderID) return nil } sb := new(strings.Builder) - sb.WriteString("老板,") + sb.WriteString(suffix + "老板,") sb.WriteString(order.ConsigneeName) sb.WriteString("调整了订单商品,请及时查看!") sb.WriteString(getOrderDetailBrief(order))