Forráskód Böngészése

Merge branch 'mfyx_3.4' of http://8.136.199.33:3000/cxzhang/hongze_mfyx into debug

xingzai 7 hónapja
szülő
commit
e41c5ce738

+ 1 - 1
controllers/yanxuan_special_message.go

@@ -506,7 +506,7 @@ func (this *YanxuanSpecialMessageController) MessageSpecialList() {
 
 	var conditionMyself string
 	var parsMyself []interface{}
-	conditionMyself += `  AND status = 0  AND  parent_id  = 0  AND   user_id =  ? AND yanxuan_special_id  =   ?  `
+	conditionMyself += `  AND status = 0  AND  parent_id  = 0  AND   user_id =  ? AND yanxuan_special_id  =   ?   ORDER BY message_id  DESC `
 	parsMyself = append(parsMyself, userId, yanxuanSpecialId)
 
 	var listMyself []*models.CygxYanxuanSpecialMessage

+ 2 - 3
services/wx_category_template_msg.go

@@ -1062,8 +1062,7 @@ func SendWxCategoryMsgByYanxuanSpecialMassageByAuthor(content string, yanxuanSpe
 		return
 	}
 	mobile = userInfo.Mobile
-	mobile = utils.WxMsgTemplateIdAskMsgMobilePublic
-	if utils.RunMode == "" {
+	if utils.RunMode == "release" {
 		redirectUrl = utils.WX_MSG_PATH_YX_SPECIAL_MASSAGE_MANAGE_LIST
 	}
 
@@ -1116,7 +1115,7 @@ func SendWxCategoryMsgByYanxuanSpecialMassage(parentId, messageId int, content s
 	keyword2 = "作者回复了您的留言"
 	keyword3 = content
 	keyword4 = time.Now().Format(utils.FormatDateTimeMinute2)
-	if utils.RunMode == "" {
+	if utils.RunMode == "release" {
 		redirectUrl = utils.WX_MSG_PATH_YX_SPECIAL_MASSAGE_DETAIL + strconv.Itoa(messageId)
 	}