feat:xiugai

p/struct.go

@@ -92,7 +92,9 @@ type SubSet struct {
 	Amount                string                     //金额
 	StartAmount           float64                    //开始金额
 	EndAmount             float64                    //结束金额
-	BusinessType          []string                   //业务类型
+	BusinessType          []interface{}              //业务类型
+	BusinessTypes         []string                   //业务类型
+	AreaCityDistrict      map[string]interface{}     //省市区
 }
 
 // 推送设置
@@ -543,6 +545,7 @@ func (u *UserInfo) GetSubSet(isFreeUser bool, userId string, obj map[string]inte
 		subSet.Area, _ = obj["o_area"].(map[string]interface{})
 		subSet.District, _ = obj["o_district"].(map[string]interface{})
 	}
+	subSet.BusinessType, _ = obj["a_businesstype"].([]interface{})
 	for _, v := range subSet.Buyerclass {
 		s_v, _ := v.(string)
 		if s_v == "" {
@@ -557,12 +560,35 @@ func (u *UserInfo) GetSubSet(isFreeUser bool, userId string, obj map[string]inte
 		}
 		subSet.Subtypes = append(subSet.Subtypes, s_v)
 	}
+	subSet.AreaCityDistrict, _ = obj["o_area_city_district"].(map[string]interface{})
+	if subSet.AreaCityDistrict != nil {
+		area, district := map[string]interface{}{}, map[string]interface{}{}
+		for k, v := range subSet.AreaCityDistrict {
+			city := []interface{}{}
+			vm, _ := v.(map[string]interface{})
+			for kk, vv := range vm {
+				city = append(city, kk)
+				district[kk] = vv
+			}
+			area[k] = city
+		}
+		subSet.Area = area
+		subSet.District = district
+
+	}
 	for area, _ := range subSet.Area {
 		if area == "" {
 			continue
 		}
 		subSet.Areas = append(subSet.Areas, area)
 	}
+	for _, v := range subSet.BusinessType {
+		s_v, _ := v.(string)
+		if s_v == "" {
+			continue
+		}
+		subSet.BusinessTypes = append(subSet.BusinessTypes, s_v)
+	}
 	////////////////
 	for _, vs := range keySets {
 		if vs == nil {
@@ -691,6 +717,17 @@ func (u *UserInfo) Add(k string, m *map[string]map[*UserInfo]bool) {
 	(*m)[k] = mk
 }
 
+// 添加业务类型
+func (u *UserInfo) AddBusinessType(m *map[string]map[*UserInfo]bool) {
+	if len(u.SubSet.BusinessType) == 0 {
+		u.Add("", m)
+	} else {
+		for _, v := range u.SubSet.BusinessTypes {
+			u.Add(v, m)
+		}
+	}
+}
+
 // 添加信息类型映射关系
 func (u *UserInfo) AddSubtype(m *map[string]map[*UserInfo]bool) {
 	if len(u.SubSet.Subtypes) == 0 {