xingzai преди 1 година
родител
ревизия
3cc14cbfe8
променени са 3 файла, в които са добавени 33 реда и са изтрити 40 реда
  1. 2 12
      controllers/report_selection.go
  2. 30 28
      models/report_history_record.go
  3. 1 0
      services/report_history_record.go

+ 2 - 12
controllers/report_selection.go

@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"encoding/json"
-	"fmt"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/services"
 	"hongze/hongze_cygx/utils"
@@ -282,7 +281,7 @@ func (this *ReportSelectionController) AddStopTime() {
 		historyRecord := new(models.CygxReportHistoryRecord)
 		historyRecord.UserId = uid
 		historyRecord.ArticleId = articleId
-		historyRecord.CreateTime = time.Now()
+		historyRecord.CreateTime = time.Now().Add(-time.Second * time.Duration(stopTime))
 		historyRecord.Mobile = user.Mobile
 		historyRecord.Email = user.Email
 		historyRecord.CompanyId = user.CompanyId
@@ -290,6 +289,7 @@ func (this *ReportSelectionController) AddStopTime() {
 		historyRecord.StopTime = stopTime
 		historyRecord.OutType = outType
 		historyRecord.ReportType = reportType
+		historyRecord.RegisterPlatform = utils.REGISTER_PLATFORM
 		sellerItem, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取信息失败"
@@ -307,13 +307,3 @@ func (this *ReportSelectionController) AddStopTime() {
 	br.Success = true
 	br.Msg = "操作成功"
 }
-
-func init() {
-	st, _ := time.ParseDuration("-500s")
-	fmt.Println(st)
-	fmt.Println()
-	fmt.Println("50秒之后的时间:", time.Now().Add(st))
-
-	startDate := time.Now().Add(-time.Second * 300).Format(utils.FormatDateTime)
-	fmt.Println(startDate)
-}

+ 30 - 28
models/report_history_record.go

@@ -6,37 +6,39 @@ import (
 )
 
 type CygxReportHistoryRecord struct {
-	Id          int `orm:"column(id);pk"`
-	ArticleId   int
-	UserId      int
-	CreateTime  time.Time
-	Mobile      string    `description:"手机号"`
-	Email       string    `description:"邮箱"`
-	CompanyId   int       `description:"公司id"`
-	CompanyName string    `description:"公司名称"`
-	ModifyTime  time.Time `description:"修改时间"`
-	ReportType  string    `description:"报告类型,bgjx:报告精选、bzyjhz:本周研究汇总、szjyhz:上周纪要汇总"`
-	RealName    string    `description:"用户实际名称"`
-	SellerName  string    `description:"所属销售"`
-	StopTime    int       `description:"停留时间"`
-	OutType     int       `description:"退出方式,1正常退出,2强制关闭"`
+	Id               int `orm:"column(id);pk"`
+	ArticleId        int
+	UserId           int
+	CreateTime       time.Time
+	Mobile           string    `description:"手机号"`
+	Email            string    `description:"邮箱"`
+	CompanyId        int       `description:"公司id"`
+	CompanyName      string    `description:"公司名称"`
+	ModifyTime       time.Time `description:"修改时间"`
+	ReportType       string    `description:"报告类型,bgjx:报告精选、bzyjhz:本周研究汇总、szjyhz:上周纪要汇总"`
+	RealName         string    `description:"用户实际名称"`
+	SellerName       string    `description:"所属销售"`
+	StopTime         int       `description:"停留时间"`
+	OutType          int       `description:"退出方式,1正常退出,2强制关闭"`
+	RegisterPlatform int       `description:"来源 1小程序,2:网页"`
 }
 
 type CygxReportHistoryRecordLog struct {
-	Id          int `orm:"column(id);pk"`
-	ArticleId   int
-	UserId      int
-	CreateTime  time.Time
-	Mobile      string    `description:"手机号"`
-	Email       string    `description:"邮箱"`
-	CompanyId   int       `description:"公司id"`
-	CompanyName string    `description:"公司名称"`
-	ModifyTime  time.Time `description:"修改时间"`
-	ReportType  string    `description:"报告类型,bgjx:报告精选、bzyjhz:本周研究汇总、szjyhz:上周纪要汇总"`
-	RealName    string    `description:"用户实际名称"`
-	SellerName  string    `description:"所属销售"`
-	StopTime    int       `description:"停留时间"`
-	OutType     int       `description:"退出方式,1正常退出,2强制关闭"`
+	Id               int `orm:"column(id);pk"`
+	ArticleId        int
+	UserId           int
+	CreateTime       time.Time
+	Mobile           string    `description:"手机号"`
+	Email            string    `description:"邮箱"`
+	CompanyId        int       `description:"公司id"`
+	CompanyName      string    `description:"公司名称"`
+	ModifyTime       time.Time `description:"修改时间"`
+	ReportType       string    `description:"报告类型,bgjx:报告精选、bzyjhz:本周研究汇总、szjyhz:上周纪要汇总"`
+	RealName         string    `description:"用户实际名称"`
+	SellerName       string    `description:"所属销售"`
+	StopTime         int       `description:"停留时间"`
+	OutType          int       `description:"退出方式,1正常退出,2强制关闭"`
+	RegisterPlatform int       `description:"来源 1小程序,2:网页"`
 }
 
 // 添加历史信息

+ 1 - 0
services/report_history_record.go

@@ -31,6 +31,7 @@ func AddCygxReportHistoryRecord(item *models.CygxReportHistoryRecord) (err error
 	historyRecordLog.StopTime = historyRecordLog.StopTime
 	historyRecordLog.OutType = historyRecordLog.OutType
 	historyRecordLog.ReportType = historyRecordLog.ReportType
+	historyRecordLog.RegisterPlatform = historyRecordLog.RegisterPlatform
 
 	_, err = models.AddCygxReportHistoryRecordLog(historyRecordLog)
 	if err != nil {