Merge branch 'fix/eta_trial'

controller/eta_trial/user.go

@@ -244,31 +244,31 @@ func (a *EtaTrialController) UpdateActiveTime(c *gin.Context) {
 // @Description 更新登录时长
 // @Success 200 {string} string "操作成功"
 // @Router /eta_trial/user/update_login_duration [post]
-//func (a *EtaTrialController) UpdateLoginDuration(c *gin.Context) {
-//	var req etaTrialReq.UpdateUserLoginDurationReq
-//	err := c.Bind(&req)
-//	if err != nil {
-//		errs, ok := err.(validator.ValidationErrors)
-//		if !ok {
-//			resp.FailData("参数解析失败", "Err:"+err.Error(), c)
-//			return
-//		}
-//		resp.FailData("参数解析失败", errs.Translate(global.Trans), c)
-//		return
-//	}
-//
-//	record := new(crm.EtaTrialLoginDurationRecord)
-//	record.UserName = req.UserName
-//	record.Mobile = req.Mobile
-//	record.Duration = req.ActiveTime
-//	record.CreateTime = time.Now().Local()
-//	if e := record.Create(); e != nil {
-//		resp.FailData("操作失败", "新增试用客户登录时长记录失败, Err:"+e.Error(), c)
-//		return
-//	}
-//	if e := crm.UpdateEtaTrailLastLoginDuration(req.ActiveTime, req.Mobile); e != nil {
-//		resp.FailData("操作失败", "更新试用客户登录时长失败, Err:"+e.Error(), c)
-//		return
-//	}
-//	resp.OkData("操作成功", true, c)
-//}
+func (a *EtaTrialController) UpdateLoginDuration(c *gin.Context) {
+	var req etaTrialReq.UpdateUserLoginDurationReq
+	err := c.Bind(&req)
+	if err != nil {
+		errs, ok := err.(validator.ValidationErrors)
+		if !ok {
+			resp.FailData("参数解析失败", "Err:"+err.Error(), c)
+			return
+		}
+		resp.FailData("参数解析失败", errs.Translate(global.Trans), c)
+		return
+	}
+
+	record := new(crm.EtaTrialLoginDurationRecord)
+	record.UserName = req.UserName
+	record.Mobile = req.Mobile
+	record.Duration = req.ActiveTime
+	record.CreateTime = time.Now().Local()
+	if e := record.Create(); e != nil {
+		resp.FailData("操作失败", "新增试用客户登录时长记录失败, Err:"+e.Error(), c)
+		return
+	}
+	if e := crm.UpdateEtaTrailLastLoginDuration(req.ActiveTime, req.Mobile); e != nil {
+		resp.FailData("操作失败", "更新试用客户登录时长失败, Err:"+e.Error(), c)
+		return
+	}
+	resp.OkData("操作成功", true, c)
+}

models/crm/eta_trial_login_duration_record.go

@@ -1,26 +1,31 @@
 package crm
 
+import (
+	"hongze/hz_crm_eta/global"
+	"time"
+)
+
 // EtaTrialLoginDurationRecord ETA试用客户登录时长记录表
-//type EtaTrialLoginDurationRecord struct {
-//	RecordId   int       `gorm:"primaryKey;column:record_id;type:int(10) unsigned;not null" json:"record_id"`
-//	UserName   string    `gorm:"column:user_name;type:varchar(128);not null;default:''" json:"user_name"`  // 用户名称
-//	Mobile     string    `gorm:"column:mobile;type:varchar(16);not null;default:''" json:"mobile"`         // 手机号
-//	Duration   int       `gorm:"column:duration;type:int(10) unsigned;not null;default:0" json:"duration"` // 登录时长，单位秒
-//	CreateTime time.Time `gorm:"column:create_time;type:datetime" json:"create_time"`                      // 创建时间
-//}
-//
-//func (m *EtaTrialLoginDurationRecord) TableName() string {
-//	return "eta_trial_login_duration_record"
-//}
-//
-//// Create 新增
-//func (m *EtaTrialLoginDurationRecord) Create() (err error) {
-//	err = global.MYSQL["hz_crm"].Create(m).Error
-//	return
-//}
-//
-//// Update 更新
-//func (m *EtaTrialLoginDurationRecord) Update(cols []string) (err error) {
-//	err = global.MYSQL["hz_crm"].Model(m).Select(cols).Updates(m).Error
-//	return
-//}
+type EtaTrialLoginDurationRecord struct {
+	RecordId   int       `gorm:"primaryKey;column:record_id;type:int(10) unsigned;not null" json:"record_id"`
+	UserName   string    `gorm:"column:user_name;type:varchar(128);not null;default:''" json:"user_name"`  // 用户名称
+	Mobile     string    `gorm:"column:mobile;type:varchar(16);not null;default:''" json:"mobile"`         // 手机号
+	Duration   int       `gorm:"column:duration;type:int(10) unsigned;not null;default:0" json:"duration"` // 登录时长，单位秒
+	CreateTime time.Time `gorm:"column:create_time;type:datetime" json:"create_time"`                      // 创建时间
+}
+
+func (m *EtaTrialLoginDurationRecord) TableName() string {
+	return "eta_trial_login_duration_record"
+}
+
+// Create 新增
+func (m *EtaTrialLoginDurationRecord) Create() (err error) {
+	err = global.MYSQL["hz_crm"].Create(m).Error
+	return
+}
+
+// Update 更新
+func (m *EtaTrialLoginDurationRecord) Update(cols []string) (err error) {
+	err = global.MYSQL["hz_crm"].Model(m).Select(cols).Updates(m).Error
+	return
+}

routers/eta_trial.go

@@ -17,7 +17,7 @@ func InitEtaTrial(r *gin.RouterGroup) {
 	group.POST("user/update_index_num", control.UpdateIndexNum)
 	group.POST("user/update_chart_num", control.UpdateChartNum)
 	group.POST("user/update_active_time", control.UpdateActiveTime)
-	//group.POST("user/update_login_duration", control.UpdateLoginDuration)
+	group.POST("user/update_login_duration", control.UpdateLoginDuration)
 
 	group.POST("questionnaire/list", control.GetQuestionnaireList)
 	group.POST("questionnaire/commit", control.QuestionnaireCommit)