日常提交

data/dao/manage/GoodsIndexBannerDao.go

@@ -1,76 +0,0 @@
-package manage
-
-import (
-	"demo/configs"
-	"demo/data/domain"
-	"demo/data/domain/vo"
-)
-
-func GetGoodsIndexBannerById(id int64) (domain.GoodsIndexBanner, error) {
-	var goodsIndexBanner domain.GoodsIndexBanner
-	_, err := configs.Engine.Table("goods_index_banner").Where("id = ?", id).Get(&goodsIndexBanner)
-	if err != nil {
-		return goodsIndexBanner, err
-	}
-	return goodsIndexBanner, nil
-}
-
-func GetGoodsIndexBannerListInId(ids []int64) ([]domain.GoodsIndexBanner, error) {
-	rows, err := configs.Engine.Table("goods_index_banner").In("id", ids).Rows(&domain.GoodsIndexBanner{})
-	if err != nil {
-		return make([]domain.GoodsIndexBanner, 0), err
-	}
-	defer rows.Close()
-	var list []domain.GoodsIndexBanner
-	for rows.Next() {
-		var u domain.GoodsIndexBanner
-		list = append(list, u)
-	}
-	return list, nil
-}
-
-func GetGoodsIndexBannerList(goodsIndexBanner domain.GoodsIndexBanner, pageNum, pageSize int) (vo.BaseListVo, error) {
-	var arr []domain.GoodsIndexBanner
-	Count, err := configs.Engine.Table("goods_index_banner").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &goodsIndexBanner)
-	var vo vo.BaseListVo
-	if err != nil {
-		return vo, err
-	}
-	if err != nil {
-		return vo, err
-	}
-	vo.PageNum = pageNum
-	vo.PageSize = pageSize
-	vo.List = make([]any, len(arr))
-	for i, v := range arr {
-		vo.List[i] = v
-	}
-	vo.Total = int(Count)
-	return vo, nil
-}
-
-func SaveGoodsIndexBanner(goodsIndexBanner *domain.GoodsIndexBanner) (domain.GoodsIndexBanner, error) {
-	_, err := configs.Engine.Table("goods_index_banner").Insert(&goodsIndexBanner)
-	if err != nil {
-		return *goodsIndexBanner, err
-	}
-	return *goodsIndexBanner, nil
-}
-
-func SetGoodsIndexBanner(goodsIndexBannerMap map[string]interface{}, id int64) (domain.GoodsIndexBanner, bool, error) {
-	var goodsIndexBanner domain.GoodsIndexBanner
-	_, err := configs.Engine.Table("goods_index_banner").Where("id = ?", id).Update(goodsIndexBannerMap)
-	if err != nil {
-		return goodsIndexBanner, false, err
-	}
-	return goodsIndexBanner, true, nil
-}
-
-func DeleteGoodsIndexBanner(id int64) bool {
-	var goodsIndexBanner domain.GoodsIndexBanner
-	i, err := configs.Engine.Table("goods_index_banner").Where("id = ?", id).Delete(&goodsIndexBanner)
-	if err != nil {
-		return false
-	}
-	return i > 0
-}

data/dao/manage/GoodsTopicDao.go

@@ -1,76 +0,0 @@
-package manage
-
-import (
-	"demo/configs"
-	"demo/data/domain"
-	"demo/data/domain/vo"
-)
-
-func GetGoodsTopicById(id int64) (domain.GoodsTopic, error) {
-	var goodsTopic domain.GoodsTopic
-	_, err := configs.Engine.Table("goods_topic").Where("id = ?", id).Get(&goodsTopic)
-	if err != nil {
-		return goodsTopic, err
-	}
-	return goodsTopic, nil
-}
-
-func GetGoodsTopicListInId(ids []int64) ([]domain.GoodsTopic, error) {
-	rows, err := configs.Engine.Table("goods_topic").In("id", ids).Rows(&domain.GoodsTopic{})
-	if err != nil {
-		return make([]domain.GoodsTopic, 0), err
-	}
-	defer rows.Close()
-	var list []domain.GoodsTopic
-	for rows.Next() {
-		var u domain.GoodsTopic
-		list = append(list, u)
-	}
-	return list, nil
-}
-
-func GetGoodsTopicList(goodsTopic domain.GoodsTopic, pageNum, pageSize int) (vo.BaseListVo, error) {
-	var arr []domain.GoodsTopic
-	Count, err := configs.Engine.Table("goods_topic").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &goodsTopic)
-	var vo vo.BaseListVo
-	if err != nil {
-		return vo, err
-	}
-	if err != nil {
-		return vo, err
-	}
-	vo.PageNum = pageNum
-	vo.PageSize = pageSize
-	vo.List = make([]any, len(arr))
-	for i, v := range arr {
-		vo.List[i] = v
-	}
-	vo.Total = int(Count)
-	return vo, nil
-}
-
-func SaveGoodsTopic(goodsTopic *domain.GoodsTopic) (domain.GoodsTopic, error) {
-	_, err := configs.Engine.Table("goods_topic").Insert(&goodsTopic)
-	if err != nil {
-		return *goodsTopic, err
-	}
-	return *goodsTopic, nil
-}
-
-func SetGoodsTopic(goodsTopicMap map[string]interface{}, id int64) (domain.GoodsTopic, bool, error) {
-	var goodsTopic domain.GoodsTopic
-	_, err := configs.Engine.Table("goods_topic").Where("id = ?", id).Update(goodsTopicMap)
-	if err != nil {
-		return goodsTopic, false, err
-	}
-	return goodsTopic, true, nil
-}
-
-func DeleteGoodsTopic(id int64) bool {
-	var goodsTopic domain.GoodsTopic
-	i, err := configs.Engine.Table("goods_topic").Where("id = ?", id).Delete(&goodsTopic)
-	if err != nil {
-		return false
-	}
-	return i > 0
-}

data/dao/manage/ShopAdviceCarouselDao.go

