WH01243 7 mesi fa
parent
commit
3713013eb6

+ 1 - 1
jyBXCore/api/bxcore.api

@@ -245,7 +245,7 @@ type (
 		PurchaseTime string `json:"purchaseTime,optional"`
 		WinnerTag    string `json:"winnerTag,optional"`
 		PositionId   int64  `header:"positionId,optional"` //职位id
-		Order        int64  `json:"order,optional"`
+		Order        string `json:"order,optional"`
 	}
 	mobileHotWordReq {
 		AppId   string `header:"appId"`

+ 1 - 1
jyBXCore/api/internal/types/types.go

@@ -245,7 +245,7 @@ type OperatorSearchReq struct {
 	PurchaseTime string `json:"purchaseTime,optional"`
 	WinnerTag    string `json:"winnerTag,optional"`
 	PositionId   int64  `header:"positionId,optional"` //职位id
-	Order        int64  `json:"order,optional"`
+	Order        string `json:"order,optional"`
 }
 
 type MobileHotWordReq struct {

+ 1 - 1
jyBXCore/rpc/bxcore.proto

@@ -753,7 +753,7 @@ message OperatorSearchReq{
   string purchaseTime=21;
   string winnerTag=7;
   int64 positionId=15;
-  int64  order =22;
+  string  order =22;
 }
 message  OperatorSearchResp{
   int64 error_code = 1;

+ 2 - 1
jyBXCore/rpc/internal/logic/operatorsearchlogic.go

@@ -4,6 +4,7 @@ import (
 	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/service"
 	"context"
 	"encoding/json"
+	"github.com/gogf/gf/v2/util/gconv"
 
 	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/internal/svc"
 	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/type/bxcore"
@@ -47,7 +48,7 @@ func (l *OperatorSearchLogic) OperatorSearch(in *bxcore.OperatorSearchReq) (*bxc
 		OpeningTime:  in.OpeningTime,
 		WinnerTag:    in.WinnerTag,
 		PositionId:   in.PositionId,
-		Order:        in.Order,
+		Order:        gconv.Int64(in.Order),
 	}
 	count, data, total := service.SearchList(operator)
 	result := map[string]interface{}{

+ 4 - 4
jyBXCore/rpc/type/bxcore/bxcore.pb.go

@@ -6921,7 +6921,7 @@ type OperatorSearchReq struct {
 	PurchaseTime string `protobuf:"bytes,21,opt,name=purchaseTime,proto3" json:"purchaseTime,omitempty"`
 	WinnerTag    string `protobuf:"bytes,7,opt,name=winnerTag,proto3" json:"winnerTag,omitempty"`
 	PositionId   int64  `protobuf:"varint,15,opt,name=positionId,proto3" json:"positionId,omitempty"`
-	Order        int64  `protobuf:"varint,22,opt,name=order,proto3" json:"order,omitempty"`
+	Order        string `protobuf:"bytes,22,opt,name=order,proto3" json:"order,omitempty"`
 }
 
 func (x *OperatorSearchReq) Reset() {
@@ -7096,11 +7096,11 @@ func (x *OperatorSearchReq) GetPositionId() int64 {
 	return 0
 }
 
-func (x *OperatorSearchReq) GetOrder() int64 {
+func (x *OperatorSearchReq) GetOrder() string {
 	if x != nil {
 		return x.Order
 	}
-	return 0
+	return ""
 }
 
 type OperatorSearchResp struct {
@@ -8311,7 +8311,7 @@ var file_bxcore_proto_rawDesc = []byte{
 	0x28, 0x09, 0x52, 0x09, 0x77, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x54, 0x61, 0x67, 0x12, 0x1e, 0x0a,
 	0x0a, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x0f, 0x20, 0x01, 0x28,
 	0x03, 0x52, 0x0a, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x14, 0x0a,
-	0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x16, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6f, 0x72,
+	0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x72,
 	0x64, 0x65, 0x72, 0x22, 0x64, 0x0a, 0x12, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x53,
 	0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x72, 0x72,
 	0x6f, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x65,