no message

models/activity_video_history.go

@@ -81,6 +81,7 @@ func GetActivityVideoHistoryByMobileListCRM_16_5Init(condition string) (items []
 }
 
 type CygxActivityVideoHistoryResp struct {
+	RecordId         int    `description:"日志ID"`
 	VideoId          int    `description:"微路演音频id"`
 	VideoName        string `description:"文件名称"`
 	UserId           int    `description:"用户ID"`
@@ -102,6 +103,7 @@ func GetCygxActivityVideoHistoryListNoLimit(condition string, pars []interface{}
 			a.video_id,
 			a.activity_id,
 			b.user_id,
+			b.id as record_id,
 			b.real_name,
 			b.mobile,
 			b.email,

models/activity_voice_history.go

@@ -84,6 +84,7 @@ type CygxActivityVoiceHistoryResp struct {
 	CreateTime       string `description:"创建时间"`
 	ActivityId       int    `description:"活动ID"`
 	RegisterPlatform int    `description:"来源 1小程序，2：网页"`
+	RecordId         int    `description:"日志ID"`
 }
 
 // 列表
@@ -94,6 +95,7 @@ func GetCygxActivityVoiceHistoryListNoLimit(condition string, pars []interface{}
 			a.activity_voice_id,
 			a.activity_id,
 			b.user_id,
+			b.id as record_id,
 			b.real_name,
 			b.mobile,
 			b.email,

models/chart_record.go

@@ -36,6 +36,7 @@ type CygxChartRecordResp struct {
 	RealName         string `description:"用户实际名称"`
 	CreateTime       string `description:"创建时间"`
 	RegisterPlatform int    `description:"来源 1小程序，2：网页"`
+	RecordId         int    `description:"来源 1小程序，2：网页"`
 }
 
 // 列表
@@ -44,6 +45,7 @@ func GetCygxChartRecordListNoLimit(condition string, pars []interface{}) (items
 	sql := `SELECT
 			a.title,
 			a.chart_id,
+			b.record_id,
 			b.user_id,
 			b.real_name,
 			b.mobile,

models/product_interior_history.go

@@ -77,6 +77,7 @@ type ListProductInteriorResp struct {
 	RealName          string `description:"用户实际名称"`
 	CreateTime        string `description:"创建时间"`
 	RegisterPlatform  int    `description:"来源 1小程序，2：网页"`
+	RecordId          int    `description:"日志ID"`
 }
 
 // 列表
@@ -86,6 +87,7 @@ func GetCygxProductInteriorHistoryListData(condition string, pars []interface{})
 			a.product_interior_id,
 			a.title,
 			b.user_id,
+			b.id as record_id,
 			b.real_name,
 			b.mobile,
 			b.email,

models/rai_serve/rai_company_user_bill.go

@@ -31,6 +31,7 @@ type CygxRaiCompanyUserBill struct {
 	CreateTime          time.Time `comment:"创建时间"`
 	ViewTime            string    `comment:"浏览时间"`
 	ActivityId          int       `description:"活动ID"`
+	RecordId            int       `description:"日志ID"`
 }
 
 // 列表

models/rai_serve/rai_serve_bill.go

@@ -32,6 +32,7 @@ type CygxRaiServeBill struct {
 	CreateTime          time.Time `comment:"创建时间"`
 	ViewTime            string    `comment:"浏览时间"`
 	ActivityId          int       `description:"活动ID"`
+	RecordId            int       `description:"日志ID"`
 }
 
 // Redis对列消息中的结构体

models/report_history_record.go

@@ -95,6 +95,7 @@ type CygxReportSelectionHistoryRecordResp struct {
 	RealName         string `description:"用户实际名称"`
 	CreateTime       string `description:"创建时间"`
 	RegisterPlatform int    `description:"来源 1小程序，2：网页"`
+	RecordId         int    `description:"日志ID"`
 }
 
 // 列表
@@ -103,6 +104,7 @@ func GetCygxReportSelectionHistoryRecordRespLimit(condition string, pars []inter
 	sql := `SELECT
 			a.article_id,
 			b.user_id,
+			b.id as record_id,
 			b.real_name,
 			b.mobile,
 			b.email,

services/rai_company_user_bill.go

@@ -575,29 +575,19 @@ func UpdateCygxRaiCompanyUserBill() (err error) {
 		var parsBill []interface{}
 		conditionBill = " AND source = 'newchart' AND   company_id IN  (" + utils.GetOrmInReplace(lencompanyId) + ")  AND view_time > ?  "
 		parsBill = append(parsBill, companyIds, startWeekDate)
-		listBillByuserFeedback, e := rai_serve.GetCygxRaiCompanyUserBillListAll(conditionBill, parsBill)
+		listBillByChart, e := rai_serve.GetCygxRaiCompanyUserBillListAll(conditionBill, parsBill)
 		if e != nil {
 			err = errors.New("GetCygxRaiServeBillListAll, Err: " + e.Error())
 			return
 		}
 
-		mapRscalendarBill := make(map[string]bool)
-		for _, v := range listBillByuserFeedback {
-			mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] = true
+		mapChartBill := make(map[string]bool)
+		for _, v := range listBillByChart {
+			mapChartBill[fmt.Sprint("UID_", v.UserId, "SID_", v.RecordId)] = true
 		}
 
-		mapDelRscalendarBill := make(map[string]bool)
 		for _, v := range userChartRecordList {
-			mapDelRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.ChartId)] = true
-		}
-		for _, v := range listBillByuserFeedback {
-			if !mapDelRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] { // 如果内容存在就插入删除ID中
-				delBillIds = append(delBillIds, v.BillId)
-			}
-		}
-
-		for _, v := range userChartRecordList {
-			if mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.ChartId)] { // 如果内容存在就不插入
+			if mapChartBill[fmt.Sprint("UID_", v.UserId, "SID_", v.RecordId)] { // 如果内容存在就不插入
 				continue
 			}
 			item := new(rai_serve.CygxRaiCompanyUserBill)
@@ -616,6 +606,7 @@ func UpdateCygxRaiCompanyUserBill() (err error) {
 				item.ServeCount = item.ServeCount * 3
 			}
 			item.SourceId = v.ChartId
+			item.RecordId = v.RecordId
 			item.Source = utils.CYGX_OBJ_NEWCHART
 			item.CreateTime = time.Now()
 			item.ViewTime = v.CreateTime
@@ -646,23 +637,13 @@ func UpdateCygxRaiCompanyUserBill() (err error) {
 			return
 		}
 
-		mapRscalendarBill := make(map[string]bool)
+		mapActivityVoiceBill := make(map[string]bool)
 		for _, v := range listBillActivityVoice {
-			mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] = true
-		}
-
-		mapDelRscalendarBill := make(map[string]bool)
-		for _, v := range userActivityVoiceList {
-			mapDelRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.ActivityVoiceId)] = true
-		}
-		for _, v := range listBillActivityVoice {
-			if !mapDelRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] { // 如果内容存在就插入删除ID中
-				delBillIds = append(delBillIds, v.BillId)
-			}
+			mapActivityVoiceBill[fmt.Sprint("UID_", v.UserId, "SID_", v.RecordId)] = true
 		}
 
 		for _, v := range userActivityVoiceList {
-			if mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.ActivityVoiceId)] { // 如果内容存在就不插入
+			if mapActivityVoiceBill[fmt.Sprint("UID_", v.UserId, "SID_", v.RecordId)] { // 如果内容存在就不插入
 				continue
 			}
 			item := new(rai_serve.CygxRaiCompanyUserBill)
@@ -681,6 +662,7 @@ func UpdateCygxRaiCompanyUserBill() (err error) {
 				item.ServeCount = item.ServeCount * 3
 			}
 			item.SourceId = v.ActivityVoiceId
+			item.RecordId = v.RecordId
 			item.ActivityId = v.ActivityId
 			item.Source = utils.CYGX_OBJ_ACTIVITYVOICE
 			item.CreateTime = time.Now()
@@ -701,7 +683,7 @@ func UpdateCygxRaiCompanyUserBill() (err error) {
 			return
 		}
 
-		//图表浏览记录明细
+		//活动视频记录 明细
 		var conditionBill string
 		var parsBill []interface{}
 		conditionBill = " AND source = 'activityvideo' AND   company_id IN  (" + utils.GetOrmInReplace(lencompanyId) + ")  AND view_time > ?  "
@@ -712,23 +694,13 @@ func UpdateCygxRaiCompanyUserBill() (err error) {
 			return
 		}
 
-		mapRscalendarBill := make(map[string]bool)
-		for _, v := range listBillActivityVideo {
-			mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] = true
-		}
-
-		mapDelRscalendarBill := make(map[string]bool)
-		for _, v := range userActivityVideoList {
-			mapDelRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.VideoId)] = true
-		}
+		mapActivityVideoBill := make(map[string]bool)
 		for _, v := range listBillActivityVideo {
-			if !mapDelRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] { // 如果内容存在就插入删除ID中
-				delBillIds = append(delBillIds, v.BillId)
-			}
+			mapActivityVideoBill[fmt.Sprint("UID_", v.UserId, "SID_", v.RecordId)] = true
 		}
 
 		for _, v := range userActivityVideoList {
-			if mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.VideoId)] { // 如果内容存在就不插入
+			if mapActivityVideoBill[fmt.Sprint("UID_", v.UserId, "SID_", v.RecordId)] { // 如果内容存在就不插入
 				continue
 			}
 			item := new(rai_serve.CygxRaiCompanyUserBill)
@@ -747,6 +719,7 @@ func UpdateCygxRaiCompanyUserBill() (err error) {
 				item.ServeCount = item.ServeCount * 3
 			}
 			item.SourceId = v.VideoId
+			item.RecordId = v.RecordId
 			item.ActivityId = v.ActivityId
 			item.Source = utils.CYGX_OBJ_ACTIVITYVIDEO
 			item.CreateTime = time.Now()
@@ -778,23 +751,13 @@ func UpdateCygxRaiCompanyUserBill() (err error) {
 			return
 		}
 
-		mapRscalendarBill := make(map[string]bool)
+		mapReportSelectionBill := make(map[string]bool)
 		for _, v := range listBillReportSelection {
-			mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] = true
+			mapReportSelectionBill[fmt.Sprint("UID_", v.UserId, "SID_", v.RecordId)] = true
 		}
 
