Merge branch 'cygx_10.7' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -1671,6 +1671,8 @@ func (this *ActivityCoAntroller) LabelMoreList() {
 // @Param   ActivityId   query   int  false       "活动列表传过来的活动ID"
 // @Param   Filter			query	int		false	"筛选条件 0:全部 1:视频 2:音频"
 // @Param   TypeName   query   string  false       "电话会类型 ，1专家电话会 2分析师电话会"
+// @Param   IsExternalLabel   query   int  false       "是否仅展示外部资源 1：是、0：否 默认0"
+// @Param   IsResearchPoints   query   int  false       "是否仅展示研选扣点 1：是、0：否 默认0"
 // @Success 200 {object} models.GetCygxActivityListRep
 // @router /listNew [get]
 func (this *ActivityCoAntroller) ActivityListNew() {
@@ -1698,7 +1700,16 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	playBack, _ := this.GetInt("PlayBack")
 	filter, _ := this.GetInt("Filter")
 	typeName := this.GetString("TypeName")
-	activityId, _ := this.GetInt("ActivityId") // 仅用于判断【新】标签
+	activityId, _ := this.GetInt("ActivityId")             // 仅用于判断【新】标签
+	isExternalLabel, _ := this.GetInt("IsExternalLabel")   //
+	isResearchPoints, _ := this.GetInt("IsResearchPoints") //
+
+	if isExternalLabel == 1 {
+
+	}
+	if isResearchPoints == 1 {
+
+	}
 
 	if label == "undefined" {
 		label = ""
@@ -2247,6 +2258,7 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 		item.ActivityId = v.ActivityId
 		//if v.YidongActivityId > 0 {
 		item.IsExternalLabel = v.IsExternalLabel
+		item.IsResearchPoints = v.IsResearchPoints
 		//}
 		mapActivity[v.ActivityTypeId] = append(mapActivity[v.ActivityTypeId], item)
 		mapkeyWord[fmt.Sprint(v.ActivityTypeId, "-", item.KeyWord)] = item.KeyWord
@@ -3869,3 +3881,93 @@ func (this *ActivityCoAntroller) OverActivityList() {
 	br.Msg = "获取成功"
 	br.Data = resp
 }
+
+// @Title 活动报名之前的校验（权限、时间、点数、邮箱）
+// @Description 活动报名之前的校验（权限、时间、点数、邮箱）接口
+// @Param	request	body models.ActivityIdRep true "type json string"
+// @Success Ret=200 {object} models.SignupStatus
+// @router /check [post]
+func (this *ActivityCoAntroller) Check() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	user := this.User
+	if user == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，用户信息为空"
+		br.Ret = 408
+		return
+	}
+	var req models.ActivityIdRep
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	activityId := req.ActivityId
+	activityInfo, errInfo := models.GetAddActivityInfoById(activityId)
+	if activityInfo == nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "活动ID错误,不存在activityId：" + strconv.Itoa(activityId)
+		return
+	}
+	if errInfo != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "操作失败,Err:" + errInfo.Error()
+		return
+	}
+	//这里的文案顺序提示 权限>时间>研选扣点>邮箱绑定。
+	resp := new(models.ActivityCheck)
+	hasPermission := 0
+	havePower, isResearchSpecial, err := services.GetActivityDetailUserPower(user, activityInfo)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "校验用户权限失败，Err:" + err.Error()
+		return
+	}
+	resp.IsResearchSpecial = isResearchSpecial
+	if havePower {
+		hasPermission = 1
+		resp.CheckPermission = true
+		resp.HasPermission = hasPermission
+	} else {
+		hasPermission, sellerName, sellerMobile, popupMsg, err := services.GetUserHasPermissionActivity(user, activityInfo)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
+			return
+		}
+		resp.PopupMsg = popupMsg
+		resp.HasPermission = hasPermission
+		resp.SellerName = sellerName
+		resp.SellerMobile = sellerMobile
+	}
+	if resp.CheckPermission {
+		//如果权限通过了校验，那么就来校验时间
+		resp.CheckTime, resp.PopupMsg = services.CheckSiginupDeadline(activityInfo)
+	}
+	if resp.CheckTime {
+		// 如果时间通过校验就校验点数
+		resp.CheckPoints, resp.PopupMsg, resp.CompanyPoints, resp.ActivityPoints, err = services.CheckActivityPoints(activityInfo, user)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "CheckActivityPoints，Err:" + err.Error()
+			return
+		}
+	}
+
+	if resp.CheckPoints {
+		//如果通过点数的校验，就来校验邮箱
+		resp.CheckEmail, resp.PopupMsg = services.CheckActivityUserEmail(activityInfo, user)
+	}
+	// 判断是否属于研选类型的活动
+	if strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
+		resp.IsResearch = true
+	}
+	br.Ret = 200
+	br.Success = true
+	br.Data = resp
+}

