fix

model/gmodel/fs_product_design_logic.go

@@ -7,8 +7,8 @@ import (
 	"gorm.io/gorm"
 )
 
-func (d *FsProductDesignModel) FindOneBySn(ctx context.Context, sn string) (resp FsProductDesign, err error) {
+func (d *FsProductDesignModel) FindOneBySn(ctx context.Context, sn string, userId int64) (resp FsProductDesign, err error) {
-	err = d.db.WithContext(ctx).Model(&FsProductDesign{}).Where("`sn` = ? and `status` = ?", sn, 1).First(&resp).Error
+	err = d.db.WithContext(ctx).Model(&FsProductDesign{}).Where("`sn` = ? and `user_id` = ? and `status` = ?", sn, userId, 1).First(&resp).Error
 	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 		return FsProductDesign{}, err
 	}

model/gmodel/fs_product_size_logic.go

@@ -2,8 +2,17 @@ package gmodel
 
 import (
 	"context"
+	"errors"
+	"gorm.io/gorm"
 )
 
+func (s *FsProductSizeModel) FindOne(ctx context.Context, id int64) (resp FsProductSize, err error) {
+	err = s.db.WithContext(ctx).Model(&FsProductSize{}).Where("`id` = ? and  `status` = ?", id, 1).First(&resp).Error
+	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		return FsProductSize{}, err
+	}
+	return resp, nil
+}
 func (s *FsProductSizeModel) GetAllByIds(ctx context.Context, ids []int64, sort string) (resp []FsProductSize, err error) {
 	if len(ids) == 0 {
 		return

model/gmodel/fs_product_template_v2_logic.go

@@ -2,15 +2,35 @@ package gmodel
 
 import (
 	"context"
+	"errors"
+	"gorm.io/gorm"
 )
 
 func (t *FsProductTemplateV2Model) FindAllByProductIds(ctx context.Context, productIds []int64) (resp []FsProductTemplateV2, err error) {
 	if len(productIds) == 0 {
 		return
 	}
-	err = t.db.WithContext(ctx).Model(&FsProductTemplateV2{}).Where("`id` in (?) and `is_del` = ? and `status` = ?", productIds, 0, 1).Find(&resp).Error
+	err = t.db.WithContext(ctx).Model(&FsProductTemplateV2{}).Where("`product_id` in (?) and `is_del` = ? and `status` = ?", productIds, 0, 1).Find(&resp).Error
 	if err != nil {
 		return nil, err
 	}
 	return
 }
+func (t *FsProductTemplateV2Model) FindAllByIds(ctx context.Context, ids []int64) (resp []FsProductTemplateV2, err error) {
+	if len(ids) == 0 {
+		return
+	}
+	err = t.db.WithContext(ctx).Model(&FsProductTemplateV2{}).Where("`id` in (?) and `is_del` = ? and `status` = ?", ids, 0, 1).Find(&resp).Error
+	if err != nil {
+		return nil, err
+	}
+	return
+}
+func (t *FsProductTemplateV2Model) FindOne(ctx context.Context, id int64) (resp FsProductTemplateV2, err error) {
+
+	err = t.db.WithContext(ctx).Model(&FsProductTemplateV2{}).Where("`id` = ? and `is_del` = ? and `status` = ?", id, 0, 1).Find(&resp).Error
+	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		return FsProductTemplateV2{}, err
+	}
+	return resp, nil
+}

server/product/internal/config/config.go

@@ -7,6 +7,6 @@ import (
 
 type Config struct {
 	rest.RestConf
-	DataSource string
+	SourceMysql string
-	Auth       types.Auth
+	Auth        types.Auth
 }

server/product/internal/handler/getproductdesignhandler.go

@@ -12,6 +12,7 @@ import (
 
 	"fusenapi/server/product/internal/logic"
 	"fusenapi/server/product/internal/svc"
+	"fusenapi/server/product/internal/types"
 )
 
 func GetProductDesignHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
@@ -52,8 +53,19 @@ func GetProductDesignHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 			userinfo = &auth.UserInfo{UserId: 0, GuestId: 0}
 		}
 
+		var req types.GetProductDesignReq
+		// 如果端点有请求结构体，则使用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.NewGetProductDesignLogic(r.Context(), svcCtx)
-		resp := l.GetProductDesign(userinfo)
+		resp := l.GetProductDesign(&req, userinfo)
 		// 如果响应不为nil，则使用httpx.OkJsonCtx方法返回JSON响应;
 		if resp != nil {
 			httpx.OkJsonCtx(r.Context(), w, resp)

server/product/internal/logic/getproductdesignlogic.go

@@ -1,6 +1,8 @@
 package logic
 
 import (
+	"encoding/json"
+	"fusenapi/model/gmodel"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
 
@@ -26,9 +28,48 @@ func NewGetProductDesignLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
 	}
 }
 
-func (l *GetProductDesignLogic) GetProductDesign(, userinfo *auth.UserInfo) (resp *basic.Response) {
+func (l *GetProductDesignLogic) GetProductDesign(req *types.GetProductDesignReq, userinfo *auth.UserInfo) (resp *basic.Response) {
-	// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data) 
+	if userinfo.GetIdType() != auth.IDTYPE_User {
-	// userinfo 传入值时, 一定不为null
+		return resp.SetStatusWithMessage(basic.CodeUnAuth, "please login first")
-
+	}
- 	return resp.SetStatus(basic.CodeOK)
+	if req.Sn == "" {
+		return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "param sn is required")
+	}
+	//获取设计数据
+	productDesignModel := gmodel.NewFsProductDesignModel(l.svcCtx.MysqlConn)
+	designInfo, err := productDesignModel.FindOneBySn(l.ctx, req.Sn, userinfo.UserId)
+	if err != nil {
+		logx.Error(err)
+		return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get design info")
+	}
+	if designInfo.Id == 0 {
+		return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "design info is not exists")
+	}
+	//获取产品尺寸信息
+	productSizeModel := gmodel.NewFsProductSizeModel(l.svcCtx.MysqlConn)
+	sizeInfo, err := productSizeModel.FindOne(l.ctx, *designInfo.SizeId)
+	if err != nil {
+		logx.Error(err)
+		return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get product size info")
+	}
+	if sizeInfo.Id == 0 {
+		return resp.SetStatusWithMessage(basic.CodeServiceErr, "product size info is not exists")
+	}
+	//获取模板信息
+	productTemplateV2Model := gmodel.NewFsProductTemplateV2Model(l.svcCtx.MysqlConn)
+	productTemplateV2Info, err := productTemplateV2Model.FindOne(l.ctx, *designInfo.TemplateId)
+	if err != nil {
+		logx.Error(err)
+		return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get template info")
+	}
+	if productTemplateV2Info.Id == 0 {
+		return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "template info is not exists")
+	}
+	//解析json
+	var info types.ProductDesignInfo
+	if err = json.Unmarshal([]byte(*designInfo.Info), &info); err != nil {
+		logx.Error(err)
+		return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to parse design info")
+	}
+	return resp.SetStatus(basic.CodeOK)
 }

