fix

controller/census/income_list.go

@@ -819,10 +819,10 @@ func getPaymentIncomeChartList(ch chan models.CensusIncomeChartResp, req fms.Inc
 
 		if req.SellerIds != "" {
 			sellerIds := strings.Split(req.SellerIds, ",")
-			cond += ` AND (c.seller_id in ? OR d.seller_id in ?)`
-			pars = append(pars, sellerIds, sellerIds)
-			prevCond += ` AND (c.seller_id in ? OR d.seller_id in ?)`
-			prevPars = append(prevPars, sellerIds, sellerIds)
+			cond += ` AND d.seller_id in ? `
+			pars = append(pars, sellerIds)
+			prevCond += ` AND d.seller_id in ?`
+			prevPars = append(prevPars, sellerIds)
 			histrtyCond += ` AND seller_id in ? `
 			prevHistoryCond += ` AND seller_id in ? `
 			historyPars = append(historyPars, sellerIds)
@@ -873,7 +873,7 @@ func getPaymentIncomeChartList(ch chan models.CensusIncomeChartResp, req fms.Inc
 				if req.SellerIds != "" {
 					sellerIds := strings.Split(req.SellerIds, ",")
 					amountCond += `AND ( d.seller_id IN ? AND  a.payment_id <> 0 AND d.invoice_time BETWEEN ? AND ?) `
-					amountPars = append(amountPars, sellerIds, st, ed, sellerIds, st, ed)
+					amountPars = append(amountPars, sellerIds, st, ed)
 				} else {
 					amountCond += `AND (a.payment_id <> 0  AND d.invoice_time BETWEEN ? AND ?)`
 					amountPars = append(amountPars, st, ed, st, ed)
@@ -885,7 +885,7 @@ func getPaymentIncomeChartList(ch chan models.CensusIncomeChartResp, req fms.Inc
 				}
 				//dataList = append(dataList, results...)
 				var amountSum float64
-				for _, result := range results {
+				for _, resut := range results {
 					incomeChart.DataList = append(incomeChart.DataList, result)
 					amountSum += result.Amount
 					fmt.Println("result.Amount:", result.Amount)
@@ -1145,8 +1145,8 @@ func getPaymentIncomeList(ch chan base.BaseData, req fms.IncomeListReq) (baseDat
 
 	if req.SellerIds != "" {
 		sellerIds := strings.Split(req.SellerIds, ",")
-		cond += ` AND (c.seller_id in ? OR d.seller_id in ?)`
-		pars = append(pars, sellerIds, sellerIds)
+		cond += ` AND  d.seller_id in ?`
+		pars = append(pars, sellerIds)
 	}
 
 	// 套餐筛选