bsm-infra/full
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: centralize protobuf and remove go-zero

Browse Source
This commit is contained in:
yanweidong
2026-08-09 15:10:19 +08:00
parent 5cc5fd92ed
commit 4bbed3156c
357 changed files with 14208 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
module/ec/delivery/internal/logic/car/car_add_logic.go
View File

@@ -3,27 +3,29 @@ package deliverylogic
import (
"context"
"git.apinb.com/bsm-sdk/engine/exception"
"git.apinb.com/bsm-sdk/engine/service"
"git.apinb.com/bsm-sdk/engine/utils"
"bsm/full/module/ec/delivery/external/pb/delivery"
"bsm/full/module/ec/delivery/internal/models"
"bsm/full/module/ec/delivery/internal/svc"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/service"
"git.apinb.com/bsm-sdk/core/utils"
"github.com/zeromicro/go-zero/core/logx"
"log/slog"
"bsm/full/shared/logging"
)
type CarAddLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
*slog.Logger
}
func NewCarAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CarAddLogic {
return &CarAddLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
Logger: logging.Context(ctx),
}
}
@@ -51,32 +53,32 @@ func (l *CarAddLogic) CarAdd(in *delivery.CarItem) (*delivery.StatusReply, error
err = models.DBService.Create(&data).Error
if err != nil {
l.Logger.Error(err.Error())
return nil, exception.ErrDBFatal
return nil, errcode.ErrDB
}
return &delivery.StatusReply{Status: 200, Identity: data.Identity, Message: ""}, nil
}
func carAddChick(in *delivery.CarItem) error {
if in.GetBrand() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetPhone() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
// if in.GetTeamIdentity() == "" {
// return exception.ErrInvalidArgument
// return errcode.ErrInvalidArgument
// }
if in.GetContacts() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetVersion() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetPicture() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetLicenseNumber() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
return nil
}

16
module/ec/delivery/internal/logic/car/car_del_logic.go
View File

@@ -3,26 +3,28 @@ package deliverylogic
import (
"context"
"git.apinb.com/bsm-sdk/engine/exception"
"git.apinb.com/bsm-sdk/engine/service"
"bsm/full/module/ec/delivery/external/pb/delivery"
"bsm/full/module/ec/delivery/internal/models"
"bsm/full/module/ec/delivery/internal/svc"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/service"
"github.com/zeromicro/go-zero/core/logx"
"log/slog"
"bsm/full/shared/logging"
)
type CarDelLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
*slog.Logger
}
func NewCarDelLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CarDelLogic {
return &CarDelLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
Logger: logging.Context(ctx),
}
}
@@ -33,14 +35,14 @@ func (l *CarDelLogic) CarDel(in *delivery.IdentRequest) (*delivery.StatusReply,
return nil, err
}
if in.GetIdentity() == "" {
return nil, exception.ErrInvalidArgument
return nil, errcode.ErrInvalidArgument
}
//Todo: 删除是是否判定有未完成订单不能删除
err = models.DBService.Where("identity = ?", in.Identity).Delete(&models.DeliveryCar{}).Error
if err != nil {
l.Logger.Error(err.Error())
return nil, exception.ErrDBFatal
return nil, errcode.ErrDB
}
return &delivery.StatusReply{Status: 200, Identity: in.Identity, Message: ""}, nil
}

18
module/ec/delivery/internal/logic/car/car_get_logic.go
View File

@@ -4,27 +4,29 @@ import (
"context"
"errors"
"git.apinb.com/bsm-sdk/engine/exception"
"git.apinb.com/bsm-sdk/engine/service"
"bsm/full/module/ec/delivery/external/pb/delivery"
"bsm/full/module/ec/delivery/internal/models"
"bsm/full/module/ec/delivery/internal/svc"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/service"
"gorm.io/gorm"
"github.com/zeromicro/go-zero/core/logx"
"log/slog"
"bsm/full/shared/logging"
)
type CarGetLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
*slog.Logger
}
func NewCarGetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CarGetLogic {
return &CarGetLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
Logger: logging.Context(ctx),
}
}
@@ -35,7 +37,7 @@ func (l *CarGetLogic) CarGet(in *delivery.IdentRequest) (*delivery.CarItem, erro
return nil, err
}
if in.GetIdentity() == "" {
return nil, exception.ErrInvalidArgument
return nil, errcode.ErrInvalidArgument
}
var data = delivery.CarItem{}
@@ -43,9 +45,9 @@ func (l *CarGetLogic) CarGet(in *delivery.IdentRequest) (*delivery.CarItem, erro
if err != nil {
l.Logger.Error(err.Error())
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, exception.ErrNotFound
return nil, errcode.ErrRecordNotFound
}
return nil, exception.ErrDBFatal
return nil, errcode.ErrDB
}
return &data, nil
}

