add log service and change order

rpc/order/order.proto

@@ -109,6 +109,16 @@ message AdminCreateOrderRequest {
   int32 type =4;
 }
 
+message UpdateOrderDeliverStatusRequest {
+  string sign_time = 1;
+  int32 deliver_status = 2;
+  string id = 3;
+}
+
+message UpdateOrderDeliverStatusResponse {
+  int32 num = 1;
+}
+
 service order {
   rpc Items(OrderItemsRequest) returns(Response){
     option (google.api.http) = {
@@ -212,4 +222,5 @@ service order {
       body: "*"
     };
   };
+  rpc UpdateOrderDeliverStatus(UpdateOrderDeliverStatusRequest) returns(UpdateOrderDeliverStatusResponse);
 }

rpc/order/pb/order.pb.go

@@ -1038,6 +1038,110 @@ func (x *AdminCreateOrderRequest) GetType() int32 {
 	return 0
 }
 
+type UpdateOrderDeliverStatusRequest struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	SignTime      string                 `protobuf:"bytes,1,opt,name=sign_time,json=signTime,proto3" json:"sign_time,omitempty"`
+	DeliverStatus int32                  `protobuf:"varint,2,opt,name=deliver_status,json=deliverStatus,proto3" json:"deliver_status,omitempty"`
+	Id            string                 `protobuf:"bytes,3,opt,name=id,proto3" json:"id,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *UpdateOrderDeliverStatusRequest) Reset() {
+	*x = UpdateOrderDeliverStatusRequest{}
+	mi := &file_order_order_proto_msgTypes[16]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *UpdateOrderDeliverStatusRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UpdateOrderDeliverStatusRequest) ProtoMessage() {}
+
+func (x *UpdateOrderDeliverStatusRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_order_order_proto_msgTypes[16]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UpdateOrderDeliverStatusRequest.ProtoReflect.Descriptor instead.
+func (*UpdateOrderDeliverStatusRequest) Descriptor() ([]byte, []int) {
+	return file_order_order_proto_rawDescGZIP(), []int{16}
+}
+
+func (x *UpdateOrderDeliverStatusRequest) GetSignTime() string {
+	if x != nil {
+		return x.SignTime
+	}
+	return ""
+}
+
+func (x *UpdateOrderDeliverStatusRequest) GetDeliverStatus() int32 {
+	if x != nil {
+		return x.DeliverStatus
+	}
+	return 0
+}
+
+func (x *UpdateOrderDeliverStatusRequest) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+type UpdateOrderDeliverStatusResponse struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Num           int32                  `protobuf:"varint,1,opt,name=num,proto3" json:"num,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *UpdateOrderDeliverStatusResponse) Reset() {
+	*x = UpdateOrderDeliverStatusResponse{}
+	mi := &file_order_order_proto_msgTypes[17]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *UpdateOrderDeliverStatusResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UpdateOrderDeliverStatusResponse) ProtoMessage() {}
+
+func (x *UpdateOrderDeliverStatusResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_order_order_proto_msgTypes[17]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UpdateOrderDeliverStatusResponse.ProtoReflect.Descriptor instead.
+func (*UpdateOrderDeliverStatusResponse) Descriptor() ([]byte, []int) {
+	return file_order_order_proto_rawDescGZIP(), []int{17}
+}
+
+func (x *UpdateOrderDeliverStatusResponse) GetNum() int32 {
+	if x != nil {
+		return x.Num
+	}
+	return 0
+}
+
 var File_order_order_proto protoreflect.FileDescriptor
 
 const file_order_order_proto_rawDesc = "" +
@@ -1119,7 +1223,13 @@ const file_order_order_proto_rawDesc = "" +
 	"address_id\x18\x01 \x01(\x03R\taddressId\x12\x12\n" +
 	"\x04note\x18\x02 \x01(\tR\x04note\x12\x12\n" +
 	"\x04info\x18\x03 \x01(\tR\x04info\x12\x12\n" +
-	"\x04type\x18\x04 \x01(\x05R\x04type2\xf4\v\n" +
+	"\x04type\x18\x04 \x01(\x05R\x04type\"u\n" +
+	"\x1fUpdateOrderDeliverStatusRequest\x12\x1b\n" +
+	"\tsign_time\x18\x01 \x01(\tR\bsignTime\x12%\n" +
+	"\x0edeliver_status\x18\x02 \x01(\x05R\rdeliverStatus\x12\x0e\n" +
+	"\x02id\x18\x03 \x01(\tR\x02id\"4\n" +
+	" UpdateOrderDeliverStatusResponse\x12\x10\n" +
+	"\x03num\x18\x01 \x01(\x05R\x03num2\xe1\f\n" +
 	"\x05order\x12T\n" +
 	"\x05Items\x12\x18.order.OrderItemsRequest\x1a\x0f.order.Response\" \x82\xd3\xe4\x93\x02\x1a:\x01*\x12\x15/admin/v3/order/items\x12X\n" +
 	"\tWebCreate\x12\x19.order.CreateOrderRequest\x1a\x0f.order.Response\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/api/v3/order/create\x12b\n" +
@@ -1136,7 +1246,8 @@ const file_order_order_proto_rawDesc = "" +
 	"\x0eAddressByStore\x12!.order.AddressByStoreItemsRequest\x1a\x0f.order.Response\"(\x82\xd3\xe4\x93\x02\":\x01*\x12\x1d/admin/v3/address/store/items\x12r\n" +
 	"\x12OrderAuditingItems\x12 .order.OrderAuditingItemsRequest\x1a\x0f.order.Response\")\x82\xd3\xe4\x93\x02#:\x01*\x12\x1e/admin/v3/order/auditing/items\x12b\n" +
 	"\rOrderAuditing\x12\x1b.order.OrderAuditingRequest\x1a\x0f.order.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/admin/v3/order/auditing\x12a\n" +
-	"\vOrderCreate\x12\x1e.order.AdminCreateOrderRequest\x1a\x0f.order.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\"\x16/admin/v3/order/createB\x19Z\x17lone-services/rpc/orderb\x06proto3"
+	"\vOrderCreate\x12\x1e.order.AdminCreateOrderRequest\x1a\x0f.order.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\"\x16/admin/v3/order/create\x12k\n" +
+	"\x18UpdateOrderDeliverStatus\x12&.order.UpdateOrderDeliverStatusRequest\x1a'.order.UpdateOrderDeliverStatusResponseB\x19Z\x17lone-services/rpc/orderb\x06proto3"
 
 var (
 	file_order_order_proto_rawDescOnce sync.Once
@@ -1150,24 +1261,26 @@ func file_order_order_proto_rawDescGZIP() []byte {
 	return file_order_order_proto_rawDescData
 }
 
-var file_order_order_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
+var file_order_order_proto_msgTypes = make([]protoimpl.MessageInfo, 18)
 var file_order_order_proto_goTypes = []any{
-	(*OrderItemsRequest)(nil),          // 0: order.OrderItemsRequest
-	(*Response)(nil),                   // 1: order.Response
-	(*CreateOrderRequest)(nil),         // 2: order.CreateOrderRequest
-	(*CreateOrderOneRequest)(nil),      // 3: order.CreateOrderOneRequest
-	(*EditAddressRequest)(nil),         // 4: order.EditAddressRequest
-	(*EmptyRequest)(nil),               // 5: order.EmptyRequest
-	(*EditCartRequest)(nil),            // 6: order.EditCartRequest
-	(*CartRequest)(nil),                // 7: order.CartRequest
-	(*IdRequest)(nil),                  // 8: order.IdRequest
-	(*IdAndTypeRequest)(nil),           // 9: order.IdAndTypeRequest
-	(*TypeRequest)(nil),                // 10: order.TypeRequest
-	(*AddressItemsRequest)(nil),        // 11: order.AddressItemsRequest
-	(*AddressByStoreItemsRequest)(nil), // 12: order.AddressByStoreItemsRequest
-	(*OrderAuditingItemsRequest)(nil),  // 13: order.OrderAuditingItemsRequest
-	(*OrderAuditingRequest)(nil),       // 14: order.OrderAuditingRequest
-	(*AdminCreateOrderRequest)(nil),    // 15: order.AdminCreateOrderRequest
+	(*OrderItemsRequest)(nil),                // 0: order.OrderItemsRequest
+	(*Response)(nil),                         // 1: order.Response
+	(*CreateOrderRequest)(nil),               // 2: order.CreateOrderRequest
+	(*CreateOrderOneRequest)(nil),            // 3: order.CreateOrderOneRequest
+	(*EditAddressRequest)(nil),               // 4: order.EditAddressRequest
+	(*EmptyRequest)(nil),                     // 5: order.EmptyRequest
+	(*EditCartRequest)(nil),                  // 6: order.EditCartRequest
+	(*CartRequest)(nil),                      // 7: order.CartRequest
+	(*IdRequest)(nil),                        // 8: order.IdRequest
+	(*IdAndTypeRequest)(nil),                 // 9: order.IdAndTypeRequest
+	(*TypeRequest)(nil),                      // 10: order.TypeRequest
+	(*AddressItemsRequest)(nil),              // 11: order.AddressItemsRequest
+	(*AddressByStoreItemsRequest)(nil),       // 12: order.AddressByStoreItemsRequest
+	(*OrderAuditingItemsRequest)(nil),        // 13: order.OrderAuditingItemsRequest
+	(*OrderAuditingRequest)(nil),             // 14: order.OrderAuditingRequest
+	(*AdminCreateOrderRequest)(nil),          // 15: order.AdminCreateOrderRequest
+	(*UpdateOrderDeliverStatusRequest)(nil),  // 16: order.UpdateOrderDeliverStatusRequest
+	(*UpdateOrderDeliverStatusResponse)(nil), // 17: order.UpdateOrderDeliverStatusResponse
 }
 var file_order_order_proto_depIdxs = []int32{
 	0,  // 0: order.order.Items:input_type -> order.OrderItemsRequest
@@ -1186,24 +1299,26 @@ var file_order_order_proto_depIdxs = []int32{
 	13, // 13: order.order.OrderAuditingItems:input_type -> order.OrderAuditingItemsRequest
 	14, // 14: order.order.OrderAuditing:input_type -> order.OrderAuditingRequest
 	15, // 15: order.order.OrderCreate:input_type -> order.AdminCreateOrderRequest
-	1,  // 16: order.order.Items:output_type -> order.Response
-	1,  // 17: order.order.WebCreate:output_type -> order.Response
-	1,  // 18: order.order.WebCreateOne:output_type -> order.Response
-	1,  // 19: order.order.WebAddressCreate:output_type -> order.Response
-	1,  // 20: order.order.WebAddressEdit:output_type -> order.Response
-	1,  // 21: order.order.WebAddressDel:output_type -> order.Response
-	1,  // 22: order.order.WebAddressDef:output_type -> order.Response
-	1,  // 23: order.order.WebAddressInfo:output_type -> order.Response
-	1,  // 24: order.order.WebAddressItems:output_type -> order.Response
-	1,  // 25: order.order.WebCart:output_type -> order.Response
-	1,  // 26: order.order.WebCartEdit:output_type -> order.Response
-	1,  // 27: order.order.AddressItem:output_type -> order.Response
-	1,  // 28: order.order.AddressByStore:output_type -> order.Response
-	1,  // 29: order.order.OrderAuditingItems:output_type -> order.Response
-	1,  // 30: order.order.OrderAuditing:output_type -> order.Response
-	1,  // 31: order.order.OrderCreate:output_type -> order.Response
-	16, // [16:32] is the sub-list for method output_type
-	0,  // [0:16] is the sub-list for method input_type
+	16, // 16: order.order.UpdateOrderDeliverStatus:input_type -> order.UpdateOrderDeliverStatusRequest
+	1,  // 17: order.order.Items:output_type -> order.Response
+	1,  // 18: order.order.WebCreate:output_type -> order.Response
+	1,  // 19: order.order.WebCreateOne:output_type -> order.Response
+	1,  // 20: order.order.WebAddressCreate:output_type -> order.Response
+	1,  // 21: order.order.WebAddressEdit:output_type -> order.Response
+	1,  // 22: order.order.WebAddressDel:output_type -> order.Response
+	1,  // 23: order.order.WebAddressDef:output_type -> order.Response
+	1,  // 24: order.order.WebAddressInfo:output_type -> order.Response
+	1,  // 25: order.order.WebAddressItems:output_type -> order.Response
+	1,  // 26: order.order.WebCart:output_type -> order.Response
+	1,  // 27: order.order.WebCartEdit:output_type -> order.Response
+	1,  // 28: order.order.AddressItem:output_type -> order.Response
+	1,  // 29: order.order.AddressByStore:output_type -> order.Response
+	1,  // 30: order.order.OrderAuditingItems:output_type -> order.Response
+	1,  // 31: order.order.OrderAuditing:output_type -> order.Response
+	1,  // 32: order.order.OrderCreate:output_type -> order.Response
+	17, // 33: order.order.UpdateOrderDeliverStatus:output_type -> order.UpdateOrderDeliverStatusResponse
+	17, // [17:34] is the sub-list for method output_type
+	0,  // [0:17] is the sub-list for method input_type
 	0,  // [0:0] is the sub-list for extension type_name
 	0,  // [0:0] is the sub-list for extension extendee
 	0,  // [0:0] is the sub-list for field type_name
@@ -1220,7 +1335,7 @@ func file_order_order_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_order_order_proto_rawDesc), len(file_order_order_proto_rawDesc)),
 			NumEnums:      0,
-			NumMessages:   16,
+			NumMessages:   18,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

rpc/order/pb/order_grpc.pb.go

@@ -19,22 +19,23 @@ import (
 const _ = grpc.SupportPackageIsVersion9
 
 const (
-	Order_Items_FullMethodName              = "/order.order/Items"
-	Order_WebCreate_FullMethodName          = "/order.order/WebCreate"
-	Order_WebCreateOne_FullMethodName       = "/order.order/WebCreateOne"
-	Order_WebAddressCreate_FullMethodName   = "/order.order/WebAddressCreate"
-	Order_WebAddressEdit_FullMethodName     = "/order.order/WebAddressEdit"
-	Order_WebAddressDel_FullMethodName      = "/order.order/WebAddressDel"
-	Order_WebAddressDef_FullMethodName      = "/order.order/WebAddressDef"
-	Order_WebAddressInfo_FullMethodName     = "/order.order/WebAddressInfo"
-	Order_WebAddressItems_FullMethodName    = "/order.order/WebAddressItems"
-	Order_WebCart_FullMethodName            = "/order.order/WebCart"
-	Order_WebCartEdit_FullMethodName        = "/order.order/WebCartEdit"
-	Order_AddressItem_FullMethodName        = "/order.order/AddressItem"
-	Order_AddressByStore_FullMethodName     = "/order.order/AddressByStore"
-	Order_OrderAuditingItems_FullMethodName = "/order.order/OrderAuditingItems"
-	Order_OrderAuditing_FullMethodName      = "/order.order/OrderAuditing"
-	Order_OrderCreate_FullMethodName        = "/order.order/OrderCreate"
+	Order_Items_FullMethodName                    = "/order.order/Items"
+	Order_WebCreate_FullMethodName                = "/order.order/WebCreate"
+	Order_WebCreateOne_FullMethodName             = "/order.order/WebCreateOne"
+	Order_WebAddressCreate_FullMethodName         = "/order.order/WebAddressCreate"
+	Order_WebAddressEdit_FullMethodName           = "/order.order/WebAddressEdit"
+	Order_WebAddressDel_FullMethodName            = "/order.order/WebAddressDel"
+	Order_WebAddressDef_FullMethodName            = "/order.order/WebAddressDef"
+	Order_WebAddressInfo_FullMethodName           = "/order.order/WebAddressInfo"
+	Order_WebAddressItems_FullMethodName          = "/order.order/WebAddressItems"
+	Order_WebCart_FullMethodName                  = "/order.order/WebCart"
+	Order_WebCartEdit_FullMethodName              = "/order.order/WebCartEdit"
+	Order_AddressItem_FullMethodName              = "/order.order/AddressItem"
+	Order_AddressByStore_FullMethodName           = "/order.order/AddressByStore"
+	Order_OrderAuditingItems_FullMethodName       = "/order.order/OrderAuditingItems"
+	Order_OrderAuditing_FullMethodName            = "/order.order/OrderAuditing"
+	Order_OrderCreate_FullMethodName              = "/order.order/OrderCreate"
+	Order_UpdateOrderDeliverStatus_FullMethodName = "/order.order/UpdateOrderDeliverStatus"
 )
 
 // OrderClient is the client API for Order service.
@@ -57,6 +58,7 @@ type OrderClient interface {
 	OrderAuditingItems(ctx context.Context, in *OrderAuditingItemsRequest, opts ...grpc.CallOption) (*Response, error)
 	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)
 }
 
 type orderClient struct {
@@ -227,6 +229,16 @@ func (c *orderClient) OrderCreate(ctx context.Context, in *AdminCreateOrderReque
 	return out, nil
 }
 
+func (c *orderClient) UpdateOrderDeliverStatus(ctx context.Context, in *UpdateOrderDeliverStatusRequest, opts ...grpc.CallOption) (*UpdateOrderDeliverStatusResponse, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(UpdateOrderDeliverStatusResponse)
+	err := c.cc.Invoke(ctx, Order_UpdateOrderDeliverStatus_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // OrderServer is the server API for Order service.
 // All implementations must embed UnimplementedOrderServer
 // for forward compatibility.
@@ -247,6 +259,7 @@ type OrderServer interface {
 	OrderAuditingItems(context.Context, *OrderAuditingItemsRequest) (*Response, error)
 	OrderAuditing(context.Context, *OrderAuditingRequest) (*Response, error)
 	OrderCreate(context.Context, *AdminCreateOrderRequest) (*Response, error)
+	UpdateOrderDeliverStatus(context.Context, *UpdateOrderDeliverStatusRequest) (*UpdateOrderDeliverStatusResponse, error)
 	mustEmbedUnimplementedOrderServer()
 }
 
@@ -305,6 +318,9 @@ func (UnimplementedOrderServer) OrderAuditing(context.Context, *OrderAuditingReq
 func (UnimplementedOrderServer) OrderCreate(context.Context, *AdminCreateOrderRequest) (*Response, error) {
 	return nil, status.Error(codes.Unimplemented, "method OrderCreate not implemented")
 }
+func (UnimplementedOrderServer) UpdateOrderDeliverStatus(context.Context, *UpdateOrderDeliverStatusRequest) (*UpdateOrderDeliverStatusResponse, error) {
+	return nil, status.Error(codes.Unimplemented, "method UpdateOrderDeliverStatus not implemented")
+}
 func (UnimplementedOrderServer) mustEmbedUnimplementedOrderServer() {}
 func (UnimplementedOrderServer) testEmbeddedByValue()               {}
 
@@ -614,6 +630,24 @@ func _Order_OrderCreate_Handler(srv interface{}, ctx context.Context, dec func(i
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Order_UpdateOrderDeliverStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateOrderDeliverStatusRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(OrderServer).UpdateOrderDeliverStatus(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: Order_UpdateOrderDeliverStatus_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(OrderServer).UpdateOrderDeliverStatus(ctx, req.(*UpdateOrderDeliverStatusRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // Order_ServiceDesc is the grpc.ServiceDesc for Order service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -685,6 +719,10 @@ var Order_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "OrderCreate",
 			Handler:    _Order_OrderCreate_Handler,
 		},
+		{
+			MethodName: "UpdateOrderDeliverStatus",
+			Handler:    _Order_UpdateOrderDeliverStatus_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "order/order.proto",