Administrator 2 жил өмнө
parent
commit
47369a647c
82 өөрчлөгдсөн 49 нэмэгдсэн , 20 устгасан
  1. 22 19
      data/dao/DetailDao.go
  2. 8 0
      data/domain/vo/DetailVo.go
  3. BIN
      file/resources/1716885931268.jpg
  4. BIN
      file/resources/1716885931991.jpg
  5. BIN
      file/resources/1716885932032.jpg
  6. BIN
      file/resources/1716885932108.jpg
  7. BIN
      file/resources/1716885932986.jpg
  8. BIN
      file/resources/1716885933030.jpg
  9. BIN
      file/resources/1716885933083.jpg
  10. BIN
      file/resources/1716885933127.jpg
  11. BIN
      file/resources/1716885933164.jpg
  12. BIN
      file/resources/1716885933287.jpg
  13. BIN
      file/resources/1716885933766.jpg
  14. BIN
      file/resources/1716885933852.jpg
  15. BIN
      file/resources/1716885933874.jpg
  16. BIN
      file/resources/1716885933908.jpg
  17. BIN
      file/resources/1716885933959.jpg
  18. BIN
      file/resources/1716885934040.jpg
  19. BIN
      file/resources/1716885934102.jpg
  20. BIN
      file/resources/1716885934128.jpg
  21. BIN
      file/resources/1716885934161.jpg
  22. BIN
      file/resources/1716885934192.jpg
  23. BIN
      file/resources/1716885934218.jpg
  24. BIN
      file/resources/1716885934252.jpg
  25. BIN
      file/resources/1716885934307.jpg
  26. BIN
      file/resources/1716885934339.jpg
  27. BIN
      file/resources/1716885934369.jpg
  28. BIN
      file/resources/1716885934402.jpg
  29. BIN
      file/resources/1716885934431.jpg
  30. BIN
      file/resources/1716885934474.jpg
  31. BIN
      file/resources/1716885934508.jpg
  32. BIN
      file/resources/1716885935000.jpg
  33. BIN
      file/resources/1716885935234.jpg
  34. BIN
      file/resources/1716885935338.jpg
  35. BIN
      file/resources/1716885935378.jpg
  36. BIN
      file/resources/1716885935508.jpg
  37. BIN
      file/resources/1716885935530.jpg
  38. BIN
      file/resources/1716885935568.jpg
  39. BIN
      file/resources/1716885935596.jpg
  40. BIN
      file/resources/1716885935652.jpg
  41. BIN
      file/resources/1716885935684.jpg
  42. BIN
      file/resources/1716885935707.jpg
  43. BIN
      file/resources/1716885935734.jpg
  44. BIN
      file/resources/1716885935758.jpg
  45. BIN
      file/resources/1716885935799.jpg
  46. BIN
      file/resources/1716885935826.jpg
  47. BIN
      file/resources/1716885935942.jpg
  48. BIN
      file/resources/1716885935973.jpg
  49. BIN
      file/resources/1716885936008.jpg
  50. BIN
      file/resources/1716885936043.jpg
  51. BIN
      file/resources/1716885936198.jpg
  52. BIN
      file/resources/1716885936358.jpg
  53. BIN
      file/resources/1716885936394.jpg
  54. BIN
      file/resources/1716885936428.jpg
  55. BIN
      file/resources/1716885936465.jpg
  56. BIN
      file/resources/1716885936496.jpg
  57. BIN
      file/resources/1716885936528.jpg
  58. BIN
      file/resources/1716885936554.jpg
  59. BIN
      file/resources/1716885936584.jpg
  60. BIN
      file/resources/1716885936611.jpg
  61. BIN
      file/resources/1716885936635.jpg
  62. BIN
      file/resources/1716885936659.jpg
  63. BIN
      file/resources/1716885936687.jpg
  64. BIN
      file/resources/1716885936719.jpg
  65. BIN
      file/resources/1716885936752.jpg
  66. BIN
      file/resources/1716885936786.jpg
  67. BIN
      file/resources/1716885936822.jpg
  68. BIN
      file/resources/1716885936882.jpg
  69. BIN
      file/resources/1716885936918.jpg
  70. BIN
      file/resources/1716885936954.jpg
  71. BIN
      file/resources/1716885937000.jpg
  72. BIN
      file/resources/1716885937144.jpg
  73. BIN
      file/resources/1716885937180.jpg
  74. BIN
      file/resources/1716885937214.jpg
  75. BIN
      file/resources/1716885937249.jpg
  76. BIN
      file/resources/1716885937283.jpg
  77. BIN
      file/resources/1716885937392.jpg
  78. BIN
      file/resources/1716885937430.jpg
  79. BIN
      file/resources/1716885937469.jpg
  80. BIN
      file/resources/1716885937556.jpg
  81. BIN
      file/resources/1716885937621.jpg
  82. 19 1
      router/DetailRouter.go

