diff --git a/business/jxutils/weixinmsg/weixinmsg.go b/business/jxutils/weixinmsg/weixinmsg.go index 049bc9ef8..973ea39bf 100644 --- a/business/jxutils/weixinmsg/weixinmsg.go +++ b/business/jxutils/weixinmsg/weixinmsg.go @@ -757,7 +757,7 @@ func NotifyAfsOrderStatus(afsOrder *model.AfsOrder) (err error) { "color": WX_HIGHLEVEL_TEMPLATE_COLOR2, }, "keyword1": map[string]interface{}{ - "value": afsOrder.AfsOrderID, + "value": fmt.Sprintf("%s 第%d号订单:", model.VendorChineseNames[afsOrder.VendorID], order.OrderSeq) + afsOrder.AfsOrderID, "color": WX_TEMPLATE_VENDERCOLOR_JDDJ, }, "keyword2": map[string]interface{}{ diff --git a/business/partner/im/im.go b/business/partner/im/im.go index 4ef20c5f5..d91943322 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -6,6 +6,7 @@ import ( "errors" "fmt" "strings" + "time" "git.rosy.net.cn/jx-callback/business/partner" @@ -276,14 +277,24 @@ func GetImUserList(req []RelInfo) (map[string][]interface{}, error) { for _, j := range keys { temp := rdb.LRange(j) for _, v := range temp { - retVal[j] = append(retVal[j], v) - //暂时写死 - //retVal["userList"] = append(retVal["userList"], v) + //过滤过期信息 + if FilterUserList(v) { + retVal[j] = append(retVal[j], v) + } } } return retVal, nil } +func FilterUserList(val string) bool { + retVal := UserMessageList{} + err := json.Unmarshal([]byte(val), &retVal) + if err != nil || time.Now().Unix()-int64(retVal.LatestTime) >= 3600*6 { + return false + } + return true +} + // GetImChatDetail 获取门店用户聊天详情 func GetImChatDetail(req []UserRelInfo) (map[string][]interface{}, error) { retVal := make(map[string][]interface{}, 0)