add log service and change order
CI / changes (push) Successful in 38s
CI / ad (push) Successful in 29s
CI / admin (push) Successful in 22s
CI / bff (push) Successful in 19s
CI / chore (push) Successful in 22s
CI / equipment (push) Successful in 20s
CI / express (push) Successful in 18s
CI / log (push) Successful in 0s
CI / product (push) Successful in 15s
CI / sale (push) Successful in 16s
CI / task (push) Successful in 17s
CI / user (push) Successful in 16s
CI / wecom (push) Successful in 16s
CI / changes (push) Successful in 38s
CI / ad (push) Successful in 29s
CI / admin (push) Successful in 22s
CI / bff (push) Successful in 19s
CI / chore (push) Successful in 22s
CI / equipment (push) Successful in 20s
CI / express (push) Successful in 18s
CI / log (push) Successful in 0s
CI / product (push) Successful in 15s
CI / sale (push) Successful in 16s
CI / task (push) Successful in 17s
CI / user (push) Successful in 16s
CI / wecom (push) Successful in 16s
This commit is contained in:
@@ -32,7 +32,7 @@ const (
|
||||
SendStatusOk = 4 //为已发货
|
||||
SendStatusCancel = 5 //已取消
|
||||
|
||||
OrderVerifyStatusOK = 1
|
||||
OrderVerifyStatusOK = 1
|
||||
OrderVerifyStatusFail = 2
|
||||
OrderVerifyStatusWait = 3
|
||||
)
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user