+ 22 - 19
data/dao/DetailDao.go

@@ -210,25 +210,26 @@ func GetSkuByKey(key string, pageNum, pageSize int) (vo.BaseListVo, string, erro
 	return vo, "", nil
 }
 
-func SelectSkuInfoBySkuId(skuId int64) (any, error) {
+func SelectSkuInfoBySkuId(skuId int64) (vo.DetailInfoVo, error) {
 	//根据skuid 获取GoodsId
 	var sku domain.GoodsSku
+	var infoVo vo.DetailInfoVo
 	_, err := configs.Engine.Table("goods_sku").Where("id = ?", skuId).Get(&sku)
 	if err != nil || sku.GoodsId == 0 {
-		return nil, err
+		return infoVo, err
 	}
 	var goods domain.Goods
-	_, err = configs.Engine.Table("goods_sku").Where("id = ?", sku.GoodsId).Get(&goods)
+	_, err = configs.Engine.Table("goods").Where("id = ?", sku.GoodsId).Get(&goods)
 	//查询属性
 	var areas = make([]domain.GoodsCommodityArea, 0)
 	err = configs.Engine.Table("goods_commodity_area").
-		Where("goods_id = ?", goods.Id).
-		Find(&areas)
+		Where("goods_id = ?", goods.Id).Find(&areas)
 	if err != nil {
-		return nil, err
+		return infoVo, err
 	}
 	//查询文章下的所有
 	intrIds := make([]int64, 0)
+
 	intrIds = append(intrIds, goods.IntroductionId)
 	for i := range areas {
 		if areas[i].DetailIntroductionId != 0 {
@@ -243,22 +244,24 @@ func SelectSkuInfoBySkuId(skuId int64) (any, error) {
 
 	var intrs = make([]domain.GoodsIntroduction, 0)
 	err = configs.Engine.Table("goods_introduction").
-		Where("FIND_IN_SET(id,?)", iis).
-		Find(&intrs)
+		Where("FIND_IN_SET(id,?)", iis).Find(&intrs)
 	if err != nil {
-		return nil, err
+		return infoVo, err
 	}
 	var skus = make([]domain.GoodsSku, 0)
 	err = configs.Engine.Table("goods_sku").Where("goods_id = ?", goods.Id).Find(&skus)
-	return DetailInfo{
-		sku, goods, intrs, skus, skus,
-	}, nil
-}
 
-type DetailInfo struct {
-	Sku              domain.GoodsSku            `json:"sku"`
-	Goods            domain.Goods               `json:"goods"`
-	Introduction     []domain.GoodsIntroduction `json:"introduction"`
-	Skus             []domain.GoodsSku          `json:"skus"`
-	RecommendedGoods []domain.GoodsSku          `json:"recommendedGoods"` //推荐商品
+	infoVo.Sku = sku
+	infoVo.Goods = goods
+	infoVo.Introductions = intrs
+	infoVo.Skus = skus
+	infoVo.Areas = areas
+
+	if len(skus) > 8 {
+		infoVo.RecommendedGoods = skus[0:8]
+	} else {
+		infoVo.RecommendedGoods = skus
+	}
+
+	return infoVo, nil
 }

+ 8 - 0
data/domain/vo/DetailVo.go

@@ -29,3 +29,11 @@ type DetailCommodityAreaVo struct {
 	NowCommodityAreaId int64                       `json:"commodityArea"`     //当前地区
 	CommodityAreaList  []domain.GoodsCommodityArea `json:"commodityAreaList"` //地区列表
 }
+type DetailInfoVo struct {
+	Sku              domain.GoodsSku             `json:"sku"`
+	Goods            domain.Goods                `json:"goods"`
+	Introductions    []domain.GoodsIntroduction  `json:"introductions"`
+	Skus             []domain.GoodsSku           `json:"skus"`
+	Areas            []domain.GoodsCommodityArea `json:"areas"`
+	RecommendedGoods []domain.GoodsSku           `json:"recommendedGoods"` //推荐商品
+}

BIN
file/resources/1716885931268.jpg


BIN
file/resources/1716885931991.jpg


BIN
file/resources/1716885932032.jpg


BIN
file/resources/1716885932108.jpg


BIN
file/resources/1716885932986.jpg


BIN
file/resources/1716885933030.jpg


BIN
file/resources/1716885933083.jpg


BIN
file/resources/1716885933127.jpg


BIN
file/resources/1716885933164.jpg


BIN
file/resources/1716885933287.jpg


BIN
file/resources/1716885933766.jpg


BIN
file/resources/1716885933852.jpg


BIN
file/resources/1716885933874.jpg


BIN
file/resources/1716885933908.jpg


BIN
file/resources/1716885933959.jpg


BIN
file/resources/1716885934040.jpg


BIN
file/resources/1716885934102.jpg


BIN
file/resources/1716885934128.jpg


BIN
file/resources/1716885934161.jpg


BIN
file/resources/1716885934192.jpg


BIN
file/resources/1716885934218.jpg


BIN
file/resources/1716885934252.jpg


BIN
file/resources/1716885934307.jpg


BIN
file/resources/1716885934339.jpg


BIN
file/resources/1716885934369.jpg


BIN
file/resources/1716885934402.jpg


BIN
file/resources/1716885934431.jpg


BIN
file/resources/1716885934474.jpg


BIN
file/resources/1716885934508.jpg


BIN
file/resources/1716885935000.jpg


BIN
file/resources/1716885935234.jpg


BIN
file/resources/1716885935338.jpg


BIN
file/resources/1716885935378.jpg


BIN
file/resources/1716885935508.jpg


BIN
file/resources/1716885935530.jpg


BIN
file/resources/1716885935568.jpg


BIN
file/resources/1716885935596.jpg


BIN
file/resources/1716885935652.jpg


BIN
file/resources/1716885935684.jpg


BIN
file/resources/1716885935707.jpg


BIN
file/resources/1716885935734.jpg


BIN
file/resources/1716885935758.jpg


BIN
file/resources/1716885935799.jpg


BIN
file/resources/1716885935826.jpg


BIN
file/resources/1716885935942.jpg


BIN
file/resources/1716885935973.jpg


BIN
file/resources/1716885936008.jpg


BIN
file/resources/1716885936043.jpg


BIN
file/resources/1716885936198.jpg


BIN
file/resources/1716885936358.jpg


BIN
file/resources/1716885936394.jpg


BIN
file/resources/1716885936428.jpg


BIN
file/resources/1716885936465.jpg


BIN
file/resources/1716885936496.jpg


BIN
file/resources/1716885936528.jpg


BIN
file/resources/1716885936554.jpg


BIN
file/resources/1716885936584.jpg


BIN
file/resources/1716885936611.jpg


BIN
file/resources/1716885936635.jpg


BIN
file/resources/1716885936659.jpg


BIN
file/resources/1716885936687.jpg


BIN
file/resources/1716885936719.jpg


BIN
file/resources/1716885936752.jpg


BIN
file/resources/1716885936786.jpg


BIN
file/resources/1716885936822.jpg


BIN
file/resources/1716885936882.jpg


BIN
file/resources/1716885936918.jpg


BIN
file/resources/1716885936954.jpg


BIN
file/resources/1716885937000.jpg


BIN
file/resources/1716885937144.jpg


BIN
file/resources/1716885937180.jpg


BIN
file/resources/1716885937214.jpg


BIN
file/resources/1716885937249.jpg


BIN
file/resources/1716885937283.jpg


BIN
file/resources/1716885937392.jpg


BIN
file/resources/1716885937430.jpg


BIN
file/resources/1716885937469.jpg


BIN
file/resources/1716885937556.jpg


BIN
file/resources/1716885937621.jpg


+ 19 - 1
router/DetailRouter.go

@@ -16,7 +16,8 @@ func DetailRouter(engine *gin.RouterGroup) {
 	PushRouter(user, "GET", "/search", GetSearchByKey)
 	//获取文章详情
 	//user.GET("/:id", GetDetailData)
-	PushRouter(user, "GET", "/:id", GetDetailData)
+	//PushRouter(user, "GET", "/:id", GetDetailData)
+	PushRouter(user, "GET", "/:id", GetDetailInfo)
 }
 
 // GetDetailData 获取文章详情
@@ -36,6 +37,23 @@ func GetDetailData(c *gin.Context) {
 	c.JSON(200, CreateResultData(vo))
 }
 
+// GetDetailInfo 获取文章详情
+func GetDetailInfo(c *gin.Context) {
+	id, err2 := strconv.Atoi(c.Param("id"))
+	if err2 != nil {
+		c.JSON(200, CreateResultError(400, "param 参数错误"))
+		return
+	}
+
+	vo, err := dao.SelectSkuInfoBySkuId(int64(id))
+	if err != nil || vo.Sku.Id == 0 {
+		c.JSON(200, CreateResultError(400, "查询失败"))
+		return
+	}
+
+	c.JSON(200, CreateResultData(vo))
+}
+
 func GetSearchByKey(c *gin.Context) {
 	key := c.Query("key")
 	pageNum := c.Query("pageNum")