Merge branch 'feature/crm10.1_sellerLog' into debug

models/tables/voice_broadcast_statistics/voice_broadcast_statistics.go

@@ -9,6 +9,7 @@ type VoiceBroadcastStatistics struct {
 	Mobile        string `description:"用户手机号"`
 	Email         string `description:"电子邮箱"`
 	CompanyStatus string `description:"客户状态"`
+	SellerId      int    `description:"销售id"`
 	Source        int    `description:"点击来源,1手机小程序,2pc小程序,3web端"`
 	BroadcastId   int    `description:"语音ID"`
 	BroadcastName string `description:"语音名称"`

models/tables/yb_community_audio_listen_log/entity.go

@@ -8,13 +8,15 @@ type YbCommunityAudioListenLog struct {
 	CommunityQuestionAudioID int       `gorm:"column:community_question_audio_id;type:int(10) unsigned;not null" json:"community_question_audio_id"` //问答音频ID
 	CommunityQuestionID      int       `gorm:"column:community_question_id;type:int(10) unsigned;not null;default:0" json:"community_question_id"`   // 社区问题ID
 	UserID                   int       `gorm:"index:idx_user_id;column:user_id;type:int(10) unsigned;not null;default:0" json:"user_id"`             // 点击音频的用户ID
-	SourceAgent              int       `gorm:"column:source_agent;type:tinyint(4);default:1" json:"source_agent"`                                    // 操作来源，1：小程序，2：小程序 pc 3:弘则研究公众号，4:web pc
-	CreateTime               time.Time `gorm:"column:create_time;type:datetime;default:CURRENT_TIMESTAMP" json:"create_time"`                        // 创建日志时间
+	CompanyID                int       `gorm:"column:company_id;type:int(10) unsigned;not null;default:0" json:"companyId"`                          // 客户ID
+	CompanyName              string    `gorm:"column:company_name;type:varchar(100);not null;default:''" json:"companyName"`
+	CompanyStatus            string    `gorm:"column:company_status;type:varchar(30);not null;default:''" json:"companyStatus"`
+	SellerID                 int       `gorm:"column:seller_id;type:int(11)" json:"sellerId"`
+	SourceAgent              int       `gorm:"column:source_agent;type:tinyint(4);default:1" json:"source_agent"`             // 操作来源，1：小程序，2：小程序 pc 3:弘则研究公众号，4:web pc
+	CreateTime               time.Time `gorm:"column:create_time;type:datetime;default:CURRENT_TIMESTAMP" json:"create_time"` // 创建日志时间
 }
 
 // TableName get sql table name.获取数据库表名
 func (l *YbCommunityAudioListenLog) TableName() string {
 	return "yb_community_audio_listen_log"
 }
-
-

models/tables/yb_community_video_play_log/entity.go

@@ -14,7 +14,8 @@ type YbCommunityVideoPlayLog struct {
 	CompanyName      string    `gorm:"column:company_name;type:varchar(100);not null;default:''" json:"companyName"`                                  // 客户名称
 	CompanyStatus    string    `gorm:"column:company_status;type:varchar(30);not null;default:''" json:"companyStatus"`                               // 客户状态
 	SourceAgent      int       `gorm:"column:source_agent;type:tinyint(4) unsigned;not null;default:1" json:"sourceAgent"`                            // 操作来源，1：小程序，2：小程序 pc 3:弘则研究公众号，4:web pc
-	CreateTime       time.Time `gorm:"column:create_time;type:datetime;default:CURRENT_TIMESTAMP" json:"createTime"`                                  // 创建时间
+	SellerID         int       `gorm:"column:seller_id;type:int(11)" json:"sellerId"`
+	CreateTime       time.Time `gorm:"column:create_time;type:datetime;default:CURRENT_TIMESTAMP" json:"createTime"` // 创建时间
 }
 
 // TableName get sql table name.获取数据库表名

services/community/question.go

@@ -476,11 +476,26 @@ func AddAudioListenLog(userInfo user.UserInfo, audioId int, sourceAgent int) (er
 		err = errors.New("音频不存在")
 		return
 	}
+	companyInfo, e := company_product.GetByCompany2ProductId(userInfo.CompanyID, 1)
+	if e != nil && e != utils.ErrNoRow {
+		err = errors.New("获取客户信息失败")
+		return
+	}
+	companyName := "潜在客户"
+	companyStatus := "潜在"
+	if companyInfo != nil && companyInfo.CompanyID > 0 {
+		companyName = companyInfo.CompanyName
+		companyStatus = companyInfo.Status
+	}
 	//3. 添加点击日志
 	item := &yb_community_audio_listen_log.YbCommunityAudioListenLog{
 		CommunityQuestionAudioID: audio.CommunityQuestionAudioID,
 		CommunityQuestionID:      audio.CommunityQuestionID,
 		UserID:                   int(userInfo.UserID),
+		CompanyID:                int(userInfo.CompanyID),
+		CompanyName:              companyName,
+		CompanyStatus:            companyStatus,
+		SellerID:                 companyInfo.SellerID,
 		SourceAgent:              sourceAgent,
 	}
 	if err = item.Create(); err != nil {

services/community/video.go

@@ -86,6 +86,7 @@ func SaveVideoPlayLog(userInfo user.UserInfo, videoId, sourceAgent int) (errMsg
 		CompanyName:      companyName,
 		CompanyStatus:    companyStatus,
 		SourceAgent:      sourceAgent,
+		SellerID:         companyInfo.SellerID,
 		CreateTime:       time.Now().Local(),
 	}
 	if e = item.Create(); e != nil {

services/voice_broadcast.go

@@ -155,6 +155,7 @@ func AddBroadcastRecord(userinfo user.UserInfo, source, broadcastId int) {
 		Mobile:        userinfo.Mobile,
 		Email:         userinfo.Email,
 		CompanyStatus: companyProduct.Status,
+		SellerId:      companyProduct.SellerID,
 		Source:        source,
 		BroadcastId:   broadcastId,
 		BroadcastName: broadcast.BroadcastName,
@@ -467,4 +468,4 @@ func GetMyVoiceBroadcastListCount(authorId, sectionId int) (resp response.Broadc
 	}
 	resp.All = resp.Unpublished + resp.Published
 	return
-}
+}