未发布的活动，文章不在我的收藏、提问展示

controllers/article.go

@@ -607,10 +607,7 @@ func (this *ArticleController) AddStopTime() {
 			}
 			if hasPersion {
 				detailNew, err := models.GetNewArticleHistoryRecord(uid, articleId)
-				fmt.Println(detailNew)
-				fmt.Println(err)
 				if err == nil {
-					fmt.Println("修改")
 					hasPermission = 1
 					historyRecord := new(models.AddStopTimeNewRep)
 					historyRecord.StopTime = detailNew.StopTime + stopTime
@@ -620,7 +617,7 @@ func (this *ArticleController) AddStopTime() {
 				}
 
 				//不统计本公司的阅读记录、正常退出的不做时间差统计
-				if user.CompanyId != 16 {
+				if user.CompanyId != 16 && stopTime > 3 {
 					key := "CYGX_ARTICLE_PV" + strconv.Itoa(articleId) + "_" + strconv.Itoa(uid) + "_" + strconv.Itoa(user.CompanyId) + "_" + strconv.Itoa(outType)
 					record := new(models.CygxArticleHistoryRecordNewpv)
 					record.UserId = uid

controllers/user.go

@@ -17,159 +17,6 @@ type UserController struct {
 	BaseAuthController
 }
 
-/*
-// @Title 登录
-// @Description 登录接口
-// @Param	request	body models.LoginReq true "type json string"
-// @Success 200 {object} models.LoginResp
-// @router /login [post]
-func (this *UserController) Login() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req models.LoginReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-	user := this.User
-	if user == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录"
-		br.Ret = 408
-		return
-	}
-
-	unionId := this.User.UnionId
-	userId := this.User.UserId
-	if unionId == "" {
-		br.Msg = "参数错误"
-		br.ErrMsg = "参数错误，unionId 为空"
-		return
-	}
-	newUserId := 0
-	if req.LoginType == 1 || req.LoginType == 3 {
-		if req.Mobile == "" {
-			br.Msg = "参数错误"
-			br.ErrMsg = "参数错误，手机号为空 为空"
-			return
-		}
-		if req.LoginType == 3 {
-			item, err := models.GetMsgCode(req.Mobile, req.VCode)
-			if err != nil {
-				if err.Error() == utils.ErrNoRow() {
-					br.Msg = "验证码错误,请重新输入"
-					br.ErrMsg = "校验验证码失败，Err:" + err.Error()
-					return
-				} else {
-					br.Msg = "验证码错误,请重新输入"
-					br.ErrMsg = "校验验证码失败，Err:" + err.Error()
-					return
-				}
-			}
-			if item == nil {
-				br.Msg = "验证码错误,请重新输入"
-				return
-			}
-		}
-		//BindMobile(openId, mobile string, userId, loginType int) (err error) {
-		req.Mobile = strings.Trim(req.Mobile, " ")
-		req.LoginType = 1
-		newUserId, err = models.PcBindMobile(unionId, req.Mobile, userId, req.LoginType)
-	} else if req.LoginType == 2 {
-		if req.Email == "" {
-			br.ErrMsg = "邮箱不能为空,请输入邮箱"
-			br.Msg = "邮箱不能为空,请输入邮箱"
-			return
-		}
-		if !utils.ValidateEmailFormatat(req.Email) {
-			br.ErrMsg = "邮箱格式错误，请重新输入"
-			br.Msg = "邮箱格式错误，请重新输入"
-			return
-		}
-		item, err := models.GetMsgCode(req.Email, req.VCode)
-		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
-				br.Msg = "验证码错误,请重新输入"
-				br.ErrMsg = "校验验证码失败，Err:" + err.Error()
-				return
-			} else {
-				br.Msg = "验证码错误,请重新输入"
-				br.ErrMsg = "校验验证码失败，Err:" + err.Error()
-				return
-			}
-		}
-		if item == nil {
-			br.Msg = "验证码错误,请重新输入"
-			return
-		}
-
-		newUserId, err = models.PcBindMobile(unionId, req.Email, userId, req.LoginType)
-	} else {
-		br.Msg = "无效的登录方式"
-		br.ErrMsg = "无效的登录方式,Err:" + err.Error()
-		return
-	}
-	var token string
-	tokenItem, err := models.GetTokenByUid(newUserId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		br.Msg = "登录失败"
-		br.ErrMsg = "登录失败，获取token失败:" + err.Error()
-		return
-	}
-
-	if tokenItem == nil || (err != nil && err.Error() == utils.ErrNoRow()) {
-		timeUnix := time.Now().Unix()
-		timeUnixStr := strconv.FormatInt(timeUnix, 10)
-		token = utils.MD5(strconv.Itoa(userId)) + utils.MD5(timeUnixStr)
-		//新增session
-		{
-			session := new(models.CygxSession)
-			session.OpenId = unionId
-			session.UnionId = unionId
-			session.UserId = userId
-			session.CreatedTime = time.Now()
-			session.LastUpdatedTime = time.Now()
-			session.ExpireTime = time.Now().AddDate(0, 1, 0)
-			session.AccessToken = token
-			err = models.AddSession(session)
-			if err != nil {
-				br.Msg = "登录失败"
-				br.ErrMsg = "登录失败，新增用户session信息失败:" + err.Error()
-				return
-			}
-		}
-	} else {
-		token = tokenItem.AccessToken
-	}
-
-	//新增登录日志
-	{
-		loginLog := new(models.WxUserLog)
-		loginLog.UserId = userId
-		loginLog.OpenId = unionId
-		loginLog.Mobile = req.Mobile
-		loginLog.Email = req.Email
-		loginLog.CreateTime = time.Now()
-		loginLog.Handle = "wechat_user_login"
-		loginLog.Remark = token
-		go models.AddWxUserLog(loginLog)
-	}
-
-	resp := new(models.LoginResp)
-	resp.UserId = newUserId
-	resp.Authorization = token
-	br.Ret = 200
-	br.Success = true
-	br.Data = resp
-	br.Msg = "登录成功"
-}
-*/
-
 // @Title 登录
 // @Description 登录接口
 // @Param	request	body models.LoginReq true "type json string"
@@ -338,9 +185,6 @@ func (this *UserController) Detail() {
 		return
 	}
 	uid := user.UserId
-
-	fmt.Println("uid:", uid)
-
 	var hasPermission int
 	detail := new(models.UserDetail)
 	if uid > 0 {

models/activity_help_ask.go

@@ -55,7 +55,7 @@ func GetActivityAskList(userId int) (items []*CygxAskList, err error) {
 			cygx_activity_help_ask AS k
 			INNER JOIN cygx_activity AS a ON a.activity_id = k.activity_id 
 		WHERE
-			user_id = ? ORDER BY k.ask_id DESC`
+			user_id = ? a.publish_status = 1 ORDER BY k.ask_id DESC`
 	_, err = o.Raw(sql, userId).QueryRows(&items)
 	return
 }
@@ -72,7 +72,7 @@ func GetArticleAskList(userId int) (items []*CygxAskList, err error) {
 			cygx_article_ask AS k
 			INNER JOIN cygx_article AS a ON a.article_id = k.article_id 
 		WHERE
-			user_id = ? ORDER BY k.ask_id DESC`
+			user_id = ? AND a.publish_status = 1 ORDER BY k.ask_id DESC`
 	_, err = o.Raw(sql, userId).QueryRows(&items)
 	return
 }

models/user.go

@@ -136,14 +136,14 @@ type CheckStatusResp struct {
 }
 
 func GetArticleUserCollectCount(userId int) (count int, err error) {
-	sql := `SELECT COUNT(1) AS count FROM cygx_article_collect AS a INNER JOIN cygx_article as art ON art.article_id = a.article_id WHERE a.user_id=?  `
+	sql := `SELECT COUNT(1) AS count FROM cygx_article_collect AS a INNER JOIN cygx_article as art ON art.article_id = a.article_id WHERE a.user_id=? AND publish_status = 1  `
 	err = orm.NewOrm().Raw(sql, userId).QueryRow(&count)
 	return
 }
 
 func GetArticleUserCollectList(startSize, pageSize, userId int) (items []*ArticleCollectList, err error) {
 	sql := `SELECT a.* FROM cygx_article_collect AS a INNER JOIN cygx_article as art ON art.article_id = a.article_id
-			WHERE a.user_id=? 
+			WHERE a.user_id=?  AND publish_status = 1
            ORDER BY a.create_time DESC LIMIT ?,? `
 	_, err = orm.NewOrm().Raw(sql, userId, startSize, pageSize).QueryRows(&items)
 	return