16
module/ec/delivery/internal/logic/car/car_list_logic.go
View File

@@ -4,27 +4,29 @@ import (
"context"
"errors"
"git.apinb.com/bsm-sdk/engine/exception"
"git.apinb.com/bsm-sdk/engine/service"
"bsm/full/module/ec/delivery/external/pb/delivery"
"bsm/full/module/ec/delivery/internal/models"
"bsm/full/module/ec/delivery/internal/svc"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/service"
"gorm.io/gorm"
"github.com/zeromicro/go-zero/core/logx"
"log/slog"
"bsm/full/shared/logging"
)
type CarListLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
*slog.Logger
}
func NewCarListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CarListLogic {
return &CarListLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
Logger: logging.Context(ctx),
}
}
@@ -60,9 +62,9 @@ func (l *CarListLogic) CarList(in *delivery.FetchRequest) (*delivery.CarListRepl
if err != nil {
l.Logger.Error(err.Error())
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, exception.ErrNotFound
return nil, errcode.ErrRecordNotFound
}
return nil, exception.ErrDBFatal
return nil, errcode.ErrDB
}
for _, v := range res {
item := delivery.CarItem{

30
module/ec/delivery/internal/logic/car/car_set_logic.go
View File

@@ -3,26 +3,28 @@ package deliverylogic
import (
"context"
"git.apinb.com/bsm-sdk/engine/exception"
"git.apinb.com/bsm-sdk/engine/service"
"bsm/full/module/ec/delivery/external/pb/delivery"
"bsm/full/module/ec/delivery/internal/models"
"bsm/full/module/ec/delivery/internal/svc"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/service"
"github.com/zeromicro/go-zero/core/logx"
"log/slog"
"bsm/full/shared/logging"
)
type CarSetLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
*slog.Logger
}
func NewCarSetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CarSetLogic {
return &CarSetLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
Logger: logging.Context(ctx),
}
}
@@ -49,35 +51,35 @@ func (l *CarSetLogic) CarSet(in *delivery.CarItem) (*delivery.StatusReply, error
err = models.DBService.Where("identity = ?", in.Identity).Updates(&data).Error
if err != nil {
l.Logger.Error(err.Error())
return nil, exception.ErrDBFatal
return nil, errcode.ErrDB
}
return &delivery.StatusReply{Status: 200, Identity: in.Identity, Message: ""}, nil
}
func carSetChick(in *delivery.CarItem) error {
if in.GetIdentity() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetBrand() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetPhone() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
// if in.GetTeamIdentity() == "" {
// return exception.ErrInvalidArgument
// return errcode.ErrInvalidArgument
// }
if in.GetContacts() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetVersion() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetPicture() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetLicenseNumber() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
return nil
}

26
module/ec/delivery/internal/logic/member/member_add_logic.go
View File

@@ -3,27 +3,29 @@ package deliverylogic
import (
"context"
"git.apinb.com/bsm-sdk/engine/exception"
"git.apinb.com/bsm-sdk/engine/service"
"git.apinb.com/bsm-sdk/engine/utils"
"bsm/full/module/ec/delivery/external/pb/delivery"
"bsm/full/module/ec/delivery/internal/models"
"bsm/full/module/ec/delivery/internal/svc"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/service"
"git.apinb.com/bsm-sdk/core/utils"
"github.com/zeromicro/go-zero/core/logx"
"log/slog"
"bsm/full/shared/logging"
)
type MemberAddLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
*slog.Logger
}
func NewMemberAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MemberAddLogic {
return &MemberAddLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
Logger: logging.Context(ctx),
}
}
@@ -48,26 +50,26 @@ func (l *MemberAddLogic) MemberAdd(in *delivery.MemberItem) (*delivery.StatusRep
err = models.DBService.Create(&data).Error
if err != nil {
l.Logger.Error(err.Error())
return nil, exception.ErrDBFatal
return nil, errcode.ErrDB
}
return &delivery.StatusReply{Status: 200, Identity: data.Identity, Message: ""}, nil
}
func memberAddChick(in *delivery.MemberItem) error {
if in.GetName() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetPhone() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
// if in.GetTeamIdentity() == "" {
// return exception.ErrInvalidArgument
// return errcode.ErrInvalidArgument
// }
if in.GetPicture() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetPhone() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
return nil
}

