From c012b3f7ddfafddd477677a91d2d25abec67d501 Mon Sep 17 00:00:00 2001 From: shenzhuan Date: Thu, 17 Nov 2022 17:04:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=9F=A5=E8=AF=A2=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- trade-order/client/client.go | 116 +---- .../domain/repository/trade_repository.go | 10 + trade-order/domain/service/trade_service.go | 4 + trade-order/handler/trade_handler.go | 15 + trade-order/main.go | 3 + trade-order/proto/trade.pb.go | 398 ++++++++++++++---- trade-order/proto/trade.pb.micro.go | 59 +++ trade-order/proto/trade.proto | 15 +- 8 files changed, 426 insertions(+), 194 deletions(-) diff --git a/trade-order/client/client.go b/trade-order/client/client.go index 7434805..9641f19 100644 --- a/trade-order/client/client.go +++ b/trade-order/client/client.go @@ -69,6 +69,8 @@ func main() { AddTraderClient := proto.NewAddTradeOrderService("trade-order", rpcServer.Client()) UpdateTraderClient := proto.NewUpdateTradeOrderService("trade-order", rpcServer.Client()) FindCartClient := proto.NewFindCartService("shop-cart", rpcServer.Client()) + FindOrderClient := proto.NewFindOrderService("trade-order", rpcServer.Client()) + //开始拆分 DTM服务 router.POST("/updateCart", func(c *gin.Context) { @@ -213,107 +215,19 @@ func main() { common.RespOK(c.Writer, resp, "请求成功") }) - //router.POST("/addCart-compensate", func(c *gin.Context) { - // req := &proto.AddCartReq{} - // if err := c.BindJSON(req); err != nil { - // log.Fatalln(err) - // } - // req.Id = CartId - // resp, err = UpdateCartClient.UpdateCart(context.TODO(), req) - // CartId = resp.ID - // if err != nil { - // log.Println("/addCart-compensate err ", err) - // c.JSON(http.StatusOK, gin.H{"dtm_reslut": "FAILURE", "Message": "删除购物车失败!"}) - // return - // } - // c.JSON(http.StatusOK, gin.H{"addCart-compensate": "SUCCESS", "Message": "删除购物车成功!"}) - //}) - // - //router.GET("/addShoppingCart", func(c *gin.Context) { - // number, _ := strconv.Atoi(c.Request.FormValue("number")) - // productId, _ := strconv.Atoi(c.Request.FormValue("productId")) - // productSkuId, _ := strconv.Atoi(c.Request.FormValue("productSkuId")) - // uuid := c.Request.Header["Uuid"][0] - // cc := common.GetInput(uuid) - // out := common.SQ(cc) - // sum := 0 - // for o := range out { - // sum += o - // } - // //Token校验 - // //拼接请求信息 - // tokenReq := &proto.TokenReq{ - // Uuid: uuid, - // } - // //响应 - // tokenResp, err := GetUserTokenClient.GetUserToken(context.TODO(), tokenReq) - // //拼接请求信息 - // respErr := &proto.AddCartResp{} - // if err != nil || tokenResp.IsLogin == false { - // log.Println("GetUserToken err : ", err) - // common.RespFail(c.Writer, respErr, "未登录！") - // return - // } - // log.Println("GetUserToken success : ", tokenResp) - // - // //拼接请求信息 - // req := &proto.AddCartReq{ - // Number: int32(number), - // ProductId: int32(productId), - // ProductSkuId: int32(productSkuId), - // UserId: int32(sum), - // } - // resp := &proto.AddCartResp{} - // //商品详情 - // reqDetail := &proto.ProductDetailReq{ - // Id: int32(productId), - // } - // respDetail, err := ShowProductDetailClient.ShowProductDetail(context.TODO(), reqDetail) - // if err != nil { - // log.Println("ShowProductDetail err : ", err) - // common.RespFail(c.Writer, respErr, "查询商品详情失败！") - // return - // } - // if respDetail != nil { - // req.ProductName = respDetail.ProductDetail[0].Name - // req.ProductMainPicture = respDetail.ProductDetail[0].MainPicture - // } - // - // //log.Println(" /ShowProductDetail resp :", respDetail) - // //SKU详情 - // reqDetail.Id = req.ProductSkuId - // respSkuDetail, err := ShowDetailSkuClient.ShowDetailSku(context.TODO(), reqDetail) - // //log.Println(" /ShowDetailSku resp :", respSkuDetail) - // //添加购物车 远程调用服务 - // //log.Println(" /AddCart req :", req) - // - // if respSkuDetail.ProductSku[0].Stock < req.Number { - // common.RespFail(c.Writer, &proto.AddCartResp{}, "库存不足，添加失败") - // return - // } - // sku := respSkuDetail.ProductSku[0] - // sku.Stock -= req.Number - // Number = req.Number // - // updateSkuReq := &proto.UpdateSkuReq{ - // ProductSku: sku, - // } - // resp.ProductSkuSimple = respSkuDetail.ProductSku[0] - // resp.ProductSimple = respDetail.ProductDetail[0] - // - // //全局事务 - // gid := shortuuid.New() - // saga := dtmcli.NewSaga(DtmServer, gid). - // Add(QSBusi+"/updateSku", QSBusi+"/updateSku-compensate", updateSkuReq). - // Add(QSBusi+"/addCart", QSBusi+"/addCart-compensate", req) - // err = saga.Submit() - // if err != nil { - // log.Println("saga submit err :", err) - // common.RespFail(c.Writer, resp, "添加失败") - // } - // log.Println(" /saga submit submit :", gid) - // ////writer data message row total field - // common.RespOK(c.Writer, resp, "请求成功") - //}) + router.POST("/findOrder", func(c *gin.Context) { + req := &proto.FindOrderReq{} + req.Id = c.PostForm("id") + req.OrderNo = c.PostForm("orderNo") + + obj, err := FindOrderClient.FindOrder(context.TODO(), req) + if err != nil { + log.Println("findOrder err :", err) + common.RespFail(c.Writer, resp, "查询失败") + } + fmt.Println("findOrder:", obj) + c.JSON(http.StatusOK, gin.H{"findOrder": "SUCCESS", "Message": obj}) + }) service := web.NewService( web.Address(":6669"), diff --git a/trade-order/domain/repository/trade_repository.go b/trade-order/domain/repository/trade_repository.go index fe890a9..6f477e3 100644 --- a/trade-order/domain/repository/trade_repository.go +++ b/trade-order/domain/repository/trade_repository.go @@ -22,6 +22,7 @@ import ( **/ //接口 type ITradeRepository interface { + FindOrder(req *proto.FindOrderReq) (*model.TraderOrder, error) AddTradeOrder(req *proto.AddTradeOrderReq) (*model.TraderOrder, error) UpdateTradeOrder(req *proto.AddTradeOrderReq) (*model.TraderOrder, error) } @@ -79,6 +80,15 @@ func (u *TradeRepository) UpdateTradeOrder(req *proto.AddTradeOrderReq) (obj *mo return &trade, tb.Error //err } +func (u *TradeRepository) FindOrder(req *proto.FindOrderReq) (obj *model.TraderOrder, err error) { + id := req.GetId() + no := req.GetOrderNo() + obj = &model.TraderOrder{} + tb := u.mysqlDB.Where("id=? or order_no=?", id, no).Find(obj) + fmt.Println("FindTradeOrder>>>>>>> ", obj) + return obj, tb.Error +} + // 生产 订单号 Y2022 06 27 11 00 53 948 97 103564 // // 年 月 日 时 分 秒 毫秒 ID 随机数 diff --git a/trade-order/domain/service/trade_service.go b/trade-order/domain/service/trade_service.go index 001849b..0a49959 100644 --- a/trade-order/domain/service/trade_service.go +++ b/trade-order/domain/service/trade_service.go @@ -7,6 +7,7 @@ import ( ) type ITradeOrderService interface { + FindOrder(req *proto.FindOrderReq) (*model.TraderOrder, error) AddTradeOrder(req *proto.AddTradeOrderReq) (obj *model.TraderOrder, err error) UpdateTradeOrder(req *proto.AddTradeOrderReq) (obj *model.TraderOrder, err error) } @@ -30,3 +31,6 @@ func (u *TradeOrderService) AddTradeOrder(req *proto.AddTradeOrderReq) (obj *mod func (u *TradeOrderService) UpdateTradeOrder(req *proto.AddTradeOrderReq) (obj *model.TraderOrder, err error) { return u.tradeRepository.AddTradeOrder(req) } +func (u *TradeOrderService) FindOrder(req *proto.FindOrderReq) (obj *model.TraderOrder, err error) { + return u.tradeRepository.FindOrder(req) +} diff --git a/trade-order/handler/trade_handler.go b/trade-order/handler/trade_handler.go index a58c4d6..44ed5f1 100644 --- a/trade-order/handler/trade_handler.go +++ b/trade-order/handler/trade_handler.go @@ -3,6 +3,7 @@ package handler import ( "context" "fmt" + common "git.mashibing.com/msb_47094/shopping-comm" "trade-order/domain/service" "trade-order/proto" ) @@ -35,3 +36,17 @@ func (u *TradeOrderHandler) UpdateTradeOrder(ctx context.Context, req *proto.Add } return err } +func (u *TradeOrderHandler) FindOrder(ctx context.Context, req *proto.FindOrderReq, resp *proto.FindOrderResp) error { + obj, err := u.TradeOrderService.FindOrder(req) + if err != nil { + println(" FindTradeOrder err :", err) + } else { + order := &proto.TradeOrder{} + err := common.SwapToStruct(obj, order) + if err != nil { + fmt.Println("转换失败 ", err) + } + resp.TradeOrder = order + } + return err +} diff --git a/trade-order/main.go b/trade-order/main.go index 9e6eee3..d5af981 100644 --- a/trade-order/main.go +++ b/trade-order/main.go @@ -60,6 +60,9 @@ func main() { proto.RegisterAddTradeOrderHandler(repcService.Server(), &handler.TradeOrderHandler{tradeService}) //4.注册handler proto.RegisterUpdateTradeOrderHandler(repcService.Server(), &handler.TradeOrderHandler{tradeService}) + //4.注册handler + proto.RegisterFindOrderHandler(repcService.Server(), &handler.TradeOrderHandler{tradeService}) + //5.启动服务 if err := repcService.Run(); err != nil { log.Println("start cart service err :", err) diff --git a/trade-order/proto/trade.pb.go b/trade-order/proto/trade.pb.go index 129e6b4..8d1e017 100644 --- a/trade-order/proto/trade.pb.go +++ b/trade-order/proto/trade.pb.go @@ -55,7 +55,7 @@ type TradeOrder struct { UserId int32 `protobuf:"varint,12,opt,name=userId,proto3" json:"userId,omitempty"` CreateUser int32 `protobuf:"varint,13,opt,name=createUser,proto3" json:"createUser,omitempty"` UpdateUser int32 `protobuf:"varint,14,opt,name=updateUser,proto3" json:"updateUser,omitempty"` - CancelReason string `protobuf:"bytes,15,opt,name=cancelReason,proto3" json:"cancelReason,omitempty"` + CancelReason int32 `protobuf:"varint,15,opt,name=cancelReason,proto3" json:"cancelReason,omitempty"` CreateTime string `protobuf:"bytes,16,opt,name=createTime,proto3" json:"createTime,omitempty"` SubmitTime string `protobuf:"bytes,17,opt,name=submitTime,proto3" json:"submitTime,omitempty"` } @@ -190,11 +190,11 @@ func (x *TradeOrder) GetUpdateUser() int32 { return 0 } -func (x *TradeOrder) GetCancelReason() string { +func (x *TradeOrder) GetCancelReason() int32 { if x != nil { return x.CancelReason } - return "" + return 0 } func (x *TradeOrder) GetCreateTime() string { @@ -1915,6 +1915,109 @@ func (x *OrderTotalResp) GetTotalPrice() float32 { return 0 } +// 查询订单详情 +type FindOrderReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + OrderNo string `protobuf:"bytes,2,opt,name=orderNo,proto3" json:"orderNo,omitempty"` +} + +func (x *FindOrderReq) Reset() { + *x = FindOrderReq{} + if protoimpl.UnsafeEnabled { + mi := &file_trade_proto_msgTypes[24] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *FindOrderReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FindOrderReq) ProtoMessage() {} + +func (x *FindOrderReq) ProtoReflect() protoreflect.Message { + mi := &file_trade_proto_msgTypes[24] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FindOrderReq.ProtoReflect.Descriptor instead. +func (*FindOrderReq) Descriptor() ([]byte, []int) { + return file_trade_proto_rawDescGZIP(), []int{24} +} + +func (x *FindOrderReq) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *FindOrderReq) GetOrderNo() string { + if x != nil { + return x.OrderNo + } + return "" +} + +type FindOrderResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + TradeOrder *TradeOrder `protobuf:"bytes,1,opt,name=tradeOrder,proto3" json:"tradeOrder,omitempty"` +} + +func (x *FindOrderResp) Reset() { + *x = FindOrderResp{} + if protoimpl.UnsafeEnabled { + mi := &file_trade_proto_msgTypes[25] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *FindOrderResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FindOrderResp) ProtoMessage() {} + +func (x *FindOrderResp) ProtoReflect() protoreflect.Message { + mi := &file_trade_proto_msgTypes[25] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FindOrderResp.ProtoReflect.Descriptor instead. +func (*FindOrderResp) Descriptor() ([]byte, []int) { + return file_trade_proto_rawDescGZIP(), []int{25} +} + +func (x *FindOrderResp) GetTradeOrder() *TradeOrder { + if x != nil { + return x.TradeOrder + } + return nil +} + var File_trade_proto protoreflect.FileDescriptor var file_trade_proto_rawDesc = []byte{ @@ -1949,7 +2052,7 @@ var file_trade_proto_rawDesc = []byte{ 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x0f, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0c, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, + 0x05, 0x52, 0x0c, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x11, 0x20, @@ -2174,62 +2277,74 @@ var file_trade_proto_rawDesc = []byte{ 0x63, 0x61, 0x72, 0x74, 0x49, 0x64, 0x73, 0x22, 0x30, 0x0a, 0x0e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0a, 0x74, - 0x6f, 0x74, 0x61, 0x6c, 0x50, 0x72, 0x69, 0x63, 0x65, 0x32, 0x55, 0x0a, 0x0d, 0x41, 0x64, 0x64, - 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x44, 0x0a, 0x0d, 0x41, 0x64, - 0x64, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x17, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x2e, 0x41, 0x64, 0x64, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, - 0x72, 0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x41, 0x64, 0x64, - 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, - 0x32, 0x5b, 0x0a, 0x10, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, - 0x72, 0x64, 0x65, 0x72, 0x12, 0x47, 0x0a, 0x10, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x72, - 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x17, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x2e, 0x41, 0x64, 0x64, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, - 0x71, 0x1a, 0x18, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x41, 0x64, 0x64, 0x54, 0x72, 0x61, - 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x32, 0x49, 0x0a, - 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x61, 0x72, 0x74, 0x12, 0x3b, 0x0a, 0x0a, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x61, 0x72, 0x74, 0x12, 0x14, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x1a, - 0x15, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x61, - 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x32, 0x41, 0x0a, 0x08, 0x46, 0x69, 0x6e, 0x64, - 0x43, 0x61, 0x72, 0x74, 0x12, 0x35, 0x0a, 0x08, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x61, 0x72, 0x74, - 0x12, 0x12, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x61, 0x72, - 0x74, 0x52, 0x65, 0x71, 0x1a, 0x13, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x46, 0x69, 0x6e, - 0x64, 0x43, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x32, 0x31, 0x0a, 0x04, 0x50, - 0x61, 0x67, 0x65, 0x12, 0x29, 0x0a, 0x04, 0x50, 0x61, 0x67, 0x65, 0x12, 0x0e, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x0f, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x32, 0x5d, - 0x0a, 0x11, 0x53, 0x68, 0x6f, 0x77, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x44, 0x65, 0x74, - 0x61, 0x69, 0x6c, 0x12, 0x48, 0x0a, 0x11, 0x53, 0x68, 0x6f, 0x77, 0x50, 0x72, 0x6f, 0x64, 0x75, - 0x63, 0x74, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x12, 0x17, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x2e, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x65, - 0x71, 0x1a, 0x18, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, - 0x74, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x32, 0x51, 0x0a, + 0x6f, 0x74, 0x61, 0x6c, 0x50, 0x72, 0x69, 0x63, 0x65, 0x22, 0x38, 0x0a, 0x0c, 0x46, 0x69, 0x6e, + 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, + 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x4e, 0x6f, 0x22, 0x42, 0x0a, 0x0d, 0x46, 0x69, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x31, 0x0a, 0x0a, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, + 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x2e, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x0a, 0x74, 0x72, 0x61, + 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x32, 0x55, 0x0a, 0x0d, 0x41, 0x64, 0x64, 0x54, 0x72, + 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x44, 0x0a, 0x0d, 0x41, 0x64, 0x64, 0x54, + 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x17, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x2e, 0x41, 0x64, 0x64, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, + 0x65, 0x71, 0x1a, 0x18, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x41, 0x64, 0x64, 0x54, 0x72, + 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x32, 0x5b, + 0x0a, 0x10, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, + 0x65, 0x72, 0x12, 0x47, 0x0a, 0x10, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x72, 0x61, 0x64, + 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x17, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x41, + 0x64, 0x64, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x1a, + 0x18, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x41, 0x64, 0x64, 0x54, 0x72, 0x61, 0x64, 0x65, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x32, 0x49, 0x0a, 0x0a, 0x55, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x61, 0x72, 0x74, 0x12, 0x3b, 0x0a, 0x0a, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x43, 0x61, 0x72, 0x74, 0x12, 0x14, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x61, 0x72, 0x74, + 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x32, 0x41, 0x0a, 0x08, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x61, + 0x72, 0x74, 0x12, 0x35, 0x0a, 0x08, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x61, 0x72, 0x74, 0x12, 0x12, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x61, 0x72, 0x74, 0x52, + 0x65, 0x71, 0x1a, 0x13, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x43, + 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x32, 0x31, 0x0a, 0x04, 0x50, 0x61, 0x67, + 0x65, 0x12, 0x29, 0x0a, 0x04, 0x50, 0x61, 0x67, 0x65, 0x12, 0x0e, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x0f, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x32, 0x5d, 0x0a, 0x11, + 0x53, 0x68, 0x6f, 0x77, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x44, 0x65, 0x74, 0x61, 0x69, + 0x6c, 0x12, 0x48, 0x0a, 0x11, 0x53, 0x68, 0x6f, 0x77, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, + 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x12, 0x17, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x50, + 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x1a, + 0x18, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x44, + 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x32, 0x51, 0x0a, 0x0e, 0x53, + 0x68, 0x6f, 0x77, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x53, 0x6b, 0x75, 0x12, 0x3f, 0x0a, 0x0e, 0x53, 0x68, 0x6f, 0x77, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x53, 0x6b, 0x75, 0x12, - 0x3f, 0x0a, 0x0e, 0x53, 0x68, 0x6f, 0x77, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x53, 0x6b, - 0x75, 0x12, 0x14, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, - 0x74, 0x53, 0x6b, 0x75, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, - 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x53, 0x6b, 0x75, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, - 0x32, 0x52, 0x0a, 0x0d, 0x53, 0x68, 0x6f, 0x77, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x53, 0x6b, - 0x75, 0x12, 0x41, 0x0a, 0x0d, 0x53, 0x68, 0x6f, 0x77, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x53, - 0x6b, 0x75, 0x12, 0x17, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x50, 0x72, 0x6f, 0x64, 0x75, - 0x63, 0x74, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x2e, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x53, 0x6b, 0x75, 0x52, 0x65, - 0x73, 0x70, 0x22, 0x00, 0x32, 0x43, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x54, - 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x33, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x54, - 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x0f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54, 0x6f, 0x6b, - 0x65, 0x6e, 0x52, 0x65, 0x71, 0x1a, 0x10, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54, 0x6f, - 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x32, 0x45, 0x0a, 0x09, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x53, 0x6b, 0x75, 0x12, 0x38, 0x0a, 0x09, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x53, 0x6b, 0x75, 0x12, 0x13, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x55, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x53, 0x6b, 0x75, 0x52, 0x65, 0x71, 0x1a, 0x14, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x6b, 0x75, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, - 0x32, 0x4f, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x6f, 0x74, 0x61, - 0x6c, 0x12, 0x3e, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x6f, 0x74, - 0x61, 0x6c, 0x12, 0x14, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x22, - 0x00, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2f, 0x3b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x14, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x53, + 0x6b, 0x75, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x50, 0x72, + 0x6f, 0x64, 0x75, 0x63, 0x74, 0x53, 0x6b, 0x75, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x32, 0x52, + 0x0a, 0x0d, 0x53, 0x68, 0x6f, 0x77, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x53, 0x6b, 0x75, 0x12, + 0x41, 0x0a, 0x0d, 0x53, 0x68, 0x6f, 0x77, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x53, 0x6b, 0x75, + 0x12, 0x17, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, + 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x2e, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x53, 0x6b, 0x75, 0x52, 0x65, 0x73, 0x70, + 0x22, 0x00, 0x32, 0x43, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x54, 0x6f, 0x6b, + 0x65, 0x6e, 0x12, 0x33, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x54, 0x6f, 0x6b, + 0x65, 0x6e, 0x12, 0x0f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, + 0x52, 0x65, 0x71, 0x1a, 0x10, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54, 0x6f, 0x6b, 0x65, + 0x6e, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x32, 0x45, 0x0a, 0x09, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x53, 0x6b, 0x75, 0x12, 0x38, 0x0a, 0x09, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x6b, + 0x75, 0x12, 0x13, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x53, 0x6b, 0x75, 0x52, 0x65, 0x71, 0x1a, 0x14, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x55, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x6b, 0x75, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x32, 0x4f, + 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x12, + 0x3e, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x6f, 0x74, 0x61, 0x6c, + 0x12, 0x14, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x6f, + 0x74, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4f, + 0x72, 0x64, 0x65, 0x72, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x32, + 0x45, 0x0a, 0x09, 0x46, 0x69, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x38, 0x0a, 0x09, + 0x46, 0x69, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x13, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x1a, 0x14, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2f, 0x3b, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2244,7 +2359,7 @@ func file_trade_proto_rawDescGZIP() []byte { return file_trade_proto_rawDescData } -var file_trade_proto_msgTypes = make([]protoimpl.MessageInfo, 25) +var file_trade_proto_msgTypes = make([]protoimpl.MessageInfo, 27) var file_trade_proto_goTypes = []interface{}{ (*TradeOrder)(nil), // 0: proto.TradeOrder (*AddTradeOrderReq)(nil), // 1: proto.AddTradeOrderReq @@ -2270,45 +2385,50 @@ var file_trade_proto_goTypes = []interface{}{ (*UpdateSkuResp)(nil), // 21: proto.UpdateSkuResp (*OrderTotalReq)(nil), // 22: proto.OrderTotalReq (*OrderTotalResp)(nil), // 23: proto.OrderTotalResp - nil, // 24: proto.Product.LabelListEntry + (*FindOrderReq)(nil), // 24: proto.FindOrderReq + (*FindOrderResp)(nil), // 25: proto.FindOrderResp + nil, // 26: proto.Product.LabelListEntry } var file_trade_proto_depIdxs = []int32{ 0, // 0: proto.AddTradeOrderReq.tradeOrder:type_name -> proto.TradeOrder 0, // 1: proto.AddTradeOrderResp.tradeOrder:type_name -> proto.TradeOrder 3, // 2: proto.AddTradeOrderResp.products:type_name -> proto.ProductOrder 4, // 3: proto.FindCartResp.shoppingCart:type_name -> proto.ShoppingCart - 24, // 4: proto.Product.labelList:type_name -> proto.Product.LabelListEntry + 26, // 4: proto.Product.labelList:type_name -> proto.Product.LabelListEntry 9, // 5: proto.PageResp.product:type_name -> proto.Product 12, // 6: proto.ProductDetailResp.productDetail:type_name -> proto.ProductDetail 15, // 7: proto.ProductSkuResp.productSku:type_name -> proto.ProductSku 15, // 8: proto.UpdateSkuReq.productSku:type_name -> proto.ProductSku - 1, // 9: proto.AddTradeOrder.AddTradeOrder:input_type -> proto.AddTradeOrderReq - 1, // 10: proto.UpdateTradeOrder.UpdateTradeOrder:input_type -> proto.AddTradeOrderReq - 5, // 11: proto.UpdateCart.UpdateCart:input_type -> proto.UpdateCartReq - 7, // 12: proto.FindCart.FindCart:input_type -> proto.FindCartReq - 10, // 13: proto.Page.Page:input_type -> proto.PageReq - 13, // 14: proto.ShowProductDetail.ShowProductDetail:input_type -> proto.ProductDetailReq - 16, // 15: proto.ShowProductSku.ShowProductSku:input_type -> proto.ProductSkuReq - 13, // 16: proto.ShowDetailSku.ShowDetailSku:input_type -> proto.ProductDetailReq - 18, // 17: proto.GetUserToken.GetUserToken:input_type -> proto.TokenReq - 20, // 18: proto.UpdateSku.UpdateSku:input_type -> proto.UpdateSkuReq - 22, // 19: proto.GetOrderTotal.GetOrderTotal:input_type -> proto.OrderTotalReq - 2, // 20: proto.AddTradeOrder.AddTradeOrder:output_type -> proto.AddTradeOrderResp - 2, // 21: proto.UpdateTradeOrder.UpdateTradeOrder:output_type -> proto.AddTradeOrderResp - 6, // 22: proto.UpdateCart.UpdateCart:output_type -> proto.UpdateCartResp - 8, // 23: proto.FindCart.FindCart:output_type -> proto.FindCartResp - 11, // 24: proto.Page.Page:output_type -> proto.PageResp - 14, // 25: proto.ShowProductDetail.ShowProductDetail:output_type -> proto.ProductDetailResp - 17, // 26: proto.ShowProductSku.ShowProductSku:output_type -> proto.ProductSkuResp - 17, // 27: proto.ShowDetailSku.ShowDetailSku:output_type -> proto.ProductSkuResp - 19, // 28: proto.GetUserToken.GetUserToken:output_type -> proto.TokenResp - 21, // 29: proto.UpdateSku.UpdateSku:output_type -> proto.UpdateSkuResp - 23, // 30: proto.GetOrderTotal.GetOrderTotal:output_type -> proto.OrderTotalResp - 20, // [20:31] is the sub-list for method output_type - 9, // [9:20] is the sub-list for method input_type - 9, // [9:9] is the sub-list for extension type_name - 9, // [9:9] is the sub-list for extension extendee - 0, // [0:9] is the sub-list for field type_name + 0, // 9: proto.FindOrderResp.tradeOrder:type_name -> proto.TradeOrder + 1, // 10: proto.AddTradeOrder.AddTradeOrder:input_type -> proto.AddTradeOrderReq + 1, // 11: proto.UpdateTradeOrder.UpdateTradeOrder:input_type -> proto.AddTradeOrderReq + 5, // 12: proto.UpdateCart.UpdateCart:input_type -> proto.UpdateCartReq + 7, // 13: proto.FindCart.FindCart:input_type -> proto.FindCartReq + 10, // 14: proto.Page.Page:input_type -> proto.PageReq + 13, // 15: proto.ShowProductDetail.ShowProductDetail:input_type -> proto.ProductDetailReq + 16, // 16: proto.ShowProductSku.ShowProductSku:input_type -> proto.ProductSkuReq + 13, // 17: proto.ShowDetailSku.ShowDetailSku:input_type -> proto.ProductDetailReq + 18, // 18: proto.GetUserToken.GetUserToken:input_type -> proto.TokenReq + 20, // 19: proto.UpdateSku.UpdateSku:input_type -> proto.UpdateSkuReq + 22, // 20: proto.GetOrderTotal.GetOrderTotal:input_type -> proto.OrderTotalReq + 24, // 21: proto.FindOrder.FindOrder:input_type -> proto.FindOrderReq + 2, // 22: proto.AddTradeOrder.AddTradeOrder:output_type -> proto.AddTradeOrderResp + 2, // 23: proto.UpdateTradeOrder.UpdateTradeOrder:output_type -> proto.AddTradeOrderResp + 6, // 24: proto.UpdateCart.UpdateCart:output_type -> proto.UpdateCartResp + 8, // 25: proto.FindCart.FindCart:output_type -> proto.FindCartResp + 11, // 26: proto.Page.Page:output_type -> proto.PageResp + 14, // 27: proto.ShowProductDetail.ShowProductDetail:output_type -> proto.ProductDetailResp + 17, // 28: proto.ShowProductSku.ShowProductSku:output_type -> proto.ProductSkuResp + 17, // 29: proto.ShowDetailSku.ShowDetailSku:output_type -> proto.ProductSkuResp + 19, // 30: proto.GetUserToken.GetUserToken:output_type -> proto.TokenResp + 21, // 31: proto.UpdateSku.UpdateSku:output_type -> proto.UpdateSkuResp + 23, // 32: proto.GetOrderTotal.GetOrderTotal:output_type -> proto.OrderTotalResp + 25, // 33: proto.FindOrder.FindOrder:output_type -> proto.FindOrderResp + 22, // [22:34] is the sub-list for method output_type + 10, // [10:22] is the sub-list for method input_type + 10, // [10:10] is the sub-list for extension type_name + 10, // [10:10] is the sub-list for extension extendee + 0, // [0:10] is the sub-list for field type_name } func init() { file_trade_proto_init() } @@ -2605,6 +2725,30 @@ func file_trade_proto_init() { return nil } } + file_trade_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*FindOrderReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_trade_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*FindOrderResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -2612,9 +2756,9 @@ func file_trade_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_trade_proto_rawDesc, NumEnums: 0, - NumMessages: 25, + NumMessages: 27, NumExtensions: 0, - NumServices: 11, + NumServices: 12, }, GoTypes: file_trade_proto_goTypes, DependencyIndexes: file_trade_proto_depIdxs, @@ -3443,3 +3587,75 @@ var _GetOrderTotal_serviceDesc = grpc.ServiceDesc{ Streams: []grpc.StreamDesc{}, Metadata: "trade.proto", } + +// FindOrderClient is the client API for FindOrder service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type FindOrderClient interface { + FindOrder(ctx context.Context, in *FindOrderReq, opts ...grpc.CallOption) (*FindOrderResp, error) +} + +type findOrderClient struct { + cc grpc.ClientConnInterface +} + +func NewFindOrderClient(cc grpc.ClientConnInterface) FindOrderClient { + return &findOrderClient{cc} +} + +func (c *findOrderClient) FindOrder(ctx context.Context, in *FindOrderReq, opts ...grpc.CallOption) (*FindOrderResp, error) { + out := new(FindOrderResp) + err := c.cc.Invoke(ctx, "/proto.FindOrder/FindOrder", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// FindOrderServer is the server API for FindOrder service. +type FindOrderServer interface { + FindOrder(context.Context, *FindOrderReq) (*FindOrderResp, error) +} + +// UnimplementedFindOrderServer can be embedded to have forward compatible implementations. +type UnimplementedFindOrderServer struct { +} + +func (*UnimplementedFindOrderServer) FindOrder(context.Context, *FindOrderReq) (*FindOrderResp, error) { + return nil, status.Errorf(codes.Unimplemented, "method FindOrder not implemented") +} + +func RegisterFindOrderServer(s *grpc.Server, srv FindOrderServer) { + s.RegisterService(&_FindOrder_serviceDesc, srv) +} + +func _FindOrder_FindOrder_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(FindOrderReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(FindOrderServer).FindOrder(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/proto.FindOrder/FindOrder", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(FindOrderServer).FindOrder(ctx, req.(*FindOrderReq)) + } + return interceptor(ctx, in, info, handler) +} + +var _FindOrder_serviceDesc = grpc.ServiceDesc{ + ServiceName: "proto.FindOrder", + HandlerType: (*FindOrderServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "FindOrder", + Handler: _FindOrder_FindOrder_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "trade.proto", +} diff --git a/trade-order/proto/trade.pb.micro.go b/trade-order/proto/trade.pb.micro.go index de7cf9b..8882763 100644 --- a/trade-order/proto/trade.pb.micro.go +++ b/trade-order/proto/trade.pb.micro.go @@ -693,3 +693,62 @@ type getOrderTotalHandler struct { func (h *getOrderTotalHandler) GetOrderTotal(ctx context.Context, in *OrderTotalReq, out *OrderTotalResp) error { return h.GetOrderTotalHandler.GetOrderTotal(ctx, in, out) } + +// Api Endpoints for FindOrder service + +func NewFindOrderEndpoints() []*api.Endpoint { + return []*api.Endpoint{} +} + +// Client API for FindOrder service + +type FindOrderService interface { + FindOrder(ctx context.Context, in *FindOrderReq, opts ...client.CallOption) (*FindOrderResp, error) +} + +type findOrderService struct { + c client.Client + name string +} + +func NewFindOrderService(name string, c client.Client) FindOrderService { + return &findOrderService{ + c: c, + name: name, + } +} + +func (c *findOrderService) FindOrder(ctx context.Context, in *FindOrderReq, opts ...client.CallOption) (*FindOrderResp, error) { + req := c.c.NewRequest(c.name, "FindOrder.FindOrder", in) + out := new(FindOrderResp) + err := c.c.Call(ctx, req, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// Server API for FindOrder service + +type FindOrderHandler interface { + FindOrder(context.Context, *FindOrderReq, *FindOrderResp) error +} + +func RegisterFindOrderHandler(s server.Server, hdlr FindOrderHandler, opts ...server.HandlerOption) error { + type findOrder interface { + FindOrder(ctx context.Context, in *FindOrderReq, out *FindOrderResp) error + } + type FindOrder struct { + findOrder + } + h := &findOrderHandler{hdlr} + return s.Handle(s.NewHandler(&FindOrder{h}, opts...)) +} + +type findOrderHandler struct { + FindOrderHandler +} + +func (h *findOrderHandler) FindOrder(ctx context.Context, in *FindOrderReq, out *FindOrderResp) error { + return h.FindOrderHandler.FindOrder(ctx, in, out) +} diff --git a/trade-order/proto/trade.proto b/trade-order/proto/trade.proto index 4a22a85..684bc58 100644 --- a/trade-order/proto/trade.proto +++ b/trade-order/proto/trade.proto @@ -33,7 +33,7 @@ message TradeOrder { int32 userId =12 ; int32 createUser =13; int32 updateUser =14; - string cancelReason =15; + int32 cancelReason =15; string createTime =16; string submitTime =17; } @@ -320,5 +320,16 @@ service GetOrderTotal { } - +//查询订单详情 +message FindOrderReq { + string id = 1; + string orderNo = 2; +} +message FindOrderResp { + TradeOrder tradeOrder = 1; +} +//查询订单详情 +service FindOrder { + rpc FindOrder (FindOrderReq) returns (FindOrderResp){} +}