Merge branch 'dev/v1.0.1_ws' of http://192.168.3.207:8080/BaseService/entManageApplication into dev/v1.0.1_ws

go.mod

@@ -1,6 +1,6 @@
 module bp.jydev.jianyu360.cn/BaseService/entManageApplication
 
-go 1.19
+go 1.18
 
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a

service/service.go

@@ -386,11 +386,19 @@ func memberSetMap(userId int64, orderData map[string]interface{}) (set map[strin
 	if startdate.Unix() > time.Now().Unix() {
 		dataType = 2
 	}
+	var (
+		areaCount = common.IntAllDef((*filterMap)["areaCount"], -1)
+		area      = common.If(areaCount > 0, map[string]interface{}{"北京": []string{}}, map[string]interface{}{}).(map[string]interface{})
+	)
+
+	areaCount = common.IntAllDef((*filterMap)["areaCount"], -1)
 	set = map[string]interface{}{
+		"i_type": 1,
 		"o_member_jy": map[string]interface{}{
-			"i_wxpush":    1,
-			"i_areacount": common.IntAllDef((*filterMap)["areaCount"], -1),
+			"i_wxpush": 1,
 		},
+		"o_entniche.i_areacount": areaCount,
+		"o_entniche.o_area":      area, //默认北京
 	}
 	setEntUser = map[string]interface{}{
 		"i_member_status":    common.If(dataType == 1, level, -level),