-		mapDelRscalendarBill := make(map[string]bool)
 		for _, v := range userReportSelectionList {
-			mapDelRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.ArticleId)] = true
-		}
-		for _, v := range listBillReportSelection {
-			if !mapDelRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] { // 如果内容存在就插入删除ID中
-				delBillIds = append(delBillIds, v.BillId)
-			}
-		}
-
-		for _, v := range userReportSelectionList {
-			if mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.ArticleId)] { // 如果内容存在就不插入
+			if mapReportSelectionBill[fmt.Sprint("UID_", v.UserId, "SID_", v.RecordId)] { // 如果内容存在就不插入
 				continue
 			}
 			item := new(rai_serve.CygxRaiCompanyUserBill)
@@ -813,6 +776,7 @@ func UpdateCygxRaiCompanyUserBill() (err error) {
 				item.ServeCount = item.ServeCount * 3
 			}
 			item.SourceId = v.ArticleId
+			item.RecordId = v.RecordId
 			item.Source = utils.CYGX_OBJ_REPORTSELECTION
 			item.CreateTime = time.Now()
 			item.ViewTime = v.CreateTime
@@ -843,23 +807,13 @@ func UpdateCygxRaiCompanyUserBill() (err error) {
 			return
 		}
 
-		mapRscalendarBill := make(map[string]bool)
-		for _, v := range listBillProductInterior {
-			mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] = true
-		}
-
-		mapDelRscalendarBill := make(map[string]bool)
-		for _, v := range userProductInteriorList {
-			mapDelRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.ProductInteriorId)] = true
-		}
+		mapProductInteriorBill := make(map[string]bool)
 		for _, v := range listBillProductInterior {
-			if !mapDelRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] { // 如果内容存在就插入删除ID中
-				delBillIds = append(delBillIds, v.BillId)
-			}
+			mapProductInteriorBill[fmt.Sprint("UID_", v.UserId, "SID_", v.RecordId)] = true
 		}
 
 		for _, v := range userProductInteriorList {
-			if mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.ProductInteriorId)] { // 如果内容存在就不插入
+			if mapProductInteriorBill[fmt.Sprint("UID_", v.UserId, "SID_", v.RecordId)] { // 如果内容存在就不插入
 				continue
 			}
 			item := new(rai_serve.CygxRaiCompanyUserBill)
@@ -878,6 +832,7 @@ func UpdateCygxRaiCompanyUserBill() (err error) {
 				item.ServeCount = item.ServeCount * 3
 			}
 			item.SourceId = v.ProductInteriorId
+			item.RecordId = v.RecordId
 			item.Source = utils.CYGX_OBJ_PRODUCTINTERIOR
 			item.CreateTime = time.Now()
 			item.ViewTime = v.CreateTime

services/rai_serve_count.go

@@ -961,29 +961,19 @@ func UpdateCygxRaiServeBillByCompanyIds() (err error) {
 		var parsBill []interface{}
 		conditionBill = " AND source = 'newchart' AND   company_id IN  (" + utils.GetOrmInReplace(lencompanyId) + ")  AND view_time > ?  "
 		parsBill = append(parsBill, companyIds, startWeekDate)
-		listBillByuserFeedback, e := rai_serve.GetCygxRaiServeBillListAll(conditionBill, parsBill)
+		listBillByChart, e := rai_serve.GetCygxRaiServeBillListAll(conditionBill, parsBill)
 		if e != nil {
 			err = errors.New("GetCygxRaiServeBillListAll, Err: " + e.Error())
 			return
 		}
 
 		mapRscalendarBill := make(map[string]bool)
-		for _, v := range listBillByuserFeedback {
-			mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] = true
-		}
-
-		mapDelRscalendarBill := make(map[string]bool)
-		for _, v := range userChartRecordList {
-			mapDelRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.ChartId)] = true
-		}
-		for _, v := range listBillByuserFeedback {
-			if !mapDelRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] { // 如果内容存在就插入删除ID中
-				delBillIds = append(delBillIds, v.BillId)
-			}
+		for _, v := range listBillByChart {
+			mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.RecordId)] = true
 		}
 
 		for _, v := range userChartRecordList {
-			if mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.ChartId)] { // 如果内容存在就不插入
+			if mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.RecordId)] { // 如果内容存在就不插入
 				continue
 			}
 			item := new(rai_serve.CygxRaiServeBill)
