feat: import services and standardize Go 1.26.5
This commit is contained in:
14
apps/ec/delivery/internal/config/config.go
Normal file
14
apps/ec/delivery/internal/config/config.go
Normal file
@@ -0,0 +1,14 @@
|
||||
package config
|
||||
|
||||
import (
|
||||
"git.apinb.com/bsm-sdk/engine/types"
|
||||
"github.com/zeromicro/go-zero/zrpc"
|
||||
)
|
||||
|
||||
type Config struct {
|
||||
zrpc.RpcServerConf
|
||||
DSN string `json:",optional"`
|
||||
Cache string `json:",optional"`
|
||||
Anonymous types.AnonymousConf `json:",optional"`
|
||||
Pulsar types.PulsarConf `json:",optional"`
|
||||
}
|
||||
34
apps/ec/delivery/internal/errorcode/errorcode.go
Normal file
34
apps/ec/delivery/internal/errorcode/errorcode.go
Normal file
@@ -0,0 +1,34 @@
|
||||
package errorcode
|
||||
|
||||
import "fmt"
|
||||
|
||||
type CError struct {
|
||||
ErrorCode string
|
||||
Msg string
|
||||
Title string
|
||||
}
|
||||
|
||||
var (
|
||||
ErrTokenAuth = CError{ErrorCode: "3801", Msg: "Token Not Found", Title: "无效token"}
|
||||
ErrInvalidArgument = CError{ErrorCode: "3801", Msg: "Invalid Argument", Title: "无效参数"}
|
||||
ErrorJson = CError{ErrorCode: "3802", Msg: "Json Format Error", Title: "json格式错误"}
|
||||
ErrIdentityArgument = CError{ErrorCode: "3803", Msg: "Invalid parameter:identity", Title: "identity参数无效"}
|
||||
ErrPasswordArgument = CError{ErrorCode: "3804", Msg: " Invalid parameter:password", Title: "password参数无效"}
|
||||
ErrAuthPasswd = CError{ErrorCode: "3805", Msg: " Auth Password", Title: "password验证失败"}
|
||||
ErrDBFatal = CError{ErrorCode: "3806", Msg: "DB Fatal", Title: "数据错误"}
|
||||
ErrBalance = CError{ErrorCode: "3807", Msg: "Err Balance", Title: "余额异常"}
|
||||
ErrNotFound = CError{ErrorCode: "3809", Msg: "Err Not Found", Title: "数据未找到"}
|
||||
ErrPermissionDenied = CError{ErrorCode: "3810", Msg: "No Access", Title: "无权访问"}
|
||||
)
|
||||
|
||||
func (e *CError) Error() string {
|
||||
return fmt.Sprintf("Error Code: %s, Message: %s", e.ErrorCode, e.Msg)
|
||||
}
|
||||
|
||||
// 函数返回自定义错误
|
||||
func ContentError(err CError) error {
|
||||
return &CError{
|
||||
ErrorCode: err.ErrorCode,
|
||||
Msg: err.Msg,
|
||||
}
|
||||
}
|
||||
32
apps/ec/delivery/internal/impl/cache.go
Normal file
32
apps/ec/delivery/internal/impl/cache.go
Normal file
@@ -0,0 +1,32 @@
|
||||
package impl
|
||||
|
||||
import (
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"git.apinb.com/bsm-sdk/engine/cache/mem"
|
||||
"git.apinb.com/bsm-sdk/engine/cache/redis"
|
||||
"git.apinb.com/bsm-sdk/engine/print"
|
||||
"git.apinb.com/bsm-sdk/engine/vars"
|
||||
"github.com/FishGoddess/cachego"
|
||||
)
|
||||
|
||||
var (
|
||||
MemCache *cachego.Cache
|
||||
RedisCache *redis.RedisClient
|
||||
)
|
||||
|
||||
func withMemCache() {
|
||||
m := mem.New()
|
||||
MemCache = &m
|
||||
}
|
||||
|
||||
func withRedisCache() {
|
||||
if Configure.Cache != "" {
|
||||
addrs := strings.Split(Configure.ListenOn, ":")
|
||||
port, _ := strconv.Atoi(addrs[1])
|
||||
RedisCache = redis.New(Configure.Cache, port)
|
||||
|
||||
print.Info("[Blocks Service] %s Cache: %s, DB Index: %d", vars.ServiceKey, Configure.Cache, RedisCache.DB)
|
||||
}
|
||||
}
|
||||
29
apps/ec/delivery/internal/impl/impl.go
Normal file
29
apps/ec/delivery/internal/impl/impl.go
Normal file
@@ -0,0 +1,29 @@
|
||||
package impl
|
||||
|
||||
import (
|
||||
"git.apinb.com/bsm-service-ec/delivery/internal/config"
|
||||
|
||||
"git.apinb.com/bsm-sdk/engine/service"
|
||||
)
|
||||
|
||||
var (
|
||||
Configure config.Config
|
||||
)
|
||||
|
||||
func NewService(srvKey string) {
|
||||
// register service
|
||||
service.Register(srvKey, &Configure)
|
||||
service.RegisterAnonymous(&Configure.RpcServerConf, &Configure.Anonymous)
|
||||
|
||||
service.Start(Configure.ListenOn)
|
||||
|
||||
// with activating
|
||||
withModel() // model
|
||||
withMemCache() // mem cache
|
||||
withRedisCache() // redis cache
|
||||
withPulsar() // mq - pulsar
|
||||
|
||||
// service done.
|
||||
service.Done(&Configure.Prometheus, &Configure.Telemetry)
|
||||
|
||||
}
|
||||
21
apps/ec/delivery/internal/impl/model.go
Normal file
21
apps/ec/delivery/internal/impl/model.go
Normal file
@@ -0,0 +1,21 @@
|
||||
package impl
|
||||
|
||||
import (
|
||||
"os"
|
||||
|
||||
"git.apinb.com/bsm-service-ec/delivery/internal/models"
|
||||
|
||||
"git.apinb.com/bsm-sdk/engine/print"
|
||||
"git.apinb.com/bsm-sdk/engine/vars"
|
||||
)
|
||||
|
||||
func withModel() {
|
||||
if Configure.DSN != "" {
|
||||
err := models.New(Configure.DSN, nil)
|
||||
if err != nil {
|
||||
print.Fail("[Blocks Service] %s Model Error: %d", vars.ServiceKey, err.Error())
|
||||
os.Exit(0)
|
||||
}
|
||||
print.Info("[Blocks Service] %s Database Source: %s", vars.ServiceKey, Configure.DSN)
|
||||
}
|
||||
}
|
||||
24
apps/ec/delivery/internal/impl/mq.go
Normal file
24
apps/ec/delivery/internal/impl/mq.go
Normal file
@@ -0,0 +1,24 @@
|
||||
package impl
|
||||
|
||||
import (
|
||||
"os"
|
||||
|
||||
"git.apinb.com/bsm-sdk/engine/print"
|
||||
"git.apinb.com/bsm-sdk/engine/queue/pulsar"
|
||||
"git.apinb.com/bsm-sdk/engine/vars"
|
||||
)
|
||||
|
||||
var MQ *pulsar.Pulsar
|
||||
|
||||
func withPulsar() {
|
||||
if Configure.Pulsar.IsHas() {
|
||||
mq, err := pulsar.NewPulsar(&Configure.Pulsar)
|
||||
if err != nil {
|
||||
print.Fail("[Blocks Service] %s Pulsar Error: %d", vars.ServiceKey, err.Error())
|
||||
os.Exit(0)
|
||||
} else {
|
||||
MQ = mq
|
||||
print.Info("[Blocks Service] %s Queue/Pulsar Endpoint: %s", vars.ServiceKey, Configure.Pulsar.Endpoints)
|
||||
}
|
||||
}
|
||||
}
|
||||
82
apps/ec/delivery/internal/logic/car/car_add_logic.go
Normal file
82
apps/ec/delivery/internal/logic/car/car_add_logic.go
Normal file
@@ -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
|
||||
}
|
||||
46
apps/ec/delivery/internal/logic/car/car_del_logic.go
Normal file
46
apps/ec/delivery/internal/logic/car/car_del_logic.go
Normal file
@@ -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
|
||||
}
|
||||
51
apps/ec/delivery/internal/logic/car/car_get_logic.go
Normal file
51
apps/ec/delivery/internal/logic/car/car_get_logic.go
Normal file
@@ -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
|
||||
}
|
||||
82
apps/ec/delivery/internal/logic/car/car_list_logic.go
Normal file
82
apps/ec/delivery/internal/logic/car/car_list_logic.go
Normal file
@@ -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
|
||||
}
|
||||
83
apps/ec/delivery/internal/logic/car/car_set_logic.go
Normal file
83
apps/ec/delivery/internal/logic/car/car_set_logic.go
Normal file
@@ -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
|
||||
}
|
||||
73
apps/ec/delivery/internal/logic/member/member_add_logic.go
Normal file
73
apps/ec/delivery/internal/logic/member/member_add_logic.go
Normal file
@@ -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
|
||||
}
|
||||
46
apps/ec/delivery/internal/logic/member/member_del_logic.go
Normal file
46
apps/ec/delivery/internal/logic/member/member_del_logic.go
Normal file
@@ -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
|
||||
}
|
||||
51
apps/ec/delivery/internal/logic/member/member_get_logic.go
Normal file
51
apps/ec/delivery/internal/logic/member/member_get_logic.go
Normal file
@@ -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
|
||||
}
|
||||
80
apps/ec/delivery/internal/logic/member/member_list_logic.go
Normal file
80
apps/ec/delivery/internal/logic/member/member_list_logic.go
Normal file
@@ -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
|
||||
}
|
||||
76
apps/ec/delivery/internal/logic/member/member_set_logic.go
Normal file
76
apps/ec/delivery/internal/logic/member/member_set_logic.go
Normal file
@@ -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
|
||||
}
|
||||
75
apps/ec/delivery/internal/logic/team/team_add_logic.go
Normal file
75
apps/ec/delivery/internal/logic/team/team_add_logic.go
Normal file
@@ -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
|
||||
}
|
||||
47
apps/ec/delivery/internal/logic/team/team_del_logic.go
Normal file
47
apps/ec/delivery/internal/logic/team/team_del_logic.go
Normal file
@@ -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
|
||||
}
|
||||
51
apps/ec/delivery/internal/logic/team/team_get_logic.go
Normal file
51
apps/ec/delivery/internal/logic/team/team_get_logic.go
Normal file
@@ -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
|
||||
}
|
||||
83
apps/ec/delivery/internal/logic/team/team_list_logic.go
Normal file
83
apps/ec/delivery/internal/logic/team/team_list_logic.go
Normal file
@@ -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
|
||||
}
|
||||
76
apps/ec/delivery/internal/logic/team/team_set_logic.go
Normal file
76
apps/ec/delivery/internal/logic/team/team_set_logic.go
Normal file
@@ -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
|
||||
}
|
||||
50
apps/ec/delivery/internal/models/delivery_car.go
Normal file
50
apps/ec/delivery/internal/models/delivery_car.go
Normal file
@@ -0,0 +1,50 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
// Deliverycar 配送员表/*
|
||||
type DeliveryCar struct {
|
||||
gorm.Model
|
||||
Identity string `gorm:"column:identity;type:varchar(36);uniqueIndex;"` // 唯一标识,24位NanoID,36位为UUID
|
||||
Brand string `gorm:"column:brand;type:varchar(36);index;;" json:"brand"` // 品牌
|
||||
TeamIdentity string `gorm:"column:team_identity;type:varchar(36);Index;" json:"team_identity"` // 团队唯一标识
|
||||
Version string `gorm:"column:version;type:varchar(36);index;;" json:"version"` // 型号
|
||||
LicenseNumber string `gorm:"column:license_number;type:varchar(36);index;;" json:"license_number"` // 车牌号
|
||||
Contacts string `gorm:"column:contacts;type:varchar(36);Index;" json:"contacts"` // 联系人姓名
|
||||
Phone string `gorm:"column:phone;type:varchar(36);Index;" json:"phone"` // 联系人电话
|
||||
Picture string `gorm:"column:picture;type:varchar(255);Index;" json:"picture"` // 车辆图片
|
||||
Status int64 `gorm:"column:status;default:1;" json:"status"` // 状态:1正常;-1禁用
|
||||
}
|
||||
|
||||
// TableName .
|
||||
func (table *DeliveryCar) TableName() string {
|
||||
return "delivery_car" //对应数据库表名
|
||||
}
|
||||
|
||||
// DeliveryMemberList 获取配送团队
|
||||
func DeliverycarList(identity, teamIdentity, licenseNumber string, status int64, size, page int) (int64, []DeliveryCar, error) {
|
||||
var (
|
||||
cnt int64 = 0
|
||||
data = make([]DeliveryCar, 0)
|
||||
)
|
||||
tx := DBService
|
||||
if identity != "" {
|
||||
tx = tx.Where("identity = ?", identity)
|
||||
}
|
||||
if teamIdentity != "" {
|
||||
tx = tx.Where("team_identity = ?", teamIdentity)
|
||||
}
|
||||
if licenseNumber != "" {
|
||||
tx = tx.Where("license_number like ? or brand like ?", "%"+licenseNumber+"%", "%"+licenseNumber+"%")
|
||||
}
|
||||
if status != 0 {
|
||||
tx = tx.Where("status = ?", status)
|
||||
}
|
||||
err := tx.Model(DeliveryCar{}).Order("created_at desc").Count(&cnt).Limit(size).Offset((page - 1) * size).Find(&data).Error
|
||||
if err != nil {
|
||||
return 0, nil, err
|
||||
}
|
||||
return cnt, data, nil
|
||||
}
|
||||
49
apps/ec/delivery/internal/models/delivery_item.go
Normal file
49
apps/ec/delivery/internal/models/delivery_item.go
Normal file
@@ -0,0 +1,49 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
// DeliveryItem 配送团队表/*
|
||||
type DeliveryItem struct {
|
||||
gorm.Model
|
||||
Identity string `gorm:"column:identity;type:varchar(36);uniqueIndex;"` // 唯一标识,24位NanoID,36位为UUID
|
||||
Title string `gorm:"column:title;type:varchar(36);index;" json:"title"` // 团队名称
|
||||
Owner string `gorm:"column:owner;type:varchar(36);Index;" json:"owner"` // 归属者唯一标识
|
||||
Contacts string `gorm:"column:contacts;type:varchar(36);Index;" json:"contacts"` // 联系人姓名
|
||||
Phone string `gorm:"column:phone;type:varchar(36);Index;" json:"phone"` // 联系人电话
|
||||
Logo string `gorm:"column:logo;type:varchar(255);Index;" json:"logo"` // 团队图标地址
|
||||
Status int64 `gorm:"column:status;default:1;" json:"status"` // 状态:1正常;-1禁用
|
||||
}
|
||||
|
||||
// TableName .
|
||||
func (table *DeliveryItem) TableName() string {
|
||||
return "delivery_item" //对应数据库表名
|
||||
}
|
||||
|
||||
// DeliveryItemList 获取配送团队
|
||||
func DeliveryItemList(identity, title, owner string, status int64, size, page int) (int64, []DeliveryItem, error) {
|
||||
var (
|
||||
cnt int64 = 0
|
||||
data = make([]DeliveryItem, 0)
|
||||
)
|
||||
tx := DBService
|
||||
if identity != "" {
|
||||
tx = tx.Where("identity = ?", identity)
|
||||
}
|
||||
if title != "" {
|
||||
tx = tx.Where("title like ?", "%"+title+"%")
|
||||
}
|
||||
if owner != "" {
|
||||
tx = tx.Where("owner = ?", owner)
|
||||
}
|
||||
if status != 0 {
|
||||
tx = tx.Where("status = ?", status)
|
||||
}
|
||||
err := tx.Model(DeliveryItem{}).Order("created_at desc").Count(&cnt).Limit(size).Offset((page - 1) * size).Find(&data).Error
|
||||
if err != nil {
|
||||
|
||||
return 0, nil, err
|
||||
}
|
||||
return cnt, data, nil
|
||||
}
|
||||
48
apps/ec/delivery/internal/models/delivery_member.go
Normal file
48
apps/ec/delivery/internal/models/delivery_member.go
Normal file
@@ -0,0 +1,48 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
// DeliveryMember 配送员表/*
|
||||
type DeliveryMember struct {
|
||||
gorm.Model
|
||||
Identity string `gorm:"column:identity;type:varchar(36);uniqueIndex;"` // 唯一标识,24位NanoID,36位为UUID
|
||||
Name string `gorm:"column:name;type:varchar(36);index;" json:"name"` // 姓名
|
||||
TeamIdentity string `gorm:"column:team_identity;type:varchar(36);Index;" json:"team_identity"` // 团队唯一标识
|
||||
Phone string `gorm:"column:phone;type:varchar(36);Index;" json:"phone"` // 电话
|
||||
Picture string `gorm:"column:picture;type:varchar(255);Index;" json:"picture"` // 头像
|
||||
Status int64 `gorm:"column:status;default:1;" json:"status"` // 状态:1正常;-1禁用
|
||||
Turnover int64 `gorm:"column:turnover;default:1;" json:"turnover"` // 总成交量
|
||||
}
|
||||
|
||||
// TableName .
|
||||
func (table *DeliveryMember) TableName() string {
|
||||
return "delivery_member" //对应数据库表名
|
||||
}
|
||||
|
||||
// DeliveryMemberList 获取配送团队成员
|
||||
func DeliveryMemberList(identity, teamIdentity, name string, status int64, size, page int) (int64, []DeliveryMember, error) {
|
||||
var (
|
||||
cnt int64 = 0
|
||||
data = make([]DeliveryMember, 0)
|
||||
)
|
||||
tx := DBService
|
||||
if identity != "" {
|
||||
tx = tx.Where("identity = ?", identity)
|
||||
}
|
||||
if name != "" {
|
||||
tx = tx.Where("name like ?", "%"+name+"%")
|
||||
}
|
||||
if teamIdentity != "" {
|
||||
tx = tx.Where("team_identity = ?", teamIdentity)
|
||||
}
|
||||
if status != 0 {
|
||||
tx = tx.Where("status = ?", status)
|
||||
}
|
||||
err := tx.Model(DeliveryMember{}).Order("created_at desc").Count(&cnt).Limit(size).Offset((page - 1) * size).Find(&data).Error
|
||||
if err != nil {
|
||||
return 0, nil, err
|
||||
}
|
||||
return cnt, data, nil
|
||||
}
|
||||
28
apps/ec/delivery/internal/models/impl.go
Normal file
28
apps/ec/delivery/internal/models/impl.go
Normal file
@@ -0,0 +1,28 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"git.apinb.com/bsm-sdk/engine/database/sql"
|
||||
"git.apinb.com/bsm-sdk/engine/types"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
var DBService *gorm.DB
|
||||
|
||||
var migrateTables = []any{
|
||||
&DeliveryItem{},
|
||||
&DeliveryMember{},
|
||||
&DeliveryCar{},
|
||||
}
|
||||
|
||||
func New(dsn string, options *types.SqlOptions) (err error) {
|
||||
DBService, err = sql.NewPostgreSql(dsn, options)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = DBService.AutoMigrate(migrateTables...)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return
|
||||
}
|
||||
53
apps/ec/delivery/internal/server/car/car_server.go
Normal file
53
apps/ec/delivery/internal/server/car/car_server.go
Normal file
@@ -0,0 +1,53 @@
|
||||
// Code generated by goctl. DO NOT EDIT.
|
||||
// Source: delivery.proto
|
||||
|
||||
package server
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"git.apinb.com/bsm-service-ec/delivery/external/pb/delivery"
|
||||
carlogic "git.apinb.com/bsm-service-ec/delivery/internal/logic/car"
|
||||
"git.apinb.com/bsm-service-ec/delivery/internal/svc"
|
||||
)
|
||||
|
||||
type CarServer struct {
|
||||
svcCtx *svc.ServiceContext
|
||||
delivery.UnimplementedCarServer
|
||||
}
|
||||
|
||||
func NewCarServer(svcCtx *svc.ServiceContext) *CarServer {
|
||||
return &CarServer{
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
// 配送车辆列表
|
||||
func (s *CarServer) CarList(ctx context.Context, in *delivery.FetchRequest) (*delivery.CarListReply, error) {
|
||||
l := carlogic.NewCarListLogic(ctx, s.svcCtx)
|
||||
return l.CarList(in)
|
||||
}
|
||||
|
||||
// 添加配送车辆信息
|
||||
func (s *CarServer) CarAdd(ctx context.Context, in *delivery.CarItem) (*delivery.StatusReply, error) {
|
||||
l := carlogic.NewCarAddLogic(ctx, s.svcCtx)
|
||||
return l.CarAdd(in)
|
||||
}
|
||||
|
||||
// 获取配送车辆信息
|
||||
func (s *CarServer) CarGet(ctx context.Context, in *delivery.IdentRequest) (*delivery.CarItem, error) {
|
||||
l := carlogic.NewCarGetLogic(ctx, s.svcCtx)
|
||||
return l.CarGet(in)
|
||||
}
|
||||
|
||||
// 修改配送车辆信息
|
||||
func (s *CarServer) CarSet(ctx context.Context, in *delivery.CarItem) (*delivery.StatusReply, error) {
|
||||
l := carlogic.NewCarSetLogic(ctx, s.svcCtx)
|
||||
return l.CarSet(in)
|
||||
}
|
||||
|
||||
// 删除配送车辆信息
|
||||
func (s *CarServer) CarDel(ctx context.Context, in *delivery.IdentRequest) (*delivery.StatusReply, error) {
|
||||
l := carlogic.NewCarDelLogic(ctx, s.svcCtx)
|
||||
return l.CarDel(in)
|
||||
}
|
||||
53
apps/ec/delivery/internal/server/member/member_server.go
Normal file
53
apps/ec/delivery/internal/server/member/member_server.go
Normal file
@@ -0,0 +1,53 @@
|
||||
// Code generated by goctl. DO NOT EDIT.
|
||||
// Source: delivery.proto
|
||||
|
||||
package server
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"git.apinb.com/bsm-service-ec/delivery/external/pb/delivery"
|
||||
memberlogic "git.apinb.com/bsm-service-ec/delivery/internal/logic/member"
|
||||
"git.apinb.com/bsm-service-ec/delivery/internal/svc"
|
||||
)
|
||||
|
||||
type MemberServer struct {
|
||||
svcCtx *svc.ServiceContext
|
||||
delivery.UnimplementedMemberServer
|
||||
}
|
||||
|
||||
func NewMemberServer(svcCtx *svc.ServiceContext) *MemberServer {
|
||||
return &MemberServer{
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
// 获取配送员列表
|
||||
func (s *MemberServer) MemberList(ctx context.Context, in *delivery.FetchRequest) (*delivery.MemberListReply, error) {
|
||||
l := memberlogic.NewMemberListLogic(ctx, s.svcCtx)
|
||||
return l.MemberList(in)
|
||||
}
|
||||
|
||||
// 添加配送员
|
||||
func (s *MemberServer) MemberAdd(ctx context.Context, in *delivery.MemberItem) (*delivery.StatusReply, error) {
|
||||
l := memberlogic.NewMemberAddLogic(ctx, s.svcCtx)
|
||||
return l.MemberAdd(in)
|
||||
}
|
||||
|
||||
// 获取配送员数据
|
||||
func (s *MemberServer) MemberGet(ctx context.Context, in *delivery.IdentRequest) (*delivery.MemberItem, error) {
|
||||
l := memberlogic.NewMemberGetLogic(ctx, s.svcCtx)
|
||||
return l.MemberGet(in)
|
||||
}
|
||||
|
||||
// 修改配送员
|
||||
func (s *MemberServer) MemberSet(ctx context.Context, in *delivery.MemberItem) (*delivery.StatusReply, error) {
|
||||
l := memberlogic.NewMemberSetLogic(ctx, s.svcCtx)
|
||||
return l.MemberSet(in)
|
||||
}
|
||||
|
||||
// 删除配送员
|
||||
func (s *MemberServer) MemberDel(ctx context.Context, in *delivery.IdentRequest) (*delivery.StatusReply, error) {
|
||||
l := memberlogic.NewMemberDelLogic(ctx, s.svcCtx)
|
||||
return l.MemberDel(in)
|
||||
}
|
||||
53
apps/ec/delivery/internal/server/team/team_server.go
Normal file
53
apps/ec/delivery/internal/server/team/team_server.go
Normal file
@@ -0,0 +1,53 @@
|
||||
// Code generated by goctl. DO NOT EDIT.
|
||||
// Source: delivery.proto
|
||||
|
||||
package server
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"git.apinb.com/bsm-service-ec/delivery/external/pb/delivery"
|
||||
teamlogic "git.apinb.com/bsm-service-ec/delivery/internal/logic/team"
|
||||
"git.apinb.com/bsm-service-ec/delivery/internal/svc"
|
||||
)
|
||||
|
||||
type TeamServer struct {
|
||||
svcCtx *svc.ServiceContext
|
||||
delivery.UnimplementedTeamServer
|
||||
}
|
||||
|
||||
func NewTeamServer(svcCtx *svc.ServiceContext) *TeamServer {
|
||||
return &TeamServer{
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
// 配送团队列表
|
||||
func (s *TeamServer) TeamList(ctx context.Context, in *delivery.FetchRequest) (*delivery.TeamListReply, error) {
|
||||
l := teamlogic.NewTeamListLogic(ctx, s.svcCtx)
|
||||
return l.TeamList(in)
|
||||
}
|
||||
|
||||
// 添加配送团队
|
||||
func (s *TeamServer) TeamAdd(ctx context.Context, in *delivery.TeamItem) (*delivery.StatusReply, error) {
|
||||
l := teamlogic.NewTeamAddLogic(ctx, s.svcCtx)
|
||||
return l.TeamAdd(in)
|
||||
}
|
||||
|
||||
// 配送团队详情
|
||||
func (s *TeamServer) TeamGet(ctx context.Context, in *delivery.IdentRequest) (*delivery.TeamItem, error) {
|
||||
l := teamlogic.NewTeamGetLogic(ctx, s.svcCtx)
|
||||
return l.TeamGet(in)
|
||||
}
|
||||
|
||||
// 修改配送团队信息
|
||||
func (s *TeamServer) TeamSet(ctx context.Context, in *delivery.TeamItem) (*delivery.StatusReply, error) {
|
||||
l := teamlogic.NewTeamSetLogic(ctx, s.svcCtx)
|
||||
return l.TeamSet(in)
|
||||
}
|
||||
|
||||
// 删除配送团队
|
||||
func (s *TeamServer) TeamDel(ctx context.Context, in *delivery.IdentRequest) (*delivery.StatusReply, error) {
|
||||
l := teamlogic.NewTeamDelLogic(ctx, s.svcCtx)
|
||||
return l.TeamDel(in)
|
||||
}
|
||||
13
apps/ec/delivery/internal/svc/service_context.go
Normal file
13
apps/ec/delivery/internal/svc/service_context.go
Normal file
@@ -0,0 +1,13 @@
|
||||
package svc
|
||||
|
||||
import "git.apinb.com/bsm-service-ec/delivery/internal/config"
|
||||
|
||||
type ServiceContext struct {
|
||||
Config config.Config
|
||||
}
|
||||
|
||||
func NewServiceContext(c config.Config) *ServiceContext {
|
||||
return &ServiceContext{
|
||||
Config: c,
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user