From c5bcf9d6760735f1080b197f94a4ed1014f0beda Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Tue, 27 Jun 2023 14:25:25 +0800 Subject: [PATCH] fix --- constants/cloud_order.go | 26 ++++ go.mod | 1 + go.sum | 2 + model/gmodel/fs_cloud_pick_up_logic.go | 31 +++- model/gmodel/fs_user_stock_logic.go | 24 +++- server/inventory/etc/inventory.yaml | 8 ++ server/inventory/internal/config/config.go | 9 ++ server/inventory/internal/handler/routes.go | 22 +++ .../inventory/internal/handler/takehandler.go | 78 +++++++++++ server/inventory/internal/logic/takelogic.go | 132 ++++++++++++++++++ .../inventory/internal/svc/servicecontext.go | 60 ++++++++ server/inventory/internal/types/types.go | 71 ++++++++++ server/inventory/inventory.go | 49 +++++++ server_api/inventory.api | 12 +- utils/snow_id_generator/snowflake.go | 16 +++ 15 files changed, 536 insertions(+), 5 deletions(-) create mode 100644 constants/cloud_order.go create mode 100644 server/inventory/etc/inventory.yaml create mode 100644 server/inventory/internal/config/config.go create mode 100644 server/inventory/internal/handler/routes.go create mode 100644 server/inventory/internal/handler/takehandler.go create mode 100644 server/inventory/internal/logic/takelogic.go create mode 100644 server/inventory/internal/svc/servicecontext.go create mode 100644 server/inventory/internal/types/types.go create mode 100644 server/inventory/inventory.go create mode 100644 utils/snow_id_generator/snowflake.go diff --git a/constants/cloud_order.go b/constants/cloud_order.go new file mode 100644 index 00000000..2600fc30 --- /dev/null +++ b/constants/cloud_order.go @@ -0,0 +1,26 @@ +package constants + +type cloud int64 + +// 已下单 +const STATUS_ORDERD cloud = 1 + +// 运输中 +const STATUS_SHIPPING cloud = 2 + +// ups待提货 +const STATUS_PICK_UP cloud = 3 + +// 已到达 +const STATUS_ARRIVAL cloud = 4 + +/** + * 状态对应中文 + * @var string[] + */ +var CloudOrderMap = map[cloud]string{ + STATUS_ORDERD: "已下单", + STATUS_SHIPPING: "运输中", + STATUS_PICK_UP: "UPS已发货", + STATUS_ARRIVAL: "已到达", +} diff --git a/go.mod b/go.mod index d4a3e687..8bba335f 100644 --- a/go.mod +++ b/go.mod @@ -15,6 +15,7 @@ require ( ) require ( + github.com/bwmarrin/snowflake v0.3.0 // indirect github.com/google/uuid v1.3.0 // indirect github.com/schollz/progressbar v1.0.0 // indirect ) diff --git a/go.sum b/go.sum index e5372365..01f352c9 100644 --- a/go.sum +++ b/go.sum @@ -45,6 +45,8 @@ github.com/alicebob/miniredis/v2 v2.30.2 h1:lc1UAUT9ZA7h4srlfBmBt2aorm5Yftk9nBjx github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0= +github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE= github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4= github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= diff --git a/model/gmodel/fs_cloud_pick_up_logic.go b/model/gmodel/fs_cloud_pick_up_logic.go index e68225aa..51202633 100644 --- a/model/gmodel/fs_cloud_pick_up_logic.go +++ b/model/gmodel/fs_cloud_pick_up_logic.go @@ -1,2 +1,31 @@ package gmodel -// TODO: 使用model的属性做你想做的 \ No newline at end of file + +import ( + "context" + "gorm.io/gorm" +) + +// TODO: 使用model的属性做你想做的 + +func (p *FsCloudPickUpModel) SavePickUpWithTransaction(ctx context.Context, pickUpData *FsCloudPickUp, stockList []FsUserStock, pickUpDetailAddList []FsCloudPickUpDetail) error { + return p.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error { + //保存总提单信息 + if err := tx.Model(&FsCloudPickUp{}).Create(&pickUpData).Error; err != nil { + return err + } + //更新云仓库存 + for _, v := range stockList { + if err := tx.Model(&FsUserStock{}).Where("`id` = ?", v.Id).Updates(&v).Error; err != nil { + return err + } + } + //添加提单详情 + for _, v := range pickUpDetailAddList { + v.PickId = &pickUpData.Id //外面没赋值在这需要赋值 + if err := tx.Model(&FsCloudPickUpDetail{}).Create(&v).Error; err != nil { + return err + } + } + return nil + }) +} diff --git a/model/gmodel/fs_user_stock_logic.go b/model/gmodel/fs_user_stock_logic.go index e68225aa..f83b3e1c 100644 --- a/model/gmodel/fs_user_stock_logic.go +++ b/model/gmodel/fs_user_stock_logic.go @@ -1,2 +1,24 @@ package gmodel -// TODO: 使用model的属性做你想做的 \ No newline at end of file + +import "context" + +// TODO: 使用model的属性做你想做的 + +func (s *FsUserStockModel) GetUserAllStockByIds(ctx context.Context, ids []int64, userId int64) (resp []FsUserStock, err error) { + if len(ids) == 0 { + return nil, nil + } + if userId <= 0 { + return nil, nil + } + err = s.db.WithContext(ctx).Model(&FsUserStock{}).Where("`id` in (?) and `user_id` = ?", ids, userId).Find(&resp).Error + return resp, err +} +func (s *FsUserStockModel) FindOne(ctx context.Context, id int64, userId int64, lock ...bool) (resp *FsUserStock, err error) { + db := s.db.WithContext(ctx).Model(&FsUserStock{}).Where("`id` = ? and `user_id` = ?", id, userId) + if len(lock) != 0 && lock[0] { + db = db.Set("gorm:query_option", "FOR UPDATE") + } + err = db.First(&resp).Error + return resp, err +} diff --git a/server/inventory/etc/inventory.yaml b/server/inventory/etc/inventory.yaml new file mode 100644 index 00000000..611a0d7e --- /dev/null +++ b/server/inventory/etc/inventory.yaml @@ -0,0 +1,8 @@ +Name: inventory +Host: 0.0.0.0 +Port: 8898 +SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest +Auth: + AccessSecret: fusen2023 + AccessExpire: 604800 + RefreshAfter: 345600 \ No newline at end of file diff --git a/server/inventory/internal/config/config.go b/server/inventory/internal/config/config.go new file mode 100644 index 00000000..b24bb7d7 --- /dev/null +++ b/server/inventory/internal/config/config.go @@ -0,0 +1,9 @@ +package config + +import "github.com/zeromicro/go-zero/rest" + +type Config struct { + rest.RestConf + SourceMysql string + Auth types.Auth +} diff --git a/server/inventory/internal/handler/routes.go b/server/inventory/internal/handler/routes.go new file mode 100644 index 00000000..8122eebb --- /dev/null +++ b/server/inventory/internal/handler/routes.go @@ -0,0 +1,22 @@ +// Code generated by goctl. DO NOT EDIT. +package handler + +import ( + "net/http" + + "fusenapi/server/inventory/internal/svc" + + "github.com/zeromicro/go-zero/rest" +) + +func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { + server.AddRoutes( + []rest.Route{ + { + Method: http.MethodPost, + Path: "/inventory/take", + Handler: TakeHandler(serverCtx), + }, + }, + ) +} diff --git a/server/inventory/internal/handler/takehandler.go b/server/inventory/internal/handler/takehandler.go new file mode 100644 index 00000000..2ff8d910 --- /dev/null +++ b/server/inventory/internal/handler/takehandler.go @@ -0,0 +1,78 @@ +package handler + +import ( + "errors" + "net/http" + + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" + + "fusenapi/utils/auth" + "fusenapi/utils/basic" + + "fusenapi/server/inventory/internal/logic" + "fusenapi/server/inventory/internal/svc" + "fusenapi/server/inventory/internal/types" +) + +func TakeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + + var ( + // 定义错误变量 + err error + // 定义用户信息变量 + userinfo *auth.UserInfo + ) + // 解析JWT token,并对空用户进行判断 + claims, err := svcCtx.ParseJwtToken(r) + // 如果解析JWT token出错,则返回未授权的JSON响应并记录错误消息 + if err != nil { + httpx.OkJsonCtx(r.Context(), w, &basic.Response{ + Code: 401, // 返回401状态码,表示未授权 + Message: "unauthorized", // 返回未授权信息 + }) + logx.Info("unauthorized:", err.Error()) // 记录错误日志 + return + } + + if claims != nil { + // 从token中获取对应的用户信息 + userinfo, err = auth.GetUserInfoFormMapClaims(claims) + // 如果获取用户信息出错,则返回未授权的JSON响应并记录错误消息 + if err != nil { + httpx.OkJsonCtx(r.Context(), w, &basic.Response{ + Code: 401, + Message: "unauthorized", + }) + logx.Info("unauthorized:", err.Error()) + return + } + } else { + // 如果claims为nil,则认为用户身份为白板用户 + userinfo = &auth.UserInfo{UserId: 0, GuestId: 0} + } + + var req types.TakeReq + // 如果端点有请求结构体，则使用httpx.Parse方法从HTTP请求体中解析请求数据 + if err := httpx.Parse(r, &req); err != nil { + httpx.OkJsonCtx(r.Context(), w, &basic.Response{ + Code: 510, + Message: "parameter error", + }) + logx.Info(err) + return + } + // 创建一个业务逻辑层实例 + l := logic.NewTakeLogic(r.Context(), svcCtx) + resp := l.Take(&req, userinfo) + // 如果响应不为nil，则使用httpx.OkJsonCtx方法返回JSON响应; + if resp != nil { + httpx.OkJsonCtx(r.Context(), w, resp) + } else { + err := errors.New("server logic is error, resp must not be nil") + httpx.ErrorCtx(r.Context(), w, err) + logx.Error(err) + } + } +} diff --git a/server/inventory/internal/logic/takelogic.go b/server/inventory/internal/logic/takelogic.go new file mode 100644 index 00000000..b4f9bdbe --- /dev/null +++ b/server/inventory/internal/logic/takelogic.go @@ -0,0 +1,132 @@ +package logic + +import ( + "context" + "encoding/json" + "errors" + "fmt" + "fusenapi/constants" + "fusenapi/model/gmodel" + "fusenapi/server/inventory/internal/types" + "fusenapi/utils/auth" + "fusenapi/utils/basic" + "fusenapi/utils/snow_id_generator" + "github.com/bwmarrin/snowflake" + "gorm.io/gorm" + "time" + + "fusenapi/server/inventory/internal/svc" + "github.com/zeromicro/go-zero/core/logx" +) + +type TakeLogic struct { + logx.Logger + ctx context.Context + svcCtx *svc.ServiceContext +} + +func NewTakeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *TakeLogic { + return &TakeLogic{ + Logger: logx.WithContext(ctx), + ctx: ctx, + svcCtx: svcCtx, + } +} + +func (l *TakeLogic) Take(req *types.TakeReq, userinfo *auth.UserInfo) (resp *basic.Response) { + if userinfo.GetIdType() != auth.IDTYPE_User { + return resp.SetStatusWithMessage(basic.CodeServiceErr, "please login first") + } + if len(req.Form) == 0 { + return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "param err :form can`t be empty array") + } + if req.AddressId <= 0 { + return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "param err :address_id is required") + } + //获取地址信息 + addressInfo, err := l.svcCtx.AllModels.FsAddress.GetOne(l.ctx, req.AddressId, userinfo.UserId) + if err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "your address is not exists") + } + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get address info") + } + stockIds := make([]int64, 0, len(req.Form)) + for _, v := range req.Form { + stockIds = append(stockIds, v.Id) + } + //提货单总单 + addressInfoBytes, _ := json.Marshal(addressInfo) + addressInfoJson := string(addressInfoBytes) + trackNum, err := snow_id_generator.GenSnowId() + if err != nil { + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to gen trackNum") + } + status := int64(constants.STATUS_ORDERD) + now := time.Now().Unix() + pickUpData := gmodel.FsCloudPickUp{ + UserId: &userinfo.UserId, + TrackNum: &trackNum, + AddressId: &req.AddressId, + AddressInfo: &addressInfoJson, + Status: &status, + Ctime: &now, + } + //开启事务 + //箱数验证 + boxes := int64(0) + //需要更新的库存信息 + stockUpdateList := make([]gmodel.FsUserStock, 0, len(req.Form)) + //需要新增的提货详情单 + pickUpDetailAddList := make([]gmodel.FsCloudPickUpDetail, 0, len(req.Form)) + for k, val := range req.Form { + formItem := val + //验证提取数量 + if formItem.Num <= 0 { + return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, fmt.Sprintf("row %d inventory data`s take num can`be less than 0", k+1)) + } + //获取库存信息（枷锁） + stockInfo, err := l.svcCtx.AllModels.FsUserStock.FindOne(l.ctx, v.Id, userinfo.UserId, true) + if err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, fmt.Sprintf("row %d inventory data is not availabled for you", k+1)) + } + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeDbSqlErr, fmt.Sprintf("failed to get row %d`s stock info ", k+1)) + } + //校验取货数量 + if *stockInfo.Stick < formItem.Num { + return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, fmt.Sprintf("row %d inventory data is shortage", k+1)) + } + if *stockInfo.EachBoxNum <= 0 { + return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, fmt.Sprintf("row %d inventory data each box num can`t be less than 0", k+1)) + } + boxes += (formItem.Num / *stockInfo.EachBoxNum) + //库存变更 + newStick := *stockInfo.Stick - formItem.Num + newTransNum := *stockInfo.TransNum + formItem.Num + stockUpdateList = append(stockUpdateList, gmodel.FsUserStock{ + Id: stockInfo.Id, + Stick: &newStick, + TransNum: &newTransNum, + }) + //提货详情单 + detailBoxes := formItem.Num / *stockInfo.EachBoxNum + pickUpDetailAddList = append(pickUpDetailAddList, gmodel.FsCloudPickUpDetail{ + PickId: nil, //到model里方法会给他赋值pick总单id + StockId: &formItem.Id, + Num: &formItem.Num, + Boxes: &detailBoxes, + Ctime: &now, + }) + } + //事务处理数据 + err = l.svcCtx.AllModels.FsCloudPickUp.SavePickUpWithTransaction(l.ctx, &pickUpData, stockUpdateList, pickUpDetailAddList) + if err != nil { + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to take your goods") + } + return resp.SetStatusWithMessage(basic.CodeOK, "success", []int64{}) +} diff --git a/server/inventory/internal/svc/servicecontext.go b/server/inventory/internal/svc/servicecontext.go new file mode 100644 index 00000000..f30de860 --- /dev/null +++ b/server/inventory/internal/svc/servicecontext.go @@ -0,0 +1,60 @@ +package svc + +import ( + "errors" + "fmt" + "fusenapi/server/inventory/internal/config" + "net/http" + + "fusenapi/initalize" + "fusenapi/model/gmodel" + + "github.com/golang-jwt/jwt" + "gorm.io/gorm" +) + +type ServiceContext struct { + Config config.Config + + MysqlConn *gorm.DB + AllModels *gmodel.AllModelsGen +} + +func NewServiceContext(c config.Config) *ServiceContext { + + return &ServiceContext{ + Config: c, + MysqlConn: initalize.InitMysql(c.SourceMysql), + AllModels: gmodel.NewAllModels(initalize.InitMysql(c.SourceMysql)), + } +} + +func (svcCtx *ServiceContext) ParseJwtToken(r *http.Request) (jwt.MapClaims, error) { + AuthKey := r.Header.Get("Authorization") + if AuthKey == "" { + return nil, nil + } + + if len(AuthKey) <= 50 { + return nil, errors.New(fmt.Sprint("Error parsing token, len:", len(AuthKey))) + } + + token, err := jwt.Parse(AuthKey, func(token *jwt.Token) (interface{}, error) { + // 检查签名方法是否为 HS256 + if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok { + return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"]) + } + // 返回用于验证签名的密钥 + return []byte(svcCtx.Config.Auth.AccessSecret), nil + }) + if err != nil { + return nil, errors.New(fmt.Sprint("Error parsing token:", err)) + } + + // 验证成功返回 + if claims, ok := token.Claims.(jwt.MapClaims); ok && token.Valid { + return claims, nil + } + + return nil, errors.New(fmt.Sprint("Invalid token", err)) +} diff --git a/server/inventory/internal/types/types.go b/server/inventory/internal/types/types.go new file mode 100644 index 00000000..02ad0eb0 --- /dev/null +++ b/server/inventory/internal/types/types.go @@ -0,0 +1,71 @@ +// Code generated by goctl. DO NOT EDIT. +package types + +import ( + "fusenapi/utils/basic" +) + +type TakeReq struct { + Form []TakeForm `json:"form"` + AddressId int64 `json:"address_id"` +} + +type TakeForm struct { + Id int64 `json:"id"` + Num int64 `json:"num"` +} + +type Request struct { +} + +type Response struct { + Code int `json:"code"` + Message string `json:"msg"` + Data interface{} `json:"data"` +} + +type Auth struct { + AccessSecret string `json:"accessSecret"` + AccessExpire int64 `json:"accessExpire"` + RefreshAfter int64 `json:"refreshAfter"` +} + +// Set 设置Response的Code和Message值 +func (resp *Response) Set(Code int, Message string) *Response { + return &Response{ + Code: Code, + Message: Message, + } +} + +// Set 设置整个Response +func (resp *Response) SetWithData(Code int, Message string, Data interface{}) *Response { + return &Response{ + Code: Code, + Message: Message, + Data: Data, + } +} + +// SetStatus 设置默认StatusResponse(内部自定义) 默认msg, 可以带data, data只使用一个参数 +func (resp *Response) SetStatus(sr *basic.StatusResponse, data ...interface{}) *Response { + newResp := &Response{ + Code: sr.Code, + } + if len(data) == 1 { + newResp.Data = data[0] + } + return newResp +} + +// SetStatusWithMessage 设置默认StatusResponse(内部自定义) 非默认msg, 可以带data, data只使用一个参数 +func (resp *Response) SetStatusWithMessage(sr *basic.StatusResponse, msg string, data ...interface{}) *Response { + newResp := &Response{ + Code: sr.Code, + Message: msg, + } + if len(data) == 1 { + newResp.Data = data[0] + } + return newResp +} diff --git a/server/inventory/inventory.go b/server/inventory/inventory.go new file mode 100644 index 00000000..83d3d6ed --- /dev/null +++ b/server/inventory/inventory.go @@ -0,0 +1,49 @@ +package main + +import ( + "flag" + "fmt" + + "fusenapi/server/inventory/internal/config" + "fusenapi/server/inventory/internal/handler" + "fusenapi/server/inventory/internal/svc" + + "github.com/zeromicro/go-zero/core/conf" + "github.com/zeromicro/go-zero/rest" +) + +var configFile = flag.String("f", "etc/inventory.yaml", "the config file") + +func main() { + flag.Parse() + + var c config.Config + conf.MustLoad(*configFile, &c) + + server := rest.MustNewServer(c.RestConf) + defer server.Stop() + + ctx := svc.NewServiceContext(c) + handler.RegisterHandlers(server, ctx) + + fmt.Printf("Starting server at %s:%d...\n", c.Host, c.Port) + server.Start() +} + +// var testConfigFile = flag.String("f", "../etc/inventory.yaml", "the config file") +// var cnf config.Config + +// func GetTestServer() *rest.Server { +// flag.Parse() + +// conf.MustLoad(*testConfigFile, &cnf) + +// server := rest.MustNewServer(cnf.RestConf) +// defer server.Stop() + +// ctx := svc.NewServiceContext(cnf) +// handler.RegisterHandlers(server, ctx) + +// fmt.Printf("Starting server at %s:%d...\n", cnf.Host, cnf.Port) +// return server +// } diff --git a/server_api/inventory.api b/server_api/inventory.api index 07d6bceb..3bea4665 100644 --- a/server_api/inventory.api +++ b/server_api/inventory.api @@ -8,12 +8,18 @@ info ( ) import "basic.api" -service canteen { +service inventory { //提取云仓货物 @handler TakeHandler post /inventory/take(TakeReq) returns (response); } -//提取云仓货物 -type TakeReq{ +//提取云仓货物 +type TakeReq { + Form []TakeForm `json:"form"` + AddressId int64 `json:"address_id"` +} +type TakeForm { + Id int64 `json:"id"` + Num int64 `json:"num"` } \ No newline at end of file diff --git a/utils/snow_id_generator/snowflake.go b/utils/snow_id_generator/snowflake.go new file mode 100644 index 00000000..465c9e21 --- /dev/null +++ b/utils/snow_id_generator/snowflake.go @@ -0,0 +1,16 @@ +package snow_id_generator + +import ( + "fmt" + "github.com/bwmarrin/snowflake" + "time" +) + +// 雪花算法生成id +func GenSnowId() (string, error) { + node, err := snowflake.NewNode(1) + if err != nil { + return "", err + } + return fmt.Sprintf("%s%s", time.Now().Format("20060102"), node.Generate().Base58()), nil +}