WH01243 7 сар өмнө
parent
commit
5f52b9801c

+ 2 - 5
jyBXCore/api/bxcore.api

@@ -230,16 +230,13 @@ type (
 		AppId        string `header:"appId"`
 		AppId        string `header:"appId"`
 		PageNum      int64  `json:"pageNum,optional"`
 		PageNum      int64  `json:"pageNum,optional"`
 		PageSize     int64  `json:"pageSize,optional"`
 		PageSize     int64  `json:"pageSize,optional"`
-		Province     string `json:"province,optional"`
-		City         string `json:"city,optional"`
-		Subtype      string `json:"subtype,optional"`
-		TopType      string `json:"toptype,optional"`
+		TopType      string `json:"topType,optional"`
 		PublishTime  string `json:"publishTime,optional"`
 		PublishTime  string `json:"publishTime,optional"`
 		SelectType   string `json:"selectType,optional"`
 		SelectType   string `json:"selectType,optional"`
 		Price        string `json:"price,optional"`
 		Price        string `json:"price,optional"`
+		Province     string `json:"province,optional"`
 		Industry     string `json:"industry,optional"`
 		Industry     string `json:"industry,optional"`
 		KeyWords     string `json:"keyWords,optional"`
 		KeyWords     string `json:"keyWords,optional"`
-		District     string `json:"district,optional"`
 		Tagname      string `json:"tagname,optional"`
 		Tagname      string `json:"tagname,optional"`
 		Tagname1     string `json:"tagname1,optional"`
 		Tagname1     string `json:"tagname1,optional"`
 		Tagname2     string `json:"tagname2,optional"`
 		Tagname2     string `json:"tagname2,optional"`

+ 2 - 5
jyBXCore/api/internal/types/types.go

@@ -230,16 +230,13 @@ type OperatorSearchReq struct {
 	AppId        string `header:"appId"`
 	AppId        string `header:"appId"`
 	PageNum      int64  `json:"pageNum,optional"`
 	PageNum      int64  `json:"pageNum,optional"`
 	PageSize     int64  `json:"pageSize,optional"`
 	PageSize     int64  `json:"pageSize,optional"`
-	Province     string `json:"province,optional"`
-	City         string `json:"city,optional"`
-	Subtype      string `json:"subtype,optional"`
-	TopType      string `json:"toptype,optional"`
+	TopType      string `json:"topType,optional"`
 	PublishTime  string `json:"publishTime,optional"`
 	PublishTime  string `json:"publishTime,optional"`
 	SelectType   string `json:"selectType,optional"`
 	SelectType   string `json:"selectType,optional"`
 	Price        string `json:"price,optional"`
 	Price        string `json:"price,optional"`
+	Province     string `json:"province,optional"`
 	Industry     string `json:"industry,optional"`
 	Industry     string `json:"industry,optional"`
 	KeyWords     string `json:"keyWords,optional"`
 	KeyWords     string `json:"keyWords,optional"`
-	District     string `json:"district,optional"`
 	Tagname      string `json:"tagname,optional"`
 	Tagname      string `json:"tagname,optional"`
 	Tagname1     string `json:"tagname1,optional"`
 	Tagname1     string `json:"tagname1,optional"`
 	Tagname2     string `json:"tagname2,optional"`
 	Tagname2     string `json:"tagname2,optional"`

+ 3 - 6
jyBXCore/rpc/bxcore.proto

@@ -737,9 +737,7 @@ message OperatorSearchReq{
   int64  pageNum =2;//当前页码
   int64  pageNum =2;//当前页码
   int64  pageSize = 3;//每页数量
   int64  pageSize = 3;//每页数量
   string  province = 4;//省份
   string  province = 4;//省份
-  string  city = 5;//城市
-  string  subtype = 6;//信息类型-二级
-  string  topType = 7;//信息类型-一级分类
+  string  topType = 6;//信息类型-二级
   string  publishTime = 8;//发布时间
   string  publishTime = 8;//发布时间
   string selectType = 9;//搜索范围:标题;正文等
   string selectType = 9;//搜索范围:标题;正文等
   string  price = 10;//价格
   string  price = 10;//价格
@@ -747,15 +745,14 @@ message OperatorSearchReq{
   int64 searchMode = 12;//搜索模式:0:精准搜索;1:模糊搜索
   int64 searchMode = 12;//搜索模式:0:精准搜索;1:模糊搜索
   int64 wordsMode = 13;//搜索关键词模式;默认0:包含所有,1:包含任意
   int64 wordsMode = 13;//搜索关键词模式;默认0:包含所有,1:包含任意
   string keyWords = 14;//关键词:多个空格隔开(主)
   string keyWords = 14;//关键词:多个空格隔开(主)
-  string  district = 15;//区县
   string  tagname=16;
   string  tagname=16;
   string  tagname1=17;
   string  tagname1=17;
   string  tagname2=18;
   string  tagname2=18;
   int64   tag=19;
   int64   tag=19;
   string openingTime=20;
   string openingTime=20;
   string purchaseTime=21;
   string purchaseTime=21;
-  string winnerTag=22;
-  int64 positionId=23;
+  string winnerTag=7;
+  int64 positionId=15;
 }
 }
 message  OperatorSearchResp{
 message  OperatorSearchResp{
   int64 error_code = 1;
   int64 error_code = 1;

+ 0 - 3
jyBXCore/rpc/internal/logic/operatorsearchlogic.go

@@ -34,9 +34,6 @@ func (l *OperatorSearchLogic) OperatorSearch(in *bxcore.OperatorSearchReq) (*bxc
 		PageNum:      in.PageNum,
 		PageNum:      in.PageNum,
 		PageSize:     in.PageSize,
 		PageSize:     in.PageSize,
 		Province:     in.Province,
 		Province:     in.Province,
-		City:         in.City,
-		District:     in.District,
-		Subtype:      in.Subtype,
 		TopType:      in.TopType,
 		TopType:      in.TopType,
 		PublishTime:  in.PublishTime,
 		PublishTime:  in.PublishTime,
 		SelectType:   in.SelectType,
 		SelectType:   in.SelectType,