From 1a48387e92df868169732bb6aeb684f848c2f236 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Sun, 25 Jun 2023 11:28:37 +0800 Subject: [PATCH 1/5] fix --- .../fs_product_template_basemap_logic.go | 3 + .../internal/handler/addbasemaphandler.go | 41 +++++++++++++ .../internal/handler/routes.go | 10 +++ .../internal/handler/updatetemplatehandler.go | 42 +++++++++++++ .../internal/logic/addbasemaplogic.go | 61 +++++++++++++++++++ .../internal/logic/updatetemplatelogic.go | 47 ++++++++++++++ .../internal/types/types.go | 35 ++++++++--- server_api/product-templatev2.api | 33 +++++++++- 8 files changed, 261 insertions(+), 11 deletions(-) create mode 100644 server/product-templatev2/internal/handler/addbasemaphandler.go create mode 100644 server/product-templatev2/internal/handler/updatetemplatehandler.go create mode 100644 server/product-templatev2/internal/logic/addbasemaplogic.go create mode 100644 server/product-templatev2/internal/logic/updatetemplatelogic.go diff --git a/model/gmodel/fs_product_template_basemap_logic.go b/model/gmodel/fs_product_template_basemap_logic.go index e876bb74..e2ee7d24 100644 --- a/model/gmodel/fs_product_template_basemap_logic.go +++ b/model/gmodel/fs_product_template_basemap_logic.go @@ -35,3 +35,6 @@ func (bm *FsProductTemplateBasemapModel) UpdateBaseMapWithTransaction(ctx contex Where("`status` = ? and `id` not in (?)", 1, notInIds).Update("status", 0).Error }) } +func (bm *FsProductTemplateBasemapModel) Create(ctx context.Context, data *FsProductTemplateBasemap) error { + return bm.db.WithContext(ctx).Create(&data).Error +} diff --git a/server/product-templatev2/internal/handler/addbasemaphandler.go b/server/product-templatev2/internal/handler/addbasemaphandler.go new file mode 100644 index 00000000..314c6e2e --- /dev/null +++ b/server/product-templatev2/internal/handler/addbasemaphandler.go @@ -0,0 +1,41 @@ +package handler + +import ( + "errors" + "net/http" + + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" + + "fusenapi/utils/basic" + + "fusenapi/server/product-templatev2/internal/logic" + "fusenapi/server/product-templatev2/internal/svc" + "fusenapi/server/product-templatev2/internal/types" +) + +func AddBaseMapHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.AddBaseMapReq + // 如果端点有请求结构体，则使用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.NewAddBaseMapLogic(r.Context(), svcCtx) + resp := l.AddBaseMap(&req, r) + // 如果响应不为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/product-templatev2/internal/handler/routes.go b/server/product-templatev2/internal/handler/routes.go index 0c838655..a91d7c77 100644 --- a/server/product-templatev2/internal/handler/routes.go +++ b/server/product-templatev2/internal/handler/routes.go @@ -27,6 +27,16 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { Path: "/product-template/base-map-update", Handler: SaveBaseMapHandler(serverCtx), }, + { + Method: http.MethodPost, + Path: "/product-template/base-map-add", + Handler: AddBaseMapHandler(serverCtx), + }, + { + Method: http.MethodPost, + Path: "/product-template/update-template", + Handler: UpdateTemplateHandler(serverCtx), + }, }, ) } diff --git a/server/product-templatev2/internal/handler/updatetemplatehandler.go b/server/product-templatev2/internal/handler/updatetemplatehandler.go new file mode 100644 index 00000000..ac02fa3b --- /dev/null +++ b/server/product-templatev2/internal/handler/updatetemplatehandler.go @@ -0,0 +1,42 @@ +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/product-templatev2/internal/logic" + "fusenapi/server/product-templatev2/internal/svc" + "fusenapi/server/product-templatev2/internal/types" +) + +func UpdateTemplateHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.UpdateTemplateReq + // 如果端点有请求结构体，则使用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.NewUpdateTemplateLogic(r.Context(), svcCtx) + resp := l.UpdateTemplate(&req, r) + // 如果响应不为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/product-templatev2/internal/logic/addbasemaplogic.go b/server/product-templatev2/internal/logic/addbasemaplogic.go new file mode 100644 index 00000000..cd73c66c --- /dev/null +++ b/server/product-templatev2/internal/logic/addbasemaplogic.go @@ -0,0 +1,61 @@ +package logic + +import ( + "errors" + "fusenapi/model/gmodel" + "fusenapi/utils/basic" + "gorm.io/gorm" + "net/http" + "strings" + "time" + + "context" + + "fusenapi/server/product-templatev2/internal/svc" + "fusenapi/server/product-templatev2/internal/types" + + "github.com/zeromicro/go-zero/core/logx" +) + +type AddBaseMapLogic struct { + logx.Logger + ctx context.Context + svcCtx *svc.ServiceContext +} + +func NewAddBaseMapLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AddBaseMapLogic { + return &AddBaseMapLogic{ + Logger: logx.WithContext(ctx), + ctx: ctx, + svcCtx: svcCtx, + } +} + +func (l *AddBaseMapLogic) AddBaseMap(req *types.AddBaseMapReq, r *http.Request) (resp *basic.Response) { + authKey := r.Header.Get("Auth-Key") + genentModel := gmodel.NewFsGerentModel(l.svcCtx.MysqlConn) + _, err := genentModel.Find(l.ctx, authKey) + if err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return resp.SetStatusWithMessage(basic.CodeUnAuth, "please login first..") + } + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeUnAuth, "failed to get user info") + } + req.Name = strings.Trim(req.Name, " ") + req.Url = strings.Trim(req.Url, " ") + if req.Name == "" || req.Url == "" { + return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "err param is empty") + } + now := time.Now().Unix() + err = l.svcCtx.AllModels.FsProductTemplateBasemap.Create(l.ctx, &gmodel.FsProductTemplateBasemap{ + Name: &req.Name, + Url: &req.Url, + Ctime: &now, + }) + if err != nil { + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeSaveErr, "failed to add base map") + } + return resp.SetStatusWithMessage(basic.CodeOK, "success") +} diff --git a/server/product-templatev2/internal/logic/updatetemplatelogic.go b/server/product-templatev2/internal/logic/updatetemplatelogic.go new file mode 100644 index 00000000..ce0a00cb --- /dev/null +++ b/server/product-templatev2/internal/logic/updatetemplatelogic.go @@ -0,0 +1,47 @@ +package logic + +import ( + "errors" + "fusenapi/model/gmodel" + "fusenapi/utils/basic" + "gorm.io/gorm" + "net/http" + + "context" + + "fusenapi/server/product-templatev2/internal/svc" + "fusenapi/server/product-templatev2/internal/types" + + "github.com/zeromicro/go-zero/core/logx" +) + +type UpdateTemplateLogic struct { + logx.Logger + ctx context.Context + svcCtx *svc.ServiceContext +} + +func NewUpdateTemplateLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdateTemplateLogic { + return &UpdateTemplateLogic{ + Logger: logx.WithContext(ctx), + ctx: ctx, + svcCtx: svcCtx, + } +} + +func (l *UpdateTemplateLogic) UpdateTemplate(req *types.UpdateTemplateReq, r *http.Request) (resp *basic.Response) { + authKey := r.Header.Get("Auth-Key") + genentModel := gmodel.NewFsGerentModel(l.svcCtx.MysqlConn) + _, err := genentModel.Find(l.ctx, authKey) + if err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return resp.SetStatusWithMessage(basic.CodeUnAuth, "please login first..") + } + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeUnAuth, "failed to get user info") + } + if req.ModelId <= 0 { + return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "param modelId is required") + } + return resp.SetStatus(basic.CodeOK) +} diff --git a/server/product-templatev2/internal/types/types.go b/server/product-templatev2/internal/types/types.go index 91f77e33..27b639a7 100644 --- a/server/product-templatev2/internal/types/types.go +++ b/server/product-templatev2/internal/types/types.go @@ -42,20 +42,39 @@ type SaveBaseMapReq struct { Ctime string `json:"ctime"` } +type AddBaseMapReq struct { + Name string `json:"name"` + Url string `json:"url"` +} + +type UpdateTemplateReq struct { + ModelId int64 `json:"modelId"` + TemplateData TemplateData `json:"templateData"` +} + +type TemplateData struct { + Id int64 `json:"id"` + Name string `json:"name"` + Cover string `json:"cover"` + IsPublic bool `json:"isPublic"` + Material string `json:"material"` + MaterialList []interface{} `json:"materialList"` +} + +type UpdateTemplateRsp struct { + ModelId int64 `json:"modelId"` + TemplateId int64 `json:"templateId"` +} + +type Request struct { +} + type Response struct { Code int `json:"code"` Message string `json:"msg"` Data interface{} `json:"data"` } -type ResponseJwt struct { - Code int `json:"code"` - Message string `json:"msg"` - Data interface{} `json:"data"` - AccessSecret string `json:"accessSecret"` - AccessExpire int64 `json:"accessExpire"` -} - type Auth struct { AccessSecret string `json:"accessSecret"` AccessExpire int64 `json:"accessExpire"` diff --git a/server_api/product-templatev2.api b/server_api/product-templatev2.api index 525eb8a2..430b2b60 100644 --- a/server_api/product-templatev2.api +++ b/server_api/product-templatev2.api @@ -1,7 +1,7 @@ syntax = "v1" info ( - title: "产品模板"// TODO: add title + title: "产品模板底图服务"// TODO: add title desc: // TODO: add description author: "" email: "" @@ -16,10 +16,15 @@ service product-templatev2 { //获取底图列表 @handler GetBaseMapListHandler get /product-template/base-map-list( ) returns (response); - //保存底图列表信息 + //底图批量保存 @handler SaveBaseMapHandler post /product-template/base-map-update ( ) returns (response); - + //新增底图 + @handler AddBaseMapHandler + post /product-template/base-map-add (AddBaseMapReq) returns (response); + //更新模板 + @handler UpdateTemplateHandler + post /product-template/update-template (UpdateTemplateReq) returns (response); } //获取产品模板详情 @@ -57,4 +62,26 @@ type SaveBaseMapReq { Name string `json:"name"` Url string `json:"url"` Ctime string `json:"ctime"` +} +//新增底图 +type AddBaseMapReq { + Name string `json:"name"` + Url string `json:"url"` +} +//更新模板 +type UpdateTemplateReq { + ModelId int64 `json:"modelId"` + TemplateData TemplateData `json:"templateData"` +} +type TemplateData { + Id int64 `json:"id"` + Name string `json:"name"` + Cover string `json:"cover"` + IsPublic bool `json:"isPublic"` + Material string `json:"material"` + MaterialList []interface{} `json:"materialList"` +} +type UpdateTemplateRsp { + ModelId int64 `json:"modelId"` + TemplateId int64 `json:"templateId"` } \ No newline at end of file From cd8a578dfef075d66aa5f674f87df79ba7c9d54a Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Sun, 25 Jun 2023 11:31:37 +0800 Subject: [PATCH 2/5] fix --- server/canteen/internal/svc/servicecontext.go | 3 +++ server/data-transfer/internal/svc/servicecontext.go | 3 +++ server/map-library/internal/svc/servicecontext.go | 3 +++ server/orders/internal/svc/servicecontext.go | 3 +++ server/product-templatev2/internal/svc/servicecontext.go | 3 +++ server/product/internal/svc/servicecontext.go | 3 +++ .../shopping-cart-confirmation/internal/svc/servicecontext.go | 3 +++ 7 files changed, 21 insertions(+) diff --git a/server/canteen/internal/svc/servicecontext.go b/server/canteen/internal/svc/servicecontext.go index dcd1d889..9712cabb 100644 --- a/server/canteen/internal/svc/servicecontext.go +++ b/server/canteen/internal/svc/servicecontext.go @@ -31,6 +31,9 @@ func NewServiceContext(c config.Config) *ServiceContext { 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))) } diff --git a/server/data-transfer/internal/svc/servicecontext.go b/server/data-transfer/internal/svc/servicecontext.go index 1a1a27a2..3236a65d 100644 --- a/server/data-transfer/internal/svc/servicecontext.go +++ b/server/data-transfer/internal/svc/servicecontext.go @@ -31,6 +31,9 @@ func NewServiceContext(c config.Config) *ServiceContext { 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))) } diff --git a/server/map-library/internal/svc/servicecontext.go b/server/map-library/internal/svc/servicecontext.go index ccf526be..5ee6e83a 100644 --- a/server/map-library/internal/svc/servicecontext.go +++ b/server/map-library/internal/svc/servicecontext.go @@ -31,6 +31,9 @@ func NewServiceContext(c config.Config) *ServiceContext { 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))) } diff --git a/server/orders/internal/svc/servicecontext.go b/server/orders/internal/svc/servicecontext.go index 99a7400a..61d8b459 100644 --- a/server/orders/internal/svc/servicecontext.go +++ b/server/orders/internal/svc/servicecontext.go @@ -31,6 +31,9 @@ func NewServiceContext(c config.Config) *ServiceContext { 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))) } diff --git a/server/product-templatev2/internal/svc/servicecontext.go b/server/product-templatev2/internal/svc/servicecontext.go index b12e9921..635b8dce 100644 --- a/server/product-templatev2/internal/svc/servicecontext.go +++ b/server/product-templatev2/internal/svc/servicecontext.go @@ -31,6 +31,9 @@ func NewServiceContext(c config.Config) *ServiceContext { 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))) } diff --git a/server/product/internal/svc/servicecontext.go b/server/product/internal/svc/servicecontext.go index b9157f3a..941adabc 100644 --- a/server/product/internal/svc/servicecontext.go +++ b/server/product/internal/svc/servicecontext.go @@ -31,6 +31,9 @@ func NewServiceContext(c config.Config) *ServiceContext { 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))) } diff --git a/server/shopping-cart-confirmation/internal/svc/servicecontext.go b/server/shopping-cart-confirmation/internal/svc/servicecontext.go index de8389d2..25e27c80 100644 --- a/server/shopping-cart-confirmation/internal/svc/servicecontext.go +++ b/server/shopping-cart-confirmation/internal/svc/servicecontext.go @@ -31,6 +31,9 @@ func NewServiceContext(c config.Config) *ServiceContext { 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))) } From 81b315b12ba56516cd94dbfa075c7e435fab0163 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Sun, 25 Jun 2023 12:16:01 +0800 Subject: [PATCH 3/5] fix --- model/gmodel/fs_product_template_v2_logic.go | 3 + .../internal/handler/updatetemplatehandler.go | 4 +- .../internal/logic/updatetemplatelogic.go | 56 ++++++++++++++++++- .../internal/types/types.go | 16 +++--- server_api/product-templatev2.api | 16 +++--- 5 files changed, 75 insertions(+), 20 deletions(-) diff --git a/model/gmodel/fs_product_template_v2_logic.go b/model/gmodel/fs_product_template_v2_logic.go index c620be45..bc0d5670 100755 --- a/model/gmodel/fs_product_template_v2_logic.go +++ b/model/gmodel/fs_product_template_v2_logic.go @@ -37,3 +37,6 @@ func (t *FsProductTemplateV2Model) FindByParam(ctx context.Context, id int64, mo err = db.Take(&resp).Error return resp, err } +func (t *FsProductTemplateV2Model) Update(ctx context.Context, id int64, data *FsProductTemplateV2) error { + return t.db.WithContext(ctx).Model(&FsProductTemplateV2{}).Where("`id` = ? ", id).Updates(&data).Error +} diff --git a/server/product-templatev2/internal/handler/updatetemplatehandler.go b/server/product-templatev2/internal/handler/updatetemplatehandler.go index ac02fa3b..2f868d9b 100644 --- a/server/product-templatev2/internal/handler/updatetemplatehandler.go +++ b/server/product-templatev2/internal/handler/updatetemplatehandler.go @@ -4,12 +4,10 @@ import ( "errors" "net/http" + "fusenapi/utils/basic" "github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/rest/httpx" - "fusenapi/utils/auth" - "fusenapi/utils/basic" - "fusenapi/server/product-templatev2/internal/logic" "fusenapi/server/product-templatev2/internal/svc" "fusenapi/server/product-templatev2/internal/types" diff --git a/server/product-templatev2/internal/logic/updatetemplatelogic.go b/server/product-templatev2/internal/logic/updatetemplatelogic.go index ce0a00cb..814acf7b 100644 --- a/server/product-templatev2/internal/logic/updatetemplatelogic.go +++ b/server/product-templatev2/internal/logic/updatetemplatelogic.go @@ -1,6 +1,7 @@ package logic import ( + "encoding/json" "errors" "fusenapi/model/gmodel" "fusenapi/utils/basic" @@ -43,5 +44,58 @@ func (l *UpdateTemplateLogic) UpdateTemplate(req *types.UpdateTemplateReq, r *ht if req.ModelId <= 0 { return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "param modelId is required") } - return resp.SetStatus(basic.CodeOK) + if req.TemplateData == nil { + return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "param template data is required") + } + if req.TemplateData.Id <= 0 { + return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "param template data`id is required") + } + //验证模板数据真实性 + templatev2Info, err := l.svcCtx.AllModels.FsProductTemplateV2.FindOne(l.ctx, req.TemplateData.Id) + if err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "template is not exists") + } + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get v2 template info") + } + if *templatev2Info.ModelId != req.ModelId { + return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "the template`s model id is not match") + } + templateInfoBytes, err := json.Marshal(req.TemplateData) + if err != nil { + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to marshal template data") + } + templateInfoJson := string(templateInfoBytes) + var logoWidth int64 + var logoHeight int64 + for _, v := range req.TemplateData.MaterialList { + //logo面板需保存宽高 + if v["tag"] == "Logo" { + logoWidth, _ = v["width"].(json.Number).Int64() + logoHeight, _ = v["height"].(json.Number).Int64() + } + } + //保存模板宽高 + isPublic := int64(0) + if req.TemplateData.IsPublic { + isPublic = 1 + } + updData := gmodel.FsProductTemplateV2{ + TemplateInfo: &templateInfoJson, + MaterialImg: &req.TemplateData.Material, + Name: &req.TemplateData.Name, + LogoWidth: &logoWidth, + LogoHeight: &logoHeight, + IsPublic: &isPublic, + } + if err = l.svcCtx.AllModels.FsProductTemplateV2.Update(l.ctx, req.TemplateData.Id, &updData); err != nil { + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeSaveErr, "failed to update template") + } + return resp.SetStatusWithMessage(basic.CodeOK, "success", types.UpdateTemplateRsp{ + ModelId: req.ModelId, + TemplateId: req.TemplateData.Id, + }) } diff --git a/server/product-templatev2/internal/types/types.go b/server/product-templatev2/internal/types/types.go index 27b639a7..b3214193 100644 --- a/server/product-templatev2/internal/types/types.go +++ b/server/product-templatev2/internal/types/types.go @@ -48,17 +48,17 @@ type AddBaseMapReq struct { } type UpdateTemplateReq struct { - ModelId int64 `json:"modelId"` - TemplateData TemplateData `json:"templateData"` + ModelId int64 `json:"modelId"` + TemplateData *TemplateData `json:"templateData"` } type TemplateData struct { - Id int64 `json:"id"` - Name string `json:"name"` - Cover string `json:"cover"` - IsPublic bool `json:"isPublic"` - Material string `json:"material"` - MaterialList []interface{} `json:"materialList"` + Id int64 `json:"id"` + Name string `json:"name"` + Cover string `json:"cover"` + IsPublic bool `json:"isPublic"` + Material string `json:"material"` + MaterialList []map[string]interface{} `json:"materialList"` } type UpdateTemplateRsp struct { diff --git a/server_api/product-templatev2.api b/server_api/product-templatev2.api index 430b2b60..430c7348 100644 --- a/server_api/product-templatev2.api +++ b/server_api/product-templatev2.api @@ -70,16 +70,16 @@ type AddBaseMapReq { } //更新模板 type UpdateTemplateReq { - ModelId int64 `json:"modelId"` - TemplateData TemplateData `json:"templateData"` + ModelId int64 `json:"modelId"` + TemplateData *TemplateData `json:"templateData"` } type TemplateData { - Id int64 `json:"id"` - Name string `json:"name"` - Cover string `json:"cover"` - IsPublic bool `json:"isPublic"` - Material string `json:"material"` - MaterialList []interface{} `json:"materialList"` + Id int64 `json:"id"` + Name string `json:"name"` + Cover string `json:"cover"` + IsPublic bool `json:"isPublic"` + Material string `json:"material"` + MaterialList []map[string]interface{} `json:"materialList"` } type UpdateTemplateRsp { ModelId int64 `json:"modelId"` From 4d4381b1962c9b517164233fec08da45ad3f4da5 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Sun, 25 Jun 2023 12:16:40 +0800 Subject: [PATCH 4/5] fix --- server/product-templatev2/internal/logic/updatetemplatelogic.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/product-templatev2/internal/logic/updatetemplatelogic.go b/server/product-templatev2/internal/logic/updatetemplatelogic.go index 814acf7b..b7951e60 100644 --- a/server/product-templatev2/internal/logic/updatetemplatelogic.go +++ b/server/product-templatev2/internal/logic/updatetemplatelogic.go @@ -68,6 +68,7 @@ func (l *UpdateTemplateLogic) UpdateTemplate(req *types.UpdateTemplateReq, r *ht return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to marshal template data") } templateInfoJson := string(templateInfoBytes) + //保存模板宽高 var logoWidth int64 var logoHeight int64 for _, v := range req.TemplateData.MaterialList { @@ -77,7 +78,6 @@ func (l *UpdateTemplateLogic) UpdateTemplate(req *types.UpdateTemplateReq, r *ht logoHeight, _ = v["height"].(json.Number).Int64() } } - //保存模板宽高 isPublic := int64(0) if req.TemplateData.IsPublic { isPublic = 1 From 305bf83d4e6b900a6aadaaafc896dc5474c71ad6 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Sun, 25 Jun 2023 12:28:06 +0800 Subject: [PATCH 5/5] fix --- server/product-templatev2/internal/logic/updatetemplatelogic.go | 1 + 1 file changed, 1 insertion(+) diff --git a/server/product-templatev2/internal/logic/updatetemplatelogic.go b/server/product-templatev2/internal/logic/updatetemplatelogic.go index b7951e60..fd1e27ab 100644 --- a/server/product-templatev2/internal/logic/updatetemplatelogic.go +++ b/server/product-templatev2/internal/logic/updatetemplatelogic.go @@ -76,6 +76,7 @@ func (l *UpdateTemplateLogic) UpdateTemplate(req *types.UpdateTemplateReq, r *ht if v["tag"] == "Logo" { logoWidth, _ = v["width"].(json.Number).Int64() logoHeight, _ = v["height"].(json.Number).Int64() + break } } isPublic := int64(0)