顺丰的查询、预计时间、取消接口

services/order/internal/dao/order.go

@@ -248,3 +248,32 @@ type OrderTaskAndAwardHalfYear struct {
 type OrderTaskAndAwardYear struct {
 	TaskAwardYearStatus uint8 `gorm:"column:task_award_year_status;type:tinyint(1);default:2;comment:结算任务与奖励年，1 为已结算，2为未结算" json:"task_awark_year_status"`
 }
+
+type OrderInfoDetail struct {
+	Id            int64   `gorm:"column:id;type:bigint(20);primary_key;AUTO_INCREMENT" json:"id"`
+	OrderSn       string  `gorm:"column:order_sn;type:varchar(100);comment:订单号;NOT NULL" json:"order_sn"`
+	StoreId       int64   `gorm:"column:store_id;type:int(11);comment:美容院关联ID号" json:"store_id"`
+	StoreName     string  `gorm:"column:store_name;type:varchar(50);comment:门店名" json:"store_name"`
+	SaleName      string  `gorm:"column:sale_name;type:varchar(50);comment:销售姓名" json:"sale_name"`
+	SaleMobile    string  `gorm:"column:sale_mobile;type:char(60);comment:销售电话" json:"sale_mobile"`
+	UserId        int64   `gorm:"column:user_id;type:int(11);comment:用户ID" json:"user_id"`
+	UserName      string  `gorm:"column:user_name;type:varchar(255);comment:用户名" json:"user_name"`
+	SaleId        int64   `gorm:"column:sale_id;type:int(11);comment:销售员ID号" json:"sale_id"`
+	Mobile        string  `gorm:"column:mobile;type:char(60);comment:收货人手机号;NOT NULL" json:"mobile"`
+	Address       string  `gorm:"column:address;type:varchar(255);comment:收货人地址;NOT NULL" json:"address"`
+	Addressee     string  `gorm:"column:addressee;type:varchar(50);comment:收货人姓名;NOT NULL" json:"addressee"`
+	DistrictIds   string  `gorm:"column:district_ids;type:varchar(255);comment:地区IDS;NOT NULL" json:"district_ids"`
+	TotalPrice    float64 `gorm:"column:total_price;type:decimal(10,2);comment:总价;NOT NULL" json:"total_price"`
+	PayPrice      float64 `gorm:"column:pay_price;type:decimal(10,2);comment:实际支付金额" json:"pay_price"`
+	PayType       int32   `gorm:"column:pay_type;type:tinyint(1);default:1;comment:支付类型，1为微信，2为支付宝,3为余额支付" json:"pay_type"`
+	DeliverStatus int32   `gorm:"column:deliver_status;type:tinyint(1);default:2;comment:发货状态，1为已签收，2为待发货，3为发货中，4为已发货" json:"deliver_status"`
+	Status        int32   `gorm:"column:status;type:tinyint(1);default:2;comment:支付状态，1为已支付，2为未支付，3为支付中,4支付失败，5已失效;NOT NULL" json:"status"`
+	IsSupply      int32   `gorm:"column:is_supply;type:tinyint(1);default:1;comment:是否补过货，1为没有，2为补过" json:"is_supply"`
+	Note          string  `gorm:"column:note;type:varchar(255);comment:备注" json:"note"`
+	ProductIds    string  `gorm:"column:product_ids;type:varchar(150);comment:产品IDs" json:"product_ids"`
+	OutTradeNo    string  `gorm:"column:out_trade_no;type:varchar(50);comment:支付订单号" json:"out_trade_no"`
+	Type          int32   `gorm:"column:type;type:tinyint(1);default:0;comment:类型  1 销售，2为门店，3为个人，4为个人家庭试用，5为个人门店试用" json:"type"`
+	VerifyStatus  int32   `gorm:"column:verify_status;type:tinyint(1);default:0;comment:审核状态，1为通过，2为失败，3为待审核，0为正常订单不需要审核" json:"verify_status"`
+	CreateType    int32   `gorm:"column:create_type;type:tinyint(1);default:1;comment:下单人类型，1为销售，2为门店，3为个人;NOT NULL" json:"create_type"`
+	RefundStatus  int32   `gorm:"column:refund_status" json:"refund_status"`
+}

services/order/internal/logic/getOrderInfoLogic.go

@@ -0,0 +1,30 @@
+package logic
+
+import (
+	"context"
+
+	"lone-services/rpc/order/pb"
+	"lone-services/services/order/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type GetOrderInfoLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewGetOrderInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetOrderInfoLogic {
+	return &GetOrderInfoLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *GetOrderInfoLogic) GetOrderInfo(in *order.GetOrderInfoRequest) (*order.OrderInfoResponse, error) {
+	// todo: add your logic here and delete this line
+
+	return &order.OrderInfoResponse{}, nil
+}

services/order/internal/server/orderServer.go

@@ -107,3 +107,8 @@ func (s *OrderServer) UpdateOrderDeliverStatus(ctx context.Context, in *order.Up
 	l := logic.NewUpdateOrderDeliverStatusLogic(ctx, s.svcCtx)
 	return l.UpdateOrderDeliverStatus(in)
 }
+
+func (s *OrderServer) GetOrderInfo(ctx context.Context, in *order.GetOrderInfoRequest) (*order.OrderInfoResponse, error) {
+	l := logic.NewGetOrderInfoLogic(ctx, s.svcCtx)
+	return l.GetOrderInfo(in)
+}

services/order/orderClient/order.go

@@ -23,10 +23,12 @@ type (
 	EditAddressRequest               = order.EditAddressRequest
 	EditCartRequest                  = order.EditCartRequest
 	EmptyRequest                     = order.EmptyRequest
+	GetOrderInfoRequest              = order.GetOrderInfoRequest
 	IdAndTypeRequest                 = order.IdAndTypeRequest
 	IdRequest                        = order.IdRequest
 	OrderAuditingItemsRequest        = order.OrderAuditingItemsRequest
 	OrderAuditingRequest             = order.OrderAuditingRequest
+	OrderInfoResponse                = order.OrderInfoResponse
 	OrderItemsRequest                = order.OrderItemsRequest
 	Response                         = order.Response
 	TypeRequest                      = order.TypeRequest
@@ -51,6 +53,7 @@ type (
 		OrderAuditing(ctx context.Context, in *OrderAuditingRequest, opts ...grpc.CallOption) (*Response, error)
 		OrderCreate(ctx context.Context, in *AdminCreateOrderRequest, opts ...grpc.CallOption) (*Response, error)
 		UpdateOrderDeliverStatus(ctx context.Context, in *UpdateOrderDeliverStatusRequest, opts ...grpc.CallOption) (*UpdateOrderDeliverStatusResponse, error)
+		GetOrderInfo(ctx context.Context, in *GetOrderInfoRequest, opts ...grpc.CallOption) (*OrderInfoResponse, error)
 	}
 
 	defaultOrder struct {
@@ -148,3 +151,8 @@ func (m *defaultOrder) UpdateOrderDeliverStatus(ctx context.Context, in *UpdateO
 	client := order.NewOrderClient(m.cli.Conn())
 	return client.UpdateOrderDeliverStatus(ctx, in, opts...)
 }
+
+func (m *defaultOrder) GetOrderInfo(ctx context.Context, in *GetOrderInfoRequest, opts ...grpc.CallOption) (*OrderInfoResponse, error) {
+	client := order.NewOrderClient(m.cli.Conn())
+	return client.GetOrderInfo(ctx, in, opts...)
+}