feat:协议文件

jyBXCore/api/bxcore.api

@@ -62,12 +62,12 @@ type (
 		EntId        int64  `header:"entId,optional"`     // 企业id
 		EntUserId    int64  `header:"entUserId,optional"` // 企业下用户id
 		PositionType int64  `header:"positionType"`       // 职位类型 0个人 1企业
-		PositionId   int64  `header:"positionId"`//职位id
+		PositionId   int64  `header:"positionId"`         //职位id
 		AccountId    int64  `header:"accountId,optional"` //账户id
 		MgoUserId    string `header:"mgoUserId,optional"` //原userId
-		AppId        string `header:"appId,optional"`//剑鱼10000
-		UserId       string `header:"userId,optional"`//用户id
-		NewUserId    int64  `header:"newUserId,optional"`//base_user_id
+		AppId        string `header:"appId,optional"`     //剑鱼10000
+		UserId       string `header:"userId,optional"`    //用户id
+		NewUserId    int64  `header:"newUserId,optional"` //base_user_id
 	}
 	// 列表数据参标信息请求参数
 	participateShowReq {
@@ -131,6 +131,7 @@ type (
 	participateActionReq {
 		baseParam
 		BidId       string `json:"bidId,optional"`                     //招标信息id ，已加密。多个,号隔开
+		ProjectIds  string `json:"projectIds,optional"`                //项目信息id，已加密。多个,号隔开
 		ToEntUserId string `json:"toEntUserId,optional"`               //划转对象的企业用户id
 		IsRetain    bool   `json:"isRetain,optional"`                  //是否保留原跟踪人
 		ActionType  string `path:"actionType,options=in|out|transfer"` //in:参标；out:终止参标；transfer:划转

jyBXCore/api/internal/svc/serviceContext.go

@@ -3,17 +3,17 @@ package svc
 import (
 	"github.com/zeromicro/go-zero/zrpc"
 	"jyBXCore/api/internal/config"
-	"jyBXCore/rpc/bxcore"
+	"jyBXCore/rpc/bxcoreclient"
 )
 
 type ServiceContext struct {
 	Config config.Config
-	BxCore bxcore.BxCore
+	BxCore bxcoreclient.BxCore
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
 	return &ServiceContext{
 		Config: c,
-		BxCore: bxcore.NewBxCore(zrpc.MustNewClient(c.Core)),
+		BxCore: bxcoreclient.NewBxCore(zrpc.MustNewClient(c.Core)),
 	}
 }

jyBXCore/api/internal/types/types.go

@@ -55,12 +55,12 @@ type BaseParam struct {
 	EntId        int64  `header:"entId,optional"`     // 企业id
 	EntUserId    int64  `header:"entUserId,optional"` // 企业下用户id
 	PositionType int64  `header:"positionType"`       // 职位类型 0个人 1企业
-	PositionId   int64  `header:"positionId"`
+	PositionId   int64  `header:"positionId"`         //职位id
 	AccountId    int64  `header:"accountId,optional"` //账户id
 	MgoUserId    string `header:"mgoUserId,optional"` //原userId
-	AppId        string `header:"appId,optional"`
-	UserId       string `header:"userId,optional"`
-	NewUserId    int64  `header:"newUserId,optional"`
+	AppId        string `header:"appId,optional"`     //剑鱼10000
+	UserId       string `header:"userId,optional"`    //用户id
+	NewUserId    int64  `header:"newUserId,optional"` //base_user_id
 }
 
 type ParticipateShowReq struct {
@@ -123,6 +123,7 @@ type ParticipateSetUpInfoReq struct {
 type ParticipateActionReq struct {
 	BaseParam
 	BidId       string `json:"bidId,optional"`                     //招标信息id ，已加密。多个,号隔开
+	ProjectIds  string `json:"projectIds,optional"`                //项目信息id，已加密。多个,号隔开
 	ToEntUserId string `json:"toEntUserId,optional"`               //划转对象的企业用户id
 	IsRetain    bool   `json:"isRetain,optional"`                  //是否保留原跟踪人
 	ActionType  string `path:"actionType,options=in|out|transfer"` //in:参标；out:终止参标；transfer:划转

jyBXCore/rpc/bxcore.proto

@@ -348,6 +348,7 @@ message ParticipateActionReq{
   string  toEntUserId = 11;//划转对象的企业用户id
   bool isRetain = 12;//是否保留原跟踪人
   string actionType = 13;//in:参标；out:终止参标；transfer:划转
+  string projectIds = 14;//项目ids 多个,号隔开
 }
 //
 message ParticipateActionRes{

jyBXCore/rpc/bxcore/bxcore.go → jyBXCore/rpc/bxcoreclient/bxcore.go

@@ -1,7 +1,7 @@
 // Code generated by goctl. DO NOT EDIT!
 // Source: bxcore.proto
 
-package bxcore
+package bxcoreclient
 
 import (
 	"context"

jyBXCore/rpc/entity/search.go

@@ -6,9 +6,9 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/zeromicro/go-zero/core/logx"
-	"jyBXCore/rpc/bxcore"
 	IC "jyBXCore/rpc/init"
 	"jyBXCore/rpc/service"
+	"jyBXCore/rpc/type/bxcore"
 	"jyBXCore/rpc/util"
 	"strconv"
 	"strings"

jyBXCore/rpc/model/es/search.go

@@ -5,8 +5,8 @@ import (
 	elastic "app.yhyue.com/moapp/jybase/esv1"
 	"fmt"
 	"github.com/zeromicro/go-zero/core/logx"
-	"jyBXCore/rpc/bxcore"
 	IC "jyBXCore/rpc/init"
+	"jyBXCore/rpc/type/bxcore"
 	"strconv"
 	"strings"
 	"time"

jyBXCore/rpc/service/participate.go

@@ -43,8 +43,7 @@ func ParticipateDo(in *bxcore.ParticipateActionReq) (*bxcore.ParticipateActionRe
 	}
 	bidId := in.BidId
 	//当前项目是否符合参标条件
-	participateBid := NewParticipateBid(in.EntId, in.EntUserId, in.PositionType, in.PositionId)
-	projectInfos := participateBid.GetProjectByInfoId([]string{in.BidId})
+	projectInfos := es.GetProjectByInfoId([]string{in.BidId})
 	if projectInfos == nil || len(*projectInfos) == 0 {
 		tip := "参标"
 		switch in.ActionType {

jyBXCore/rpc/service/search.go

@@ -3,9 +3,9 @@ package service
 import (
 	MC "app.yhyue.com/moapp/jybase/common"
 	"github.com/zeromicro/go-zero/core/logx"
-	"jyBXCore/rpc/bxcore"
 	IC "jyBXCore/rpc/init"
 	"jyBXCore/rpc/model/es"
+	"jyBXCore/rpc/type/bxcore"
 	"jyBXCore/rpc/util"
 	"strings"
 	"time"

jyBXCore/rpc/type/bxcore/bxcore.pb.go

@@ -3068,6 +3068,7 @@ type ParticipateActionReq struct {
 	ToEntUserId  string `protobuf:"bytes,11,opt,name=toEntUserId,proto3" json:"toEntUserId,omitempty"`   //划转对象的企业用户id
 	IsRetain     bool   `protobuf:"varint,12,opt,name=isRetain,proto3" json:"isRetain,omitempty"`        //是否保留原跟踪人
 	ActionType   string `protobuf:"bytes,13,opt,name=actionType,proto3" json:"actionType,omitempty"`     //in:参标；out:终止参标；transfer:划转
+	ProjectIds   string `protobuf:"bytes,14,opt,name=projectIds,proto3" json:"projectIds,omitempty"`     //项目ids 多个,号隔开
 }
 
 func (x *ParticipateActionReq) Reset() {
@@ -3193,6 +3194,13 @@ func (x *ParticipateActionReq) GetActionType() string {
 	return ""
 }
 
+func (x *ParticipateActionReq) GetProjectIds() string {
+	if x != nil {
+		return x.ProjectIds
+	}
+	return ""
+}
+
 //
 type ParticipateActionRes struct {
 	state         protoimpl.MessageState
@@ -4215,7 +4223,7 @@ var file_bxcore_proto_rawDesc = []byte{
 	0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x30, 0x0a, 0x04, 0x64, 0x61,
 	0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x72,
 	0x65, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74,
-	0x55, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x8a, 0x03, 0x0a,
+	0x55, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0xaa, 0x03, 0x0a,
 	0x14, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69,
 	0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x65,
@@ -4240,7 +4248,9 @@ var file_bxcore_proto_rawDesc = []byte{
 	0x08, 0x69, 0x73, 0x52, 0x65, 0x74, 0x61, 0x69, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52,
 	0x08, 0x69, 0x73, 0x52, 0x65, 0x74, 0x61, 0x69, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74,
 	0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x22, 0x5e, 0x0a, 0x14, 0x50, 0x61, 0x72,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x6f,
+	0x6a, 0x65, 0x63, 0x74, 0x49, 0x64, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70,
+	0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x49, 0x64, 0x73, 0x22, 0x5e, 0x0a, 0x14, 0x50, 0x61, 0x72,
 	0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
 	0x73, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a, 0x07,