feat: import services and standardize Go 1.26.5

apps/ec/delivery/internal/logic/car/car_add_logic.go

@@ -0,0 +1,82 @@
+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"
+	"git.apinb.com/bsm-service-ec/delivery/external/pb/delivery"
+	"git.apinb.com/bsm-service-ec/delivery/internal/models"
+	"git.apinb.com/bsm-service-ec/delivery/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type CarAddLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewCarAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CarAddLogic {
+	return &CarAddLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// 添加配送车辆信息
+func (l *CarAddLogic) CarAdd(in *delivery.CarItem) (*delivery.StatusReply, error) {
+	_, err := service.ParseMetaCtx(l.ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if err = carAddChick(in); err != nil {
+		return nil, err
+	}
+
+	data := models.DeliveryCar{
+		Identity:      utils.ULID(),
+		Brand:         in.Brand,
+		Version:       in.Version,
+		TeamIdentity:  in.TeamIdentity,
+		LicenseNumber: in.LicenseNumber,
+		Contacts:      in.Contacts,
+		Phone:         in.Phone,
+		Picture:       in.Picture,
+	}
+
+	err = models.DBService.Create(&data).Error
+	if err != nil {
+		l.Logger.Error(err.Error())
+		return nil, exception.ErrDBFatal
+	}
+
+	return &delivery.StatusReply{Status: 200, Identity: data.Identity, Message: ""}, nil
+}
+func carAddChick(in *delivery.CarItem) error {
+	if in.GetBrand() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetPhone() == "" {
+		return exception.ErrInvalidArgument
+	}
+	// if in.GetTeamIdentity() == "" {
+	// 	return exception.ErrInvalidArgument
+	// }
+	if in.GetContacts() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetVersion() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetPicture() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetLicenseNumber() == "" {
+		return exception.ErrInvalidArgument
+	}
+	return nil
+}

apps/ec/delivery/internal/logic/car/car_del_logic.go

@@ -0,0 +1,46 @@
+package deliverylogic
+
+import (
+	"context"
+
+	"git.apinb.com/bsm-sdk/engine/exception"
+	"git.apinb.com/bsm-sdk/engine/service"
+	"git.apinb.com/bsm-service-ec/delivery/external/pb/delivery"
+	"git.apinb.com/bsm-service-ec/delivery/internal/models"
+	"git.apinb.com/bsm-service-ec/delivery/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type CarDelLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewCarDelLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CarDelLogic {
+	return &CarDelLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// 删除配送车辆信息
+func (l *CarDelLogic) CarDel(in *delivery.IdentRequest) (*delivery.StatusReply, error) {
+	_, err := service.ParseMetaCtx(l.ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.GetIdentity() == "" {
+		return nil, exception.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 &delivery.StatusReply{Status: 200, Identity: in.Identity, Message: ""}, nil
+}

apps/ec/delivery/internal/logic/car/car_get_logic.go

@@ -0,0 +1,51 @@
+package deliverylogic
+
+import (
+	"context"
+	"errors"
+
+	"git.apinb.com/bsm-sdk/engine/exception"
+	"git.apinb.com/bsm-sdk/engine/service"
+	"git.apinb.com/bsm-service-ec/delivery/external/pb/delivery"
+	"git.apinb.com/bsm-service-ec/delivery/internal/models"
+	"git.apinb.com/bsm-service-ec/delivery/internal/svc"
+	"gorm.io/gorm"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type CarGetLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewCarGetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CarGetLogic {
+	return &CarGetLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// 获取配送车辆信息
+func (l *CarGetLogic) CarGet(in *delivery.IdentRequest) (*delivery.CarItem, error) {
+	_, err := service.ParseMetaCtx(l.ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.GetIdentity() == "" {
+		return nil, exception.ErrInvalidArgument
+	}
+
+	var data = delivery.CarItem{}
+	err = models.DBService.Model(&models.DeliveryCar{}).Where("identity = ?", in.Identity).Find(&data).Error
+	if err != nil {
+		l.Logger.Error(err.Error())
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, exception.ErrNotFound
+		}
+		return nil, exception.ErrDBFatal
+	}
+	return &data, nil
+}

apps/ec/delivery/internal/logic/car/car_list_logic.go

@@ -0,0 +1,82 @@
+package deliverylogic
+
+import (
+	"context"
+	"errors"
+
+	"git.apinb.com/bsm-sdk/engine/exception"
+	"git.apinb.com/bsm-sdk/engine/service"
+	"git.apinb.com/bsm-service-ec/delivery/external/pb/delivery"
+	"git.apinb.com/bsm-service-ec/delivery/internal/models"
+	"git.apinb.com/bsm-service-ec/delivery/internal/svc"
+	"gorm.io/gorm"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type CarListLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewCarListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CarListLogic {
+	return &CarListLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// 配送车辆列表
+func (l *CarListLogic) CarList(in *delivery.FetchRequest) (*delivery.CarListReply, error) {
+	_, err := service.ParseMetaCtx(l.ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	var (
+		teamIdentity  string = ""
+		identity      string = ""
+		licenseNumber string = ""
+		status        int64  = 1
+		cnt           int64  = 0
+		data                 = make([]*delivery.CarItem, 0)
+	)
+
+	if in.GetParams()["identity"] != "" {
+		identity = in.Params["identity"]
+	}
+	if in.GetParams()["team_identity"] != "" {
+		teamIdentity = in.Params["team_identity"]
+	}
+	if in.GetParams()["license_number"] != "" {
+		licenseNumber = in.Params["license_number"]
+	}
+
+	if in.GetParams()["status"] == "-1" {
+		status = -1
+	}
+	cnt, res, err := models.DeliverycarList(identity, teamIdentity, licenseNumber, status, int(in.PageSize), int(in.PageNo))
+	if err != nil {
+		l.Logger.Error(err.Error())
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, exception.ErrNotFound
+		}
+		return nil, exception.ErrDBFatal
+	}
+	for _, v := range res {
+		item := delivery.CarItem{
+			Identity:      v.Identity,
+			Brand:         v.Brand,
+			LicenseNumber: v.LicenseNumber,
+			TeamIdentity:  v.TeamIdentity,
+			Contacts:      v.Contacts,
+			Picture:       v.Picture,
+			Phone:         v.Phone,
+			Status:        v.Status,
+			Version:       v.Version,
+		}
+		data = append(data, &item)
+	}
+	return &delivery.CarListReply{Count: cnt, List: data}, nil
+}

apps/ec/delivery/internal/logic/car/car_set_logic.go

@@ -0,0 +1,83 @@
+package deliverylogic
+
+import (
+	"context"
+
+	"git.apinb.com/bsm-sdk/engine/exception"
+	"git.apinb.com/bsm-sdk/engine/service"
+	"git.apinb.com/bsm-service-ec/delivery/external/pb/delivery"
+	"git.apinb.com/bsm-service-ec/delivery/internal/models"
+	"git.apinb.com/bsm-service-ec/delivery/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type CarSetLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewCarSetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CarSetLogic {
+	return &CarSetLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// 修改配送车辆信息
+func (l *CarSetLogic) CarSet(in *delivery.CarItem) (*delivery.StatusReply, error) {
+	_, err := service.ParseMetaCtx(l.ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if err = carSetChick(in); err != nil {
+		return nil, err
+	}
+
+	data := models.DeliveryCar{
+		Brand:         in.Brand,
+		Version:       in.Version,
+		TeamIdentity:  in.TeamIdentity,
+		LicenseNumber: in.LicenseNumber,
+		Contacts:      in.Contacts,
+		Phone:         in.Phone,
+		Picture:       in.Picture,
+	}
+
+	err = models.DBService.Where("identity = ?", in.Identity).Updates(&data).Error
+	if err != nil {
+		l.Logger.Error(err.Error())
+		return nil, exception.ErrDBFatal
+	}
+
+	return &delivery.StatusReply{Status: 200, Identity: in.Identity, Message: ""}, nil
+}
+func carSetChick(in *delivery.CarItem) error {
+	if in.GetIdentity() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetBrand() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetPhone() == "" {
+		return exception.ErrInvalidArgument
+	}
+	// if in.GetTeamIdentity() == "" {
+	// 	return exception.ErrInvalidArgument
+	// }
+	if in.GetContacts() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetVersion() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetPicture() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetLicenseNumber() == "" {
+		return exception.ErrInvalidArgument
+	}
+	return nil
+}

apps/ec/delivery/internal/logic/member/member_add_logic.go

@@ -0,0 +1,73 @@
+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"
+	"git.apinb.com/bsm-service-ec/delivery/external/pb/delivery"
+	"git.apinb.com/bsm-service-ec/delivery/internal/models"
+	"git.apinb.com/bsm-service-ec/delivery/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type MemberAddLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewMemberAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MemberAddLogic {
+	return &MemberAddLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// 添加配送员
+func (l *MemberAddLogic) MemberAdd(in *delivery.MemberItem) (*delivery.StatusReply, error) {
+	_, err := service.ParseMetaCtx(l.ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if err = memberAddChick(in); err != nil {
+		return nil, err
+	}
+
+	data := models.DeliveryMember{
+		Identity:     utils.ULID(),
+		Name:         in.Name,
+		TeamIdentity: in.TeamIdentity,
+		Phone:        in.Phone,
+		Picture:      in.Picture,
+	}
+
+	err = models.DBService.Create(&data).Error
+	if err != nil {
+		l.Logger.Error(err.Error())
+		return nil, exception.ErrDBFatal
+	}
+
+	return &delivery.StatusReply{Status: 200, Identity: data.Identity, Message: ""}, nil
+}
+func memberAddChick(in *delivery.MemberItem) error {
+	if in.GetName() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetPhone() == "" {
+		return exception.ErrInvalidArgument
+	}
+	// if in.GetTeamIdentity() == "" {
+	// 	return exception.ErrInvalidArgument
+	// }
+	if in.GetPicture() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetPhone() == "" {
+		return exception.ErrInvalidArgument
+	}
+	return nil
+}

apps/ec/delivery/internal/logic/member/member_del_logic.go

@@ -0,0 +1,46 @@
+package deliverylogic
+
+import (
+	"context"
+
+	"git.apinb.com/bsm-sdk/engine/exception"
+	"git.apinb.com/bsm-sdk/engine/service"
+	"git.apinb.com/bsm-service-ec/delivery/external/pb/delivery"
+	"git.apinb.com/bsm-service-ec/delivery/internal/models"
+	"git.apinb.com/bsm-service-ec/delivery/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type MemberDelLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewMemberDelLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MemberDelLogic {
+	return &MemberDelLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// 删除配送员
+func (l *MemberDelLogic) MemberDel(in *delivery.IdentRequest) (*delivery.StatusReply, error) {
+	_, err := service.ParseMetaCtx(l.ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.GetIdentity() == "" {
+		return nil, exception.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 &delivery.StatusReply{Status: 200, Identity: in.Identity, Message: ""}, nil
+}

apps/ec/delivery/internal/logic/member/member_get_logic.go

@@ -0,0 +1,51 @@
+package deliverylogic
+
+import (
+	"context"
+	"errors"
+
+	"git.apinb.com/bsm-sdk/engine/exception"
+	"git.apinb.com/bsm-sdk/engine/service"
+	"git.apinb.com/bsm-service-ec/delivery/external/pb/delivery"
+	"git.apinb.com/bsm-service-ec/delivery/internal/models"
+	"git.apinb.com/bsm-service-ec/delivery/internal/svc"
+	"gorm.io/gorm"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type MemberGetLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewMemberGetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MemberGetLogic {
+	return &MemberGetLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// 获取配送员数据
+func (l *MemberGetLogic) MemberGet(in *delivery.IdentRequest) (*delivery.MemberItem, error) {
+	_, err := service.ParseMetaCtx(l.ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.GetIdentity() == "" {
+		return nil, exception.ErrInvalidArgument
+	}
+
+	var data = delivery.MemberItem{}
+	err = models.DBService.Model(&models.DeliveryMember{}).Where("identity = ?", in.Identity).Find(&data).Error
+	if err != nil {
+		l.Logger.Error(err.Error())
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, exception.ErrNotFound
+		}
+		return nil, exception.ErrDBFatal
+	}
+	return &data, nil
+}

apps/ec/delivery/internal/logic/member/member_list_logic.go

@@ -0,0 +1,80 @@
+package deliverylogic
+
+import (
+	"context"
+	"errors"
+
+	"git.apinb.com/bsm-sdk/engine/exception"
+	"git.apinb.com/bsm-sdk/engine/service"
+	"git.apinb.com/bsm-service-ec/delivery/external/pb/delivery"
+	"git.apinb.com/bsm-service-ec/delivery/internal/models"
+	"git.apinb.com/bsm-service-ec/delivery/internal/svc"
+	"gorm.io/gorm"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type MemberListLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewMemberListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MemberListLogic {
+	return &MemberListLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// 获取配送员列表
+func (l *MemberListLogic) MemberList(in *delivery.FetchRequest) (*delivery.MemberListReply, error) {
+	_, err := service.ParseMetaCtx(l.ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	var (
+		teamIdentity string = ""
+		identity     string = ""
+		name         string = ""
+		status       int64  = 1
+		cnt          int64  = 0
+		data                = make([]*delivery.MemberItem, 0)
+	)
+
+	if in.GetParams()["identity"] != "" {
+		identity = in.Params["identity"]
+	}
+	if in.GetParams()["team_identity"] != "" {
+		teamIdentity = in.Params["team_identity"]
+	}
+	if in.GetParams()["name"] != "" {
+		name = in.Params["name"]
+	}
+
+	if in.GetParams()["status"] == "-1" {
+		status = -1
+	}
+	cnt, res, err := models.DeliveryMemberList(identity, teamIdentity, name, status, int(in.PageSize), int(in.PageNo))
+	if err != nil {
+		l.Logger.Error(err.Error())
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, exception.ErrNotFound
+		}
+		return nil, exception.ErrDBFatal
+	}
+	for _, v := range res {
+		item := delivery.MemberItem{
+			Identity:     v.Identity,
+			Name:         v.Name,
+			TeamIdentity: v.TeamIdentity,
+			Picture:      v.Picture,
+			Phone:        v.Phone,
+			Status:       v.Status,
+			Turnover:     v.Turnover,
+		}
+		data = append(data, &item)
+	}
+	return &delivery.MemberListReply{Count: cnt, List: data}, nil
+}

apps/ec/delivery/internal/logic/member/member_set_logic.go

@@ -0,0 +1,76 @@
+package deliverylogic
+
+import (
+	"context"
+
+	"git.apinb.com/bsm-sdk/engine/exception"
+	"git.apinb.com/bsm-sdk/engine/service"
+	"git.apinb.com/bsm-service-ec/delivery/external/pb/delivery"
+	"git.apinb.com/bsm-service-ec/delivery/internal/models"
+	"git.apinb.com/bsm-service-ec/delivery/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type MemberSetLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewMemberSetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MemberSetLogic {
+	return &MemberSetLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// 修改配送员
+func (l *MemberSetLogic) MemberSet(in *delivery.MemberItem) (*delivery.StatusReply, error) {
+	_, err := service.ParseMetaCtx(l.ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if err = memberSetChick(in); err != nil {
+		return nil, err
+	}
+
+	data := models.DeliveryMember{
+		Name:         in.Name,
+		TeamIdentity: in.TeamIdentity,
+		Phone:        in.Phone,
+		Picture:      in.Picture,
+		Turnover:     in.Turnover,
+	}
+
+	err = models.DBService.Where("identity = ?", in.Identity).Updates(&data).Error
+	if err != nil {
+		l.Logger.Error(err.Error())
+		return nil, exception.ErrDBFatal
+	}
+
+	return &delivery.StatusReply{Status: 200, Identity: in.Identity, Message: ""}, nil
+}
+
+func memberSetChick(in *delivery.MemberItem) error {
+	if in.GetIdentity() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetName() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetPhone() == "" {
+		return exception.ErrInvalidArgument
+	}
+	// if in.GetTeamIdentity() == "" {
+	// 	return exception.ErrInvalidArgument
+	// }
+	if in.GetPicture() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetPhone() == "" {
+		return exception.ErrInvalidArgument
+	}
+	return nil
+}

apps/ec/delivery/internal/logic/team/team_add_logic.go

@@ -0,0 +1,75 @@
+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"
+	"git.apinb.com/bsm-service-ec/delivery/external/pb/delivery"
+	"git.apinb.com/bsm-service-ec/delivery/internal/models"
+	"git.apinb.com/bsm-service-ec/delivery/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type TeamAddLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewTeamAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) *TeamAddLogic {
+	return &TeamAddLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// 添加配送团队
+func (l *TeamAddLogic) TeamAdd(in *delivery.TeamItem) (*delivery.StatusReply, error) {
+	_, err := service.ParseMetaCtx(l.ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if err = teamAddChick(in); err != nil {
+		return nil, err
+	}
+
+	data := models.DeliveryItem{
+		Identity: utils.ULID(),
+		Title:    in.Title,
+		Owner:    in.Owner,
+		Contacts: in.Contacts,
+		Phone:    in.Phone,
+		Logo:     in.Logo,
+	}
+
+	err = models.DBService.Create(&data).Error
+	if err != nil {
+		l.Logger.Error(err.Error())
+		return nil, exception.ErrDBFatal
+	}
+
+	return &delivery.StatusReply{Status: 200, Identity: data.Identity, Message: ""}, nil
+}
+
+func teamAddChick(in *delivery.TeamItem) error {
+	if in.GetOwner() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetPhone() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetTitle() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetContacts() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetLogo() == "" {
+		return exception.ErrInvalidArgument
+	}
+	return nil
+}

apps/ec/delivery/internal/logic/team/team_del_logic.go

@@ -0,0 +1,47 @@
+package deliverylogic
+
+import (
+	"context"
+
+	"git.apinb.com/bsm-sdk/engine/exception"
+	"git.apinb.com/bsm-sdk/engine/service"
+	"git.apinb.com/bsm-service-ec/delivery/external/pb/delivery"
+	"git.apinb.com/bsm-service-ec/delivery/internal/models"
+	"git.apinb.com/bsm-service-ec/delivery/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type TeamDelLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewTeamDelLogic(ctx context.Context, svcCtx *svc.ServiceContext) *TeamDelLogic {
+	return &TeamDelLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// 删除配送团队
+func (l *TeamDelLogic) TeamDel(in *delivery.IdentRequest) (*delivery.StatusReply, error) {
+	_, err := service.ParseMetaCtx(l.ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.GetIdentity() == "" {
+		return nil, exception.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 &delivery.StatusReply{Status: 200, Identity: in.Identity, Message: ""}, nil
+}

apps/ec/delivery/internal/logic/team/team_get_logic.go

@@ -0,0 +1,51 @@
+package deliverylogic
+
+import (
+	"context"
+	"errors"
+
+	"git.apinb.com/bsm-sdk/engine/exception"
+	"git.apinb.com/bsm-sdk/engine/service"
+	"git.apinb.com/bsm-service-ec/delivery/external/pb/delivery"
+	"git.apinb.com/bsm-service-ec/delivery/internal/models"
+	"git.apinb.com/bsm-service-ec/delivery/internal/svc"
+	"gorm.io/gorm"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type TeamGetLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewTeamGetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *TeamGetLogic {
+	return &TeamGetLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// 配送团队详情
+func (l *TeamGetLogic) TeamGet(in *delivery.IdentRequest) (*delivery.TeamItem, error) {
+	_, err := service.ParseMetaCtx(l.ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.GetIdentity() == "" {
+		return nil, exception.ErrInvalidArgument
+	}
+
+	var data = delivery.TeamItem{}
+	err = models.DBService.Model(&models.DeliveryItem{}).Where("identity = ?", in.Identity).Find(&data).Error
+	if err != nil {
+		l.Logger.Error(err.Error())
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, exception.ErrNotFound
+		}
+		return nil, exception.ErrDBFatal
+	}
+	return &data, nil
+}

apps/ec/delivery/internal/logic/team/team_list_logic.go

@@ -0,0 +1,83 @@
+package deliverylogic
+
+import (
+	"context"
+	"errors"
+	"fmt"
+
+	"git.apinb.com/bsm-sdk/engine/exception"
+	"git.apinb.com/bsm-sdk/engine/service"
+	"git.apinb.com/bsm-service-ec/delivery/external/pb/delivery"
+	"git.apinb.com/bsm-service-ec/delivery/internal/models"
+	"git.apinb.com/bsm-service-ec/delivery/internal/svc"
+	"gorm.io/gorm"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type TeamListLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewTeamListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *TeamListLogic {
+	return &TeamListLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// 配送团队列表
+func (l *TeamListLogic) TeamList(in *delivery.FetchRequest) (*delivery.TeamListReply, error) {
+	_, err := service.ParseMetaCtx(l.ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	var (
+		title    string = ""
+		identity string = ""
+		owner    string = ""
+		status   int64  = 1
+		cnt      int64  = 0
+		data            = make([]*delivery.TeamItem, 0)
+	)
+
+	if in.GetParams()["identity"] != "" {
+		identity = in.Params["identity"]
+	}
+	if in.GetParams()["title"] != "" {
+		title = in.Params["title"]
+	}
+	if in.GetParams()["owner"] != "" {
+		owner = in.Params["owner"]
+	}
+
+	if in.GetParams()["status"] == "-1" {
+		status = -1
+	}
+	cnt, res, err := models.DeliveryItemList(identity, title, owner, status, int(in.PageSize), int(in.PageNo))
+	if err != nil {
+		fmt.Println("err:", err.Error())
+		l.Logger.Error(err.Error())
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, exception.ErrNotFound
+		}
+
+		return nil, exception.ErrDBFatal
+	}
+	for _, v := range res {
+		item := delivery.TeamItem{
+			Identity: v.Identity,
+			Title:    v.Title,
+			Owner:    v.Owner,
+			Contacts: v.Contacts,
+			Phone:    v.Phone,
+			Status:   v.Status,
+			Logo:     v.Logo,
+		}
+		data = append(data, &item)
+	}
+	return &delivery.TeamListReply{Count: cnt, List: data}, nil
+}

apps/ec/delivery/internal/logic/team/team_set_logic.go

@@ -0,0 +1,76 @@
+package deliverylogic
+
+import (
+	"context"
+
+	"git.apinb.com/bsm-sdk/engine/exception"
+	"git.apinb.com/bsm-sdk/engine/service"
+	"git.apinb.com/bsm-service-ec/delivery/external/pb/delivery"
+	"git.apinb.com/bsm-service-ec/delivery/internal/models"
+	"git.apinb.com/bsm-service-ec/delivery/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type TeamSetLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewTeamSetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *TeamSetLogic {
+	return &TeamSetLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// 修改配送团队信息
+func (l *TeamSetLogic) TeamSet(in *delivery.TeamItem) (*delivery.StatusReply, error) {
+	_, err := service.ParseMetaCtx(l.ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if err = teamSetChick(in); err != nil {
+		return nil, err
+	}
+
+	data := models.DeliveryItem{
+		Title:    in.Title,
+		Owner:    in.Owner,
+		Contacts: in.Contacts,
+		Phone:    in.Phone,
+		Logo:     in.Logo,
+		Status:   in.Status,
+	}
+	err = models.DBService.Where("identity = ?", in.Identity).Updates(&data).Error
+	if err != nil {
+		l.Logger.Error(err.Error())
+		return nil, exception.ErrDBFatal
+	}
+
+	return &delivery.StatusReply{Status: 200, Identity: in.Identity, Message: ""}, nil
+}
+func teamSetChick(in *delivery.TeamItem) error {
+	if in.GetIdentity() == "" {
+		return exception.ErrInvalidArgument
+
+	}
+	if in.GetOwner() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetPhone() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetTitle() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetContacts() == "" {
+		return exception.ErrInvalidArgument
+	}
+	if in.GetLogo() == "" {
+		return exception.ErrInvalidArgument
+	}
+	return nil
+}