16
module/ec/delivery/internal/logic/member/member_del_logic.go
View File

@@ -3,26 +3,28 @@ package deliverylogic
import (
"context"
"git.apinb.com/bsm-sdk/engine/exception"
"git.apinb.com/bsm-sdk/engine/service"
"bsm/full/module/ec/delivery/external/pb/delivery"
"bsm/full/module/ec/delivery/internal/models"
"bsm/full/module/ec/delivery/internal/svc"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/service"
"github.com/zeromicro/go-zero/core/logx"
"log/slog"
"bsm/full/shared/logging"
)
type MemberDelLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
*slog.Logger
}
func NewMemberDelLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MemberDelLogic {
return &MemberDelLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
Logger: logging.Context(ctx),
}
}
@@ -33,14 +35,14 @@ func (l *MemberDelLogic) MemberDel(in *delivery.IdentRequest) (*delivery.StatusR
return nil, err
}
if in.GetIdentity() == "" {
return nil, exception.ErrInvalidArgument
return nil, errcode.ErrInvalidArgument
}
//Todo: 删除是是否判定有未完成订单不能删除
err = models.DBService.Where("identity = ?", in.Identity).Delete(&models.DeliveryMember{}).Error
if err != nil {
l.Logger.Error(err.Error())
return nil, exception.ErrDBFatal
return nil, errcode.ErrDB
}
return &delivery.StatusReply{Status: 200, Identity: in.Identity, Message: ""}, nil
}

18
module/ec/delivery/internal/logic/member/member_get_logic.go
View File

@@ -4,27 +4,29 @@ import (
"context"
"errors"
"git.apinb.com/bsm-sdk/engine/exception"
"git.apinb.com/bsm-sdk/engine/service"
"bsm/full/module/ec/delivery/external/pb/delivery"
"bsm/full/module/ec/delivery/internal/models"
"bsm/full/module/ec/delivery/internal/svc"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/service"
"gorm.io/gorm"
"github.com/zeromicro/go-zero/core/logx"
"log/slog"
"bsm/full/shared/logging"
)
type MemberGetLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
*slog.Logger
}
func NewMemberGetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MemberGetLogic {
return &MemberGetLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
Logger: logging.Context(ctx),
}
}
@@ -35,7 +37,7 @@ func (l *MemberGetLogic) MemberGet(in *delivery.IdentRequest) (*delivery.MemberI
return nil, err
}
if in.GetIdentity() == "" {
return nil, exception.ErrInvalidArgument
return nil, errcode.ErrInvalidArgument
}
var data = delivery.MemberItem{}
@@ -43,9 +45,9 @@ func (l *MemberGetLogic) MemberGet(in *delivery.IdentRequest) (*delivery.MemberI
if err != nil {
l.Logger.Error(err.Error())
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, exception.ErrNotFound
return nil, errcode.ErrRecordNotFound
}
return nil, exception.ErrDBFatal
return nil, errcode.ErrDB
}
return &data, nil
}

16
module/ec/delivery/internal/logic/member/member_list_logic.go
View File

