fix：存量客户数据入库逻辑调整

models/stack_company_statistic.go

@@ -14,6 +14,7 @@ type StackCompanyStatistic struct {
 	ProductId    int       `description:"客户产品id"`
 	ProductName  string    `description:"客户产品名称"`
 	ContractNum  int       `description:"第几份合同，默认是：1"`
+	ContractId   int       `description:"合同id，默认是：0"`
 	SellerId     int       `description:"所属销售id"`
 	SellerName   string    `description:"所属销售名称"`
 	GroupId      int       `description:"所属销售分组id"`
@@ -87,29 +88,30 @@ GROUP BY company_id,product_id `
 
 //增量客户统计报表列表数据结构
 type IncrementalList struct {
-	CompanyContractId int     `description:"合同id"`
-	ContractType      string  `description:"合同类型"`
-	CompanyId         int     `description:"企业客户id"`
-	CompanyName       string  `description:"企业客户名称"`
-	ProductId         int     `description:"产品id"`
-	ProductName       string  `description:"产品名称"`
-	CompanyProductId  int     `description:"客户购买产品授权id"`
-	ContractCode      string  `description:"合同编码"`
-	StartDate         string  `description:"合同开始日期"`
-	EndDate           string  `description:"合同结束日期"`
-	Money             float64 `description:"合同金额"`
-	PayMethod         string  `description:"付款方式"`
-	PayChannel        string  `description:"付款渠道"`
-	ImgUrl            string  `description:"合同图片"`
-	CreateTime        string  `description:"合同创建时间"`
-	ModifyTime        string  `description:"合同修改时间"`
-	Status            string  `description:"合同审批状态，0:待审批，1:已审批；默认：1"`
-	RegionType        string  `description:"企业客户所属区域；可选范围：国内，海外"`
-	SellerId          int     `description:"归属销售id"`
-	GroupId           int     `description:"归属分组id"`
-	DepartmentId      int     `description:"归属部门id"`
-	SellerName        string  `description:"归属销售名称"`
-	ExpireDay         string  `description:"剩余可用天数"`
+	CompanyOperationRecordId int     `description:"操作记录id"`
+	CompanyContractId        int     `description:"合同id"`
+	ContractType             string  `description:"合同类型"`
+	CompanyId                int     `description:"企业客户id"`
+	CompanyName              string  `description:"企业客户名称"`
+	ProductId                int     `description:"产品id"`
+	ProductName              string  `description:"产品名称"`
+	CompanyProductId         int     `description:"客户购买产品授权id"`
+	ContractCode             string  `description:"合同编码"`
+	StartDate                string  `description:"合同开始日期"`
+	EndDate                  string  `description:"合同结束日期"`
+	Money                    float64 `description:"合同金额"`
+	PayMethod                string  `description:"付款方式"`
+	PayChannel               string  `description:"付款渠道"`
+	ImgUrl                   string  `description:"合同图片"`
+	CreateTime               string  `description:"合同创建时间"`
+	ModifyTime               string  `description:"合同修改时间"`
+	Status                   string  `description:"合同审批状态，0:待审批，1:已审批；默认：1"`
+	RegionType               string  `description:"企业客户所属区域；可选范围：国内，海外"`
+	SellerId                 int     `description:"归属销售id"`
+	GroupId                  int     `description:"归属分组id"`
+	DepartmentId             int     `description:"归属部门id"`
+	SellerName               string  `description:"归属销售名称"`
+	ExpireDay                string  `description:"剩余可用天数"`
 }
 
 //未续约客户数（存量客户）
@@ -132,3 +134,64 @@ ORDER BY create_time DESC , company_id DESC  `
 	total, err = o.Raw(sql, dateTime).QueryRows(&items)
 	return
 }
