|
@@ -134,11 +134,14 @@ func (p *PayUser) ToMatch(info map[string]interface{}) (*map[*UserInfo]*MatchUse
|
|
|
for k, _ := range p.Users {
|
|
for k, _ := range p.Users {
|
|
|
if notUsers[k] {
|
|
if notUsers[k] {
|
|
|
continue
|
|
continue
|
|
|
- } else if !p.MatchArray(tag_topinformation, k, p.TopBusinessTypeUsers) || !p.MatchArray(tag_subinformation, k, p.SubBusinessTypeUsers) ||
|
|
|
|
|
- (!p.BuyerclassUsers[""][k] && !p.BuyerclassUsers[buyerclass][k]) ||
|
|
|
|
|
|
|
+ } else if (!p.BuyerclassUsers[""][k] && !p.BuyerclassUsers[buyerclass][k]) ||
|
|
|
(!p.AreaUsers[""][k] && !p.AreaUsers[area][k] && !p.CityUsers[city][k] && (p.DistrictUsers[city] == nil || !p.DistrictUsers[city][district][k])) {
|
|
(!p.AreaUsers[""][k] && !p.AreaUsers[area][k] && !p.CityUsers[city][k] && (p.DistrictUsers[city] == nil || !p.DistrictUsers[city][district][k])) {
|
|
|
continue
|
|
continue
|
|
|
}
|
|
}
|
|
|
|
|
+ //小程序
|
|
|
|
|
+ if isMiniProgram, _ := k.Extend.Object["isMiniProgram"].(bool); isMiniProgram && (!p.MatchArray(tag_topinformation, k, p.TopBusinessTypeUsers) || !p.MatchArray(tag_subinformation, k, p.SubBusinessTypeUsers)) {
|
|
|
|
|
+ continue
|
|
|
|
|
+ }
|
|
|
//关联项目不需要匹配信息类型
|
|
//关联项目不需要匹配信息类型
|
|
|
if k.SubSet.ProjectMatch == 1 {
|
|
if k.SubSet.ProjectMatch == 1 {
|
|
|
projectUsers = append(projectUsers, k)
|
|
projectUsers = append(projectUsers, k)
|