controllers/report.go

@@ -1414,6 +1414,7 @@ func (this *ReportController) IsShow() {
 	//resp.YanXuan_Explain = true
 	resp.IsShowFreeButton = IsShowFreeButton
 	resp.IsBelongRai = services.GetBelongingRai(user.Mobile)
+	resp.IsShowResearchPoints = true
 	//mobile := user.Mobile
 	//if mobile == "" {
 	//	br.Ret = 200

controllers/tactics.go

@@ -356,6 +356,7 @@ func (this *TacticsController) TacticsTimeLineList() {
 	}
 	for _, v := range list {
 		v.PublishTime = utils.TimeRemoveHms2(v.PublishTime)
+		v.Resource = 1
 	}
 	if len(list) == 0 {
 		list = make([]*models.CygxTacticsTimeLineResp, 0)

controllers/user.go

@@ -1835,3 +1835,50 @@ func (this *UserController) ApplyDetail() {
 	br.Success = true
 	br.Data = resp
 }
+
+// @Title 更改绑定邮箱
+// @Description 更改绑定邮箱接口
+// @Param	request	body models.Headimgurl true "type json string"
+// @Success 200 {object} models.ArticleDetailFileLink
+// @router /email/binding [post]
+func (this *UserController) EmailBinding() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	user := this.User
+	if user == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，用户信息为空"
+		br.Ret = 408
+		return
+	}
+	var req models.UserEmail
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	uid := user.UserId
+	if user.Email != "" {
+		br.Msg = "邮箱号已存在，请勿重复绑定"
+		br.ErrMsg = "邮箱格式错误，请重新输入 Email:" + user.Email
+		return
+	}
+	email := req.Email
+	if !utils.ValidateEmailFormatat(req.Email) {
+		br.Msg = "邮箱格式错误，请重新输入"
+		br.ErrMsg = "邮箱格式错误，请重新输入"
+		return
+	}
+	err = models.UpdateUserEmail(email, uid)
+	if err != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "头像信息不能为空"
+	}
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+}

models/activity.go

@@ -70,6 +70,22 @@ type CygxActivity struct {
 	JmcjActivityId          string    `description:"进门财经的活动ID"`
 }
 
