Merge branch 'dev_v1.1.40_wh' of BaseService/jyMicroservices into feature/v1.1.40

jyBXBase/api/internal/logic/showSearchScreenLogic.go

@@ -3,11 +3,10 @@ package logic
 import (
 	"app.yhyue.com/moapp/jybase/common"
 	"context"
-	"jyBXBase/rpc/type/bxbase"
-	"net/http"
-
 	"jyBXBase/api/internal/svc"
 	"jyBXBase/api/internal/types"
+	"jyBXBase/rpc/type/bxbase"
+	"net/http"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -41,9 +40,29 @@ func (l *ShowSearchScreenLogic) ShowSearchScreen(req *types.ShowSearchScreen) (r
 			Data:     nil,
 		}, nil
 	}
+	data := []map[string]interface{}{}
+	for _, value := range res.Data {
+		inMap := common.StructToMapMore(value)
+		region := map[string]map[string][]string{}
+		if value != nil {
+			for k, v := range value.RegionMap {
+				areaMap := map[string][]string{}
+				for k1, v1 := range v.Area {
+					if len(v1.District) != 0 {
+						areaMap[k1] = v1.District
+					} else {
+						areaMap[k1] = []string{}
+					}
+				}
+				region[k] = areaMap
+			}
+		}
+		inMap["regionMap"] = region
+		data = append(data, inMap)
+	}
 	return &types.CommonRes{
 		Err_code: common.IntAll(res.ErrCode),
 		Err_msg:  res.ErrMsg,
-		Data:     res.Data,
+		Data:     data,
 	}, nil
 }

jyBXBase/rpc/bxbaseclient/bxbase.go

