no message

models/overseas_custom/custom.go

@@ -67,6 +67,24 @@ func (obj *Custom) GetRsCompanyTotal() (list []*RsCompany, err error) {
 	return
 }
 
+// 获取客户路演数据销售部分
+func (obj *Custom) GetRsCompanyTotalSeller() (list []*RsCompany, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+			a.company_id,
+			COUNT( DISTINCT a.rs_activity_id ) total 
+		FROM
+			rs_activity AS a
+			INNER JOIN rs_activity_seller AS b ON a.rs_activity_id = b.rs_activity_id 
+		WHERE
+			b.STATUS = 2 
+			AND a.english_company = 1 
+		GROUP BY
+			a.rs_activity_id `
+	_, err = o.Raw(sql).QueryRows(&list)
+	return
+}
+
 // 获取所有英文客户
 func (obj *Custom) GetEnglishCompanyAll() (list []*EnglishCompany, err error) {
 	o := orm.NewOrmUsingDB("rddp")

services/overseas_custom/custom.go

@@ -16,6 +16,20 @@ func FixEnglishCompanyRoadShowTotal(cont context.Context) (err error) {
 		return err
 	}
 
+	listSeller, err := obj.GetRsCompanyTotalSeller()
+	if err != nil {
+		fmt.Println("GetRsCompanyTotal Err:" + err.Error())
+		return err
+	}
+	mapSellerTotal := make(map[int]int) //对应公司下 销售预约活动数量
+	for _, v := range listSeller {
+		mapSellerTotal[v.CompanyId] = v.Total
+	}
+
+	for _, v := range list {
+		v.Total += mapSellerTotal[v.CompanyId]
+	}
+
 	companyList, err := obj.GetEnglishCompanyAll()
 	if err != nil {
 		fmt.Println("GetEnglishCompanyAll Err:" + err.Error())

services/roadshow/company_product.go

@@ -7,8 +7,14 @@ import (
 
 func RoadShow(cont context.Context) (err error) {
 	roadShowTotalList, _ := GetRoadShowTotal()
+	roadShowTotalListSeller, _ := GetRoadShowTotalSellerActivity()
+
+	mapSellerTotal := make(map[int]int) //对应公司下 销售预约活动数量
+	for _, v := range roadShowTotalListSeller {
+		mapSellerTotal[v.CompanyId] = v.Total
+	}
 	for _, roadShowTotal := range roadShowTotalList {
-		err := updateProduct(roadShowTotal.Total, roadShowTotal.CompanyId)
+		err := updateProduct(roadShowTotal.Total+mapSellerTotal[roadShowTotal.CompanyId], roadShowTotal.CompanyId)
 		if err != nil {
 			return err
 		}
@@ -35,13 +41,33 @@ GROUP BY
 	return
 }
 
-func updateProduct(total, companyId int) (err error){
+// 销售预约活动数量
+func GetRoadShowTotalSellerActivity() (items []*RoadShowTotalSlice, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+	a.company_id,
+	COUNT( DISTINCT a.rs_activity_id ) total 
+FROM
+	rs_activity AS a
+	INNER JOIN rs_activity_seller AS b ON a.rs_activity_id = b.rs_activity_id 
+WHERE
+	a.company_id > 0 
+	AND b.STATUS = 2 
+	AND NOW()> DATE_FORMAT( CONCAT( end_date, " ", end_time ), '%Y-%m-%d %H:%i:%S' ) 
+GROUP BY
+	a.company_id `
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
+func updateProduct(total, companyId int) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE company_product SET road_show_total=? WHERE company_id=? AND product_name="ficc" `
-	_, err = o.Raw(sql,total, companyId).Exec()
+	_, err = o.Raw(sql, total, companyId).Exec()
 	return
 }
+
 type RoadShowTotalSlice struct {
 	Total     int `description:"总路演数"`
 	CompanyId int `description:"用户id"`
-}
+}