+
+// GetIncrementalCompanyListByOperationRecord 获取未续约客户报表列表数据（根据新增客户时间来展示）
+func GetIncrementalCompanyListByOperationRecord(condition string, pars []interface{}) (items []*IncrementalList, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT a.id company_operation_record_id,a.company_id,b.company_name,c.seller_id,c.seller_name,
+a.product_id,a.product_name,a.create_time,b.region_type,c.renewal_reason FROM company_operation_record a
+		RIGHT JOIN company b ON a.company_id = b.company_id 
+		 JOIN company_product c ON b.company_id = c.company_id and a.product_id=c.product_id WHERE 1 = 1 `
+
+	if condition != "" {
+		sql += condition
+	}
+	sql = `select * from  (` + sql + ` order by create_time asc) f group by company_id,product_id order by create_time desc,company_id desc `
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}
+
+// GetTodayStackCompanyList 获取当天存量客户报表列表数据（新签客户，根据合同来展示）
+func GetTodayStackCompanyList(condition string, pars []interface{}) (items []*IncrementalList, err error) {
+	o := orm.NewOrm()
+
+	sql := `SELECT a.*,b.region_type,c.seller_id,c.seller_name,b.company_name,c.renewal_reason FROM company_contract a
+		 JOIN company b ON a.company_id = b.company_id
+		 JOIN company_product c ON a.company_id = c.company_id and a.product_id=c.product_id WHERE a.status = 1 `
+
+	if condition != "" {
+		sql += condition
+	}
+	sql += " order by a.start_date desc "
+	sql = `select * from (` + sql + `) b  order by start_date desc,company_id desc`
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}
+
+// GetTodayStackCompanyListV2 获取当天存量客户报表列表数据（续约客户，根据合同来展示）
+func GetTodayStackCompanyListV2(condition string, pars []interface{}) (items []*IncrementalList, err error) {
+	o := orm.NewOrm()
+
+	sql1 := `SELECT a.*,b.region_type,c.seller_id,c.seller_name,b.company_name,c.renewal_reason FROM company_contract a
+		 JOIN company b ON a.company_id = b.company_id
+		 JOIN company_product c ON a.company_id = c.company_id and a.product_id=c.product_id WHERE a.status = 1 and a.product_id=1 `
+	if condition != "" {
+		sql1 += condition
+	}
+	sql1 += ` and a.company_id not in (select company_id from company_contract where contract_type="新签合同" and status=1 and product_id=1 and end_date > ?) `
+
+	sql2 := `SELECT a.*,b.region_type,c.seller_id,c.seller_name,b.company_name,c.renewal_reason FROM company_contract a
+		 JOIN company b ON a.company_id = b.company_id
+		 JOIN company_product c ON a.company_id = c.company_id and a.product_id=c.product_id WHERE a.status = 1 and a.product_id=2 `
+	if condition != "" {
+		sql2 += condition
+	}
+	sql2 += ` and a.company_id not in (select company_id from company_contract where contract_type="新签合同" and status=1 and product_id=2 and end_date > ?) `
+
+	sql := `select * from (` + sql1 + ` union (` + sql2 + `)  ` + `) f order by start_date desc`
+	sql = `select * from (` + sql + `) b order by start_date desc,company_id desc`
+
+	pars = append(pars, pars...)
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}

services/company_statistic.go

@@ -1,15 +1,15 @@
 package services
 
 import (
+	"context"
 	"fmt"
 	"hongze/hongze_task/models"
 	"hongze/hongze_task/utils"
 	"time"
-	"context"
 )
 
-//存量客户数据统计
-func StackCompanyStatistic(cont context.Context) (err error) {
+// StackCompanyStatisticOld 存量客户数据统计（2021-10-26 14:12:27 过期失效）
+func StackCompanyStatisticOld(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "存量客户数据统计 ErrMsg:"+err.Error(), utils.EmailSendToUsers)
@@ -110,3 +110,145 @@ func StackCompanyStatistic(cont context.Context) (err error) {
 	}
 	return
 }
+
+// StackCompanyStatistic 存量客户数据统计
+func StackCompanyStatistic(cont context.Context) (err error) {
+	defer func() {
+		if err != nil {
+			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "存量客户数据统计 ErrMsg:"+err.Error(), utils.EmailSendToUsers)
+		}
+	}()
+	dayStr := time.Now().AddDate(0, 0, -1).Format(utils.FormatDate) //截止到昨天的数据
+	//查询昨天的数据有没有生成，如果没有生成的话，那么重新生成
+	count, err := models.GetStackCompanyCount(dayStr)
+	if err != nil {
+		fmt.Println("查询昨天的数据是否生成语句 执行异常：", err.Error())
+		return
+	}
+	//昨天数据有生成，那么就不往下执行了
+	if count > 0 {
+		fmt.Println("昨天的数据已经生成，不允许重复生成")
+		return
+	}
+
+	//新签客户
+	{
+		var condition1 string
+		var pars1 []interface{}
+		condition1 += ` AND a.start_date <= ? AND a.end_date >= ? `
+		pars1 = append(pars1, dayStr, dayStr)
+		condition1 += ` AND a.contract_type = ? `
+		pars1 = append(pars1, "新签合同")
+		list, countErr := models.GetTodayStackCompanyList(condition1, pars1)
+		if countErr != nil {
+			err = countErr
+			return
+		}
+
+		for _, companyInfo := range list {
+			item := models.StackCompanyStatistic{
+				CompanyId:    companyInfo.CompanyId,
+				CompanyName:  companyInfo.CompanyName,
+				ProductId:    companyInfo.ProductId,
+				ProductName:  companyInfo.ProductName,
+				ContractId:   companyInfo.CompanyContractId,
+				SellerId:     companyInfo.SellerId,
+				SellerName:   companyInfo.SellerName,
+				GroupId:      companyInfo.GroupId,
+				DepartmentId: companyInfo.DepartmentId,
+				Date:         dayStr, //截止到昨天的数据
+				StartDate:    companyInfo.StartDate,
+				EndDate:      companyInfo.EndDate,
+				RegionType:   companyInfo.RegionType,
+				CreateTime:   time.Now(),
+				Type:         "新签客户",
+			}
+			addErr := models.AddStackCompanyStatistic(&item)
+			if addErr != nil {
+				fmt.Println("存量新签客户数据统计，插入数据异常：", addErr)
+			}
+		}
+	}
+
+	//续约客户
+	{
+		var condition1 string
+		var pars1 []interface{}
+		condition1 += ` AND a.start_date <= ? AND a.end_date >= ? `
+		pars1 = append(pars1, dayStr, dayStr)
+		condition1 += ` AND a.contract_type = ? `
+		pars1 = append(pars1, "续约合同")
+		//额外条件（续约合同的起始日期包含在所选时间段内且不包含在新签合同存续期内的客户）
+		pars1 = append(pars1, dayStr)
+		list, countErr := models.GetTodayStackCompanyListV2(condition1, pars1)
+		if countErr != nil {
+			err = countErr
+			return
+		}
+
+		for _, companyInfo := range list {
+			item := models.StackCompanyStatistic{
+				CompanyId:    companyInfo.CompanyId,
+				CompanyName:  companyInfo.CompanyName,
+				ProductId:    companyInfo.ProductId,
+				ProductName:  companyInfo.ProductName,
+				ContractId:   companyInfo.CompanyContractId,
+				SellerId:     companyInfo.SellerId,
+				SellerName:   companyInfo.SellerName,
+				GroupId:      companyInfo.GroupId,
+				DepartmentId: companyInfo.DepartmentId,
+				Date:         dayStr, //截止到昨天的数据
+				StartDate:    companyInfo.StartDate,
+				EndDate:      companyInfo.EndDate,
+				RegionType:   companyInfo.RegionType,
+				CreateTime:   time.Now(),
+				Type:         "续约客户",
+			}
+			addErr := models.AddStackCompanyStatistic(&item)
+			if addErr != nil {
+				fmt.Println("存量续约客户数据统计，插入数据异常：", addErr)
+			}
+		}
+	}
+
+	//未续约客户
+	{
+		var condition1 string
+		var pars1 []interface{}
+		condition1 += ` AND c.status not in ("永续","正式") AND a.create_time <= ? `
+		pars1 = append(pars1, time.Now().Format(utils.FormatDateTime))
+		condition1 += ` AND a.operation = 'try_out' `
+
+		list, countErr := models.GetIncrementalCompanyListByOperationRecord(condition1, pars1)
+		if countErr != nil {
+			err = countErr
+			return
+		}
+
+		for _, companyInfo := range list {
+			item := models.StackCompanyStatistic{
+				CompanyId:    companyInfo.CompanyId,
+				CompanyName:  companyInfo.CompanyName,
+				ProductId:    companyInfo.ProductId,
+				ProductName:  companyInfo.ProductName,
+				ContractId:   companyInfo.CompanyOperationRecordId,
+				SellerId:     companyInfo.SellerId,
+				SellerName:   companyInfo.SellerName,
+				GroupId:      companyInfo.GroupId,
+				DepartmentId: companyInfo.DepartmentId,
+				Date:         dayStr, //截止到昨天的数据
+				StartDate:    companyInfo.StartDate,
+				EndDate:      companyInfo.EndDate,
+				RegionType:   companyInfo.RegionType,
+				CreateTime:   time.Now(),
+				Type:         "未续约客户",
+			}
+			addErr := models.AddStackCompanyStatistic(&item)
+			if addErr != nil {
+				fmt.Println("存量未续约客户数据统计，插入数据异常：", addErr)
+			}
+		}
+	}
+
+	return
+}