@@ -0,0 +1,159 @@
+// Code generated by goctl. DO NOT EDIT.
+// Source: bxbase.proto
+
+package bxbaseclient
+
+import (
+	"context"
+
+	"jyBXBase/rpc/type/bxbase"
+
+	"github.com/zeromicro/go-zero/zrpc"
+	"google.golang.org/grpc"
+)
+
+type (
+	AddSearchReq      = bxbase.AddSearchReq
+	AddlabelReq       = bxbase.AddlabelReq
+	AddlabelRes       = bxbase.AddlabelRes
+	AppIdReq          = bxbase.AppIdReq
+	Area              = bxbase.Area
+	BCActionReq       = bxbase.BCActionReq
+	CheckRes          = bxbase.CheckRes
+	ColData           = bxbase.ColData
+	ColList           = bxbase.ColList
+	CommonRes         = bxbase.CommonRes
+	DelSearchReq      = bxbase.DelSearchReq
+	District          = bxbase.District
+	GetLabelActionReq = bxbase.GetLabelActionReq
+	GetLabelActionRes = bxbase.GetLabelActionRes
+	IData             = bxbase.IData
+	IncludedResp      = bxbase.IncludedResp
+	IsCollActionReq   = bxbase.IsCollActionReq
+	IsCollActionRes   = bxbase.IsCollActionRes
+	LabelActionReq    = bxbase.LabelActionReq
+	LabelActionRes    = bxbase.LabelActionRes
+	LabelByUser       = bxbase.LabelByUser
+	Labels            = bxbase.Labels
+	ListReq           = bxbase.ListReq
+	ListRes           = bxbase.ListRes
+	ListSearchRes     = bxbase.ListSearchRes
+	NewestBiddingReq  = bxbase.NewestBiddingReq
+	NewestList        = bxbase.NewestList
+	NewsetBidding     = bxbase.NewsetBidding
+	NewsetBiddingResp = bxbase.NewsetBiddingResp
+	SaveListModeReq   = bxbase.SaveListModeReq
+	ShowListModeReq   = bxbase.ShowListModeReq
+	ShowListModeRes   = bxbase.ShowListModeRes
+	ShowSearchReq     = bxbase.ShowSearchReq
+	ShowSearchRes     = bxbase.ShowSearchRes
+
+	Bxbase interface {
+		// 新增标签
+		Addlabel(ctx context.Context, in *AddlabelReq, opts ...grpc.CallOption) (*AddlabelRes, error)
+		// 获取标签
+		GetLabelAction(ctx context.Context, in *GetLabelActionReq, opts ...grpc.CallOption) (*GetLabelActionRes, error)
+		// 标签新增或删除
+		LabelAction(ctx context.Context, in *LabelActionReq, opts ...grpc.CallOption) (*LabelActionRes, error)
+		// 招标信息收藏
+		BCAction(ctx context.Context, in *BCActionReq, opts ...grpc.CallOption) (*LabelActionRes, error)
+		// 招标信息是否被收藏
+		IsCollAction(ctx context.Context, in *IsCollActionReq, opts ...grpc.CallOption) (*IsCollActionRes, error)
+		// 获取收藏列表
+		List(ctx context.Context, in *ListReq, opts ...grpc.CallOption) (*ListRes, error)
+		// 获取筛选列表
+		ShowSearch(ctx context.Context, in *ShowSearchReq, opts ...grpc.CallOption) (*ShowSearchRes, error)
+		// 添加删选列表
+		AddSearch(ctx context.Context, in *AddSearchReq, opts ...grpc.CallOption) (*CommonRes, error)
+		// 修改筛选列表
+		CheckSearch(ctx context.Context, in *AddSearchReq, opts ...grpc.CallOption) (*CheckRes, error)
+		// 删除筛选列表
+		DelSearch(ctx context.Context, in *DelSearchReq, opts ...grpc.CallOption) (*CommonRes, error)
+		// 首页最新招标信息
+		NewestBidding(ctx context.Context, in *NewestBiddingReq, opts ...grpc.CallOption) (*NewsetBiddingResp, error)
+		// 剑鱼网站收录情况
+		Included(ctx context.Context, in *AppIdReq, opts ...grpc.CallOption) (*IncludedResp, error)
+	}
+
+	defaultBxbase struct {
+		cli zrpc.Client
+	}
+)
+
+func NewBxbase(cli zrpc.Client) Bxbase {
+	return &defaultBxbase{
+		cli: cli,
+	}
+}
+
+// 新增标签
+func (m *defaultBxbase) Addlabel(ctx context.Context, in *AddlabelReq, opts ...grpc.CallOption) (*AddlabelRes, error) {
+	client := bxbase.NewBxbaseClient(m.cli.Conn())
+	return client.Addlabel(ctx, in, opts...)
+}
+
+// 获取标签
+func (m *defaultBxbase) GetLabelAction(ctx context.Context, in *GetLabelActionReq, opts ...grpc.CallOption) (*GetLabelActionRes, error) {
+	client := bxbase.NewBxbaseClient(m.cli.Conn())
+	return client.GetLabelAction(ctx, in, opts...)
+}
+
+// 标签新增或删除
+func (m *defaultBxbase) LabelAction(ctx context.Context, in *LabelActionReq, opts ...grpc.CallOption) (*LabelActionRes, error) {
+	client := bxbase.NewBxbaseClient(m.cli.Conn())
+	return client.LabelAction(ctx, in, opts...)
+}
+
+// 招标信息收藏
+func (m *defaultBxbase) BCAction(ctx context.Context, in *BCActionReq, opts ...grpc.CallOption) (*LabelActionRes, error) {
+	client := bxbase.NewBxbaseClient(m.cli.Conn())
+	return client.BCAction(ctx, in, opts...)
+}
+
+// 招标信息是否被收藏
+func (m *defaultBxbase) IsCollAction(ctx context.Context, in *IsCollActionReq, opts ...grpc.CallOption) (*IsCollActionRes, error) {
+	client := bxbase.NewBxbaseClient(m.cli.Conn())
+	return client.IsCollAction(ctx, in, opts...)
+}
+
+// 获取收藏列表
+func (m *defaultBxbase) List(ctx context.Context, in *ListReq, opts ...grpc.CallOption) (*ListRes, error) {
+	client := bxbase.NewBxbaseClient(m.cli.Conn())
+	return client.List(ctx, in, opts...)
+}
+
+// 获取筛选列表
+func (m *defaultBxbase) ShowSearch(ctx context.Context, in *ShowSearchReq, opts ...grpc.CallOption) (*ShowSearchRes, error) {
+	client := bxbase.NewBxbaseClient(m.cli.Conn())
+	return client.ShowSearch(ctx, in, opts...)
+}
+
+// 添加删选列表
+func (m *defaultBxbase) AddSearch(ctx context.Context, in *AddSearchReq, opts ...grpc.CallOption) (*CommonRes, error) {
+	client := bxbase.NewBxbaseClient(m.cli.Conn())
+	return client.AddSearch(ctx, in, opts...)
+}
+
+// 修改筛选列表
+func (m *defaultBxbase) CheckSearch(ctx context.Context, in *AddSearchReq, opts ...grpc.CallOption) (*CheckRes, error) {
+	client := bxbase.NewBxbaseClient(m.cli.Conn())
+	return client.CheckSearch(ctx, in, opts...)
+}
+
+// 删除筛选列表
+func (m *defaultBxbase) DelSearch(ctx context.Context, in *DelSearchReq, opts ...grpc.CallOption) (*CommonRes, error) {
+	client := bxbase.NewBxbaseClient(m.cli.Conn())
+	return client.DelSearch(ctx, in, opts...)
+}
+
+// 首页最新招标信息
+func (m *defaultBxbase) NewestBidding(ctx context.Context, in *NewestBiddingReq, opts ...grpc.CallOption) (*NewsetBiddingResp, error) {
+	client := bxbase.NewBxbaseClient(m.cli.Conn())
+	return client.NewestBidding(ctx, in, opts...)
+}
+
+// 剑鱼网站收录情况
+func (m *defaultBxbase) Included(ctx context.Context, in *AppIdReq, opts ...grpc.CallOption) (*IncludedResp, error) {
+	client := bxbase.NewBxbaseClient(m.cli.Conn())
+	return client.Included(ctx, in, opts...)
+}

