From 2c5c4b2326fdc361fa0d3a01cd9079c700cd39c7 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 18 Oct 2019 20:58:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=B7=AE=E8=AF=84=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/order_comment.go | 5 ++-- business/jxutils/weixinmsg/weixinmsg.go | 30 ++++++++++++++----- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/business/jxcallback/orderman/order_comment.go b/business/jxcallback/orderman/order_comment.go index d5332f637..d5dfcbe67 100644 --- a/business/jxcallback/orderman/order_comment.go +++ b/business/jxcallback/orderman/order_comment.go @@ -115,7 +115,7 @@ func (c *OrderManager) OnOrderComments(orderCommentList []*model.OrderComment) ( if comment2.Jxstoreid != "" && orderComment.Score <= JX_MIDDLE_COMMENTS_MAX_LEVEL && time.Now().Sub(orderComment.CommentCreatedAt) < MAX_REAPLY_TIME { comment2.LastPushTime = utils.Time2Str(time.Now()) comment2.PushNo = 1 - weixinmsg.PushJDBadCommentToWeiXin(comment2, orderComment.Score <= JX_BAD_COMMENTS_MAX_LEVEL) + weixinmsg.PushJDBadCommentToWeiXin(comment2, orderComment.Score <= JX_BAD_COMMENTS_MAX_LEVEL, order) } } else { // 修改评价，高于JX_BAD_COMMENTS_MAX_LEVEL if orderComment.CommentCreatedAt.Sub(str2Time(comment2.Createtime)) == 0 || @@ -138,7 +138,8 @@ func (c *OrderManager) OnOrderComments(orderCommentList []*model.OrderComment) ( comment3.Score = comment2.UpdatedScore comment3.Scorecontent = comment2.UpdatedScorecontent comment3.Vendertags = comment2.UpdatedVendertags - weixinmsg.PushJDBadCommentToWeiXin(&comment3, orderComment.Score <= JX_BAD_COMMENTS_MAX_LEVEL) + order, _ := partner.CurOrderManager.LoadOrder(orderComment.VendorOrderID, orderComment.VendorID) + weixinmsg.PushJDBadCommentToWeiXin(&comment3, orderComment.Score <= JX_BAD_COMMENTS_MAX_LEVEL, order) } } } diff --git a/business/jxutils/weixinmsg/weixinmsg.go b/business/jxutils/weixinmsg/weixinmsg.go index 985c74bb2..524ee428b 100644 --- a/business/jxutils/weixinmsg/weixinmsg.go +++ b/business/jxutils/weixinmsg/weixinmsg.go @@ -47,7 +47,7 @@ const ( WX_MTPS_DELIVERY_DONE_TEMPLATE_ID = "YXdCrQAHZlcZX1htYUiarrLmtkmKAjp7rynjwObgODo" //微信美团配送员配送完成推送 WX_MTPS_UNABLE_DELIVER_TEMPLATE_ID = "ZFph5Hp7oLlrzVRXbsKIC_StmaBeB9Dlp4tlHeAmUQ8" //微信美团配送配送能力不足推送 WX_MTPS_DELIVERY_EXCEPTION_TEMPLATE_ID = "RkfOFHgR1N75L4-a6Gv0DljpCsVfOHhLm_vyXh8MR-w" //微信美团配送异常推送 - WX_BAD_COMMENT_PUSH_TEMPLATE_ID = "zMZH5Ek0k1OHlWnsDb98UaHEOlkJZYok2QOJUfwfJWs" //微信差评消息推送 + WX_BAD_COMMENT_PUSH_TEMPLATE_ID = "NaMEzjctvVPQ9ishTI1dKpp5QSYV2FWcWftSSjDrpN8" //"zMZH5Ek0k1OHlWnsDb98UaHEOlkJZYok2QOJUfwfJWs" //微信差评消息推送 WX_DADA_DELIVERY_GRABDONE_TEMPLATE_ID = "h4dkON6AgnHz1XmaksEUB_8Bcir4V8MSexUhC149pPE" //微信达达众包配送员接单推送 WX_DADA_DELIVERY_DONE_TEMPLATE_ID = "YXdCrQAHZlcZX1htYUiarrLmtkmKAjp7rynjwObgODo" //微信达达众包配送员配送完成推送 @@ -397,7 +397,7 @@ func NotifyOrderCanceled(order *model.GoodsOrder) (err error) { return err } -func PushJDBadCommentToWeiXin(comment *legacymodel.JxBadComments, isBadComment bool) (err error) { +func PushJDBadCommentToWeiXin(comment *legacymodel.JxBadComments, isBadComment bool, order *model.GoodsOrder) (err error) { globals.SugarLogger.Debugf("PushJDBadCommentToWeiXin orderID:%s", comment.OrderId) sb := new(strings.Builder) @@ -411,21 +411,37 @@ func PushJDBadCommentToWeiXin(comment *legacymodel.JxBadComments, isBadComment b sb.WriteString("星中评，如有必要，请商家在1小时内及时联系客户处理!") } title := sb.String() + var orderInfo string + consigneeName := comment.Userphone + if order != nil { + orderInfo = fmt.Sprintf("%s第%d号订单, %s", model.VendorChineseNames[int(utils.Str2Int64WithDefault(comment.OrderFlag, 0))], order.OrderSeq, comment.OrderId) + consigneeName = order.ConsigneeName + } else { + orderInfo = fmt.Sprintf("%s订单, %s", model.VendorChineseNames[int(utils.Str2Int64WithDefault(comment.OrderFlag, 0))], comment.OrderId) + } data := map[string]interface{}{ "first": map[string]interface{}{ "value": title, "color": WX_HIGHLEVEL_TEMPLATE_COLOR, }, "keyword1": map[string]interface{}{ - "value": comment.Createtime, + "value": genJdCommentRemark(comment), "color": WX_TEMPLATE_VENDERCOLOR_BAD_COMMENTS, }, "keyword2": map[string]interface{}{ - "value": comment.OrderId, + "value": comment.Score, "color": WX_TEMPLATE_VENDERCOLOR_BAD_COMMENTS, }, - "remark": map[string]interface{}{ - "value": genJdCommentRemark(comment), + "keyword3": map[string]interface{}{ + "value": orderInfo, + "color": WX_TEMPLATE_VENDERCOLOR_BAD_COMMENTS, + }, + "keyword4": map[string]interface{}{ + "value": consigneeName, + "color": WX_TEMPLATE_VENDERCOLOR_BAD_COMMENTS, + }, + "keyword5": map[string]interface{}{ + "value": comment.Userphone, "color": WX_TEMPLATE_VENDERCOLOR_BAD_COMMENTS, }, } @@ -567,7 +583,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": fmt.Sprintf("%s 第%d号订单, %s", model.VendorChineseNames[afsOrder.VendorID], order.OrderSeq, afsOrder.VendorOrderID), "color": WX_HIGHLEVEL_TEMPLATE_COLOR2, }, "keyword1": map[string]interface{}{