浏览代码

feat:xiugai

wangchuanjin 1 年之前
父节点
当前提交
f134c18556
共有 2 个文件被更改,包括 12 次插入5 次删除
  1. 2 2
      api/internal/service/CoopHistoryService.go
  2. 10 3
      api/internal/service/owner.go

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

@@ -336,8 +336,8 @@ func LastTimeCoopBath(positionId int64, buyerIds, winners, agencys []string) (ma
 		return adiffb, agency
 	}
 	var toSearch = func(tp int, query string, args []interface{}) {
-		logx.Info("LastTimeCoopBath once start", positionId)
-		defer logx.Info("LastTimeCoopBath once over", positionId)
+		logx.Info("LastTimeCoopBath once start ", positionId)
+		defer logx.Info("LastTimeCoopBath once over ", positionId)
 		rows, err := T.ClickhouseConn.Query(context.Background(), query, args...)
 		if err != nil {
 			logx.Error(err)

+ 10 - 3
api/internal/service/owner.go

@@ -1106,7 +1106,7 @@ func (t *OwnerService) CandidateChannel() (*ResultDatas, int, int, int, int) {
 		if len(buyerIds) > 300 {
 			buyerIds = buyerIds[:300]
 		}
-		logx.Info("CandidateChannel start", t.PositionId)
+		logx.Info("CandidateChannel start ", t.PositionId)
 		buyerIdsTemp := []string{}
 		rs1, rs2 := map[string][]map[string]interface{}{}, map[string][]map[string]interface{}{}
 		for _, v := range buyerIds {
@@ -1131,7 +1131,7 @@ func (t *OwnerService) CandidateChannel() (*ResultDatas, int, int, int, int) {
 				rs2[kk] = vv
 			}
 		}
-		logx.Info("CandidateChannel GetData over", t.PositionId)
+		logx.Info("CandidateChannel GetData over ", t.PositionId)
 		winners, agency := []string{}, []string{}
 		for buyerId := range *dataMap {
 			for _, m := range rs1[buyerId] {
@@ -1141,8 +1141,15 @@ func (t *OwnerService) CandidateChannel() (*ResultDatas, int, int, int, int) {
 				agency = append(agency, common.ObjToString(m["name"]))
 			}
 		}
+		if len(winners) > 300 {
+			winners = winners[:300]
+		}
+		if len(agency) > 300 {
+			agency = agency[:300]
+		}
+		logx.Info("CandidateChannel LastTimeCoopBath start ", t.PositionId, " ", len(buyerIds), " ", len(winners), " ", len(agency))
 		ltcs1, ltcs2 := LastTimeCoopBath(t.PositionId, buyerIds, winners, agency)
-		logx.Info("CandidateChannel LastTimeCoopBath over", t.PositionId)
+		logx.Info("CandidateChannel LastTimeCoopBath over ", t.PositionId)
 		pool := make(chan bool, 3)
 		wait := &sync.WaitGroup{}
 		lock := &sync.Mutex{}