Merge branch 'cygx_14.0' of http://8.136.199.33:3000/hongze/hongze_clpt into debug

controllers/report.go

@@ -694,28 +694,28 @@ func (this *ReportController) IndustrialFllow() {
 	item.CompanyId = user.CompanyId
 	item.CompanyName = user.CompanyName
 
-	if count == 0 {
-		item.Type = 1
-		item.CreateTime = time.Now()
-		item.ModifyTime = time.Now()
-		_, err = models.AddCygxIndustryFllow(item)
-		if err != nil {
-			br.Msg = "操作失败"
-			br.ErrMsg = "操作失败,Err:" + err.Error()
-			return
-		}
-		resp.Status = 1
-		br.Msg = "关注成功"
-	} else {
-		err = models.RemoveCygxIndustryFllow(uid, industrialManagementId)
-		if err != nil {
-			br.Msg = "操作失败"
-			br.ErrMsg = "取消关注失败,Err:" + err.Error()
-			return
-		}
-		resp.Status = 2
-		br.Msg = "已取消关注"
+	//if count == 0 {
+	item.Type = 1
+	item.CreateTime = time.Now()
+	item.ModifyTime = time.Now()
+	_, err = models.AddCygxIndustryFllow(item)
+	if err != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "操作失败,Err:" + err.Error()
+		return
 	}
+	resp.Status = 1
+	br.Msg = "操作成功"
+	//} else {
+	//	err = models.RemoveCygxIndustryFllow(uid, industrialManagementId)
+	//	if err != nil {
+	//		br.Msg = "操作失败"
+	//		br.ErrMsg = "取消关注失败,Err:" + err.Error()
+	//		return
+	//	}
+	//	resp.Status = 2
+	//	br.Msg = "已取消关注"
+	//}
 	//处理是否关注全部赛道字段
 	//go services.IndustryFllowWithTrack(industrialManagementId, count, uid)
 	go services.IndustryFllowUserLabelLogAdd(industrialManagementId, count, uid) //处理用户标签
@@ -787,37 +787,37 @@ func (this *ReportController) CategoryFllow() {
 		return
 	}
 	resp := new(models.CygxIndustryFllowResp)
-	if count == 0 {
-		item := new(models.CygxXzsChooseCategory)
-		item.CategoryId = mapReport[categoryId]
-		item.IdCygx = categoryId
-		item.UserId = uid
-		item.Email = user.Email
-		item.Mobile = user.Mobile
-		item.RealName = user.RealName
-		item.CompanyId = user.CompanyId
-		item.CompanyName = user.CompanyName
-		item.FollowType = followType
-		item.CreateTime = time.Now()
-		item.ModifyTime = time.Now()
-		_, err = models.AddCygxCategoryFllow(item)
-		if err != nil {
-			br.Msg = "操作失败"
-			br.ErrMsg = "操作失败,Err:" + err.Error()
-			return
-		}
-		resp.Status = 1
-		br.Msg = "关注成功"
-	} else {
-		err = models.RemoveCygxCategoryFllow(user.Mobile, mapReport[categoryId])
-		if err != nil {
-			br.Msg = "操作失败"
-			br.ErrMsg = "取消关注失败,Err:" + err.Error()
-			return
-		}
-		resp.Status = 2
-		br.Msg = "已取消关注"
+	//if count == 0 {
+	item := new(models.CygxXzsChooseCategory)
+	item.CategoryId = mapReport[categoryId]
+	item.IdCygx = categoryId
+	item.UserId = uid
+	item.Email = user.Email
+	item.Mobile = user.Mobile
+	item.RealName = user.RealName
+	item.CompanyId = user.CompanyId
+	item.CompanyName = user.CompanyName
+	item.FollowType = followType
+	item.CreateTime = time.Now()
+	item.ModifyTime = time.Now()
+	_, err = models.AddCygxCategoryFllow(item)
+	if err != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "操作失败,Err:" + err.Error()
+		return
 	}
+	resp.Status = 1
+	br.Msg = "操作成功"
+	//} else {
+	//err = models.RemoveCygxCategoryFllow(user.Mobile, mapReport[categoryId])
+	//	if err != nil {
+	//		br.Msg = "操作失败"
+	//		br.ErrMsg = "取消关注失败,Err:" + err.Error()
+	//		return
+	//	}
+	//	resp.Status = 2
+	//	br.Msg = "已取消关注"
+	//}
 	go services.CategoryFllowUserLabelLogAdd(categoryId, count, uid) //处理用户标签
 	br.Ret = 200
 	br.Success = true
@@ -2465,43 +2465,43 @@ func (this *ReportController) CategoryZhouqiFllow() {
 	}
 	categoryId := req.CategoryId
 	followType := req.FollowType
-	count, err := models.GetCountCategoryFllowZhouqi(categoryId, user.Mobile)
+	//count, err := models.GetCountCategoryFllowZhouqi(categoryId, user.Mobile)
+	//if err != nil {
+	//	br.Msg = "获取数据失败！"
+	//	br.ErrMsg = "获取数据失败，Err:" + err.Error()
+	//	return
+	//}
+	resp := new(models.CygxIndustryFllowResp)
+	//if count == 0 {
+	item := new(models.CygxXzsChooseCategoryZhouqi)
+	item.CategoryId = categoryId
+	item.UserId = uid
+	item.Email = user.Email
+	item.Mobile = user.Mobile
+	item.RealName = user.RealName
+	item.CompanyId = user.CompanyId
+	item.CompanyName = user.CompanyName
+	item.FollowType = followType
+	item.CreateTime = time.Now()
+	item.ModifyTime = time.Now()
+	_, err = models.AddCygxCategoryFllowZhouqi(item)
 	if err != nil {
-		br.Msg = "获取数据失败！"
-		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		br.Msg = "操作失败"
+		br.ErrMsg = "操作失败,Err:" + err.Error()
 		return
 	}
-	resp := new(models.CygxIndustryFllowResp)
-	if count == 0 {
-		item := new(models.CygxXzsChooseCategoryZhouqi)
-		item.CategoryId = categoryId
-		item.UserId = uid
-		item.Email = user.Email
-		item.Mobile = user.Mobile
-		item.RealName = user.RealName
-		item.CompanyId = user.CompanyId
-		item.CompanyName = user.CompanyName
-		item.FollowType = followType
-		item.CreateTime = time.Now()
-		item.ModifyTime = time.Now()
-		_, err = models.AddCygxCategoryFllowZhouqi(item)
-		if err != nil {
-			br.Msg = "操作失败"
-			br.ErrMsg = "操作失败,Err:" + err.Error()
-			return
-		}
-		resp.Status = 1
-		br.Msg = "关注成功"
-	} else {
-		err = models.RemoveCygxCategoryFllowZhouqi(user.Mobile, categoryId)
-		if err != nil {
-			br.Msg = "操作失败"
-			br.ErrMsg = "取消关注失败,Err:" + err.Error()
-			return
-		}
-		resp.Status = 2
-		br.Msg = "已取消关注"
-	}
+	resp.Status = 1
+	br.Msg = "操作成功"
+	//} else {
+	//	err = models.RemoveCygxCategoryFllowZhouqi(user.Mobile, categoryId)
+	//	if err != nil {
+	//		br.Msg = "操作失败"
+	//		br.ErrMsg = "取消关注失败,Err:" + err.Error()
+	//		return
+	//	}
+	//	resp.Status = 2
+	//	br.Msg = "已取消关注"
+	//}
 	br.Ret = 200
 	br.Success = true
 	br.Data = resp

models/industry_fllow.go

@@ -52,7 +52,23 @@ func GetCountCygxIndustryFllowByUid(userId int) (count int, err error) {
 
 // 添加
 func AddCygxIndustryFllow(item *CygxIndustryFllow) (lastId int64, err error) {
-	o := orm.NewOrm()
+
+	o, err := orm.NewOrm().Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err == nil {
+			o.Commit()
+		} else {
+			o.Rollback()
+		}
+	}()
+	sql := `DELETE FROM cygx_industry_fllow WHERE user_id=? AND industrial_management_id=? `
+	_, err = o.Raw(sql, item.UserId, item.IndustrialManagementId).Exec()
+	if err != nil {
+		return
+	}
 	lastId, err = o.Insert(item)
 	return
 }
@@ -84,6 +100,7 @@ func GetUserFllowIndustrialList(userId int) (items []*CygxIndustryFllow, err err
 	o := orm.NewOrm()
 	sql := `SELECT
 			f.user_id,
+			f.follow_type,
 			m.industry_name,
 			m.industrial_management_id 
 		FROM

models/xzs_choose_category.go

@@ -30,7 +30,24 @@ func GetCygxXzsChooseCategoryList(mobile string) (items []*CygxXzsChooseCategory
 
 // 添加
 func AddCygxCategoryFllow(item *CygxXzsChooseCategory) (lastId int64, err error) {
-	o := orm.NewOrm()
+	o, err := orm.NewOrm().Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err == nil {
+			o.Commit()
+		} else {
+			o.Rollback()
+		}
+	}()
+
+	sql := `DELETE FROM cygx_xzs_choose_category WHERE mobile=? AND category_id=? `
+	_, err = o.Raw(sql, item.Mobile, item.CategoryId).Exec()
+
+	if err != nil {
+		return
+	}
 	lastId, err = o.Insert(item)
 	return
 }

models/xzs_choose_category_zhouqi.go

@@ -29,7 +29,23 @@ func GetCygxXzsChooseCategoryZhouqiList(mobile string) (items []*CygxXzsChooseCa
 
 // 添加
 func AddCygxCategoryFllowZhouqi(item *CygxXzsChooseCategoryZhouqi) (lastId int64, err error) {
-	o := orm.NewOrm()
+	o, err := orm.NewOrm().Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err == nil {
+			o.Commit()
+		} else {
+			o.Rollback()
+		}
+	}()
+
+	sql := `DELETE FROM cygx_xzs_choose_category_zhouqi WHERE mobile=? AND category_id=? `
+	_, err = o.Raw(sql, item.Mobile, item.CategoryId).Exec()
+	if err != nil {
+		return
+	}
 	lastId, err = o.Insert(item)
 	return
 }

services/industrial_management.go

@@ -93,6 +93,7 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
 			fllowTypeMap[v.IndustrialManagementId] = v.FollowType
 		}
 	}
+	fmt.Println(fllowTypeMap[716])
 
 	hotMap, e := IndustrialManagementHotMapGropuPermission()
 	if e != nil {