jyBXBase/rpc/internal/logic/addsearchlogic.go

@@ -76,7 +76,17 @@ func (l *AddSearchLogic) AddSearch(in *bxbase.AddSearchReq) (res *bxbase.CommonR
 	newData["searchMode"] = in.SearchMode
 	newData["wordsMode"] = in.WordsMode
 	newData["additionalWords"] = in.AdditionalWords
-	newData["regionMap"] = in.RegionMap
+	region := map[string]map[string][]string{}
+	if in.RegionMap != nil {
+		for k, v := range in.RegionMap {
+			areaMap := map[string][]string{}
+			for k1, v1 := range v.Area {
+				areaMap[k1] = v1.District
+			}
+			region[k] = areaMap
+		}
+	}
+	newData["regionMap"] = region
 	IC.Mgo.Save("search_condition", newData)
 	return
 }

jyBXSubscribe/api/bxsubscribe.api

@@ -81,6 +81,7 @@ type (
 		EntId           int64                    `header:"entId,optional"`
 		AccountId       int64                    `header:"accountId,optional"`
 		PositionId      int64                    `header:"positionId,optional"`
+		District        string                   `json:"district,optional"`
 	}
 	SetReadReq {
 		AppId        string `header:"appId"`

jyBXSubscribe/api/internal/logic/subscribeupdatelogic.go

@@ -51,6 +51,7 @@ func (l *SubscribeUpdateLogic) SubscribeUpdate(req *types.SubscribeUpdateReq) (r
 		Mailpush:        req.Mailpush,
 		Mail:            req.Mail,
 		Otherbuyerclass: req.Otherbuyerclass,
+		District:        req.District,
 	}
 	fmt.Println("###")
 	b, _ := json.Marshal(su)

jyBXSubscribe/api/internal/types/types.go

@@ -73,6 +73,7 @@ type SubscribeUpdateReq struct {
 	EntId           int64                    `header:"entId,optional"`
 	AccountId       int64                    `header:"accountId,optional"`
 	PositionId      int64                    `header:"positionId,optional"`
+	District        string                   `json:"district,optional"`
 }
 
 type SetReadReq struct {

jyBXSubscribe/entity/common.go

@@ -19,4 +19,5 @@ type SubscribeUpdate struct {
 	Mailpush        string                   `json:"mailpush,optional"`        //邮箱推送 1开启 0关闭
 	Mail            string                   `json:"mail,optional"`            //邮箱
 	Otherbuyerclass string                   `json:"otherbuyerclass,optional"` //匹配未分类类型 1匹配 0不匹配
+	District        map[string]interface{}   `json:"district,optional"`        //区县
 }

jyBXSubscribe/rpc/internal/logic/getsublistlogic.go

@@ -111,7 +111,7 @@ func (l *GetSubListLogic) GetSubList(in *bxsubscribe.SubscribeInfosReq) (*bxsubs
 	 *免费用户默认推送50条
 	 *大会员、新版商机管理、超级订阅用户 默认推送1000条记录
 	 */
-	hasNextPage, total, list = model.NewSubscribePush(in.UserType).DefaultDatas(spqp)
+	//hasNextPage, total, list = model.NewSubscribePush(in.UserType).DefaultDatas(spqp)
 	if in.PageNum == 1 && spqp.IsEmpty() && len(list) == 0 && in.IsEnt == false {
 		hasNextPage, total, list = model.NewSubscribePush(in.UserType).DefaultDatas(spqp)
 	}

jyBXSubscribe/rpc/model/service/subscribe.go

@@ -13,7 +13,6 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
-//
 type SubseribeService struct {
 	Mgo          mongodb.MongodbSim
 	UserId       string //mongodb 的用户id
@@ -29,7 +28,7 @@ type SubseribeService struct {
 // @param     		SubseribeService  用户信息相关
 // @return    		int64 是否成功 1成功 -1失败
 // @return    		error 错误信息
-//TODO 后期需要实现 查询各个身份的订阅设置修改[目前只实现了超级订阅]
+// TODO 后期需要实现 查询各个身份的订阅设置修改[目前只实现了超级订阅]
 func (this *SubseribeService) Update() (int64, error) {
 	if this.UserId == "" {
 		return -1, errors.New(entity.UPDATE_ERROR_MSG)
@@ -56,6 +55,10 @@ func (this *SubseribeService) Update() (int64, error) {
 	if this.Area != nil {
 		setMap["o_vipjy.o_area"] = this.Area
 	}
+	//区县
+	if this.District != nil {
+		setMap["o_vipjy.o_district"] = this.District
+	}
 	if this.Buyerclass != nil {
 		setMap["o_vipjy.a_buyerclass"] = this.Buyerclass
 	}

jyBXSubscribe/rpc/model/staffSubscribe.go

@@ -328,6 +328,35 @@ func getPersonSubscribe(query map[string]interface{}) (rData map[string]interfac
 		rData["matchway"] = common.If(subDetail.IMatchway == 0, 1, subDetail.IMatchway) //匹配方式 默认标题匹配 1
 		rData["wordsList"] = wordsList
 		rData["buyerClass"] = subDetail.ABuyerclass
+		regionMap := map[string]map[string][]string{}
+		if subDetail.OArea != nil {
+			district := map[string]interface{}{}
+			if subDetail.Odistrict != nil {
+				district = gconv.Map(subDetail.Odistrict)
+			}
+			o_area := subDetail.OArea
+			for k, v := range gconv.Map(o_area) {
+				areaMap := map[string][]string{}
+				if k == "北京" || k == "天津" || k == "上海" || k == "重庆" {
+					city := fmt.Sprintf("%s市", k)
+					if district[city] != nil {
+						v = city
+					}
+				}
+				for _, city := range gconv.Strings(v) {
+					if city == "" {
+						continue
+					}
+					if district[city] != nil {
+						areaMap[city] = gconv.Strings(district[city])
+					} else {
+						areaMap[city] = []string{}
+					}
+				}
+				regionMap[k] = areaMap
+			}
+		}
+		rData["regionMap"] = regionMap
 	}
 	return
 }
@@ -381,6 +410,31 @@ func getEntDistribute(ruleId string, entId, uid int64) (rData map[string]interfa
 	rData["buyerClass"] = (*ruleRes)["a_buyerclass"] //采购单位类型
 	rData["area"] = area
 	rData["district"] = district
+	regionMap := map[string]map[string][]string{}
+	if (*ruleRes)["o_area"] != nil {
+		o_area := (*ruleRes)["o_area"]
+		for k, v := range gconv.Map(o_area) {
+			areaMap := map[string][]string{}
+			if k == "北京" || k == "天津" || k == "上海" || k == "重庆" {
+				city := fmt.Sprintf("%s市", k)
+				if district[city] != nil {
+					v = city
+				}
+			}
+			for _, city := range gconv.Strings(v) {
+				if city == "" {
+					continue
+				}
+				if district[city] != nil {
+					areaMap[city] = gconv.Strings(district[city])
+				} else {
+					areaMap[city] = []string{}
+				}
+			}
+			regionMap[k] = areaMap
+		}
+	}
+	rData["regionMap"] = regionMap
 	rData["infotype"] = infotype
 	rData["projectmatch"] = i_projectmatch
 	rData["matchway"] = i_matchway