Merge branch 'yb/4.0' into debug

logic/user/user.go

@@ -108,11 +108,12 @@ type Detail struct {
 	SellerName     string              `json:"seal_name" description:"所属销售名称"`
 	SellerMobile   string              `json:"seal_mobile" description:"所属销售手机号"`
 	PermissionList []CompanyPermission `json:"permission_list" description:"权限列表"`
-	IsInner		   int				   `json:"is_inner" description:"是否为内部员工"`
-	AdminInfo      *admin2.Admin	   `json:"admin_info" description:"系统管理员信息"`
+	IsInner        int                 `json:"is_inner" description:"是否为内部员工"`
+	AdminInfo      *admin2.Admin       `json:"admin_info" description:"系统管理员信息"`
 	UnRead         int64               `json:"un_read" description:"消息未读数"`
 	NickName       string              `json:"nick_name" description:"用户昵称"`
 	HeadImgUrl     string              `json:"head_img_url" description:"用户头像，最后一个数值代表正方形头像大小（有0、46、64、96、132数值可选，0代表640*640正方形头像），用户没有头像时该项为空"`
+	UserId         uint64              `json:"user_id" description:"用户ID"`
 }
 
 // GetUserInfo 获取用户我的页面详情数据
@@ -230,6 +231,7 @@ func GetUserInfo(userInfo user.UserInfo) (userDetail Detail, err error, errMsg s
 		UnRead:         unRead,
 		NickName:       userInfo.NickName,
 		HeadImgUrl:     userInfo.Headimgurl,
+		UserId:         userInfo.UserID,
 	}
 
 	return

models/tables/yb_comment/update.go

@@ -3,10 +3,10 @@ package yb_comment
 import "hongze/hongze_yb/global"
 
 // Update 更新对应字段数据
