Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop

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_logic.go

@@ -2,6 +2,13 @@ package gmodel
 
 import "context"
 
+func (p *FsProductModel) FindOne(ctx context.Context, id int64) (resp FsProduct, err error) {
+	err = p.db.Model(&FsProduct{}).Where("`id` = ? and `is_del` =? and `is_shelf` = ? and `status` =?", id, 0, 1, 1).First(&resp).Error
+	if err != nil {
+		return FsProduct{}, err
+	}
+	return resp, nil
+}
 func (p *FsProductModel) GetProductListByIds(ctx context.Context, productIds []int64, sort string) (resp []FsProduct, err error) {
 	if len(productIds) == 0 {
 		return

model/gmodel/fs_product_model3d_logic.go

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

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` = ? ", id).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` = ? ", id).Find(&resp).Error
+	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		return FsProductTemplateV2{}, err
+	}
+	return resp, nil
+}

server/map-library/internal/logic/getmaplibrarylistlogic.go

@@ -1,7 +1,6 @@
 package logic
 
 import (
-	"encoding/json"
 	"fusenapi/model/gmodel"
 	"fusenapi/server/map-library/internal/svc"
 	"fusenapi/server/map-library/internal/types"
@@ -60,6 +59,7 @@ func (l *GetMapLibraryListLogic) GetMapLibraryList(userinfo *auth.UserInfo) (res
 		data := types.GetMapLibraryListRsp{
 			Mid:   v.Id,
 			Ctime: time.Unix(*v.Ctime, 0).Format("2006-01-02 15:04:05"),
+			Info:  *v.Info,
 		}
 		//tag拼装
 		if tagIndex, ok := mapTag[*v.TagId]; ok {
@@ -68,13 +68,6 @@ func (l *GetMapLibraryListLogic) GetMapLibraryList(userinfo *auth.UserInfo) (res
 				Title: *templateTagList[tagIndex].Title,
 			}
 		}
-		//解析info
-		var info types.MapLibraryListInfo
-		if err = json.Unmarshal([]byte(*v.Info), &info); err != nil {
-			logx.Error(err)
-			return resp.SetStatusWithMessage(basic.CodeServiceErr, "json parse info err")
-		}
-		data.Info = info
 		list = append(list, data)
 	}
 	return resp.SetStatusWithMessage(basic.CodeOK, "success", list)

server/map-library/internal/types/types.go

@@ -6,70 +6,10 @@ import (
 )
 
 type GetMapLibraryListRsp struct {
-	Mid   int64              `json:"mid"`
+	Mid   int64             `json:"mid"`
-	Ctime string             `json:"ctime"`
+	Ctime string            `json:"ctime"`
-	Tag   MapLibraryListTag  `json:"tag"`
+	Tag   MapLibraryListTag `json:"tag"`
-	Info  MapLibraryListInfo `json:"info"`
+	Info  string            `json:"info"`
-}
-
-type MapLibraryListInfo 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    int64                             `json:"QRcodeType"`
-	Width         float64                           `json:"width"`
-	Height        float64                           `json:"height"`
-	X             float64                           `json:"x"`
-	Y             float64                           `json:"y"`
-	Opacity       float64                           `json:"opacity"`
-	OptionalColor []MapLibraryListOptionalColorItem `json:"optionalColor"`
-	ZIndex        int64                             `json:"zIndex"`
-	SvgPath       string                            `json:"svgPath"`
-	Follow        MapLibraryListFollow              `json:"follow"`
-	Group         []MapLibraryListGroup             `json:"group"`
-	CameraStand   MapLibraryListCameraStand         `json:"cameraStand"`
-	MaterialTime  string                            `json:"materialTime"`
-	MaterialName  string                            `json:"materialName"`
-}
-
-type MapLibraryListCameraStand struct {
-	X int64 `json:"x"`
-	Y int64 `json:"y"`
-	Z int64 `json:"z"`
-}
-
-type MapLibraryListGroup struct {
-	Tag    string `json:"tag"`
-	Text   string `json:"text"`
-	Title  string `json:"title"`
-	IfBr   bool   `json:"ifBr"`
-	IfShow bool   `json:"ifShow"`
-	MaxNum int64  `json:"maxNum"`
-}
-
-type MapLibraryListFollow struct {
-	Fill    string `json:"fill"`
-	IfShow  string `json:"ifShow"`
-	Content string `json:"content"`
-}
-
-type MapLibraryListOptionalColorItem struct {
-	Color   string `json:"color"`
-	Name    string `json:"name"`
-	Default bool   `json:"default"`
 }
 
 type MapLibraryListTag struct {

server/product/internal/handler/getproductdesignhandler.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/product/internal/logic"
+	"fusenapi/server/product/internal/svc"
+	"fusenapi/server/product/internal/types"
+)
+
+func GetProductDesignHandler(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.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(&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)
+		}
+	}
+}

server/product/internal/handler/routes.go

@@ -27,6 +27,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/product/get-size-by-product",
 				Handler: GetSizeByProductHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodGet,
+				Path:    "/product/design",
+				Handler: GetProductDesignHandler(serverCtx),
+			},
 		},
 	)
 }

server/product/internal/logic/getproductdesignlogic.go

