Merge branch 'dev_v4.9.69_wh1' of qmx/jy into feature/v4.9.69

src/jfw/modules/publicapply/src/subscribe/entity/entity.go

@@ -110,27 +110,29 @@ func (this *ParamInfo) IsSub() (bool, string, map[string]map[string][]string) {
 		if time.Now().Unix()-lastTriggerTime < config.Config.FrequentContinuous*24*60*60 {
 			return false, productType, regionMap
 		}
-		o_jy, _ := (*mData)["o_jy"].(map[string]interface{})
-		a_key, _ := o_jy["a_key"].([]interface{})
-		if len(a_key) > 0 {
-			return false, productType, regionMap
-		}
-		if o_jy["o_area"] != nil {
-			oarea, _ := o_jy["o_area"].(map[string]interface{})
-			if len(oarea) > 0 {
-				for s, i := range oarea {
-					areaMap[s] = gconv.Interfaces(i)
+		if vipStatus == 0 && memberStatus == 0 {
+			o_jy, _ := (*mData)["o_jy"].(map[string]interface{})
+			a_key, _ := o_jy["a_key"].([]interface{})
+			if len(a_key) > 0 {
+				return false, productType, regionMap
+			}
+			if o_jy["o_area"] != nil {
+				oarea, _ := o_jy["o_area"].(map[string]interface{})
+				if len(oarea) > 0 {
+					for s, i := range oarea {
+						areaMap[s] = gconv.Interfaces(i)
+					}
 				}
+				isNull = false
+			} else {
+				isNull = true
 			}
-			isNull = false
-		} else {
-			isNull = true
-		}
-		if o_jy["o_district"] != nil {
-			district, _ := o_jy["o_district"].(map[string]interface{})
-			if len(district) > 0 {
-				for s, i := range district {
-					districtMap[s] = gconv.Interfaces(i)
+			if o_jy["o_district"] != nil {
+				district, _ := o_jy["o_district"].(map[string]interface{})
+				if len(district) > 0 {
+					for s, i := range district {
+						districtMap[s] = gconv.Interfaces(i)
+					}
 				}
 			}
 		}
@@ -198,7 +200,6 @@ func (this *ParamInfo) IsSub() (bool, string, map[string]map[string][]string) {
 				districtMap = make(map[string][]interface{})
 			}
 		}
-
 	}
 	if isNull {
 		area, city, district := HistorySearch(this.UserId)