-func (yc *YbComment) Update(updateCols []string) (err error) {
+/*func (yc *YbComment) Update(updateCols []string) (err error) {
 	err = global.DEFAULT_MYSQL.Model(yc).Select(updateCols).Updates(*yc).Error
 	return
-}
+}*/
 
 // Delete 软删除，隐藏评论
 func Delete(userId uint64, commentId uint64)(err error) {
@@ -22,9 +22,9 @@ func Delete(userId uint64, commentId uint64)(err error) {
 			SET
             	enabled = 0,
 				modify_time = NOW(),
-				type = 1,
-				user_id = ?
-			WHERE comment_id = ?`
+				is_hot = 0,
+				is_top = 0
+			WHERE type = 1 and user_id = ? and comment_id = ?`
 	err = tx.Exec(sql1, userId, commentId).Error
 	if err != nil {
 		return
@@ -33,9 +33,8 @@ func Delete(userId uint64, commentId uint64)(err error) {
 	sql2 := ` UPDATE yb_comment
 			SET
             	enabled = 0,
-				type = 2,
 				modify_time = NOW()
-			WHERE reply_comment_id = ?`
+			WHERE reply_comment_id = ? and type = 2`
 	err = tx.Exec(sql2, commentId).Error
 	return
 }

services/comment/comment.go

@@ -20,7 +20,7 @@ func Comment(user user.UserInfo, req reqComment.ReqComment) (ret response.RespCo
 	var errMsg string
 	defer func() {
 		if err != nil {
-			global.LOG.Critical(fmt.Sprintf("GetReportList: userId=%d, err:%s， errMsg:%s", user.UserID, err.Error(), errMsg))
+			global.LOG.Critical(fmt.Sprintf("Comment: userId=%d, err:%s， errMsg:%s", user.UserID, err.Error(), errMsg))
 		}
 	}()
 	//校验请求入参
@@ -103,7 +103,7 @@ func Delete(user user.UserInfo, req *reqComment.ReqDel) (err error) {
 	var errMsg string
 	defer func() {
 		if err != nil {
-			global.LOG.Critical(fmt.Sprintf("GetReportList: userId=%d, err:%s， errMsg:%s", user.UserID, err.Error(), errMsg))
+			global.LOG.Critical(fmt.Sprintf("comment Delete: userId=%d, err:%s， errMsg:%s", user.UserID, err.Error(), errMsg))
 		}
 	}()
 	if req.CommentId <= 0 {
@@ -146,7 +146,7 @@ func List(user user.UserInfo,  reportId, reportChapterId, oldReportId, oldReport
 	var errMsg string
 	defer func() {
 		if err != nil {
-			global.LOG.Critical(fmt.Sprintf("GetReportList: userId=%d, err:%s， errMsg:%s", user.UserID, err.Error(), errMsg))
+			global.LOG.Critical(fmt.Sprintf("comment List: userId=%d, err:%s， errMsg:%s", user.UserID, err.Error(), errMsg))
 		}
 	}()
 

services/like/like.go

@@ -17,7 +17,7 @@ func SetLike(user user.UserInfo, req like.ReqLike) (resp response.RespLike, err
 	var errMsg string
 	defer func() {
 		if err != nil {
-			global.LOG.Critical(fmt.Sprintf("GetReportList: userId=%d, err:%s， errMsg:%s", user.UserID, err.Error(), errMsg))
+			global.LOG.Critical(fmt.Sprintf("SetLike: userId=%d, err:%s， errMsg:%s", user.UserID, err.Error(), errMsg))
 		}
 	}()
 	reportId := req.ReportId
@@ -31,7 +31,7 @@ func SetLike(user user.UserInfo, req like.ReqLike) (resp response.RespLike, err
 		err = errors.New("请输入报告ID")
 		return
 	}
-	// todo 判断是否有点赞权限
+	// 判断是否有点赞权限
 	err, errMsg = services.CheckSimpleCompanyProduct(user)
 	if err != nil {
 		return

services/message/message.go

@@ -17,7 +17,7 @@ func GetList(user user.UserInfo, msgType, pageIndex, pageSize int) (ret response
 	var errMsg string
 	defer func() {
 		if err != nil {
-			global.LOG.Critical(fmt.Sprintf("GetReportList: userId=%d, err:%s， errMsg:%s", user.UserID, err.Error(), errMsg))
+			global.LOG.Critical(fmt.Sprintf("message GetList: userId=%d, err:%s， errMsg:%s", user.UserID, err.Error(), errMsg))
 		}
 	}()
 
@@ -67,7 +67,7 @@ func BatchRead(user user.UserInfo, req message.ReqMessageBatch) (err error) {
 	var errMsg string
 	defer func() {
 		if err != nil {
-			global.LOG.Critical(fmt.Sprintf("GetReportList: userId=%d, err:%s， errMsg:%s", user.UserID, err.Error(), errMsg))
+			global.LOG.Critical(fmt.Sprintf("message BatchRead: userId=%d, err:%s， errMsg:%s", user.UserID, err.Error(), errMsg))
 		}
 	}()
 
@@ -86,7 +86,7 @@ func SingleRead(user user.UserInfo, req message.ReqMessage) (err error) {
 	var errMsg string
 	defer func() {
 		if err != nil {
-			global.LOG.Critical(fmt.Sprintf("GetReportList: userId=%d, err:%s， errMsg:%s", user.UserID, err.Error(), errMsg))
+			global.LOG.Critical(fmt.Sprintf("message SingleRead: userId=%d, err:%s， errMsg:%s", user.UserID, err.Error(), errMsg))
 		}
 	}()
 	//查询当前消息
@@ -121,7 +121,7 @@ func SingleDelete(user user.UserInfo, req message.ReqMessage) (err error) {
 	var errMsg string
 	defer func() {
 		if err != nil {
-			global.LOG.Critical(fmt.Sprintf("GetReportList: userId=%d, err:%s， errMsg:%s", user.UserID, err.Error(), errMsg))
+			global.LOG.Critical(fmt.Sprintf("message SingleDelete: userId=%d, err:%s， errMsg:%s", user.UserID, err.Error(), errMsg))
 		}
 	}()
 	//查询当前消息