wangchuanjin 9 месяцев назад
Родитель
Сommit
9a797ef61f

+ 3 - 3
api/internal/service/CoopHistoryService.go

@@ -195,7 +195,7 @@ func GetWinnerData(scopeClass string, bid string) []AggStruct {
 	wh, newArgs := common.WhArgs(strings.Split(scopeClass, ","))
 	wh, newArgs := common.WhArgs(strings.Split(scopeClass, ","))
 	args = append(args, newArgs...)
 	args = append(args, newArgs...)
 	rows, err1 := T.ClickhouseConn.Query(context.TODO(), `select distinct wr as name,wr_id as id from information.transaction_info_all ARRAY JOIN winner_id as wr_id,winner as wr
 	rows, err1 := T.ClickhouseConn.Query(context.TODO(), `select distinct wr as name,wr_id as id from information.transaction_info_all ARRAY JOIN winner_id as wr_id,winner as wr
-			prewhere buyer_id IN (SELECT buyer_id from information.transaction_info_all prewhere has(winner_id,?) and buyer_id<>'') and wr_id<>? and LENGTH(winner)=LENGTH(winner_id) AND hasAny(topscopeclass,[`+wh+`])=0`, args...)
+			where buyer_id IN (SELECT buyer_id from information.transaction_info_all prewhere has(winner_id,?) and buyer_id<>'') and wr_id<>? and LENGTH(winner)=LENGTH(winner_id) AND hasAny(topscopeclass,[`+wh+`])=0`, args...)
 	if err1 != nil {
 	if err1 != nil {
 		logx.Error(err1)
 		logx.Error(err1)
 		return ass
 		return ass
@@ -236,7 +236,7 @@ func GetWinnerDataHz(buyerId string, winnerIds []string) map[string]AggStruct {
 	wh, newArgs := common.WhArgs(winnerIds)
 	wh, newArgs := common.WhArgs(winnerIds)
 	args = append(args, newArgs...)
 	args = append(args, newArgs...)
 	rows, err1 := T.ClickhouseConn.Query(context.TODO(), `select winner_id as id,sum(1) as sum,sum(project_money) as project_money,max(zbtime) as zbtime from information.transaction_info_all ARRAY JOIN winner_id
 	rows, err1 := T.ClickhouseConn.Query(context.TODO(), `select winner_id as id,sum(1) as sum,sum(project_money) as project_money,max(zbtime) as zbtime from information.transaction_info_all ARRAY JOIN winner_id
-			prewhere winner_id in(`+wh+`) and buyer_id=? group by winner_id`, args...)
+			where winner_id in(`+wh+`) and buyer_id=? group by winner_id`, args...)
 	if err1 != nil {
 	if err1 != nil {
 		logx.Error(err1)
 		logx.Error(err1)
 		return res
 		return res
@@ -375,7 +375,7 @@ func LastTimeCoopBath(positionId int64, buyerId string, winners, agencys []strin
 		if err == nil {
 		if err == nil {
 			json.Unmarshal(*wb, &adiffb)
 			json.Unmarshal(*wb, &adiffb)
 		} else {
 		} else {
-			sql := `SELECT winner_one,max(zbtime) FROM information.transaction_info_all ARRAY JOIN winner AS winner_one prewhere buyer_id=? AND hasAny(winner,[%s])) group by winner_one`
+			sql := `SELECT winner_one,max(zbtime) FROM information.transaction_info_all ARRAY JOIN winner AS winner_one where buyer_id=? AND hasAny(winner,[%s])) group by winner_one`
 			wns := []string{}
 			wns := []string{}
 			for _, v := range winners {
 			for _, v := range winners {
 				wns = append(wns, v)
 				wns = append(wns, v)

+ 1 - 1
api/internal/service/initNetwork.go

@@ -72,7 +72,7 @@ func (i *InitNetwork) Init() {
 		wh, newArgs := util.WhArgs(strings.Split(i.BusinessType, ","))
 		wh, newArgs := util.WhArgs(strings.Split(i.BusinessType, ","))
 		args = append(args, newArgs...)
 		args = append(args, newArgs...)
 		args = append(args, NetworkCom.ProjectYearLimit())
 		args = append(args, NetworkCom.ProjectYearLimit())
-		rows, err := ClickhouseConn.Query(context.Background(), `select DISTINCT wr,wr_id from information.transaction_info_all ARRAY JOIN winner_id as wr_id,winner as wr prewhere buyer_id IN (SELECT buyer_id from information.transaction_info_all prewhere has(winner,?) and buyer_id<>'') and wr<>? and LENGTH(winner)=LENGTH(winner_id) and hasAny(topscopeclass,[`+wh+`])=0 AND zbtime>?`, args...)
+		rows, err := ClickhouseConn.Query(context.Background(), `select DISTINCT wr,wr_id from information.transaction_info_all ARRAY JOIN winner_id as wr_id,winner as wr where buyer_id IN (SELECT buyer_id from information.transaction_info_all prewhere has(winner,?) and buyer_id<>'') and wr<>? and LENGTH(winner)=LENGTH(winner_id) and hasAny(topscopeclass,[`+wh+`])=0 AND zbtime>?`, args...)
 		if err != nil {
 		if err != nil {
 			logx.Error(err)
 			logx.Error(err)
 			return
 			return

+ 1 - 1
api/internal/service/owner.go

@@ -226,7 +226,7 @@ func Findwinner(positionId int64, buyerArr []string) []map[string]interface{} {
 	winnerSql := `select zbtime,project_id,project_name,buyer_id,buyer,winner_id,winner,agency_id,agency from transaction_info_all prewhere buyer_id in (` + wh1 + `)`
 	winnerSql := `select zbtime,project_id,project_name,buyer_id,buyer,winner_id,winner,agency_id,agency from transaction_info_all prewhere buyer_id in (` + wh1 + `)`
 	logx.Info(positionId, " Findwinner 合作 start 。。。 sql ", winnerSql, args1)
 	logx.Info(positionId, " Findwinner 合作 start 。。。 sql ", winnerSql, args1)
 	winnerArr := SupplierFindConnectionsHandle(winnerSql, args1...)
 	winnerArr := SupplierFindConnectionsHandle(winnerSql, args1...)
-	logx.Info(positionId, " Findwinner 合作 over 。。。 ", winnerSql, args1)
+	logx.Info(positionId, " Findwinner 合作 over 。。。 ")
 	if winnerArr == nil || len(winnerArr) == 0 {
 	if winnerArr == nil || len(winnerArr) == 0 {
 		return returnData
 		return returnData
 	}
 	}