xuzhiheng 6 dagar sedan
förälder
incheckning
93c08d8f30
2 ändrade filer med 44 tillägg och 0 borttagningar
  1. 22 0
      jyservice/src/usermanager/cursorMarkData.go
  2. 22 0
      jyservice/src/usermanager/getdata.go

+ 22 - 0
jyservice/src/usermanager/cursorMarkData.go

@@ -501,6 +501,28 @@ func getCursorData(appid, cursorMark string, findType, pageSize int, fields map[
 									bArr = append(bArr, map[string]string{"unit": "", "amount": bidamountStr})
 									bArr = append(bArr, map[string]string{"unit": "", "amount": bidamountStr})
 								}
 								}
 							}
 							}
+						} else if packages, ok := v["package"].(map[string]interface{}); ok {
+							for _, vv := range packages {
+								if packages1, oks := vv.(map[string]interface{}); oks {
+									if winner_all, wok := packages1["winner_all"].([]map[string]interface{}); wok {
+										for _, win := range winner_all {
+											winnerStr := util.ObjToString(win["winner"])
+											bidamountStr := strconv.FormatFloat(util.Float64All(win["bidamount"]), 'f', -1, 64)
+											wArr = append(wArr, winnerStr)
+											bArr = append(bArr, map[string]string{"unit": "", "amount": bidamountStr})
+										}
+									} else if winner_all, wok := packages1["winner_all"].([]interface{}); wok {
+										for _, win := range winner_all {
+											if win1, wok1 := win.(map[string]interface{}); wok1 {
+												winnerStr := util.ObjToString(win1["winner"])
+												bidamountStr := strconv.FormatFloat(util.Float64All(win1["bidamount"]), 'f', -1, 64)
+												wArr = append(wArr, winnerStr)
+												bArr = append(bArr, map[string]string{"unit": "", "amount": bidamountStr})
+											}
+										}
+									}
+								}
+							}
 						}
 						}
 						winnerArr = wArr
 						winnerArr = wArr
 						v["winner"] = wArr
 						v["winner"] = wArr

+ 22 - 0
jyservice/src/usermanager/getdata.go

@@ -845,6 +845,28 @@ func getDataByAppid(appid string, entId, i_day, next, i_all, findType, reload, r
 									bArr = append(bArr, map[string]string{"unit": "", "amount": bidamountStr})
 									bArr = append(bArr, map[string]string{"unit": "", "amount": bidamountStr})
 								}
 								}
 							}
 							}
+						} else if packages, ok := v["package"].(map[string]interface{}); ok {
+							for _, vv := range packages {
+								if packages1, oks := vv.(map[string]interface{}); oks {
+									if winner_all, wok := packages1["winner_all"].([]map[string]interface{}); wok {
+										for _, win := range winner_all {
+											winnerStr := util.ObjToString(win["winner"])
+											bidamountStr := strconv.FormatFloat(util.Float64All(win["bidamount"]), 'f', -1, 64)
+											wArr = append(wArr, winnerStr)
+											bArr = append(bArr, map[string]string{"unit": "", "amount": bidamountStr})
+										}
+									} else if winner_all, wok := packages1["winner_all"].([]interface{}); wok {
+										for _, win := range winner_all {
+											if win1, wok1 := win.(map[string]interface{}); wok1 {
+												winnerStr := util.ObjToString(win1["winner"])
+												bidamountStr := strconv.FormatFloat(util.Float64All(win1["bidamount"]), 'f', -1, 64)
+												wArr = append(wArr, winnerStr)
+												bArr = append(bArr, map[string]string{"unit": "", "amount": bidamountStr})
+											}
+										}
+									}
+								}
+							}
 						}
 						}
 						winnerArr = wArr
 						winnerArr = wArr
 						v["winner"] = wArr
 						v["winner"] = wArr