From bca172609752629e32ea82f77aede50cad36e817 Mon Sep 17 00:00:00 2001
From: kanade <kanade@kumo.work>
Date: Thu, 8 Dec 2022 09:47:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/api/mobile/goods/detail.go | 20 ++++++++++----------
 internal/model/goods/content.go     | 12 ++++++++++++
 2 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100755 internal/model/goods/content.go

diff --git a/internal/api/mobile/goods/detail.go b/internal/api/mobile/goods/detail.go
index 63b71b0..1019f4c 100644
--- a/internal/api/mobile/goods/detail.go
+++ b/internal/api/mobile/goods/detail.go
@@ -185,8 +185,9 @@ func fetchRecommends(goodsId int64, brandId uint) []recommend {
 }
 
 type DetailImg struct {
-	List  []goods.DetailPhoto `json:"list"`
-	Brand goods.Brand         `json:"brand"`
+	List    []goods.DetailPhoto `json:"list"`
+	Brand   goods.Brand         `json:"brand"`
+	Content string              `json:"content"`
 }
 
 func QueryGoodsPhotosDetail(c *gin.Context) {
@@ -197,12 +198,6 @@ func QueryGoodsPhotosDetail(c *gin.Context) {
 		return
 	}
 
-	var list []goods.DetailPhoto
-	err = dbc.DB.Order("order_no asc").Find(&list, "goods_id = ?", p.GoodsID).Error
-	if err != nil && gorm.IsRecordNotFoundError(err) {
-		back.Err(c, err.Error())
-		return
-	}
 	//获取品牌数据
 	var info goods.Information
 	err = dbc.DB.First(&info, "id= ?", p.GoodsID).Error
@@ -217,9 +212,14 @@ func QueryGoodsPhotosDetail(c *gin.Context) {
 		back.Err(c, err.Error())
 		return
 	}
+	var list []goods.DetailPhoto
+	dbc.DB.Order("order_no asc").Find(&list, "goods_id = ?", p.GoodsID)
+	var content goods.Content
+	dbc.DB.First(&content, "goods_id= ?", info.BrandID)
 	var gd = DetailImg{
-		List:  list,
-		Brand: brand,
+		List:    list,
+		Brand:   brand,
+		Content: content.Content,
 	}
 
 	back.Suc(c, "操作成功", &gd)
diff --git a/internal/model/goods/content.go b/internal/model/goods/content.go
new file mode 100755
index 0000000..d1fdb95
--- /dev/null
+++ b/internal/model/goods/content.go
@@ -0,0 +1,12 @@
+package goods
+
+type Content struct {
+	ID      uint   `gorm:"column:id;primary_key" json:"id"`
+	GoodsID uint   `gorm:"column:goods_id" json:"goodsId"`
+	Content string `gorm:"column:content" json:"content"`
+}
+
+// TableName sets the insert table name for this struct type
+func (c *Content) TableName() string {
+	return "recook_goods_content"
+}