Merge branch 'master' into service_types

controller/census/invoice_payment.go

@@ -1303,7 +1303,7 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 						partAccumulate = 0.0
 					}
 				}
-			} else if endDateTime.Before(historyTime) || endDateTime.Equal(historyTime) {
+			} else if (endDateTime.Before(historyTime) || endDateTime.Equal(historyTime)) && req.ServiceTypes == "" {
 				//全部走旧查询
 				//fmt.Println("旧查询")
 				//fmt.Println("st:",st)
@@ -1407,7 +1407,7 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 						partHistoryAccumulate = 0.0 // 清零部分历史金额
 					}
 				}
-			} else if prevEndDateTime.Before(historyTime) || prevEndDateTime.Equal(historyTime) {
+			} else if (prevEndDateTime.Before(historyTime) || prevEndDateTime.Equal(historyTime)) && req.ServiceTypes == "" {
 				// 全部走旧查询
 				fmt.Println("prevSt:", prevSt)
 				fmt.Println("prevEd:", prevEd)