server/product/internal/types/types.go

@@ -96,6 +96,82 @@ type PriceObj struct {
 	Price float64 `json:"price"`
 }
 
+type GetProductDesignReq struct {
+	Sn string `json:"sn"`
+}
+
+type GetProductDesignRsp struct {
+	ProductId  int64               `json:"product_id"`
+	TemplateId int64               `json:"template_id"`
+	MaterialId int64               `json:"material_id"`
+	SizeId     int64               `json:"size_id"`
+	OptionalId int64               `json:"optional_id"`
+	Cover      string              `json:"cover"`
+	Info       []ProductDesignInfo `json:"info"`
+}
+
+type ProductDesignInfo struct {
+	Id            string          `json:"id"`
+	Tag           string          `json:"tag"`
+	Title         string          `json:"title"`
+	Type          string          `json:"type"`
+	Text          string          `json:"text"`
+	Fill          string          `json:"fill"`
+	FontSize      int64           `json:"fontSize"`
+	FontFamily    string          `json:"fontFamily"`
+	IfBr          bool            `json:"ifBr"`
+	IfShow        bool            `json:"ifShow"`
+	IfGroup       bool            `json:"ifGroup"`
+	MaxNum        int64           `json:"maxNum"`
+	Rotation      int64           `json:"rotation"`
+	Align         string          `json:"align"`
+	VerticalAlign string          `json:"verticalAlign"`
+	Material      string          `json:"material"`
+	QRcodeType    string          `json:"QRcodeType"`
+	Width         int64           `json:"width"`
+	Height        int64           `json:"height"`
+	X             int64           `json:"x"`
+	Y             int64           `json:"y"`
+	Opacity       int64           `json:"opacity"`
+	OptionalColor []OptionalColor `json:"optionalColor"`
+	ZIndex        int64           `json:"zIndex"`
+	SvgPath       string          `json:"svgPath"`
+	MaterialName  string          `json:"materialName"`
+	MaterialTime  string          `json:"materialTime"`
+	Follow        DesignFollow    `json:"follow"`
+	Group         []DesignGroup   `json:"group"`
+	CameraStand   CameraStand     `json:"cameraStand"`
+}
+
+type CameraStand struct {
+	X int64 `json:"x"`
+	Y int64 `json:"y"`
+	Z int64 `json:"z"`
+}
+
+type DesignGroup struct {
+	Tag         string `json:"tag"`
+	Text        string `json:"text"`
+	Title       string `json:"title"`
+	IfBr        bool   `json:"ifBr"`
+	IfGroupNoBr bool   `json:"ifGroupNoBr"`
+	IfShow      bool   `json:"ifShow"`
+	MaxNum      int64  `json:"maxNum"`
+	PaddingNum  int64  `json:"paddingNum"`
+}
+
+type DesignFollow struct {
+	Fill    string `json:"fill"`
+	IfShow  string `json:"ifShow"`
+	Content string `json:"content"`
+}
+
+type OptionalColor struct {
+	Color   string `json:"color"`
+	Name    string `json:"name"`
+	Default bool   `json:"default"`
+}
+
 type Response struct {
 	Code    int         `json:"code"`
 	Message string      `json:"msg"`

server/shopping-cart-confirmation/internal/logic/cartaddlogic.go

@@ -46,7 +46,7 @@ func (l *CartAddLogic) CartAdd(req *types.CartAddReq, userinfo *auth.UserInfo) (
 	}
 	//查询是否有此设计
 	productDesignModel := gmodel.NewFsProductDesignModel(l.svcCtx.MysqlConn)
-	productDesignInfo, err := productDesignModel.FindOneBySn(l.ctx, req.DesignId)
+	productDesignInfo, err := productDesignModel.FindOneBySn(l.ctx, req.DesignId, userinfo.UserId)
 	if err != nil {
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get product design info")

server/shopping-cart-confirmation/internal/logic/cartlistlogic.go

@@ -244,7 +244,7 @@ func (l *CartListLogic) getUserCartRelativeList(ctx context.Context, userId int6
 	go func() {
 		defer wait.Done()
 		productTemplateModel := gmodel.NewFsProductTemplateV2Model(l.svcCtx.MysqlConn)
-		templateV2List, err := productTemplateModel.FindAllByProductIds(ctx, templateIds)
+		templateV2List, err := productTemplateModel.FindAllByIds(ctx, templateIds)
 		if err != nil {
 			errChan <- err
 		}

server_api/product.api

@@ -17,9 +17,9 @@ service product {
 	//获取分类下的产品以及尺寸
 	@handler GetSizeByProductHandler
 	get /product/get-size-by-product  returns (response);
-	//获取保存的设计
+	//获取保存的设计信息
 	@handler GetProductDesignHandler
-	get /product/design  returns (response);
+	get /product/design(GetProductDesignReq)  returns (response);
 }
 
 //获取产品列表
@@ -103,4 +103,75 @@ type ChildrenObj {
 type PriceObj {
 	Num   int     `json:"num"`
 	Price float64 `json:"price"`
+}
+
+//获取保存的设计信息
+type GetProductDesignReq {
+	Sn string `json:"sn"`
+}
+type GetProductDesignRsp {
+	ProductId  int64               `json:"product_id"`
+	TemplateId int64               `json:"template_id"`
+	MaterialId int64               `json:"material_id"`
+	SizeId     int64               `json:"size_id"`
+	OptionalId int64               `json:"optional_id"`
+	Cover      string              `json:"cover"`
+	Info       []ProductDesignInfo `json:"info"`
+}
+type ProductDesignInfo {
+	Id            string          `json:"id"`
+	Tag           string          `json:"tag"`
+	Title         string          `json:"title"`
+	Type          string          `json:"type"`
+	Text          string          `json:"text"`
+	Fill          string          `json:"fill"`
+	FontSize      int64           `json:"fontSize"`
+	FontFamily    string          `json:"fontFamily"`
+	IfBr          bool            `json:"ifBr"`
+	IfShow        bool            `json:"ifShow"`
+	IfGroup       bool            `json:"ifGroup"`
+	MaxNum        int64           `json:"maxNum"`
+	Rotation      int64           `json:"rotation"`
+	Align         string          `json:"align"`
+	VerticalAlign string          `json:"verticalAlign"`
+	Material      string          `json:"material"`
+	QRcodeType    string          `json:"QRcodeType"`
+	Width         int64           `json:"width"`
+	Height        int64           `json:"height"`
+	X             int64           `json:"x"`
+	Y             int64           `json:"y"`
+	Opacity       int64           `json:"opacity"`
+	OptionalColor []OptionalColor `json:"optionalColor"`
+	ZIndex        int64           `json:"zIndex"`
+	SvgPath       string          `json:"svgPath"`
+	MaterialName  string          `json:"materialName"`
+	MaterialTime  string          `json:"materialTime"`
+	Follow        DesignFollow    `json:"follow"`
+	Group         []DesignGroup   `json:"group"`
+	CameraStand   CameraStand     `json:"cameraStand"`
+}
+type CameraStand {
+	X int64 `json:"x"`
+	Y int64 `json:"y"`
+	Z int64 `json:"z"`
+}
+type DesignGroup {
+	Tag         string `json:"tag"`
+	Text        string `json:"text"`
+	Title       string `json:"title"`
+	IfBr        bool   `json:"ifBr"`
+	IfGroupNoBr bool   `json:"ifGroupNoBr"`
+	IfShow      bool   `json:"ifShow"`
+	MaxNum      int64  `json:"maxNum"`
+	PaddingNum  int64  `json:"paddingNum"`
+}
+type DesignFollow {
+	Fill    string `json:"fill"`
+	IfShow  string `json:"ifShow"`
+	Content string `json:"content"`
+}
+type OptionalColor {
+	Color   string `json:"color"`
+	Name    string `json:"name"`
+	Default bool   `json:"default"`
 }