@@ -4,27 +4,29 @@ import (
"context"
"errors"
"git.apinb.com/bsm-sdk/engine/exception"
"git.apinb.com/bsm-sdk/engine/service"
"bsm/full/module/ec/delivery/external/pb/delivery"
"bsm/full/module/ec/delivery/internal/models"
"bsm/full/module/ec/delivery/internal/svc"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/service"
"gorm.io/gorm"
"github.com/zeromicro/go-zero/core/logx"
"log/slog"
"bsm/full/shared/logging"
)
type MemberListLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
*slog.Logger
}
func NewMemberListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MemberListLogic {
return &MemberListLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
Logger: logging.Context(ctx),
}
}
@@ -60,9 +62,9 @@ func (l *MemberListLogic) MemberList(in *delivery.FetchRequest) (*delivery.Membe
if err != nil {
l.Logger.Error(err.Error())
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, exception.ErrNotFound
return nil, errcode.ErrRecordNotFound
}
return nil, exception.ErrDBFatal
return nil, errcode.ErrDB
}
for _, v := range res {
item := delivery.MemberItem{

26
module/ec/delivery/internal/logic/member/member_set_logic.go
View File

@@ -3,26 +3,28 @@ package deliverylogic
import (
"context"
"git.apinb.com/bsm-sdk/engine/exception"
"git.apinb.com/bsm-sdk/engine/service"
"bsm/full/module/ec/delivery/external/pb/delivery"
"bsm/full/module/ec/delivery/internal/models"
"bsm/full/module/ec/delivery/internal/svc"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/service"
"github.com/zeromicro/go-zero/core/logx"
"log/slog"
"bsm/full/shared/logging"
)
type MemberSetLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
*slog.Logger
}
func NewMemberSetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MemberSetLogic {
return &MemberSetLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
Logger: logging.Context(ctx),
}
}
@@ -47,7 +49,7 @@ func (l *MemberSetLogic) MemberSet(in *delivery.MemberItem) (*delivery.StatusRep
err = models.DBService.Where("identity = ?", in.Identity).Updates(&data).Error
if err != nil {
l.Logger.Error(err.Error())
return nil, exception.ErrDBFatal
return nil, errcode.ErrDB
}
return &delivery.StatusReply{Status: 200, Identity: in.Identity, Message: ""}, nil
@@ -55,22 +57,22 @@ func (l *MemberSetLogic) MemberSet(in *delivery.MemberItem) (*delivery.StatusRep
func memberSetChick(in *delivery.MemberItem) error {
if in.GetIdentity() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetName() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetPhone() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
// if in.GetTeamIdentity() == "" {
// return exception.ErrInvalidArgument
// return errcode.ErrInvalidArgument
// }
if in.GetPicture() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetPhone() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
return nil
}

26
module/ec/delivery/internal/logic/team/team_add_logic.go
View File

@@ -3,27 +3,29 @@ package deliverylogic
import (
"context"
"git.apinb.com/bsm-sdk/engine/exception"
"git.apinb.com/bsm-sdk/engine/service"
"git.apinb.com/bsm-sdk/engine/utils"
"bsm/full/module/ec/delivery/external/pb/delivery"
"bsm/full/module/ec/delivery/internal/models"
"bsm/full/module/ec/delivery/internal/svc"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/service"
"git.apinb.com/bsm-sdk/core/utils"
"github.com/zeromicro/go-zero/core/logx"
"log/slog"
"bsm/full/shared/logging"
)
type TeamAddLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
*slog.Logger
}
func NewTeamAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) *TeamAddLogic {
return &TeamAddLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
Logger: logging.Context(ctx),
}
}
@@ -49,7 +51,7 @@ func (l *TeamAddLogic) TeamAdd(in *delivery.TeamItem) (*delivery.StatusReply, er
err = models.DBService.Create(&data).Error
if err != nil {
l.Logger.Error(err.Error())
return nil, exception.ErrDBFatal
return nil, errcode.ErrDB
}
return &delivery.StatusReply{Status: 200, Identity: data.Identity, Message: ""}, nil
@@ -57,19 +59,19 @@ func (l *TeamAddLogic) TeamAdd(in *delivery.TeamItem) (*delivery.StatusReply, er
func teamAddChick(in *delivery.TeamItem) error {
if in.GetOwner() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetPhone() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetTitle() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetContacts() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetLogo() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
return nil
}

16
module/ec/delivery/internal/logic/team/team_del_logic.go
View File

@@ -3,26 +3,28 @@ package deliverylogic
import (
"context"
"git.apinb.com/bsm-sdk/engine/exception"
"git.apinb.com/bsm-sdk/engine/service"
"bsm/full/module/ec/delivery/external/pb/delivery"
"bsm/full/module/ec/delivery/internal/models"
"bsm/full/module/ec/delivery/internal/svc"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/service"
"github.com/zeromicro/go-zero/core/logx"
"log/slog"
"bsm/full/shared/logging"
)
type TeamDelLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
*slog.Logger
}
func NewTeamDelLogic(ctx context.Context, svcCtx *svc.ServiceContext) *TeamDelLogic {
return &TeamDelLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
Logger: logging.Context(ctx),
}
}
@@ -33,14 +35,14 @@ func (l *TeamDelLogic) TeamDel(in *delivery.IdentRequest) (*delivery.StatusReply
return nil, err
}
if in.GetIdentity() == "" {
return nil, exception.ErrInvalidArgument
return nil, errcode.ErrInvalidArgument
}
//Todo: 删除是是否判定有成员不能删除
err = models.DBService.Where("identity = ?", in.Identity).Delete(&models.DeliveryItem{}).Error
if err != nil {
l.Logger.Error(err.Error())
return nil, exception.ErrDBFatal
return nil, errcode.ErrDB
}
return &delivery.StatusReply{Status: 200, Identity: in.Identity, Message: ""}, nil

