|
@@ -2098,39 +2098,29 @@ func ModifyCompanyProductLastViewData(companyIdList []int) (err error) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- companyIdStr := ``
|
|
|
- for _, companyId := range companyIdList {
|
|
|
- companyIdStr += fmt.Sprint(companyId, ",")
|
|
|
- }
|
|
|
- companyIdStr = companyIdStr[:len(companyIdStr)-1]
|
|
|
-
|
|
|
- companyFiccViewTotalMap, err := GetFiccCountUserViewHistoryByCompanyIds(companyIdStr, mobileList, emailList, mobileCompanyIdMap, emailCompanyIdMap)
|
|
|
+ // 根据companyId列表获取客户公司的阅读情况
|
|
|
+ companyViewRecordList, err := models.GetUserViewHistoryByCompanyIdList(companyIdList)
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
- companyFiccLastViewMap, err := GetFiccLastUserViewHistoryByCompanyIds(companyIdStr, mobileList, emailList, mobileCompanyIdMap, emailCompanyIdMap)
|
|
|
- if err != nil {
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- companyRaiViewTotalMap, err := GetRaiCountUserViewHistoryByCompanyIds(companyIdStr)
|
|
|
- if err != nil {
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- companyRaiLastViewMap, err := GetRaiLastUserViewHistoryByCompanyIds(companyIdStr)
|
|
|
- if err != nil {
|
|
|
- return
|
|
|
+ companyViewRecordMap := make(map[int]*models.CompanyViewRecord)
|
|
|
+ for _, v := range companyViewRecordList {
|
|
|
+ companyViewRecordMap[v.CompanyId] = v
|
|
|
}
|
|
|
|
|
|
for _, companyId := range companyIdList {
|
|
|
+ companyViewRecord, ok := companyViewRecordMap[companyId]
|
|
|
//ficc
|
|
|
- var companyFiccViewTotal int
|
|
|
- var companyFiccLastView time.Time
|
|
|
- var companyFiccLastViewStr string
|
|
|
- companyFiccViewTotal, _ = companyFiccViewTotalMap[companyId]
|
|
|
- companyFiccLastView, _ = companyFiccLastViewMap[companyId]
|
|
|
+ var companyFiccViewTotal, companyRaiViewTotal int
|
|
|
+ var companyFiccLastView, companyRaiLastView time.Time
|
|
|
+ var companyFiccLastViewStr, companyRaiLastViewStr string
|
|
|
+
|
|
|
+ if ok && companyViewRecord != nil {
|
|
|
+ companyFiccViewTotal = companyViewRecord.FiccViewTotal
|
|
|
+ companyFiccLastView = companyViewRecord.FiccLastViewTime
|
|
|
+ companyRaiViewTotal = companyViewRecord.RaiViewTotal
|
|
|
+ companyRaiLastView = companyViewRecord.RaiLastViewTime
|
|
|
+ }
|
|
|
|
|
|
if companyFiccLastView.IsZero() {
|
|
|
companyFiccLastViewStr = "0000-00-00 00:00:00"
|
|
@@ -2140,11 +2130,6 @@ func ModifyCompanyProductLastViewData(companyIdList []int) (err error) {
|
|
|
company.ModifyCompanyProductLastViewData(companyId, 1, companyFiccViewTotal, companyFiccLastViewStr)
|
|
|
|
|
|
//权益
|
|
|
- var companyRaiViewTotal int
|
|
|
- var companyRaiLastView time.Time
|
|
|
- var companyRaiLastViewStr string
|
|
|
- companyRaiViewTotal, _ = companyRaiViewTotalMap[companyId]
|
|
|
- companyRaiLastView, _ = companyRaiLastViewMap[companyId]
|
|
|
if companyRaiLastView.IsZero() {
|
|
|
companyRaiLastViewStr = "0000-00-00 00:00:00"
|
|
|
} else {
|