@@ -0,0 +1,76 @@
+package manage
+
+import (
+	"demo/configs"
+	"demo/data/domain"
+	"demo/data/domain/vo"
+)
+
+func GetShopAdviceCarouselById(id int64) (domain.ShopAdviceCarousel, error) {
+	var shopAdviceCarousel domain.ShopAdviceCarousel
+	_, err := configs.Engine.Table("shop_advice_carousel").Where("id = ?", id).Get(&shopAdviceCarousel)
+	if err != nil {
+		return shopAdviceCarousel, err
+	}
+	return shopAdviceCarousel, nil
+}
+
+func GetShopAdviceCarouselListInId(ids []int64) ([]domain.ShopAdviceCarousel, error) {
+	rows, err := configs.Engine.Table("shop_advice_carousel").In("id", ids).Rows(&domain.ShopAdviceCarousel{})
+	if err != nil {
+		return make([]domain.ShopAdviceCarousel, 0), err
+	}
+	defer rows.Close()
+	var list []domain.ShopAdviceCarousel
+	for rows.Next() {
+		var u domain.ShopAdviceCarousel
+		list = append(list, u)
+	}
+	return list, nil
+}
+
+func GetShopAdviceCarouselList(shopAdviceCarousel domain.ShopAdviceCarousel, pageNum, pageSize int) (vo.BaseListVo, error) {
+	var arr []domain.ShopAdviceCarousel
+	Count, err := configs.Engine.Table("shop_advice_carousel").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &shopAdviceCarousel)
+	var vo vo.BaseListVo
+	if err != nil {
+		return vo, err
+	}
+	if err != nil {
+		return vo, err
+	}
+	vo.PageNum = pageNum
+	vo.PageSize = pageSize
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
+	}
+	vo.Total = int(Count)
+	return vo, nil
+}
+
+func SaveShopAdviceCarousel(shopAdviceCarousel *domain.ShopAdviceCarousel) (domain.ShopAdviceCarousel, error) {
+	_, err := configs.Engine.Table("shop_advice_carousel").Insert(&shopAdviceCarousel)
+	if err != nil {
+		return *shopAdviceCarousel, err
+	}
+	return *shopAdviceCarousel, nil
+}
+
+func SetShopAdviceCarousel(shopAdviceCarouselMap map[string]interface{}, id int64) (domain.ShopAdviceCarousel, bool, error) {
+	var shopAdviceCarousel domain.ShopAdviceCarousel
+	_, err := configs.Engine.Table("shop_advice_carousel").Where("id = ?", id).Update(shopAdviceCarouselMap)
+	if err != nil {
+		return shopAdviceCarousel, false, err
+	}
+	return shopAdviceCarousel, true, nil
+}
+
+func DeleteShopAdviceCarousel(id int64) bool {
+	var shopAdviceCarousel domain.ShopAdviceCarousel
+	i, err := configs.Engine.Table("shop_advice_carousel").Where("id = ?", id).Delete(&shopAdviceCarousel)
+	if err != nil {
+		return false
+	}
+	return i > 0
+}

data/dao/manage/ShopTopicDao.go

@@ -0,0 +1,76 @@
+package manage
+
+import (
+	"demo/configs"
+	"demo/data/domain"
+	"demo/data/domain/vo"
+)
+
+func GetShopTopicById(id int64) (domain.ShopTopic, error) {
+	var shopTopic domain.ShopTopic
+	_, err := configs.Engine.Table("shop_topic").Where("id = ?", id).Get(&shopTopic)
+	if err != nil {
+		return shopTopic, err
+	}
+	return shopTopic, nil
+}
+
+func GetShopTopicListInId(ids []int64) ([]domain.ShopTopic, error) {
+	rows, err := configs.Engine.Table("shop_topic").In("id", ids).Rows(&domain.ShopTopic{})
+	if err != nil {
+		return make([]domain.ShopTopic, 0), err
+	}
+	defer rows.Close()
+	var list []domain.ShopTopic
+	for rows.Next() {
+		var u domain.ShopTopic
+		list = append(list, u)
+	}
+	return list, nil
+}
+
+func GetShopTopicList(shopTopic domain.ShopTopic, pageNum, pageSize int) (vo.BaseListVo, error) {
+	var arr []domain.ShopTopic
+	Count, err := configs.Engine.Table("shop_topic").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &shopTopic)
+	var vo vo.BaseListVo
+	if err != nil {
+		return vo, err
+	}
+	if err != nil {
+		return vo, err
+	}
+	vo.PageNum = pageNum
+	vo.PageSize = pageSize
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
+	}
+	vo.Total = int(Count)
+	return vo, nil
+}
+
+func SaveShopTopic(shopTopic *domain.ShopTopic) (domain.ShopTopic, error) {
+	_, err := configs.Engine.Table("shop_topic").Insert(&shopTopic)
+	if err != nil {
+		return *shopTopic, err
+	}
+	return *shopTopic, nil
+}
+
+func SetShopTopic(shopTopicMap map[string]interface{}, id int64) (domain.ShopTopic, bool, error) {
+	var shopTopic domain.ShopTopic
+	_, err := configs.Engine.Table("shop_topic").Where("id = ?", id).Update(shopTopicMap)
+	if err != nil {
+		return shopTopic, false, err
+	}
+	return shopTopic, true, nil
+}
+
+func DeleteShopTopic(id int64) bool {
+	var shopTopic domain.ShopTopic
+	i, err := configs.Engine.Table("shop_topic").Where("id = ?", id).Delete(&shopTopic)
+	if err != nil {
+		return false
+	}
+	return i > 0
+}

data/dao/manage/ShopTopicSkuDao.go

@@ -0,0 +1,76 @@
+package manage
+
+import (
+	"demo/configs"
+	"demo/data/domain"
+	"demo/data/domain/vo"
+)
+
+func GetShopTopicSkuById(id int64) (domain.ShopTopicSku, error) {
+	var shopTopicSku domain.ShopTopicSku
+	_, err := configs.Engine.Table("shop_topic_sku").Where("id = ?", id).Get(&shopTopicSku)
+	if err != nil {
+		return shopTopicSku, err
+	}
+	return shopTopicSku, nil
+}
+
+func GetShopTopicSkuListInId(ids []int64) ([]domain.ShopTopicSku, error) {
+	rows, err := configs.Engine.Table("shop_topic_sku").In("id", ids).Rows(&domain.ShopTopicSku{})
+	if err != nil {
+		return make([]domain.ShopTopicSku, 0), err
+	}
+	defer rows.Close()
+	var list []domain.ShopTopicSku
+	for rows.Next() {
+		var u domain.ShopTopicSku
+		list = append(list, u)
+	}
+	return list, nil
+}
+
+func GetShopTopicSkuList(shopTopicSku domain.ShopTopicSku, pageNum, pageSize int) (vo.BaseListVo, error) {
+	var arr []domain.ShopTopicSku
+	Count, err := configs.Engine.Table("shop_topic_sku").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &shopTopicSku)
+	var vo vo.BaseListVo
+	if err != nil {
+		return vo, err
+	}
+	if err != nil {
+		return vo, err
+	}
+	vo.PageNum = pageNum
+	vo.PageSize = pageSize
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
+	}
+	vo.Total = int(Count)
+	return vo, nil
+}
+
+func SaveShopTopicSku(shopTopicSku *domain.ShopTopicSku) (domain.ShopTopicSku, error) {
+	_, err := configs.Engine.Table("shop_topic_sku").Insert(&shopTopicSku)
+	if err != nil {
+		return *shopTopicSku, err
+	}
+	return *shopTopicSku, nil
+}
+
+func SetShopTopicSku(shopTopicSkuMap map[string]interface{}, id int64) (domain.ShopTopicSku, bool, error) {
+	var shopTopicSku domain.ShopTopicSku
+	_, err := configs.Engine.Table("shop_topic_sku").Where("id = ?", id).Update(shopTopicSkuMap)
+	if err != nil {
+		return shopTopicSku, false, err
+	}
+	return shopTopicSku, true, nil
+}
+
+func DeleteShopTopicSku(id int64) bool {
+	var shopTopicSku domain.ShopTopicSku
+	i, err := configs.Engine.Table("shop_topic_sku").Where("id = ?", id).Delete(&shopTopicSku)
+	if err != nil {
+		return false
+	}
+	return i > 0
+}