@@ -0,0 +1,90 @@
+package logic
+
+import (
+	"fusenapi/model/gmodel"
+	"fusenapi/utils/auth"
+	"fusenapi/utils/basic"
+
+	"context"
+
+	"fusenapi/server/product/internal/svc"
+	"fusenapi/server/product/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type GetProductDesignLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewGetProductDesignLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetProductDesignLogic {
+	return &GetProductDesignLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *GetProductDesignLogic) GetProductDesign(req *types.GetProductDesignReq, userinfo *auth.UserInfo) (resp *basic.Response) {
+	if userinfo.GetIdType() != auth.IDTYPE_User {
+		return resp.SetStatusWithMessage(basic.CodeUnAuth, "please login first")
+	}
+	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")
+	}
+	//获取产品模型信息
+	productModel3dModel := gmodel.NewFsProductModel3dModel(l.svcCtx.MysqlConn)
+	model3dInfo, err := productModel3dModel.FindOne(l.ctx, *designInfo.OptionalId)
+	if err != nil {
+		logx.Error(err)
+		return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get product 3D model info")
+	}
+	if model3dInfo.Id == 0 {
+		return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "product 3D model info is not exists")
+	}
+	optionalId := *designInfo.OptionalId
+	if *model3dInfo.Status == 0 && *sizeInfo.Status == 1 && *productTemplateV2Info.Status == 1 && *productTemplateV2Info.IsDel == 0 {
+		optionalId = 0
+	}
+	return resp.SetStatusWithMessage(basic.CodeOK, "success", types.GetProductDesignRsp{
+		ProductId:  *designInfo.ProductId,
+		TemplateId: *designInfo.TemplateId,
+		MaterialId: *designInfo.MaterialId,
+		SizeId:     *designInfo.SizeId,
+		OptionalId: optionalId,
+		Cover:      *designInfo.Cover,
+		Info:       *designInfo.Info,
+	})
+}

server/product/internal/types/types.go

@@ -96,6 +96,20 @@ type PriceObj struct {
 	Price float64 `json:"price"`
 }
 
+type GetProductDesignReq struct {
+	Sn string `form:"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       string `json:"info"`
+}
+
 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/map-library.api

@@ -16,65 +16,10 @@ service map-library {
 
 //获取贴图库列表
 type GetMapLibraryListRsp {
-	Mid   int64              `json:"mid"`
+	Mid   int64             `json:"mid"`
-	Ctime string             `json:"ctime"`
+	Ctime string            `json:"ctime"`
-	Tag   MapLibraryListTag  `json:"tag"`
+	Tag   MapLibraryListTag `json:"tag"`
-	Info  MapLibraryListInfo `json:"info"`
+	Info  string            `json:"info"`
-}
-type MapLibraryListInfo {
-	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    int64                             `json:"QRcodeType"`
-	Width         float64                           `json:"width"`
-	Height        float64                           `json:"height"`
-	X             float64                           `json:"x"`
-	Y             float64                           `json:"y"`
-	Opacity       float64                           `json:"opacity"`
-	OptionalColor []MapLibraryListOptionalColorItem `json:"optionalColor"`
-	ZIndex        int64                             `json:"zIndex"`
-	SvgPath       string                            `json:"svgPath"`
-	Follow        MapLibraryListFollow              `json:"follow"`
-	Group         []MapLibraryListGroup             `json:"group"`
-	CameraStand   MapLibraryListCameraStand         `json:"cameraStand"`
-	MaterialTime  string                            `json:"materialTime"`
-	MaterialName  string                            `json:"materialName"`
-}
-type MapLibraryListCameraStand {
-	X int64 `json:"x"`
-	Y int64 `json:"y"`
-	Z int64 `json:"z"`
-}
-type MapLibraryListGroup {
-	Tag    string `json:"tag"`
-	Text   string `json:"text"`
-	Title  string `json:"title"`
-	IfBr   bool   `json:"ifBr"`
-	IfShow bool   `json:"ifShow"`
-	MaxNum int64  `json:"maxNum"`
-}
-type MapLibraryListFollow {
-	Fill    string `json:"fill"`
-	IfShow  string `json:"ifShow"`
-	Content string `json:"content"`
-}
-type MapLibraryListOptionalColorItem {
-	Color   string `json:"color"`
-	Name    string `json:"name"`
-	Default bool   `json:"default"`
 }
 type MapLibraryListTag {
 	Id    int64  `json:"id"`

server_api/product.api

@@ -12,11 +12,14 @@ service product {
 	@handler GetProductListHandler
 	get /product/list(GetProductListReq) returns (response);
 	//获取成功后的推荐产品
-	@handler GetSuccessRecommand
+	@handler GetSuccessRecommandHandler
 	get /product/success-recommand (GetSuccessRecommandReq) returns (response);
 	//获取分类下的产品以及尺寸
-	@handler GetSizeByProduct
+	@handler GetSizeByProductHandler
 	get /product/get-size-by-product  returns (response);
+	//获取保存的设计信息
+	@handler GetProductDesignHandler
+	get /product/design(GetProductDesignReq)  returns (response);
 }
 
 //获取产品列表
@@ -100,4 +103,18 @@ type ChildrenObj {
 type PriceObj {
 	Num   int     `json:"num"`
 	Price float64 `json:"price"`
+}
+
+//获取保存的设计信息
+type GetProductDesignReq {
+	Sn string `form:"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       string `json:"info"`
 }