|
|
@@ -174,7 +174,7 @@ func (s RedisTradeHolderDetailExArray) Less(i, j int) bool {
|
|
|
func (s RedisTradeHolderDetailExArray) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
|
|
|
|
|
|
// GetDataEx 从数据库中查询数据
|
|
|
-func (r *RedisTradeHolderDetailEx) GetDataEx(userId int, goodsId int, accountId uint64) (sData RedisTradeHolderDetailExArray, err error) {
|
|
|
+func (r *RedisTradeHolderDetailEx) GetDataEx(userId int, goodsId int, accountId string) (sData RedisTradeHolderDetailExArray, err error) {
|
|
|
redisCli := rediscli.GetRedisClient()
|
|
|
g := strconv.Itoa(goodsId)
|
|
|
if goodsId == 0 {
|
|
|
@@ -207,7 +207,7 @@ func (r *RedisTradeHolderDetailEx) GetDataEx(userId int, goodsId int, accountId
|
|
|
m.THDetailEx.AddDepositRate = utils.Float64Round(m.THDetailEx.AddDepositRate, 4)
|
|
|
|
|
|
// 有资金账户ID则只取该资金账户的数据
|
|
|
- if accountId == 0 || (accountId != 0 && accountId == m.THDetailEx.AccountID) {
|
|
|
+ if accountId == "" || (accountId != "" && accountId == strconv.FormatUint(m.THDetailEx.AccountID, 10)) {
|
|
|
sData = append(sData, m)
|
|
|
}
|
|
|
}
|