data/domain/DoMain.go

@@ -181,7 +181,7 @@ type GenTableColumn struct {
 	IsKey         string `xorm:"is_key"  json:"isKey"`                 // 1 0 注释：是否主键
 	IsIncrement   string `xorm:"is_increment"  json:"isIncrement"`     // 1 0 注释：是否自增
 	IsRequired    string `xorm:"is_required"  json:"isRequired"`       // 1 0 注释：是否未必填
-	QueryType     string `xorm:"query_type"  json:"queryType"`         // 255 0 注释：查询方式
+	QueryType     string `xorm:"query_type"  json:"queryType"`         // 1 0 注释：查询方式
 	VueShowType   string `xorm:"vue_show_type"  json:"vueShowType"`    // 255 0 注释：前端显示类型
 	DictType      string `xorm:"dict_type"  json:"dictType"`           // 255 0 注释：字典类型
 }
@@ -251,23 +251,6 @@ func (receiver GoodsCouponUser) String() string {
 	return fmt.Sprint("GoodsCouponUser{Id:", receiver.Id, ",UserId:", receiver.UserId, ",CouponId:", receiver.CouponId, ",CollectionTime:", receiver.CollectionTime, ",State:", receiver.State, "}")
 }
 
-// GoodsIndexBanner
-type GoodsIndexBanner struct {
-	Id         int64     `json:"id"`                             // 11 0 注释：
-	Sort       string    `xorm:"sort"  json:"sort"`              // 255 0 注释：排序
-	ImageUrl   string    `xorm:"image_url"  json:"imageUrl"`     // 255 0 注释：图片
-	SkuId      int64     `xorm:"sku_id"  json:"skuId"`           // 11 0 注释：商品规格
-	Show       string    `xorm:"show"  json:"show"`              // 5 0 注释：显示
-	CreateBy   string    `xorm:"create_by"  json:"createBy"`     // 255 0 注释：创建人
-	CreateTime time.Time `xorm:"create_time"  json:"createTime"` // 0 0 注释：创建时间
-	UpdateBy   string    `xorm:"update_by"  json:"updateBy"`     // 255 0 注释：更新人
-	UpdateTime time.Time `xorm:"update_time"  json:"updateTime"` // 0 0 注释：更新时间
-}
-
-func (receiver GoodsIndexBanner) String() string {
-	return fmt.Sprint("GoodsIndexBanner{Id:", receiver.Id, ",Sort:", receiver.Sort, ",ImageUrl:", receiver.ImageUrl, ",SkuId:", receiver.SkuId, ",Show:", receiver.Show, ",CreateBy:", receiver.CreateBy, ",CreateTime:", receiver.CreateTime, ",UpdateBy:", receiver.UpdateBy, ",UpdateTime:", receiver.UpdateTime, "}")
-}
-
 // GoodsIntroduction 商品介绍
 type GoodsIntroduction struct {
 	Id               int64     `json:"id"`                                          // 11 0 注释：文章id
@@ -350,19 +333,6 @@ func (receiver GoodsTag) String() string {
 	return fmt.Sprint("GoodsTag{Id:", receiver.Id, ",Name:", receiver.Name, ",IconUrl:", receiver.IconUrl, ",Tag:", receiver.Tag, "}")
 }
 
-// GoodsTopic 商品主题
-type GoodsTopic struct {
-	Id             int64  `json:"id"`                                      // 11 0 注释：
-	TopicPageImage string `xorm:"topic_page_image"  json:"topicPageImage"` // 255 0 注释：主题首页图片
-	TopicName      string `xorm:"topic_name"  json:"topicName"`            // 255 0 注释：主题名称
-	TopicDesc      string `xorm:"topic_desc"  json:"topicDesc"`            // 255 0 注释：主题描述
-	TypeIds        string `xorm:"type_ids"  json:"typeIds"`                // 255 0 注释：商品类型id
-}
-
-func (receiver GoodsTopic) String() string {
-	return fmt.Sprint("GoodsTopic{Id:", receiver.Id, ",TopicPageImage:", receiver.TopicPageImage, ",TopicName:", receiver.TopicName, ",TopicDesc:", receiver.TopicDesc, ",TypeIds:", receiver.TypeIds, "}")
-}
-
 // GoodsType 商品分类
 type GoodsType struct {
 	Id         int64     `json:"id"`                             // 11 0 注释：
@@ -395,6 +365,51 @@ func (receiver ManageUser) String() string {
 	return fmt.Sprint("ManageUser{Id:", receiver.Id, ",Name:", receiver.Name, ",Username:", receiver.Username, ",Password:", receiver.Password, ",CreationTime:", receiver.CreationTime, ",LoginTime:", receiver.LoginTime, ",Status:", receiver.Status, ",RoleId:", receiver.RoleId, ",Phone:", receiver.Phone, ",Email:", receiver.Email, ",Avatar:", receiver.Avatar, "}")
 }
 
+// ShopAdviceCarousel
+type ShopAdviceCarousel struct {
+	Id         int64     `json:"id"`                             // 11 0 注释：
+	Name       string    `xorm:"name"  json:"name"`              // 255 0 注释：广告名称
+	ToId       int64     `xorm:"to_id"  json:"toId"`             // 11 0 注释：目标id
+	AdviceType string    `xorm:"advice_type"  json:"adviceType"` // 255 0 注释：广告类型，用于跳转到对应的页面
+	Sort       string    `xorm:"sort"  json:"sort"`              // 255 0 注释：排序
+	State      string    `xorm:"state"  json:"state"`            // 255 0 注释：状态
+	ShowType   string    `xorm:"show_type"  json:"showType"`     // 50 0 注释：显示类型，carousel轮播图，package，礼包
+	CreateBy   string    `xorm:"create_by"  json:"createBy"`     // 255 0 注释：创建人
+	CreateTime time.Time `xorm:"create_time"  json:"createTime"` // 0 0 注释：创建时间
+	UpdateBy   string    `xorm:"update_by"  json:"updateBy"`     // 255 0 注释：更新人
+	UpdateTime time.Time `xorm:"update_time"  json:"updateTime"` // 0 0 注释：更新时间
+}
+
+func (receiver ShopAdviceCarousel) String() string {
+	return fmt.Sprint("ShopAdviceCarousel{Id:", receiver.Id, ",Name:", receiver.Name, ",ToId:", receiver.ToId, ",AdviceType:", receiver.AdviceType, ",Sort:", receiver.Sort, ",State:", receiver.State, ",ShowType:", receiver.ShowType, ",CreateBy:", receiver.CreateBy, ",CreateTime:", receiver.CreateTime, ",UpdateBy:", receiver.UpdateBy, ",UpdateTime:", receiver.UpdateTime, "}")
+}
+
+// ShopTopic 商品主题
+type ShopTopic struct {
+	Id             int64  `json:"id"`                                      // 11 0 注释：
+	Sort           string `xorm:"sort"  json:"sort"`                       // 255 0 注释：
+	ParentId       int64  `xorm:"parent_id"  json:"parentId"`              // 11 0 注释：父级id
+	TopicPageImage string `xorm:"topic_page_image"  json:"topicPageImage"` // 255 0 注释：主题首页图片
+	TopicName      string `xorm:"topic_name"  json:"topicName"`            // 255 0 注释：主题名称
+	TopicDesc      string `xorm:"topic_desc"  json:"topicDesc"`            // 255 0 注释：主题描述
+	TypeIds        string `xorm:"type_ids"  json:"typeIds"`                // 255 0 注释：商品类型id
+}
+
+func (receiver ShopTopic) String() string {
+	return fmt.Sprint("ShopTopic{Id:", receiver.Id, ",Sort:", receiver.Sort, ",ParentId:", receiver.ParentId, ",TopicPageImage:", receiver.TopicPageImage, ",TopicName:", receiver.TopicName, ",TopicDesc:", receiver.TopicDesc, ",TypeIds:", receiver.TypeIds, "}")
+}
+
+// ShopTopicSku
+type ShopTopicSku struct {
+	Id      int64 `json:"id"`                       // 11 0 注释：
+	TopicId int64 `xorm:"topic_id"  json:"topicId"` // 11 0 注释：
+	SkuId   int64 `xorm:"sku_id"  json:"skuId"`     // 11 0 注释：
+}
+
+func (receiver ShopTopicSku) String() string {
+	return fmt.Sprint("ShopTopicSku{Id:", receiver.Id, ",TopicId:", receiver.TopicId, ",SkuId:", receiver.SkuId, "}")
+}
+
 // User 用户表
 type User struct {
 	Id            int64  `json:"id"`                                   // 11 0 注释：

data/domain/vo/IndexData.go

@@ -4,7 +4,7 @@ import "demo/data/domain"
 
 type IndexDataVo struct {
 	//广告位标签栏
-	AdviceTopics []domain.GoodsTopic
+	AdviceTopics []domain.ShopTopic
 	//广告位左侧商品列表
 	AdviceGoodsList struct {
 		Name    string `json:"name"`

router/BackRouter.go

@@ -37,31 +37,41 @@ func GetRoleMenu(c *gin.Context) {
 }
 
 func BaseBackRouter(group *gin.RouterGroup) {
+	//文章
 	BaseArticleRouter(group)
 	BaseArticleTagRouter(group)
 	BaseArticleTopicRouter(group)
-	BaseBackAuthorityRouter(group)
-	BaseBackMenuRouter(group)
+	//权限 or 菜单
 	BaseBackRoleRouter(group)
+	BaseBackAuthorityRouter(group)
 	BaseBackRoleAuthorityRouter(group)
+	BaseBackMenuRouter(group)
 	BaseBackRoleMenuRouter(group)
-
-	BaseDictTypeRouter(group)
+	//字典
 	BaseDictDataRouter(group)
+	BaseDictTypeRouter(group)
+	//自动生成
 	BaseGenTableRouter(group)
 	BaseGenTableColumnRouter(group)
-
+	//商品设置
+	BaseGoodsTypeRouter(group)
 	BaseGoodsRouter(group)
-	BaseGoodsCommodityAreaRouter(group)
-	BaseGoodsCouponRouter(group)
-	BaseGoodsCouponUserRouter(group)
 	BaseGoodsIntroductionRouter(group)
-	BaseGoodsOrderRouter(group)
+	BaseGoodsCommodityAreaRouter(group)
 	BaseGoodsSkuRouter(group)
 	BaseGoodsSkuCardRouter(group)
 	BaseGoodsTagRouter(group)
-	BaseGoodsTopicRouter(group)
-	BaseGoodsTypeRouter(group)
+	BaseGoodsOrderRouter(group)
+	//优惠券
+	BaseGoodsCouponRouter(group)
+	BaseGoodsCouponUserRouter(group)
+	//废弃
+	//BaseManageUserRouter(group)
+	//商城显示
+	BaseShopAdviceCarouselRouter(group)
+	BaseShopTopicRouter(group)
+	BaseShopTopicSkuRouter(group)
+	//用户
 	BaseUserRouter(group)
 	BaseUserWalletRouter(group)
 }

router/BaseBackRouter.go

@@ -43,15 +43,16 @@ func UtilStructToMap(m map[string]interface{}) map[string]interface{} {
 //BaseGoodsCommodityAreaRouter(group)
 //BaseGoodsCouponRouter(group)
 //BaseGoodsCouponUserRouter(group)
-//BaseGoodsIndexBannerRouter(group)
 //BaseGoodsIntroductionRouter(group)
 //BaseGoodsOrderRouter(group)
 //BaseGoodsSkuRouter(group)
 //BaseGoodsSkuCardRouter(group)
 //BaseGoodsTagRouter(group)
-//BaseGoodsTopicRouter(group)
 //BaseGoodsTypeRouter(group)
 //BaseManageUserRouter(group)
+//BaseShopAdviceCarouselRouter(group)
+//BaseShopTopicRouter(group)
+//BaseShopTopicSkuRouter(group)
 //BaseUserRouter(group)
 //BaseUserWalletRouter(group)
 
@@ -225,16 +226,6 @@ func BaseGoodsCouponUserRouter(group *gin.RouterGroup) {
 	PushRouter(BaseGoodsCouponUserGroup, "DELETE", "/goodsCouponUser", DeleteBaseGoodsCouponUser)
 }
 
-func BaseGoodsIndexBannerRouter(group *gin.RouterGroup) {
-	BaseGoodsIndexBannerGroup := group.Group("/back/base")
-	PushRouter(BaseGoodsIndexBannerGroup, "GET", "/goodsIndexBanner", GetBaseGoodsIndexBannerById)
-	PushRouter(BaseGoodsIndexBannerGroup, "POST", "/goodsIndexBanner/list", GetBaseGoodsIndexBannerList)
-	PushRouter(BaseGoodsIndexBannerGroup, "POST", "/goodsIndexBanner/in", GetBaseGoodsIndexBannerListInId)
-	PushRouter(BaseGoodsIndexBannerGroup, "POST", "/goodsIndexBanner", SaveBaseGoodsIndexBanner)
-	PushRouter(BaseGoodsIndexBannerGroup, "PUT", "/goodsIndexBanner", UpdateBaseGoodsIndexBanner)
-	PushRouter(BaseGoodsIndexBannerGroup, "DELETE", "/goodsIndexBanner", DeleteBaseGoodsIndexBanner)
-}
-
 func BaseGoodsIntroductionRouter(group *gin.RouterGroup) {
 	BaseGoodsIntroductionGroup := group.Group("/back/base")
 	PushRouter(BaseGoodsIntroductionGroup, "GET", "/goodsIntroduction", GetBaseGoodsIntroductionById)
@@ -285,16 +276,6 @@ func BaseGoodsTagRouter(group *gin.RouterGroup) {
 	PushRouter(BaseGoodsTagGroup, "DELETE", "/goodsTag", DeleteBaseGoodsTag)
 }
 
-func BaseGoodsTopicRouter(group *gin.RouterGroup) {
-	BaseGoodsTopicGroup := group.Group("/back/base")
-	PushRouter(BaseGoodsTopicGroup, "GET", "/goodsTopic", GetBaseGoodsTopicById)
-	PushRouter(BaseGoodsTopicGroup, "POST", "/goodsTopic/list", GetBaseGoodsTopicList)
-	PushRouter(BaseGoodsTopicGroup, "POST", "/goodsTopic/in", GetBaseGoodsTopicListInId)
-	PushRouter(BaseGoodsTopicGroup, "POST", "/goodsTopic", SaveBaseGoodsTopic)
-	PushRouter(BaseGoodsTopicGroup, "PUT", "/goodsTopic", UpdateBaseGoodsTopic)
-	PushRouter(BaseGoodsTopicGroup, "DELETE", "/goodsTopic", DeleteBaseGoodsTopic)
-}
-
 func BaseGoodsTypeRouter(group *gin.RouterGroup) {
 	BaseGoodsTypeGroup := group.Group("/back/base")
 	PushRouter(BaseGoodsTypeGroup, "GET", "/goodsType", GetBaseGoodsTypeById)
@@ -315,6 +296,36 @@ func BaseManageUserRouter(group *gin.RouterGroup) {
 	PushRouter(BaseManageUserGroup, "DELETE", "/manageUser", DeleteBaseManageUser)
 }
 
+func BaseShopAdviceCarouselRouter(group *gin.RouterGroup) {
+	BaseShopAdviceCarouselGroup := group.Group("/back/base")
+	PushRouter(BaseShopAdviceCarouselGroup, "GET", "/shopAdviceCarousel", GetBaseShopAdviceCarouselById)
+	PushRouter(BaseShopAdviceCarouselGroup, "POST", "/shopAdviceCarousel/list", GetBaseShopAdviceCarouselList)
+	PushRouter(BaseShopAdviceCarouselGroup, "POST", "/shopAdviceCarousel/in", GetBaseShopAdviceCarouselListInId)
+	PushRouter(BaseShopAdviceCarouselGroup, "POST", "/shopAdviceCarousel", SaveBaseShopAdviceCarousel)
+	PushRouter(BaseShopAdviceCarouselGroup, "PUT", "/shopAdviceCarousel", UpdateBaseShopAdviceCarousel)
+	PushRouter(BaseShopAdviceCarouselGroup, "DELETE", "/shopAdviceCarousel", DeleteBaseShopAdviceCarousel)
+}
+
+func BaseShopTopicRouter(group *gin.RouterGroup) {
+	BaseShopTopicGroup := group.Group("/back/base")
+	PushRouter(BaseShopTopicGroup, "GET", "/shopTopic", GetBaseShopTopicById)
+	PushRouter(BaseShopTopicGroup, "POST", "/shopTopic/list", GetBaseShopTopicList)
+	PushRouter(BaseShopTopicGroup, "POST", "/shopTopic/in", GetBaseShopTopicListInId)
+	PushRouter(BaseShopTopicGroup, "POST", "/shopTopic", SaveBaseShopTopic)
+	PushRouter(BaseShopTopicGroup, "PUT", "/shopTopic", UpdateBaseShopTopic)
+	PushRouter(BaseShopTopicGroup, "DELETE", "/shopTopic", DeleteBaseShopTopic)
+}
+
+func BaseShopTopicSkuRouter(group *gin.RouterGroup) {
+	BaseShopTopicSkuGroup := group.Group("/back/base")
+	PushRouter(BaseShopTopicSkuGroup, "GET", "/shopTopicSku", GetBaseShopTopicSkuById)
+	PushRouter(BaseShopTopicSkuGroup, "POST", "/shopTopicSku/list", GetBaseShopTopicSkuList)
+	PushRouter(BaseShopTopicSkuGroup, "POST", "/shopTopicSku/in", GetBaseShopTopicSkuListInId)
+	PushRouter(BaseShopTopicSkuGroup, "POST", "/shopTopicSku", SaveBaseShopTopicSku)
+	PushRouter(BaseShopTopicSkuGroup, "PUT", "/shopTopicSku", UpdateBaseShopTopicSku)
+	PushRouter(BaseShopTopicSkuGroup, "DELETE", "/shopTopicSku", DeleteBaseShopTopicSku)
+}
+
 func BaseUserRouter(group *gin.RouterGroup) {
 	BaseUserGroup := group.Group("/back/base")
 	PushRouter(BaseUserGroup, "GET", "/user", GetBaseUserById)
@@ -1682,88 +1693,6 @@ func DeleteBaseGoodsCouponUser(c *gin.Context) {
 	c.JSON(200, CreateResult())
 }
 
-func GetBaseGoodsIndexBannerById(c *gin.Context) {
-	id := c.Query("id")
-	goodsIndexBanner, err := manage.GetGoodsIndexBannerById(cast.ToInt64(id))
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "用户查询不存在"))
-		return
-	}
-	c.JSON(200, CreateResultData(goodsIndexBanner))
-	return
-}
-
-func GetBaseGoodsIndexBannerList(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	param, _ := data("param")
-	pageNum, _ := data("pageNum")
-	pageSize, _ := data("pageSize")
-	goodsIndexBanner := domain.GoodsIndexBanner{}
-	err := mapstructure.Decode(param, &goodsIndexBanner)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "json转换错误"))
-		return
-	}
-	list, err := manage.GetGoodsIndexBannerList(goodsIndexBanner, cast.ToInt(pageNum), cast.ToInt(pageSize))
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "查询错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(list))
-}
-
-func GetBaseGoodsIndexBannerListInId(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	idsString, _ := data("ids")
-	var ids []int64
-	err := mapstructure.Decode([]byte(cast.ToString(idsString)), &ids)
-	list, err := manage.GetGoodsIndexBannerListInId(ids)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "查询错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(list))
-}
-
-func SaveBaseGoodsIndexBanner(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	goodsIndexBannerParam, _ := data("goodsIndexBanner")
-	goodsIndexBanner := domain.GoodsIndexBanner{}
-	err := mapstructure.Decode(goodsIndexBannerParam, &goodsIndexBanner)
-	goodsIndexBanner.CreateBy = fmt.Sprint(GetUserIdByToken(c))
-	goodsIndexBanner.CreateTime = time.Now()
-	saveGoodsIndexBanner, err := manage.SaveGoodsIndexBanner(&goodsIndexBanner)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "保存错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(saveGoodsIndexBanner))
-}
-
-func UpdateBaseGoodsIndexBanner(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	goodsIndexBanner, _ := data("goodsIndexBanner")
-	id, _ := data("id")
-	toMap := UtilStructToMap(cast.ToStringMap(goodsIndexBanner))
-	toMap["create_by"] = "fmt.Sprint(GetUserIdByToken(c))"
-	setGoodsIndexBanner, b, err := manage.SetGoodsIndexBanner(toMap, cast.ToInt64(id))
-	if err != nil || !b {
-		c.JSON(200, CreateResultError(500, "修改错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(setGoodsIndexBanner))
-}
-
-func DeleteBaseGoodsIndexBanner(c *gin.Context) {
-	id := c.Query("id")
-	res := manage.DeleteGoodsIndexBanner(cast.ToInt64(id))
-	if !res {
-		c.JSON(200, CreateResultError(500, "删除错误"))
-		return
-	}
-	c.JSON(200, CreateResult())
-}
-
 func GetBaseGoodsIntroductionById(c *gin.Context) {
 	id := c.Query("id")
 	goodsIntroduction, err := manage.GetGoodsIntroductionById(cast.ToInt64(id))
@@ -2166,29 +2095,29 @@ func DeleteBaseGoodsTag(c *gin.Context) {
 	c.JSON(200, CreateResult())
 }
 
-func GetBaseGoodsTopicById(c *gin.Context) {
+func GetBaseGoodsTypeById(c *gin.Context) {
 	id := c.Query("id")
-	goodsTopic, err := manage.GetGoodsTopicById(cast.ToInt64(id))
+	goodsType, err := manage.GetGoodsTypeById(cast.ToInt64(id))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "用户查询不存在"))
 		return
 	}
-	c.JSON(200, CreateResultData(goodsTopic))
+	c.JSON(200, CreateResultData(goodsType))
 	return
 }
 
-func GetBaseGoodsTopicList(c *gin.Context) {
+func GetBaseGoodsTypeList(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	goodsTopic := domain.GoodsTopic{}
-	err := mapstructure.Decode(param, &goodsTopic)
+	goodsType := domain.GoodsType{}
+	err := mapstructure.Decode(param, &goodsType)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetGoodsTopicList(goodsTopic, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.GetGoodsTypeList(goodsType, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -2196,12 +2125,12 @@ func GetBaseGoodsTopicList(c *gin.Context) {
 	c.JSON(200, CreateResultData(list))
 }
 
-func GetBaseGoodsTopicListInId(c *gin.Context) {
+func GetBaseGoodsTypeListInId(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	idsString, _ := data("ids")
 	var ids []int64
 	err := mapstructure.Decode([]byte(cast.ToString(idsString)), &ids)
-	list, err := manage.GetGoodsTopicListInId(ids)
+	list, err := manage.GetGoodsTypeListInId(ids)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -2209,35 +2138,36 @@ func GetBaseGoodsTopicListInId(c *gin.Context) {
 	c.JSON(200, CreateResultData(list))
 }
 
-func SaveBaseGoodsTopic(c *gin.Context) {
+func SaveBaseGoodsType(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
-	goodsTopicParam, _ := data("goodsTopic")
-	goodsTopic := domain.GoodsTopic{}
-	err := mapstructure.Decode(goodsTopicParam, &goodsTopic)
-	saveGoodsTopic, err := manage.SaveGoodsTopic(&goodsTopic)
+	goodsTypeParam, _ := data("goodsType")
+	goodsType := domain.GoodsType{}
+	err := mapstructure.Decode(goodsTypeParam, &goodsType)
+	goodsType.CreateTime = time.Now()
+	saveGoodsType, err := manage.SaveGoodsType(&goodsType)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "保存错误"))
 		return
 	}
-	c.JSON(200, CreateResultData(saveGoodsTopic))
+	c.JSON(200, CreateResultData(saveGoodsType))
 }
 
-func UpdateBaseGoodsTopic(c *gin.Context) {
+func UpdateBaseGoodsType(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
-	goodsTopic, _ := data("goodsTopic")
+	goodsType, _ := data("goodsType")
 	id, _ := data("id")
-	toMap := UtilStructToMap(cast.ToStringMap(goodsTopic))
-	setGoodsTopic, b, err := manage.SetGoodsTopic(toMap, cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(goodsType))
+	setGoodsType, b, err := manage.SetGoodsType(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
 	}
-	c.JSON(200, CreateResultData(setGoodsTopic))
+	c.JSON(200, CreateResultData(setGoodsType))
 }
 
-func DeleteBaseGoodsTopic(c *gin.Context) {
+func DeleteBaseGoodsType(c *gin.Context) {
 	id := c.Query("id")
-	res := manage.DeleteGoodsTopic(cast.ToInt64(id))
+	res := manage.DeleteGoodsType(cast.ToInt64(id))
 	if !res {
 		c.JSON(200, CreateResultError(500, "删除错误"))
 		return
@@ -2245,29 +2175,29 @@ func DeleteBaseGoodsTopic(c *gin.Context) {
 	c.JSON(200, CreateResult())
 }
 
-func GetBaseGoodsTypeById(c *gin.Context) {
+func GetBaseManageUserById(c *gin.Context) {
 	id := c.Query("id")
-	goodsType, err := manage.GetGoodsTypeById(cast.ToInt64(id))
+	manageUser, err := manage.GetManageUserById(cast.ToInt64(id))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "用户查询不存在"))
 		return
 	}
-	c.JSON(200, CreateResultData(goodsType))
+	c.JSON(200, CreateResultData(manageUser))
 	return
 }
 
-func GetBaseGoodsTypeList(c *gin.Context) {
+func GetBaseManageUserList(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	goodsType := domain.GoodsType{}
-	err := mapstructure.Decode(param, &goodsType)
+	manageUser := domain.ManageUser{}
+	err := mapstructure.Decode(param, &manageUser)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetGoodsTypeList(goodsType, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.GetManageUserList(manageUser, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -2275,12 +2205,12 @@ func GetBaseGoodsTypeList(c *gin.Context) {
 	c.JSON(200, CreateResultData(list))
 }
 
-func GetBaseGoodsTypeListInId(c *gin.Context) {
+func GetBaseManageUserListInId(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	idsString, _ := data("ids")
 	var ids []int64
 	err := mapstructure.Decode([]byte(cast.ToString(idsString)), &ids)
-	list, err := manage.GetGoodsTypeListInId(ids)
+	list, err := manage.GetManageUserListInId(ids)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -2288,36 +2218,35 @@ func GetBaseGoodsTypeListInId(c *gin.Context) {
 	c.JSON(200, CreateResultData(list))
 }
 
-func SaveBaseGoodsType(c *gin.Context) {
+func SaveBaseManageUser(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
-	goodsTypeParam, _ := data("goodsType")
-	goodsType := domain.GoodsType{}
-	err := mapstructure.Decode(goodsTypeParam, &goodsType)
-	goodsType.CreateTime = time.Now()
-	saveGoodsType, err := manage.SaveGoodsType(&goodsType)
+	manageUserParam, _ := data("manageUser")
+	manageUser := domain.ManageUser{}
+	err := mapstructure.Decode(manageUserParam, &manageUser)
+	saveManageUser, err := manage.SaveManageUser(&manageUser)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "保存错误"))
 		return
 	}
-	c.JSON(200, CreateResultData(saveGoodsType))
+	c.JSON(200, CreateResultData(saveManageUser))
 }
 
-func UpdateBaseGoodsType(c *gin.Context) {
+func UpdateBaseManageUser(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
-	goodsType, _ := data("goodsType")
+	manageUser, _ := data("manageUser")
 	id, _ := data("id")
-	toMap := UtilStructToMap(cast.ToStringMap(goodsType))
-	setGoodsType, b, err := manage.SetGoodsType(toMap, cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(manageUser))
+	setManageUser, b, err := manage.SetManageUser(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
 	}
-	c.JSON(200, CreateResultData(setGoodsType))
+	c.JSON(200, CreateResultData(setManageUser))
 }
 
-func DeleteBaseGoodsType(c *gin.Context) {
+func DeleteBaseManageUser(c *gin.Context) {
 	id := c.Query("id")
-	res := manage.DeleteGoodsType(cast.ToInt64(id))
+	res := manage.DeleteManageUser(cast.ToInt64(id))
 	if !res {
 		c.JSON(200, CreateResultError(500, "删除错误"))
 		return
@@ -2325,29 +2254,29 @@ func DeleteBaseGoodsType(c *gin.Context) {
 	c.JSON(200, CreateResult())
 }
 
-func GetBaseManageUserById(c *gin.Context) {
+func GetBaseShopAdviceCarouselById(c *gin.Context) {
 	id := c.Query("id")
-	manageUser, err := manage.GetManageUserById(cast.ToInt64(id))
+	shopAdviceCarousel, err := manage.GetShopAdviceCarouselById(cast.ToInt64(id))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "用户查询不存在"))
 		return
 	}
-	c.JSON(200, CreateResultData(manageUser))
+	c.JSON(200, CreateResultData(shopAdviceCarousel))
 	return
 }
 
-func GetBaseManageUserList(c *gin.Context) {
+func GetBaseShopAdviceCarouselList(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	manageUser := domain.ManageUser{}
-	err := mapstructure.Decode(param, &manageUser)
+	shopAdviceCarousel := domain.ShopAdviceCarousel{}
+	err := mapstructure.Decode(param, &shopAdviceCarousel)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetManageUserList(manageUser, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.GetShopAdviceCarouselList(shopAdviceCarousel, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -2355,12 +2284,12 @@ func GetBaseManageUserList(c *gin.Context) {
 	c.JSON(200, CreateResultData(list))
 }
 
-func GetBaseManageUserListInId(c *gin.Context) {
+func GetBaseShopAdviceCarouselListInId(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	idsString, _ := data("ids")
 	var ids []int64
 	err := mapstructure.Decode([]byte(cast.ToString(idsString)), &ids)
-	list, err := manage.GetManageUserListInId(ids)
+	list, err := manage.GetShopAdviceCarouselListInId(ids)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -2368,35 +2297,196 @@ func GetBaseManageUserListInId(c *gin.Context) {
 	c.JSON(200, CreateResultData(list))
 }
 
-func SaveBaseManageUser(c *gin.Context) {
+func SaveBaseShopAdviceCarousel(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
-	manageUserParam, _ := data("manageUser")
-	manageUser := domain.ManageUser{}
-	err := mapstructure.Decode(manageUserParam, &manageUser)
-	saveManageUser, err := manage.SaveManageUser(&manageUser)
+	shopAdviceCarouselParam, _ := data("shopAdviceCarousel")
+	shopAdviceCarousel := domain.ShopAdviceCarousel{}
+	err := mapstructure.Decode(shopAdviceCarouselParam, &shopAdviceCarousel)
+	shopAdviceCarousel.CreateBy = fmt.Sprint(GetUserIdByToken(c))
+	shopAdviceCarousel.CreateTime = time.Now()
+	saveShopAdviceCarousel, err := manage.SaveShopAdviceCarousel(&shopAdviceCarousel)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "保存错误"))
 		return
 	}
-	c.JSON(200, CreateResultData(saveManageUser))
+	c.JSON(200, CreateResultData(saveShopAdviceCarousel))
 }
 
-func UpdateBaseManageUser(c *gin.Context) {
+func UpdateBaseShopAdviceCarousel(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
-	manageUser, _ := data("manageUser")
+	shopAdviceCarousel, _ := data("shopAdviceCarousel")
 	id, _ := data("id")
-	toMap := UtilStructToMap(cast.ToStringMap(manageUser))
-	setManageUser, b, err := manage.SetManageUser(toMap, cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(shopAdviceCarousel))
+	toMap["create_by"] = "fmt.Sprint(GetUserIdByToken(c))"
+	setShopAdviceCarousel, b, err := manage.SetShopAdviceCarousel(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
 	}
-	c.JSON(200, CreateResultData(setManageUser))
+	c.JSON(200, CreateResultData(setShopAdviceCarousel))
 }
 
-func DeleteBaseManageUser(c *gin.Context) {
+func DeleteBaseShopAdviceCarousel(c *gin.Context) {
 	id := c.Query("id")
-	res := manage.DeleteManageUser(cast.ToInt64(id))
+	res := manage.DeleteShopAdviceCarousel(cast.ToInt64(id))
+	if !res {
+		c.JSON(200, CreateResultError(500, "删除错误"))
+		return
+	}
+	c.JSON(200, CreateResult())
+}
+
+func GetBaseShopTopicById(c *gin.Context) {
+	id := c.Query("id")
+	shopTopic, err := manage.GetShopTopicById(cast.ToInt64(id))
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "用户查询不存在"))
+		return
+	}
+	c.JSON(200, CreateResultData(shopTopic))
+	return
+}
+
+func GetBaseShopTopicList(c *gin.Context) {
+	data := share.GetJsonAnyParam(c)
+	param, _ := data("param")
+	pageNum, _ := data("pageNum")
+	pageSize, _ := data("pageSize")
+	shopTopic := domain.ShopTopic{}
+	err := mapstructure.Decode(param, &shopTopic)
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "json转换错误"))
+		return
+	}
+	list, err := manage.GetShopTopicList(shopTopic, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "查询错误"))
+		return
+	}
+	c.JSON(200, CreateResultData(list))
+}
+
+func GetBaseShopTopicListInId(c *gin.Context) {
+	data := share.GetJsonAnyParam(c)
+	idsString, _ := data("ids")
+	var ids []int64
+	err := mapstructure.Decode([]byte(cast.ToString(idsString)), &ids)
+	list, err := manage.GetShopTopicListInId(ids)
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "查询错误"))
+		return
+	}
+	c.JSON(200, CreateResultData(list))
+}
+
+func SaveBaseShopTopic(c *gin.Context) {
+	data := share.GetJsonAnyParam(c)
+	shopTopicParam, _ := data("shopTopic")
+	shopTopic := domain.ShopTopic{}
+	err := mapstructure.Decode(shopTopicParam, &shopTopic)
+	saveShopTopic, err := manage.SaveShopTopic(&shopTopic)
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "保存错误"))
+		return
+	}
+	c.JSON(200, CreateResultData(saveShopTopic))
+}
+
+func UpdateBaseShopTopic(c *gin.Context) {
+	data := share.GetJsonAnyParam(c)
+	shopTopic, _ := data("shopTopic")
+	id, _ := data("id")
+	toMap := UtilStructToMap(cast.ToStringMap(shopTopic))
+	setShopTopic, b, err := manage.SetShopTopic(toMap, cast.ToInt64(id))
+	if err != nil || !b {
+		c.JSON(200, CreateResultError(500, "修改错误"))
+		return
+	}
+	c.JSON(200, CreateResultData(setShopTopic))
+}
+
+func DeleteBaseShopTopic(c *gin.Context) {
+	id := c.Query("id")
+	res := manage.DeleteShopTopic(cast.ToInt64(id))
+	if !res {
+		c.JSON(200, CreateResultError(500, "删除错误"))
+		return
+	}
+	c.JSON(200, CreateResult())
+}
+
+func GetBaseShopTopicSkuById(c *gin.Context) {
+	id := c.Query("id")
+	shopTopicSku, err := manage.GetShopTopicSkuById(cast.ToInt64(id))
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "用户查询不存在"))
+		return
+	}
+	c.JSON(200, CreateResultData(shopTopicSku))
+	return
+}
+
+func GetBaseShopTopicSkuList(c *gin.Context) {
+	data := share.GetJsonAnyParam(c)
+	param, _ := data("param")
+	pageNum, _ := data("pageNum")
+	pageSize, _ := data("pageSize")
+	shopTopicSku := domain.ShopTopicSku{}
+	err := mapstructure.Decode(param, &shopTopicSku)
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "json转换错误"))
+		return
+	}
+	list, err := manage.GetShopTopicSkuList(shopTopicSku, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "查询错误"))
+		return
+	}
+	c.JSON(200, CreateResultData(list))
+}
+
+func GetBaseShopTopicSkuListInId(c *gin.Context) {
+	data := share.GetJsonAnyParam(c)
+	idsString, _ := data("ids")
+	var ids []int64
+	err := mapstructure.Decode([]byte(cast.ToString(idsString)), &ids)
+	list, err := manage.GetShopTopicSkuListInId(ids)
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "查询错误"))
+		return
+	}
+	c.JSON(200, CreateResultData(list))
+}
+
+func SaveBaseShopTopicSku(c *gin.Context) {
+	data := share.GetJsonAnyParam(c)
+	shopTopicSkuParam, _ := data("shopTopicSku")
+	shopTopicSku := domain.ShopTopicSku{}
+	err := mapstructure.Decode(shopTopicSkuParam, &shopTopicSku)
+	saveShopTopicSku, err := manage.SaveShopTopicSku(&shopTopicSku)
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "保存错误"))
+		return
+	}
+	c.JSON(200, CreateResultData(saveShopTopicSku))
+}
+
+func UpdateBaseShopTopicSku(c *gin.Context) {
+	data := share.GetJsonAnyParam(c)
+	shopTopicSku, _ := data("shopTopicSku")
+	id, _ := data("id")
+	toMap := UtilStructToMap(cast.ToStringMap(shopTopicSku))
+	setShopTopicSku, b, err := manage.SetShopTopicSku(toMap, cast.ToInt64(id))
+	if err != nil || !b {
+		c.JSON(200, CreateResultError(500, "修改错误"))
+		return
+	}
+	c.JSON(200, CreateResultData(setShopTopicSku))
+}
+
+func DeleteBaseShopTopicSku(c *gin.Context) {
+	id := c.Query("id")
+	res := manage.DeleteShopTopicSku(cast.ToInt64(id))
 	if !res {
 		c.JSON(200, CreateResultError(500, "删除错误"))
 		return

router/HomeRouter.go

@@ -18,12 +18,18 @@ func HomeRouter(engine *gin.RouterGroup) {
 // GetIndexBanner 获取首页的banner内容，以及下面相关的内容推荐
 func GetIndexBanner(c *gin.Context) {
 	//查询要显示的内容
-	banner := domain.GoodsIndexBanner{
-		Show: "1",
+	banner := domain.ShopAdviceCarousel{
+		State: "1",
 	}
-	list, err := manage.GetGoodsIndexBannerList(banner, 0, 10)
+	list, err := manage.GetShopAdviceCarouselList(banner, 0, 10)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "系统查询错误"))
 	}
 	c.JSON(200, CreateResultData(list))
 }
+
+//获取首页广告内容 ->shop_advice_carousel
+//特惠信息 -> 共用轮播图的页面
+
+//设定 首页展示商品 sku数据，topic 添加一个首页显示参数,其次根据排序
+//获取商品类型信息 ->goods_type 然后获取到各个商品类型下的商品信息

router/OrderRouter.go

@@ -65,7 +65,7 @@ func CreateOrder(c *gin.Context) {
 
 }
 
-// 支付回调模拟
+// PayBuyTest 支付回调模拟
 func PayBuyTest(c *gin.Context) {
 	id := GetUserIdByToken(c)
 	if id == 0 {