18
module/ec/delivery/internal/logic/team/team_get_logic.go
View File

@@ -4,27 +4,29 @@ import (
"context"
"errors"
"git.apinb.com/bsm-sdk/engine/exception"
"git.apinb.com/bsm-sdk/engine/service"
"bsm/full/module/ec/delivery/external/pb/delivery"
"bsm/full/module/ec/delivery/internal/models"
"bsm/full/module/ec/delivery/internal/svc"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/service"
"gorm.io/gorm"
"github.com/zeromicro/go-zero/core/logx"
"log/slog"
"bsm/full/shared/logging"
)
type TeamGetLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
*slog.Logger
}
func NewTeamGetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *TeamGetLogic {
return &TeamGetLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
Logger: logging.Context(ctx),
}
}
@@ -35,7 +37,7 @@ func (l *TeamGetLogic) TeamGet(in *delivery.IdentRequest) (*delivery.TeamItem, e
return nil, err
}
if in.GetIdentity() == "" {
return nil, exception.ErrInvalidArgument
return nil, errcode.ErrInvalidArgument
}
var data = delivery.TeamItem{}
@@ -43,9 +45,9 @@ func (l *TeamGetLogic) TeamGet(in *delivery.IdentRequest) (*delivery.TeamItem, e
if err != nil {
l.Logger.Error(err.Error())
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, exception.ErrNotFound
return nil, errcode.ErrRecordNotFound
}
return nil, exception.ErrDBFatal
return nil, errcode.ErrDB
}
return &data, nil
}

16
module/ec/delivery/internal/logic/team/team_list_logic.go
View File

@@ -5,27 +5,29 @@ import (
"errors"
"fmt"
"git.apinb.com/bsm-sdk/engine/exception"
"git.apinb.com/bsm-sdk/engine/service"
"bsm/full/module/ec/delivery/external/pb/delivery"
"bsm/full/module/ec/delivery/internal/models"
"bsm/full/module/ec/delivery/internal/svc"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/service"
"gorm.io/gorm"
"github.com/zeromicro/go-zero/core/logx"
"log/slog"
"bsm/full/shared/logging"
)
type TeamListLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
*slog.Logger
}
func NewTeamListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *TeamListLogic {
return &TeamListLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
Logger: logging.Context(ctx),
}
}
@@ -62,10 +64,10 @@ func (l *TeamListLogic) TeamList(in *delivery.FetchRequest) (*delivery.TeamListR
fmt.Println("err:", err.Error())
l.Logger.Error(err.Error())
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, exception.ErrNotFound
return nil, errcode.ErrRecordNotFound
}
return nil, exception.ErrDBFatal
return nil, errcode.ErrDB
}
for _, v := range res {
item := delivery.TeamItem{

26
module/ec/delivery/internal/logic/team/team_set_logic.go
View File

@@ -3,26 +3,28 @@ package deliverylogic
import (
"context"
"git.apinb.com/bsm-sdk/engine/exception"
"git.apinb.com/bsm-sdk/engine/service"
"bsm/full/module/ec/delivery/external/pb/delivery"
"bsm/full/module/ec/delivery/internal/models"
"bsm/full/module/ec/delivery/internal/svc"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/service"
"github.com/zeromicro/go-zero/core/logx"
"log/slog"
"bsm/full/shared/logging"
)
type TeamSetLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
*slog.Logger
}
func NewTeamSetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *TeamSetLogic {
return &TeamSetLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
Logger: logging.Context(ctx),
}
}
@@ -47,30 +49,30 @@ func (l *TeamSetLogic) TeamSet(in *delivery.TeamItem) (*delivery.StatusReply, er
err = models.DBService.Where("identity = ?", in.Identity).Updates(&data).Error
if err != nil {
l.Logger.Error(err.Error())
return nil, exception.ErrDBFatal
return nil, errcode.ErrDB
}
return &delivery.StatusReply{Status: 200, Identity: in.Identity, Message: ""}, nil
}
func teamSetChick(in *delivery.TeamItem) error {
if in.GetIdentity() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetOwner() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetPhone() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetTitle() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetContacts() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
if in.GetLogo() == "" {
return exception.ErrInvalidArgument
return errcode.ErrInvalidArgument
}
return nil
}