Merge branch 'cygx_12.1' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

models/cygx_yanxuan_special.go

@@ -153,6 +153,16 @@ JOIN cygx_yanxuan_special_author AS b ON a.user_id = b.user_id
 	return
 }
 
+func GetYanxuanSpecialBySpecialId(specialId int) (item *CygxYanxuanSpecialItem, err error) {
+	o := orm.NewOrm()
+	sql := ``
+	sql = `SELECT a.*
+FROM cygx_yanxuan_special AS a
+ WHERE a.id=? `
+	err = o.Raw(sql, specialId).QueryRow(&item)
+	return
+}
+
 type CygxYanxuanSpecialReq struct {
 	Id           int    `orm:"column(id);pk"`
 	Content      string // 内容

services/cygx_yanxuan_special.go

@@ -226,7 +226,20 @@ func SendWxMsgSpecialAuthor(specialId, status int) (err error) {
 }
 
 //func init() {
-//	UpdateYanxuanSpecialResourceData(185)
+//
+//	var condition string
+//	var pars []interface{}
+//
+//	condition = " AND   a.user_id = 103354  "
+//	list, tmpErr := models.GetYanxuanSpecialList(0, condition, pars)
+//
+//	fmt.Println(len(list))
+//	fmt.Println(tmpErr)
+//
+//	for _, v := range list {
+//		fmt.Println(v.Id)
+//		EsAddYanxuanSpecial(v.Id)
+//	}
 //}
 
 // 更新研选专栏  写入首页最新  cygx_resource_data 表
@@ -261,7 +274,13 @@ func UpdateYanxuanSpecialResourceData(sourceId int) {
 			err = errors.New("GetCygxReportSelectionBySourceAndId, Err: " + e.Error())
 			return
 		}
-		publishDate := time.Now().Format(utils.FormatDateTime)
+
+		detail, e := models.GetYanxuanSpecialBySpecialId(sourceId)
+		if e != nil {
+			err = errors.New("GetYanxuanSpecialBySpecialId, Err: " + e.Error())
+			return
+		}
+		publishDate := detail.PublishTime
 		item := new(models.CygxResourceData)
 		item.SourceId = sourceId
 		item.Source = source

services/keyword.go

@@ -69,15 +69,16 @@ func SearchKeywordUserRmind(user *models.WxUserItem, keyWord string) (err error)
 	defer func() {
 		if err != nil {
 			fmt.Println(err)
-			go utils.SendAlarmMsg("用户搜索操作操作行为，模板消息推送失败"+err.Error(), 2)
+			go utils.SendAlarmMsg(fmt.Sprint("用户搜索操作操作行为，模板消息推送失败"+err.Error(), "UserId:", user.UserId, "keyWord:", keyWord), 2)
 		}
 	}()
-	countUser, err := models.GetUserRemind(user.UserId)
-	if err != nil {
-		return err
+	countUser, e := models.GetUserRemind(user.UserId)
+	if e != nil {
+		err = errors.New("GetUserRemind, Err: " + e.Error())
+		return
 	}
 	if countUser == 0 {
-		return err
+		return
 	}
 	var first string
 	var keyword1 string
@@ -86,9 +87,10 @@ func SearchKeywordUserRmind(user *models.WxUserItem, keyWord string) (err error)
 	var keyword4 string
 	var remark string
 	//获取销售手机号
-	sellerItemQy, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		return err
+	sellerItemQy, e := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetSellerByCompanyIdCheckFicc, Err: " + e.Error())
+		return
 	}
 	if sellerItemQy != nil {
 		openIdList, e := models.GetWxOpenIdByMobileList(sellerItemQy.Mobile)