add log service and change order

services/order/internal/dao/order.go

@@ -32,7 +32,7 @@ const (
 	SendStatusOk     = 4 //为已发货
 	SendStatusCancel = 5 //已取消
 
-	OrderVerifyStatusOK = 1
+	OrderVerifyStatusOK   = 1
 	OrderVerifyStatusFail = 2
 	OrderVerifyStatusWait = 3
 )

services/order/internal/logic/orderCreateLogic.go

@@ -135,6 +135,7 @@ func (l *OrderCreateLogic) OrderCreate(in *order.AdminCreateOrderRequest) (*orde
 	cli, err := svc.GetRpcClient(l.svcCtx.ProductSvcName)
 	if err != nil {
 		mobileObj.Rollback()
+		l.Logger.Error(err)
 		return l.fail(utils.Fail)
 	}
 

services/order/internal/logic/updateOrderDeliverStatusLogic.go

@@ -0,0 +1,57 @@
+package logic
+
+import (
+	"context"
+	"lone-services/pkg/modelbase"
+	"lone-services/pkg/utils"
+	"lone-services/services/order/internal/dao"
+	"lone-services/services/order/internal/model"
+	"lone-services/services/order/validator"
+
+	"lone-services/rpc/order/pb"
+	"lone-services/services/order/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+)
+
+type UpdateOrderDeliverStatusLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+	BaseLogic
+}
+
+func NewUpdateOrderDeliverStatusLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdateOrderDeliverStatusLogic {
+	return &UpdateOrderDeliverStatusLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *UpdateOrderDeliverStatusLogic) UpdateOrderDeliverStatus(in *order.UpdateOrderDeliverStatusRequest) (*order.UpdateOrderDeliverStatusResponse, error) {
+	var v validator.AdminOrderAuditingValidator
+	if fail := l.checkParams(in, &v); fail != nil {
+		return nil, status.Error(codes.InvalidArgument, fail.Msg)
+	}
+
+	data := dao.OrderDeliverGoodsStatus{
+		DeliverStatus: uint8(in.DeliverStatus),
+	}
+
+	if in.SignTime != utils.StringEmpty {
+		sTime, err := utils.ParseCustomTime(in.SignTime)
+		if err != nil {
+			sTime = utils.Now()
+		}
+		data.SignTime = sTime
+	}
+	w := modelbase.Params{Eq: map[string]string{"id": in.Id}}
+	row, err := model.OrderModel{}.Init().Edit(w, &data)
+	if err != nil {
+		return nil, status.Error(codes.Internal, err.Error())
+	}
+	return &order.UpdateOrderDeliverStatusResponse{Num: int32(row)}, nil
+}

services/order/internal/server/orderServer.go

@@ -102,3 +102,8 @@ func (s *OrderServer) OrderCreate(ctx context.Context, in *order.AdminCreateOrde
 	l := logic.NewOrderCreateLogic(ctx, s.svcCtx)
 	return l.OrderCreate(in)
 }
+
+func (s *OrderServer) UpdateOrderDeliverStatus(ctx context.Context, in *order.UpdateOrderDeliverStatusRequest) (*order.UpdateOrderDeliverStatusResponse, error) {
+	l := logic.NewUpdateOrderDeliverStatusLogic(ctx, s.svcCtx)
+	return l.UpdateOrderDeliverStatus(in)
+}

services/order/orderClient/order.go

@@ -14,22 +14,24 @@ import (
 )
 
 type (
-	AddressByStoreItemsRequest = order.AddressByStoreItemsRequest
-	AddressItemsRequest        = order.AddressItemsRequest
-	AdminCreateOrderRequest    = order.AdminCreateOrderRequest
-	CartRequest                = order.CartRequest
-	CreateOrderOneRequest      = order.CreateOrderOneRequest
-	CreateOrderRequest         = order.CreateOrderRequest
-	EditAddressRequest         = order.EditAddressRequest
-	EditCartRequest            = order.EditCartRequest
-	EmptyRequest               = order.EmptyRequest
-	IdAndTypeRequest           = order.IdAndTypeRequest
-	IdRequest                  = order.IdRequest
-	OrderAuditingItemsRequest  = order.OrderAuditingItemsRequest
-	OrderAuditingRequest       = order.OrderAuditingRequest
-	OrderItemsRequest          = order.OrderItemsRequest
-	Response                   = order.Response
-	TypeRequest                = order.TypeRequest
+	AddressByStoreItemsRequest       = order.AddressByStoreItemsRequest
+	AddressItemsRequest              = order.AddressItemsRequest
+	AdminCreateOrderRequest          = order.AdminCreateOrderRequest
+	CartRequest                      = order.CartRequest
+	CreateOrderOneRequest            = order.CreateOrderOneRequest
+	CreateOrderRequest               = order.CreateOrderRequest
+	EditAddressRequest               = order.EditAddressRequest
+	EditCartRequest                  = order.EditCartRequest
+	EmptyRequest                     = order.EmptyRequest
+	IdAndTypeRequest                 = order.IdAndTypeRequest
+	IdRequest                        = order.IdRequest
+	OrderAuditingItemsRequest        = order.OrderAuditingItemsRequest
+	OrderAuditingRequest             = order.OrderAuditingRequest
+	OrderItemsRequest                = order.OrderItemsRequest
+	Response                         = order.Response
+	TypeRequest                      = order.TypeRequest
+	UpdateOrderDeliverStatusRequest  = order.UpdateOrderDeliverStatusRequest
+	UpdateOrderDeliverStatusResponse = order.UpdateOrderDeliverStatusResponse
 
 	Order interface {
 		Items(ctx context.Context, in *OrderItemsRequest, opts ...grpc.CallOption) (*Response, error)
@@ -48,6 +50,7 @@ type (
 		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)
 	}
 
 	defaultOrder struct {
@@ -140,3 +143,8 @@ func (m *defaultOrder) OrderCreate(ctx context.Context, in *AdminCreateOrderRequ
 	client := order.NewOrderClient(m.cli.Conn())
 	return client.OrderCreate(ctx, in, opts...)
 }
+
+func (m *defaultOrder) UpdateOrderDeliverStatus(ctx context.Context, in *UpdateOrderDeliverStatusRequest, opts ...grpc.CallOption) (*UpdateOrderDeliverStatusResponse, error) {
+	client := order.NewOrderClient(m.cli.Conn())
+	return client.UpdateOrderDeliverStatus(ctx, in, opts...)
+}

services/order/validator/order.go

@@ -94,3 +94,16 @@ type OrderItemsValidator struct {
 func (p OrderItemsValidator) GetMessage() validate.ValidatorMessages {
 	return validate.ValidatorMessages{}
 }
+
+type UpdateOrderDeliverStatusValidator struct {
+	Id            string `validate:"required"`
+	DeliverStatus int32  `validate:"required"`
+	SignTime      string
+}
+
+func (p UpdateOrderDeliverStatusValidator) GetMessage() validate.ValidatorMessages {
+	return validate.ValidatorMessages{
+		validate.FieldId:         validate.FieldIdValue,
+		"DeliverStatus.required": "发货状态不能为空",
+	}
+}