@@ -1002,6 +992,7 @@ func UpdateCygxRaiServeBillByCompanyIds() (err error) {
 				item.ServeCount = item.ServeCount * 3
 			}
 			item.SourceId = v.ChartId
+			item.RecordId = v.RecordId
 			item.Source = utils.CYGX_OBJ_NEWCHART
 			item.CreateTime = time.Now()
 			item.ViewTime = v.CreateTime
@@ -1032,23 +1023,13 @@ func UpdateCygxRaiServeBillByCompanyIds() (err error) {
 			return
 		}
 
-		mapRscalendarBill := make(map[string]bool)
-		for _, v := range listBillActivityVoice {
-			mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] = true
-		}
-
-		mapDelRscalendarBill := make(map[string]bool)
-		for _, v := range userActivityVoiceList {
-			mapDelRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.ActivityVoiceId)] = true
-		}
+		mapActivityVoiceBill := make(map[string]bool)
 		for _, v := range listBillActivityVoice {
-			if !mapDelRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] { // 如果内容存在就插入删除ID中
-				delBillIds = append(delBillIds, v.BillId)
-			}
+			mapActivityVoiceBill[fmt.Sprint("UID_", v.UserId, "SID_", v.RecordId)] = true
 		}
 
 		for _, v := range userActivityVoiceList {
-			if mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.ActivityVoiceId)] { // 如果内容存在就不插入
+			if mapActivityVoiceBill[fmt.Sprint("UID_", v.UserId, "SID_", v.RecordId)] { // 如果内容存在就不插入
 				continue
 			}
 			item := new(rai_serve.CygxRaiServeBill)
@@ -1068,6 +1049,7 @@ func UpdateCygxRaiServeBillByCompanyIds() (err error) {
 			}
 			item.SourceId = v.ActivityVoiceId
 			item.ActivityId = v.ActivityId
+			item.RecordId = v.RecordId
 			item.Source = utils.CYGX_OBJ_ACTIVITYVOICE
 			item.CreateTime = time.Now()
 			item.ViewTime = v.CreateTime
@@ -1098,23 +1080,13 @@ func UpdateCygxRaiServeBillByCompanyIds() (err error) {
 			return
 		}
 
-		mapRscalendarBill := make(map[string]bool)
-		for _, v := range listBillActivityVideo {
-			mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] = true
-		}
-
-		mapDelRscalendarBill := make(map[string]bool)
-		for _, v := range userActivityVideoList {
-			mapDelRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.VideoId)] = true
-		}
+		mapActivityVideoBill := make(map[string]bool)
 		for _, v := range listBillActivityVideo {
-			if !mapDelRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] { // 如果内容存在就插入删除ID中
-				delBillIds = append(delBillIds, v.BillId)
-			}
+			mapActivityVideoBill[fmt.Sprint("UID_", v.UserId, "SID_", v.RecordId)] = true
 		}
 
 		for _, v := range userActivityVideoList {
-			if mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.VideoId)] { // 如果内容存在就不插入
+			if mapActivityVideoBill[fmt.Sprint("UID_", v.UserId, "SID_", v.RecordId)] { // 如果内容存在就不插入
 				continue
 			}
 			item := new(rai_serve.CygxRaiServeBill)
@@ -1133,6 +1105,7 @@ func UpdateCygxRaiServeBillByCompanyIds() (err error) {
 				item.ServeCount = item.ServeCount * 3
 			}
 			item.SourceId = v.VideoId
+			item.RecordId = v.RecordId
 			item.ActivityId = v.ActivityId
 			item.Source = utils.CYGX_OBJ_ACTIVITYVIDEO
 			item.CreateTime = time.Now()
@@ -1164,23 +1137,13 @@ func UpdateCygxRaiServeBillByCompanyIds() (err error) {
 			return
 		}
 
-		mapRscalendarBill := make(map[string]bool)
-		for _, v := range listBillReportSelection {
-			mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] = true
-		}
-
-		mapDelRscalendarBill := make(map[string]bool)
-		for _, v := range userReportSelectionList {
-			mapDelRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.ArticleId)] = true
-		}
+		mapReportSelectionBill := make(map[string]bool)
 		for _, v := range listBillReportSelection {
-			if !mapDelRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] { // 如果内容存在就插入删除ID中
-				delBillIds = append(delBillIds, v.BillId)
-			}
+			mapReportSelectionBill[fmt.Sprint("UID_", v.UserId, "SID_", v.RecordId)] = true
 		}
 
 		for _, v := range userReportSelectionList {
-			if mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.ArticleId)] { // 如果内容存在就不插入
+			if mapReportSelectionBill[fmt.Sprint("UID_", v.UserId, "SID_", v.RecordId)] { // 如果内容存在就不插入
 				continue
 			}
 			item := new(rai_serve.CygxRaiServeBill)
@@ -1199,6 +1162,7 @@ func UpdateCygxRaiServeBillByCompanyIds() (err error) {
 				item.ServeCount = item.ServeCount * 3
 			}
 			item.SourceId = v.ArticleId
+			item.RecordId = v.RecordId
 			item.Source = utils.CYGX_OBJ_REPORTSELECTION
 			item.CreateTime = time.Now()
 			item.ViewTime = v.CreateTime
@@ -1229,23 +1193,13 @@ func UpdateCygxRaiServeBillByCompanyIds() (err error) {
 			return
 		}
 
-		mapRscalendarBill := make(map[string]bool)
-		for _, v := range listBillProductInterior {
-			mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] = true
-		}
-
-		mapDelRscalendarBill := make(map[string]bool)
-		for _, v := range userProductInteriorList {
-			mapDelRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.ProductInteriorId)] = true
-		}
+		mapProductInteriorBill := make(map[string]bool)
 		for _, v := range listBillProductInterior {
-			if !mapDelRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] { // 如果内容存在就插入删除ID中
-				delBillIds = append(delBillIds, v.BillId)
-			}
+			mapProductInteriorBill[fmt.Sprint("UID_", v.UserId, "SID_", v.RecordId)] = true
 		}
 
 		for _, v := range userProductInteriorList {
-			if mapRscalendarBill[fmt.Sprint("UID_", v.UserId, "SID_", v.ProductInteriorId)] { // 如果内容存在就不插入
+			if mapProductInteriorBill[fmt.Sprint("UID_", v.UserId, "SID_", v.RecordId)] { // 如果内容存在就不插入
 				continue
 			}
 			item := new(rai_serve.CygxRaiServeBill)
@@ -1264,6 +1218,7 @@ func UpdateCygxRaiServeBillByCompanyIds() (err error) {
 				item.ServeCount = item.ServeCount * 3
 			}
 			item.SourceId = v.ProductInteriorId
+			item.RecordId = v.RecordId
 			item.Source = utils.CYGX_OBJ_PRODUCTINTERIOR
 			item.CreateTime = time.Now()
 			item.ViewTime = v.CreateTime