|
@@ -129,11 +129,20 @@ func (p *PayUser) GetFinalUser(matchWay string, keys, notkeys []string, key_user
|
|
|
if matchUser == nil {
|
|
|
matchUser = &MatchUser{
|
|
|
Keys: []string{},
|
|
|
+ Items: []string{},
|
|
|
+ Item: map[string]bool{},
|
|
|
MatchWays: []string{},
|
|
|
MatchWay: map[string]bool{},
|
|
|
}
|
|
|
}
|
|
|
matchUser.Keys = append(matchUser.Keys, k)
|
|
|
+ item := u.SubSet.Key_item[k]
|
|
|
+ if item != "" {
|
|
|
+ if !matchUser.Item[item] {
|
|
|
+ matchUser.Items = append(matchUser.Items, item)
|
|
|
+ }
|
|
|
+ matchUser.Item[item] = true
|
|
|
+ }
|
|
|
if !matchUser.MatchWay[matchWay] {
|
|
|
matchUser.MatchWays = append(matchUser.MatchWays, matchWay)
|
|
|
}
|