fix

server/product/internal/logic/getproductdesignlogic.go

@@ -1,7 +1,6 @@
 package logic
 
 import (
-	"encoding/json"
 	"fusenapi/model/gmodel"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
@@ -65,11 +64,27 @@ func (l *GetProductDesignLogic) GetProductDesign(req *types.GetProductDesignReq,
 	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 {
+	//获取产品模型信息
+	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 parse design info")
+		return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get product 3D model info")
 	}
-	return resp.SetStatus(basic.CodeOK)
+	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,
+	})
 }