批量关注

controllers/user/user_controller.go

@@ -97,7 +97,7 @@ type FollowResp struct {
 }
 
 type FollowAnalystsReq struct {
-	AnalystNames string `json:"analystName"`
+	AnalystNames string `json:"analystNames"`
 	FollowType   string `json:"followType"`
 	Mobile       string `json:"mobile"`
 }
@@ -109,7 +109,7 @@ type FollowAnalystsReq struct {
 // @router /followAnalysts [post]
 func (u *UserController) FollowAnalysts() {
 	controllers.Wrap(&u.BaseController, func() (result *controllers.WrapData, err error) {
-		result = u.InitWrapData("")
+		result = u.InitWrapData("批量关注失败")
 		followAnalyst := new(FollowAnalystsReq)
 		u.GetPostParams(followAnalyst)
 		if !authUtils.IsValidMobile(followAnalyst.Mobile) {
@@ -167,11 +167,11 @@ func (u *UserController) FollowAnalysts() {
 	})
 }
 
-// FollowAnalyst  获取关注状态
+// CheckFollowStatus  获取关注状态
 // @Summary 获取关注状态
 // @Description 获取关注状态
 // @Success 200 {object} controllers.BaseResponse
-// @router /followAnalyst [get]
+// @router /checkFollowStatus [get]
 func (u *UserController) CheckFollowStatus(names string) {
 	controllers.Wrap(&u.BaseController, func() (result *controllers.WrapData, err error) {
 		result = u.InitWrapData("获取关注状态失败")

models/user/user_analyst_follow_list.go

@@ -65,13 +65,13 @@ func FollowAnalystsByName(userId int, analysts []UserAnalystFollowList, followTy
 			if errors.Is(err, gorm.ErrRecordNotFound) {
 				err = db.Create(&analyst).Error
 			} else {
-				if analyst.Followed == Unfollowed {
+				if dbFollow.Followed == Unfollowed {
 					analyst.ID = dbFollow.ID
 					analyst.CreatedTime = dbFollow.CreatedTime
 					analyst.FollowedTime = dbFollow.FollowedTime
 					analyst.FollowedTime = time.Now()
+					err = db.Updates(&analyst).Error
 				}
-				err = db.Updates(&analyst).Error
 			}
 			if err != nil {
 				tx.Rollback()
@@ -88,9 +88,12 @@ func FollowAnalystsByName(userId int, analysts []UserAnalystFollowList, followTy
 			if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 				return
 			}
-			if errors.Is(err, gorm.ErrRecordNotFound) || analyst.Followed == Unfollowed {
+			if errors.Is(err, gorm.ErrRecordNotFound) || dbFollow.Followed == Unfollowed {
 				continue
 			} else {
+				analyst.ID = dbFollow.ID
+				analyst.CreatedTime = dbFollow.CreatedTime
+				analyst.FollowedTime = dbFollow.FollowedTime
 				err = db.Updates(&analyst).Error
 			}
 			if err != nil {
@@ -100,10 +103,12 @@ func FollowAnalystsByName(userId int, analysts []UserAnalystFollowList, followTy
 		}
 		tx.Commit()
 	}
+	if errors.Is(err, gorm.ErrRecordNotFound) {
+		err = nil
+	}
 	return
 }
-func CheckFollowStatusByNames(userId int, names []string) (list []FollowStatus, err error) {
-	var result []FollowStatus
+func CheckFollowStatusByNames(userId int, names []string) (result []FollowStatus, err error) {
 	db := models.Main()
 	var followingList []UserAnalystFollowList
 	err = db.Select(FollowingStatusColumns).Where("user_id = ? and followed = ? and financial_analyst_name in ?", userId, Following, names).Find(&followingList).Error

routers/commentsRouter.go

@@ -253,19 +253,10 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mini_ht_api/controllers/user:UserController"] = append(beego.GlobalControllerRouter["eta/eta_mini_ht_api/controllers/user:UserController"],
-        beego.ControllerComments{
-            Method: "Feedback",
-            Router: `/feedback`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_mini_ht_api/controllers/user:UserController"] = append(beego.GlobalControllerRouter["eta/eta_mini_ht_api/controllers/user:UserController"],
         beego.ControllerComments{
             Method: "CheckFollowStatus",
-            Router: `/followAnalyst`,
+            Router: `/checkFollowStatus`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(
 				param.New("names"),
@@ -273,6 +264,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_mini_ht_api/controllers/user:UserController"] = append(beego.GlobalControllerRouter["eta/eta_mini_ht_api/controllers/user:UserController"],
+        beego.ControllerComments{
+            Method: "Feedback",
+            Router: `/feedback`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_mini_ht_api/controllers/user:UserController"] = append(beego.GlobalControllerRouter["eta/eta_mini_ht_api/controllers/user:UserController"],
         beego.ControllerComments{
             Method: "FollowAnalyst",