+type ActivityCheck struct {
+	CheckPermission   bool   `description:"权限是否通过校验"`
+	HasPermission     int    `description:"操作方式，1:有该行业权限,正常展示，2：无该行业权限，3：潜在客户，未提交过申请，4：潜在客户,已提交过申请"`
+	PopupMsg          string `description:"权限弹窗信息"`
+	SellerMobile      string `description:"销售电话"`
+	SellerName        string `description:"销售姓名"`
+	Mobile            string `description:"手机号"`
+	IsResearch        bool   `description:"是否属于研选"`
+	IsResearchSpecial bool   `description:"是否属于特殊的研选"`
+	CheckTime         bool   `description:"时间是否通过校验"`
+	CheckEmail        bool   `description:"邮箱是否通过校验"`
+	CheckPoints       bool   `description:"扣点是否通过校验"`
+	CompanyPoints     string `description:"公司剩余点数"`
+	ActivityPoints    string `description:"本场活动要扣除的点数"`
+}
+
 type Activity struct {
 	ActivityTypeId   int    `description:"活动类型id"`
 	ActivityTypeName string `description:"活动名称"`
@@ -210,6 +226,10 @@ type ActivityDetail struct {
 	IsShowSigninButton      bool                       `description:"是否展示签到码按钮"`
 	IsShowSignUpDetail      bool                       `description:"是否展示报名详情按钮"`
 	SigninImg               string                     `description:"签到码图片"`
+	IsNeedEmail             int                        `description:"是否需要提供邮箱 1是，0否"`
+	SiginupDeadline         string                     `description:"报名截止时间"`
+	IsExternalLabel         bool                       `description:"是否为外部资源"`
+	IsResearchPoints        bool                       `description:"是否为研选扣点"`
 }
 type ListArticleActivity struct {
 	Title   string `description:"文章标题"`
@@ -744,6 +764,7 @@ type CygxActivityLabelList struct {
 	IsNew             bool   `description:"是否为新：活动存在关联的的产业所关联的报告均在3个月内/无报告则标记新"`
 	YidongActivityId  int    `description:"易董活动ID"`
 	IsExternalLabel   bool   `description:"是否为外部资源"`
+	IsResearchPoints  bool   `description:"是否为研选扣点"`
 	TripStatus        int    `description:"行程进行状态 1：预报名，2：确定行程"`
 	City              string `description:"城市"`
 	Days              int    `description:"天数"`
@@ -753,7 +774,7 @@ type CygxActivityLabelList struct {
 // 主题列表
 func GetActivityLabelListAll(condition, sortTime string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityLabelList, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT	activity_id,activity_type_id, label,temporary_label,is_show_subject_name, MAX( art.activity_time ) AS timesort, MIn( art.activity_time ) AS mintimesort , yidong_activity_id,city,is_external_label
+	sql := `SELECT	activity_id,activity_type_id, label,temporary_label,is_show_subject_name, MAX( art.activity_time ) AS timesort, MIn( art.activity_time ) AS mintimesort , yidong_activity_id,city,is_external_label,is_research_points
 		FROM cygx_activity as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition

models/activity_attendance_detail.go

@@ -101,7 +101,7 @@ func AddAttendancDetail(items []*CygxActivityAttendanceDetail, activityId int, m
 	if err != nil {
 		return
 	}
-	sql = `UPDATE cygx_activity_signup SET  is_meeting=1   WHERE  activity_id=? AND outbound_mobile IN (` + mobileStr + `)`
+	sql = `UPDATE cygx_activity_signup SET  is_meeting=1   WHERE  activity_id=? AND ( outbound_mobile IN (` + mobileStr + `)  OR mobile IN (` + mobileStr + `) )`
 	_, err = o.Raw(sql, activityId).Exec()
 	if err != nil {
 		return

models/activity_points_company.go

@@ -0,0 +1,23 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type CygxActivityPointsCompany struct {
+	Id          int       `gorm:"column:id;primary_key;AUTO_INCREMENT" json:"id"`
+	CompanyId   int       `gorm:"column:company_id;default:0" json:"company_id"`  // 公司ID
+	CompanyName string    `gorm:"column:company_name" json:"company_name"`        // 公司名称
+	Points      float64   `gorm:"column:points;default:0;NOT NULL" json:"points"` // 公司剩余点数
+	CreateTime  time.Time `gorm:"column:create_time;NOT NULL" json:"create_time"` // 创建时间
+	ModifyTime  time.Time `gorm:"column:modify_time;NOT NULL" json:"modify_time"` // 更新时间
+}
+
+// 获取公司剩余点数
+func GetCompanyPoints(companyId int) (comapnyPointsNum float64, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT points FROM cygx_activity_points_company  WHERE company_id=? `
+	err = o.Raw(sql, companyId).QueryRow(&comapnyPointsNum)
+	return
+}

models/activity_points_set.go

@@ -0,0 +1,77 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type CygxActivityPointsSet struct {
+	Id               int       `gorm:"column:id;primary_key;AUTO_INCREMENT" json:"id"`
+	ActivityId       int       `gorm:"column:activity_id;NOT NULL" json:"activity_id"`                         // 活动ID
+	PointsObject     int       `gorm:"column:points_object;default:1;NOT NULL" json:"points_object"`           // 扣点对象，1：参会人、2：办会人、3:办会人和参会人
+	CompanyId        int       `gorm:"column:company_id;default:0;NOT NULL" json:"company_id"`                 // 公司ID
+	CompanyName      string    `gorm:"column:company_name;NOT NULL" json:"company_name"`                       // 公司名称
+	UserPointsNum    string    `gorm:"column:user_points_num;default:0;NOT NULL" json:"user_points_num"`       // 参会人扣点数量
+	PointsType       int       `gorm:"column:points_type;default:0;NOT NULL" json:"points_type"`               // 扣点形式，1:报名即扣点，2:到会即扣点
+	CompanyPointsNum string    `gorm:"column:company_points_num;default:0;NOT NULL" json:"company_points_num"` // 办会人扣点数量
+	CreateTime       time.Time `gorm:"column:create_time;NOT NULL" json:"create_time"`                         // 创建时间
+	ModifyTime       time.Time `gorm:"column:modify_time;NOT NULL" json:"modify_time"`                         // 更新时间
+}
+
+type CygxActivityPointsSetRsq struct {
+	ActivityId       int    `gorm:"column:activity_id;NOT NULL" json:"ActivityId"`                        // 活动ID
+	PointsObject     int    `gorm:"column:points_object;default:1;NOT NULL" json:"PointsObject"`          // 扣点对象，1：参会人、2：办会人、3:办会人和参会人
+	CompanyId        int    `gorm:"column:company_id;default:0;NOT NULL" json:"CompanyId"`                // 公司ID
+	CompanyName      string `gorm:"column:company_name;NOT NULL" json:"CompanyName"`                      // 公司名称
+	UserPointsNum    string `gorm:"column:user_points_num;default:0;NOT NULL" json:"UserPointsNum"`       // 参会人扣点数量
+	PointsType       int    `gorm:"column:points_type;default:0;NOT NULL" json:"PointsType"`              // 扣点形式，1:报名即扣点，2:到会即扣点
+	CompanyPointsNum string `gorm:"column:company_points_num;default:0;NOT NULL" json:"CompanyPointsNum"` // 办会人扣点数量
+}
+
+type CygxActivityPointsSetConfigListResp struct {
+	List []*CygxActivityPointsSetConfigResp
+}
+
+type CygxActivityPointsSetConfigResp struct {
+	PointsNum string `gorm:"column:user_points_num;default:0;NOT NULL" json:"PointsNum"` // 扣点数量
+}
+
+// 通过活动ID获取详情
+func GetCygxActivityPointsSetDetail(activityId int) (item *CygxActivityPointsSetRsq, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM cygx_activity_points_set  WHERE activity_id=? `
+	err = o.Raw(sql, activityId).QueryRow(&item)
+	return
+}
+
+// 通过活动ID获取详情
+func GetCygxActivityPointsSetUserNum(activityId int) (userPointsNum float64, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT user_points_num FROM cygx_activity_points_set  WHERE activity_id=? `
+	err = o.Raw(sql, activityId).QueryRow(&userPointsNum)
+	return
+}
+
+// 通过互动ID获取数量
+func GetCygxActivityPointsSetCountByActivityId(ActivityId int) (count int, err error) {
+	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_activity_points_set  WHERE activity_id=?   `
+	o := orm.NewOrm()
+	err = o.Raw(sqlCount, ActivityId).QueryRow(&count)
+	return
+}
+
+// 列表
+func GetCygxActivityPointsSetList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityPointsSet, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM cygx_activity_points_set as art WHERE 1= 1 `
+	if condition != "" {
+		sql += condition
+	}
+	if startSize+pageSize == 0 {
+		_, err = o.Raw(sql, pars).QueryRows(&items)
+	} else {
+		sql += ` LIMIT ?,?  `
+		_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	}
+	return
+}

models/report.go

@@ -379,6 +379,7 @@ type IsShow struct {
 	ActivitySpecialExplain string    `description:"专项调研活动"`
 	SearchTxtList          SearchTxt `description:"搜索栏回显内容说明"`
 	IsBelongRai            bool      `description:"是否属于权益内部人员"`
+	IsShowResearchPoints   bool      `description:"是否展示研选扣点搜索"`
 }
 
 type SearchTxt struct {

models/tactics_time_line.go

@@ -43,6 +43,7 @@ type CygxTacticsTimeLineResp struct {
 	ArticleId   int    `description:"文章ID"`
 	ChartId     int    `description:"图表ID"`
 	Link        string `description:"文章或图表链接"`
+	Resource    int    `description:"来源类型，1：文章、2：产品内测、3：晨报点评"`
 }
 
 // 获取数量

models/user.go

@@ -439,6 +439,9 @@ func GetSendEmailAllUserWithCompany() (items []*GetSendEmailAllUserWithCompanyRe
 type Headimgurl struct {
 	Headimgurl string `description:"用户头像"`
 }
+type UserEmail struct {
+	Email string `description:"邮箱号"`
+}
 
 // 更改用户手机号
 func UpdateUserHeadimgurl(headimgurl string, userId int) (err error) {
@@ -448,6 +451,14 @@ func UpdateUserHeadimgurl(headimgurl string, userId int) (err error) {
 	return
 }
 
+// 更改用户邮箱号
+func UpdateUserEmail(email string, userId int) (err error) {
+	o := orm.NewOrm()
+	sql := `UPDATE wx_user SET email = ? WHERE user_id=? `
+	_, err = o.Raw(sql, email, userId).Exec()
+	return
+}
+
 // 更新用户标签
 func UpdateUserLabel(userLabel string, userId int) (err error) {
 	o := orm.NewOrm()

routers/commentsRouter.go

@@ -52,6 +52,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
+        beego.ControllerComments{
+            Method: "Check",
+            Router: `/check`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
         beego.ControllerComments{
             Method: "CheckAsk",
@@ -1411,6 +1420,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"],
+        beego.ControllerComments{
+            Method: "EmailBinding",
+            Router: `/email/binding`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:UserController"],
         beego.ControllerComments{
             Method: "FreeButtonUpdate",

services/activity_points.go

@@ -0,0 +1,49 @@
+package services
+
+import (
+	"errors"
+	"fmt"
+	"hongze/hongze_cygx/models"
+	"hongze/hongze_cygx/utils"
+)
+
+//func init() {
+//	GetActivityPointsAll()
+//}
+
+// GetActivityPointsAll 获取所有带有扣点的活动
+func GetActivityPointsAll() (listxActivity []*models.CygxActivity, err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go utils.SendAlarmMsg("获取所有带有扣点的活动失败"+err.Error(), 2)
+		}
+	}()
+	var condition string
+	var pars []interface{}
+	listxActivity = make([]*models.CygxActivity, 0)
+	list, e := models.GetCygxActivityPointsSetList(condition, pars, 0, 0)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetCygxActivityPointsSetList，Err: " + e.Error())
+		return
+	}
+	var activityIds []int
+	for _, v := range list {
+		activityIds = append(activityIds, v.ActivityId)
+	}
+	lenArr := len(activityIds)
+	if lenArr == 0 {
+		return
+	}
+	condition = ` AND art.activity_id IN (` + utils.GetOrmInReplace(lenArr) + `)`
+	pars = append(pars, activityIds)
+	listxActivity, e = models.GetCygxActivityList(condition, pars, 0, lenArr)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetCygxActivityList，Err: " + e.Error())
+		return
+	}
+	for _, v := range listxActivity {
+		fmt.Println(v)
+	}
+	return
+}

services/activity_signup.go

@@ -2,8 +2,10 @@ package services
 
 import (
 	"errors"
+	"fmt"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
+	"time"
 )
 
 // GetActivitySignupResp 处理用户的报名方式
@@ -70,5 +72,55 @@ func CheckActivitySignUpLimit(user *models.WxUserItem, activityInfo *models.Acti
 	//	return
 	//}
 	return
+}
+
+// 校验报名截止时间
+func CheckSiginupDeadline(activityInfo *models.ActivityDetail) (checkTime bool, popupMsg string) {
+	checkTime = true
+	if activityInfo.SiginupDeadline != utils.FormatDateTimeInit {
+		timeResp := utils.StrTimeToTime(activityInfo.SiginupDeadline)
+		if timeResp.Before(time.Now()) {
+			checkTime = false
+			popupMsg = "该活动已截止报名\n\n若想参加，请联系对口销售"
+		}
+	}
+	return
+}
+
+// 校验报名点数
+func CheckActivityPoints(activityInfo *models.ActivityDetail, wxUser *models.WxUserItem) (checkPoints bool, popupMsg, companyPoints, activityPoints string, err error) {
+	checkPoints = true
+	if activityInfo.IsResearchPoints {
+		//获取活动对用户要扣的点
+		userPointsNum, e := models.GetCygxActivityPointsSetUserNum(activityInfo.ActivityId)
+		if e != nil {
+			err = errors.New("GetActivitySignupSuccessByUserCountNoHz, Err: " + e.Error())
+			return
+		}
+		// 获取用户所在公司剩余的点
+		companyPointsNum, e := models.GetCompanyPoints(wxUser.CompanyId)
+		if e != nil && e.Error() != utils.ErrNoRow() {
+			err = errors.New("GetCompanyPoints, Err: " + e.Error())
+			return
+		}
+		if companyPointsNum-userPointsNum < 0 {
+			checkPoints = false
+			popupMsg = "点数不足，若想报名，\n请联系对口销售充值\n\n当前剩余点数：0\n本次会议扣除点数：0.5"
+		}
+		companyPoints = fmt.Sprint(companyPointsNum)
+		activityPoints = fmt.Sprint(userPointsNum)
+	}
+	return
+}
 
+// 校验报名是否需要绑定邮箱
+func CheckActivityUserEmail(activityInfo *models.ActivityDetail, wxUser *models.WxUserItem) (checkEmail bool, popupMsg string) {
+	checkEmail = true
+	if activityInfo.IsNeedEmail == 1 {
+		if wxUser.Email == "" {
+			checkEmail = false
+			popupMsg = "应上市公司要求，该会议报名需\n提供邮箱，请填写您的工作邮箱"
+		}
+	}
+	return
 }

utils/constants.go

@@ -12,6 +12,7 @@ const (
 	HlbFormatDateTime      = "2006-01-02_15:04:05.999" //完整时间格式
 	FormatDateTimeNoSecond = "2006-01-02 15:04"        //完整时间格式
 	FormatDateTimeUnSpace  = "20060102150405"          //完整时间格式
+	FormatDateTimeInit     = "0000-00-00 00:00:00"     //为空的初始化时间格式
 	PageSize15             = 15                        //列表页每页数据量
 	FormatYearDate         = "2006"                    //日期格式
 	PageSize5              = 5