no message

controllers/statistic/rai_data_summary.go

@@ -1303,8 +1303,12 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 		listResp = append(listResp, item)
 
 	case "客单价":
+		//续约部分的数据
+		var conditionInherit string
+		var parsInherit []interface{}
 		if sellerId != "" {
 			condition += ` AND a.seller_id_last  IN (` + sellerId + `) `
+			conditionInherit += ` AND a.seller_id_last  IN (` + sellerId + `) `
 		}
 		condition += " AND  a.product_id = 2  AND  a.status = 1  AND  a.start_date >= ?  AND  a.start_date <= ? "
 		pars = append(pars, startDate, endDate)
@@ -1320,12 +1324,32 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 		mapCompany := make(map[int]bool)
 
 		for _, v := range listRaiData {
+			if v.RaiContractType != "新签合同" {
+				continue
+			}
 			ontractMoney += v.Money
 			if !mapCompany[v.CompanyId] {
 				contractNum++
 				mapCompany[v.CompanyId] = true
 			}
 		}
+		conditionInherit += " AND  a.product_id = 2  AND  a.status = 1  AND  a.inherit_end_date >= ?  AND  a.inherit_end_date <= ?  AND a.rai_contract_type = '续约合同'  "
+		parsInherit = append(parsInherit, startDate, endDate)
+		listInheritData, err := statistic_report.GetRaiDataSummaryInheritList(conditionInherit, parsInherit)
+		if err != nil {
+			br.Msg = "获取数据信息失败"
+			br.ErrMsg = "获取数据信息失败,Err:" + err.Error()
+			return
+		}
+
+		for _, v := range listInheritData {
+			ontractMoney += v.Money
+			if !mapCompany[v.CompanyId] && v.RaiContractType == "续约合同" {
+				contractNum++
+				mapCompany[v.CompanyId] = true
+			}
+		}
+
 		item := new(statistic_report.RaiDataSummaryDetailResp)
 		item.ContractMoney = fmt.Sprint(utils.SubFloatToString(ontractMoney, 2))
 		item.ContractNum = contractNum