Merge branch 'cygx_12.0' into debug

controllers/yanxuan_special.go

@@ -101,7 +101,7 @@ func (this *YanxuanSpecialController) Detail() {
 	}
 
 
-	item, tmpErr := models.GetYanxuanSpecialById(specialId)
+	item, tmpErr := models.GetYanxuanSpecialById(specialId,sysUser.UserId)
 	if tmpErr != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败, Err:" + tmpErr.Error()

models/cygx_yanxuan_special.go

@@ -79,14 +79,17 @@ type SpecialListResp struct {
 	IsAuthor bool
 }
 
-func GetYanxuanSpecialById(specialId int) (item *CygxYanxuanSpecialItem, err error) {
+func GetYanxuanSpecialById(specialId, userId int) (item *CygxYanxuanSpecialItem, err error) {
 	o := orm.NewOrm()
 	sql := ``
-	sql = `SELECT a.*,b.bg_img,b.head_img,b.introduction,b.label,b.mobile,b.nick_name,b.real_name,b.special_name
+	sql = `SELECT a.*,b.bg_img,b.head_img,b.introduction,b.label,b.mobile,
+b.nick_name,b.real_name,b.special_name,
+( SELECT count( 1 ) FROM cygx_yanxuan_special_collect AS ac INNER JOIN wx_user as u ON  u.user_id = ac.user_id  WHERE ac.yanxuan_special_id = a.id  ) AS collect_num,
+( SELECT count( 1 ) FROM cygx_yanxuan_special_collect AS ac WHERE ac.yanxuan_special_id = a.id  AND user_id = ? ) AS is_collect
 FROM cygx_yanxuan_special AS a
 JOIN cygx_yanxuan_special_author AS b ON a.user_id = b.user_id 
  WHERE a.id=? `
-	err = o.Raw(sql, specialId).QueryRow(&item)
+	err = o.Raw(sql, userId, specialId).QueryRow(&item)
 	return
 }
 

services/cygx_yanxuan_special_company.go

@@ -61,4 +61,5 @@ func GetStocksFromVmp(cont context.Context) (err error) {
 		fmt.Println("AddCygxYanxuanSpecialCompanyMulti Err:%s", err.Error())
 		return
 	}
+	return
 }