Merge branch 'service_types'

controller/census/invoice_payment.go

@@ -1055,6 +1055,23 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 		historyCond += ` AND new_company = 0 `
 	}
 
+	// 套餐筛选
+	if req.ServiceTypes != "" {
+		serviceTypes := strings.Split(req.ServiceTypes, ",")
+		registerIds, e := fms.GetContractRegisterIdsByTempId(serviceTypes)
+		if e != nil {
+			err = fmt.Errorf("获取合同登记IDs失败, Err: %s", e.Error())
+			return
+		}
+		if len(registerIds) > 0 {
+			cond += ` AND b.contract_register_id IN ?`
+			pars = append(pars, registerIds)
+		} else {
+			cond += ` AND 1 = 2`
+		}
+	}
+
+
 	var latestTime time.Time
 
 	invoiceItem, err := fms.GetLatestIncome(cond, pars)
@@ -1202,6 +1219,23 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 			historyPars = append(historyPars, sellerIds)
 			prevHistoryPars = append(prevHistoryPars, sellerIds)
 		}
+
+		// 套餐筛选
+		if req.ServiceTypes != "" {
+			serviceTypes := strings.Split(req.ServiceTypes, ",")
+			registerIds, e := fms.GetContractRegisterIdsByTempId(serviceTypes)
+			if e != nil {
+				err = fmt.Errorf("获取合同登记IDs失败, Err: %s", e.Error())
+				return
+			}
+			if len(registerIds) > 0 {
+				cond += ` AND a.register_id IN ?`
+				pars = append(pars, registerIds)
+			} else {
+				cond += ` AND 1 = 2`
+			}
+		}
+
 		//fmt.Println("i:",i)
 		//fmt.Println("j:",j)
 		{

models/fms/contract_invoice.go

@@ -663,12 +663,13 @@ func GetDuplicateContractInvoiceDetailItemList(companyName, startDate, endDate s
 }
 
 type IncomeListReq struct {
-	SellerIds   string `json:"seller_ids" form:"seller_ids" description:"销售ID，多个ID之间用逗号拼接"`
-	StartDate   string `json:"start_date" form:"start_date" binding:"omitempty,datetime=2006-01" description:"开始日期"`
-	EndDate     string `json:"end_date" form:"end_date" binding:"omitempty,datetime=2006-01" description:"结束日期"`
-	IsExport    int    `json:"is_export" form:"is_export" description:"是否导出: 0-否; 1-是"`
-	ListParam   string `json:"list_param" form:"list_param" description:"套餐类型: 0-月度; 1-季度; 2-半年度；3-年度；4-月度累计"`
-	CompanyType int    `json:"company_type" form:"company_type" description:"客户类型 0全部 1新客户 2老客户 3未续约"`
+	SellerIds    string `json:"seller_ids" form:"seller_ids" description:"销售ID，多个ID之间用逗号拼接"`
+	StartDate    string `json:"start_date" form:"start_date" binding:"omitempty,datetime=2006-01" description:"开始日期"`
+	EndDate      string `json:"end_date" form:"end_date" binding:"omitempty,datetime=2006-01" description:"结束日期"`
+	IsExport     int    `json:"is_export" form:"is_export" description:"是否导出: 0-否; 1-是"`
+	ListParam    string `json:"list_param" form:"list_param" description:"套餐类型: 0-月度; 1-季度; 2-半年度；3-年度；4-月度累计"`
+	CompanyType  int    `json:"company_type" form:"company_type" description:"客户类型 0全部 1新客户 2老客户 3未续约"`
+	ServiceTypes string `json:"service_types" form:"service_types" description:"套餐类型"`
 }
 
 // 获取最新的开票或到款日期