|
@@ -1106,7 +1106,32 @@ func (t *OwnerService) CandidateChannel() (*ResultDatas, int, int, int, int) {
|
|
|
if len(buyerIds) > 300 {
|
|
|
buyerIds = buyerIds[:300]
|
|
|
}
|
|
|
- rs1, rs2 := GetData(propertyForm, strings.Join(buyerIds, ","))
|
|
|
+ logx.Info("CandidateChannel start", t.PositionId)
|
|
|
+ buyerIdsTemp := []string{}
|
|
|
+ rs1, rs2 := map[string][]map[string]interface{}{}, map[string][]map[string]interface{}{}
|
|
|
+ for _, v := range buyerIds {
|
|
|
+ buyerIdsTemp = append(buyerIdsTemp, v)
|
|
|
+ if len(buyerIdsTemp) == 50 {
|
|
|
+ rs1Temp, rs2Temp := GetData(propertyForm, strings.Join(buyerIdsTemp, ","))
|
|
|
+ for kk, vv := range rs1Temp {
|
|
|
+ rs1[kk] = vv
|
|
|
+ }
|
|
|
+ for kk, vv := range rs2Temp {
|
|
|
+ rs2[kk] = vv
|
|
|
+ }
|
|
|
+ buyerIdsTemp = []string{}
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if len(buyerIdsTemp) > 0 {
|
|
|
+ rs1Temp, rs2Temp := GetData(propertyForm, strings.Join(buyerIdsTemp, ","))
|
|
|
+ for kk, vv := range rs1Temp {
|
|
|
+ rs1[kk] = vv
|
|
|
+ }
|
|
|
+ for kk, vv := range rs2Temp {
|
|
|
+ rs2[kk] = vv
|
|
|
+ }
|
|
|
+ }
|
|
|
+ logx.Info("CandidateChannel GetData over", t.PositionId)
|
|
|
winners, agency := []string{}, []string{}
|
|
|
for buyerId := range *dataMap {
|
|
|
for _, m := range rs1[buyerId] {
|
|
@@ -1117,6 +1142,7 @@ func (t *OwnerService) CandidateChannel() (*ResultDatas, int, int, int, int) {
|
|
|
}
|
|
|
}
|
|
|
ltcs1, ltcs2 := LastTimeCoopBath(buyerIds, winners, agency)
|
|
|
+ logx.Info("CandidateChannel LastTimeCoopBath over", t.PositionId)
|
|
|
pool := make(chan bool, 3)
|
|
|
wait := &sync.WaitGroup{}
|
|
|
lock := &sync.Mutex{}
|
|
@@ -1228,6 +1254,7 @@ func (t *OwnerService) CandidateChannel() (*ResultDatas, int, int, int, int) {
|
|
|
}
|
|
|
wait.Wait()
|
|
|
}
|
|
|
+ logx.Info("CandidateChannel over", t.PositionId)
|
|
|
//状态处理
|
|
|
result := &ResultDatas{}
|
|
|
if len(returnData) > 0 {
|