改了部分接口

data/dao/manage/DictDataDao.go

@@ -4,7 +4,6 @@ import (
 	"demo/configs"
 	"demo/data/domain"
 	"demo/data/domain/vo"
-	"fmt"
 )
 
 func GetDictDataById(id int64) (domain.DictData, error) {
@@ -62,7 +61,6 @@ func SetDictData(dictDataMap map[string]interface{}, id int64) (domain.DictData,
 	var dictData domain.DictData
 	_, err := configs.Engine.Table("dict_data").Where("id = ?", id).Update(dictDataMap)
 	if err != nil {
-		fmt.Println(err)
 		return dictData, false, err
 	}
 	return dictData, true, nil

data/dao/manage/GoodsIndexBannerDao.go

@@ -0,0 +1,76 @@
+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/RoleAuthorityDao.go

@@ -1,58 +0,0 @@
-package manage
-
-import (
-	"demo/configs"
-	"demo/data/domain"
-	"demo/data/domain/vo"
-)
-
-func GetRoleAuthorityListInId(ids []int64) ([]domain.RoleAuthority, error) {
-	rows, err := configs.Engine.Table("role_authority").In("id", ids).Rows(&domain.RoleAuthority{})
-	if err != nil {
-		return make([]domain.RoleAuthority, 0), err
-	}
-	defer rows.Close()
-	var list []domain.RoleAuthority
-	for rows.Next() {
-		var u domain.RoleAuthority
-		list = append(list, u)
-	}
-	return list, nil
-}
-
-func GetRoleAuthorityList(roleAuthority domain.RoleAuthority, pageNum, pageSize int) (vo.BaseListVo, error) {
-	var arr []domain.RoleAuthority
-	Count, err := configs.Engine.Table("role_authority").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &roleAuthority)
-	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 SaveRoleAuthority(roleAuthority *domain.RoleAuthority) (domain.RoleAuthority, error) {
-	_, err := configs.Engine.Table("role_authority").Insert(&roleAuthority)
-	if err != nil {
-		return *roleAuthority, err
-	}
-	return *roleAuthority, nil
-}
-
-func SetRoleAuthority(roleAuthorityMap map[string]interface{}, id int64) (domain.RoleAuthority, bool, error) {
-	var roleAuthority domain.RoleAuthority
-	_, err := configs.Engine.Table("role_authority").Where("authority_id = ?", id).Update(roleAuthorityMap)
-	if err != nil {
-		return roleAuthority, false, err
-	}
-	return roleAuthority, true, nil
-}

data/dao/manage/RoleDao.go

@@ -1,76 +0,0 @@
-package manage
-
-import (
-	"demo/configs"
-	"demo/data/domain"
-	"demo/data/domain/vo"
-)
-
-func GetRoleById(id int64) (domain.Role, error) {
-	var role domain.Role
-	_, err := configs.Engine.Table("role").Where("id = ?", id).Get(&role)
-	if err != nil {
-		return role, err
-	}
-	return role, nil
-}
-
-func GetRoleListInId(ids []int64) ([]domain.Role, error) {
-	rows, err := configs.Engine.Table("role").In("id", ids).Rows(&domain.Role{})
-	if err != nil {
-		return make([]domain.Role, 0), err
-	}
-	defer rows.Close()
-	var list []domain.Role
-	for rows.Next() {
-		var u domain.Role
-		list = append(list, u)
-	}
-	return list, nil
-}
-
-func GetRoleList(role domain.Role, pageNum, pageSize int) (vo.BaseListVo, error) {
-	var arr []domain.Role
-	Count, err := configs.Engine.Table("role").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &role)
-	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 SaveRole(role *domain.Role) (domain.Role, error) {
-	_, err := configs.Engine.Table("role").Insert(&role)
-	if err != nil {
-		return *role, err
-	}
-	return *role, nil
-}
-
-func SetRole(roleMap map[string]interface{}, id int64) (domain.Role, bool, error) {
-	var role domain.Role
-	_, err := configs.Engine.Table("role").Where("id = ?", id).Update(roleMap)
-	if err != nil {
-		return role, false, err
-	}
-	return role, true, nil
-}
-
-func DeleteRole(id int64) bool {
-	var role domain.Role
-	i, err := configs.Engine.Table("role").Where("id = ?", id).Delete(&role)
-	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"`         // 1 0 注释：查询方式
+	QueryType     string `xorm:"query_type"  json:"queryType"`         // 255 0 注释：查询方式
 	VueShowType   string `xorm:"vue_show_type"  json:"vueShowType"`    // 255 0 注释：前端显示类型
 	DictType      string `xorm:"dict_type"  json:"dictType"`           // 255 0 注释：字典类型
 }
@@ -251,6 +251,23 @@ 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
@@ -378,26 +395,6 @@ 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, "}")
 }
 
-// Role
-type Role struct {
-	Id       int64  `json:"id"`                         // 11 0 注释：
-	RoleName string `xorm:"role_name"  json:"roleName"` // 255 0 注释：
-}
-
-func (receiver Role) String() string {
-	return fmt.Sprint("Role{Id:", receiver.Id, ",RoleName:", receiver.RoleName, "}")
-}
-
-// RoleAuthority
-type RoleAuthority struct {
-	AuthorityId int64 `xorm:"authority_id"  json:"authorityId"` // 11 0 注释：
-	RoleId      int64 `xorm:"role_id"  json:"roleId"`           // 11 0 注释：
-}
-
-func (receiver RoleAuthority) String() string {
-	return fmt.Sprint("RoleAuthority{AuthorityId:", receiver.AuthorityId, ",RoleId:", receiver.RoleId, "}")
-}
-
 // User 用户表
 type User struct {
 	Id            int64  `json:"id"`                                   // 11 0 注释：

data/domain/vo/GoodsVo.go

@@ -0,0 +1,8 @@
+package vo
+
+import "demo/data/domain"
+
+type GoodsVo struct {
+	Goods        domain.Goods             `json:"goods"`
+	Introduction domain.GoodsIntroduction `json:"introduction"`
+}

router/BackGoodsRouter.go

@@ -0,0 +1,165 @@
+package router
+
+import (
+	"demo/data/dao/manage"
+	"demo/data/domain"
+	"demo/data/domain/vo"
+	"demo/share"
+	"fmt"
+	"github.com/gin-gonic/gin"
+	"github.com/mitchellh/mapstructure"
+	"github.com/spf13/cast"
+	"time"
+)
+
+func BackGoodsRouter(engine *gin.RouterGroup) {
+	user := engine.Group("/back/goods")
+	PushRouter(user, "GET", "/introduction", GetIntroductionByGoodsId)
+	PushRouter(user, "POST", "list", GetGoodsAndIntroductionList)
+	PushRouter(user, "POST", "", SaveGoods)
+	PushRouter(user, "PUT", "", UpdateGoods)
+	PushRouter(user, "Delete", "/:id", DeleteGoodsById)
+}
+func GetIntroductionByGoodsId(c *gin.Context) {
+	id := c.Query("id")
+	byId, err := manage.GetGoodsById(cast.ToInt64(id))
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "商品不存在"))
+		return
+	}
+	introductionById, err := manage.GetGoodsIntroductionById(byId.IntroductionId)
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "商品介绍不存在"))
+		return
+	}
+	c.JSON(200, CreateResultData(introductionById))
+}
+
+// GetGoodsAndIntroductionList 根据商品id获取商品及商品相关文章
+func GetGoodsAndIntroductionList(c *gin.Context) {
+	data := share.GetJsonAnyParam(c)
+	param, _ := data("param")
+	pageNum, _ := data("pageNum")
+	pageSize, _ := data("pageSize")
+	goods := domain.Goods{}
+	err := mapstructure.Decode(param, &goods)
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "json转换错误"))
+		return
+	}
+	list, err := manage.GetGoodsList(goods, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "查询错误"))
+		return
+	}
+	intrIds := make([]int64, 0)
+	for i := range list.List {
+		///类型判断
+		item, ok := list.List[i].(domain.Goods)
+		if ok {
+			intrIds = append(intrIds, item.IntroductionId)
+		}
+	}
+	intrs, err := manage.GetGoodsIntroductionListInId(intrIds)
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "查询错误"))
+	}
+
+	dataMap := make(map[int64]vo.GoodsVo)
+	for i := 0; i < len(list.List); i++ {
+		dataMap[list.List[i].(domain.Goods).IntroductionId] = vo.GoodsVo{Goods: list.List[i].(domain.Goods)}
+	}
+	for i := 0; i < len(intrs); i++ {
+		voData, ok := dataMap[intrs[i].Id]
+		if ok {
+			voData.Introduction = intrs[i]
+		}
+	}
+	//取出values
+	resArr := make([]any, 0)
+	for _, v := range dataMap {
+		resArr = append(resArr, v)
+	}
+	list.List = resArr
+	c.JSON(200, CreateResultData(list))
+}
+
+func SaveGoods(c *gin.Context) {
+	data := share.GetJsonAnyParam(c)
+	goodsParam, _ := data("goods")
+	//typeId, _ := data("typeId")
+	//tagIds, _ := data("tagIds")
+
+	goods := domain.Goods{}
+	err := mapstructure.Decode(goodsParam, &goods)
+	saveGoods, err := manage.SaveGoods(&goods)
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "商品保存错误"))
+		return
+	}
+	goodsIntroductionParam, _ := data("introduction")
+	goodsIntroduction := domain.GoodsIntroduction{}
+	err = mapstructure.Decode(goodsIntroductionParam, &goodsIntroduction)
+	goodsIntroduction.CreateBy = fmt.Sprint(GetUserIdByToken(c))
+	goodsIntroduction.CreateTime = time.Now()
+	saveGoodsIntroduction, err := manage.SaveGoodsIntroduction(&goodsIntroduction)
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "商品介绍保存错误"))
+		return
+	}
+	m := make(map[string]interface{})
+	m["goods"] = saveGoods
+	m["introduction"] = saveGoodsIntroduction
+	c.JSON(200, CreateResultData(m))
+}
+
+func UpdateGoods(c *gin.Context) {
+	data := share.GetJsonAnyParam(c)
+	goodsIntroduction, _ := data("introduction")
+	goods, _ := data("goods")
+	id, _ := data("id")
+	toMap := UtilStructToMap(cast.ToStringMap(goods))
+	setGoods, b, err := manage.SetGoods(toMap, cast.ToInt64(id))
+	if err != nil || !b {
+		c.JSON(200, CreateResultError(500, "修改错误"))
+		return
+	}
+
+	intrId := setGoods.IntroductionId
+	toIntrMap := UtilStructToMap(cast.ToStringMap(goodsIntroduction))
+	toIntrMap["create_by"] = "fmt.Sprint(GetUserIdByToken(c))"
+	setGoodsIntroduction, b, err := manage.SetGoodsIntroduction(toIntrMap, cast.ToInt64(intrId))
+	if err != nil || !b {
+		c.JSON(200, CreateResultError(500, "修改错误"))
+		return
+	}
+	m := make(map[string]interface{})
+	m["goods"] = setGoods
+	m["introduction"] = setGoodsIntroduction
+	c.JSON(200, CreateResultData(m))
+}
+func DeleteGoodsById(c *gin.Context) {
+	id := c.Query("id")
+	byId, err := manage.GetGoodsById(cast.ToInt64(id))
+
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "删除失败"))
+		return
+	}
+	if byId.Id == 0 || byId.Id > 0 {
+		c.JSON(200, CreateResultError(500, "商品不存在删除失败"))
+		return
+	}
+	res := manage.DeleteGoods(cast.ToInt64(id))
+	if !res {
+		c.JSON(200, CreateResultError(500, "删除错误"))
+		return
+	}
+	res = manage.DeleteGoodsIntroduction(cast.ToInt64(byId.IntroductionId))
+	if !res {
+		c.JSON(200, CreateResultError(500, "文章删除错误"))
+		return
+	}
+
+	c.JSON(200, CreateResult())
+}

router/BackRouter.go

@@ -6,6 +6,36 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
+func BackRouter(engine *gin.RouterGroup) {
+	user := engine.Group("/back")
+	PushRouter(user, "GET", "/role/authority", GetRoleAndAuthority)
+	PushRouter(user, "GET", "/role/menu", GetRoleMenu)
+}
+
+var ctx = context.Background()
+
+// GetRoleAndAuthority 获取用户权限映射表
+func GetRoleAndAuthority(c *gin.Context) {
+	id := GetUserIdByToken(c)
+	userId, err := back.GetAuthorityByUserId(id)
+	if err != nil {
+		c.JSON(200, CreateResultError(400, "获取角色权限失败"))
+		return
+	}
+	c.JSON(200, CreateResultData(userId))
+}
+
+// GetRoleMenu 获取用户菜单
+func GetRoleMenu(c *gin.Context) {
+	id := GetUserIdByToken(c)
+	userId, err := back.GetMenuByUserId(id)
+	if err != nil {
+		c.JSON(200, CreateResultError(400, "获取菜单失败"))
+		return
+	}
+	c.JSON(200, CreateResultData(userId))
+}
+
 func BaseBackRouter(group *gin.RouterGroup) {
 	BaseArticleRouter(group)
 	BaseArticleTagRouter(group)
@@ -35,31 +65,3 @@ func BaseBackRouter(group *gin.RouterGroup) {
 	BaseUserRouter(group)
 	BaseUserWalletRouter(group)
 }
-
-func BackRouter(engine *gin.RouterGroup) {
-	user := engine.Group("/back")
-	PushRouter(user, "GET", "/role/authority", GetRoleAndAuthority)
-	PushRouter(user, "GET", "/role/menu", GetRoleMenu)
-}
-
-var ctx = context.Background()
-
-func GetRoleAndAuthority(c *gin.Context) {
-	id := GetUserIdByToken(c)
-	userId, err := back.GetAuthorityByUserId(id)
-	if err != nil {
-		c.JSON(200, CreateResultError(400, "获取角色权限失败"))
-		return
-	}
-	c.JSON(200, CreateResultData(userId))
-}
-
-func GetRoleMenu(c *gin.Context) {
-	id := GetUserIdByToken(c)
-	userId, err := back.GetMenuByUserId(id)
-	if err != nil {
-		c.JSON(200, CreateResultError(400, "获取菜单失败"))
-		return
-	}
-	c.JSON(200, CreateResultData(userId))
-}

router/BaseBackRouter.go

@@ -4,10 +4,12 @@ import (
 	"demo/data/dao/manage"
 	"demo/data/domain"
 	"demo/share"
+	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/mitchellh/mapstructure"
 	"github.com/spf13/cast"
 	"strings"
+	"time"
 	"unicode"
 )
 
@@ -41,6 +43,7 @@ func UtilStructToMap(m map[string]interface{}) map[string]interface{} {
 //BaseGoodsCommodityAreaRouter(group)
 //BaseGoodsCouponRouter(group)
 //BaseGoodsCouponUserRouter(group)
+//BaseGoodsIndexBannerRouter(group)
 //BaseGoodsIntroductionRouter(group)
 //BaseGoodsOrderRouter(group)
 //BaseGoodsSkuRouter(group)
@@ -49,8 +52,6 @@ func UtilStructToMap(m map[string]interface{}) map[string]interface{} {
 //BaseGoodsTopicRouter(group)
 //BaseGoodsTypeRouter(group)
 //BaseManageUserRouter(group)
-//BaseRoleRouter(group)
-//BaseRoleAuthorityRouter(group)
 //BaseUserRouter(group)
 //BaseUserWalletRouter(group)
 
@@ -224,6 +225,16 @@ 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)
@@ -304,26 +315,6 @@ func BaseManageUserRouter(group *gin.RouterGroup) {
 	PushRouter(BaseManageUserGroup, "DELETE", "/manageUser", DeleteBaseManageUser)
 }
 
-func BaseRoleRouter(group *gin.RouterGroup) {
-	BaseRoleGroup := group.Group("/back/base")
-	PushRouter(BaseRoleGroup, "GET", "/role", GetBaseRoleById)
-	PushRouter(BaseRoleGroup, "POST", "/role/list", GetBaseRoleList)
-	PushRouter(BaseRoleGroup, "POST", "/role/in", GetBaseRoleListInId)
-	PushRouter(BaseRoleGroup, "POST", "/role", SaveBaseRole)
-	PushRouter(BaseRoleGroup, "PUT", "/role", UpdateBaseRole)
-	PushRouter(BaseRoleGroup, "DELETE", "/role", DeleteBaseRole)
-}
-
-func BaseRoleAuthorityRouter(group *gin.RouterGroup) {
-	BaseRoleAuthorityGroup := group.Group("/back/base")
-	PushRouter(BaseRoleAuthorityGroup, "GET", "/roleAuthority", GetBaseRoleAuthorityById)
-	PushRouter(BaseRoleAuthorityGroup, "POST", "/roleAuthority/list", GetBaseRoleAuthorityList)
-	PushRouter(BaseRoleAuthorityGroup, "POST", "/roleAuthority/in", GetBaseRoleAuthorityListInId)
-	PushRouter(BaseRoleAuthorityGroup, "POST", "/roleAuthority", SaveBaseRoleAuthority)
-	PushRouter(BaseRoleAuthorityGroup, "PUT", "/roleAuthority", UpdateBaseRoleAuthority)
-	PushRouter(BaseRoleAuthorityGroup, "DELETE", "/roleAuthority", DeleteBaseRoleAuthority)
-}
-
 func BaseUserRouter(group *gin.RouterGroup) {
 	BaseUserGroup := group.Group("/back/base")
 	PushRouter(BaseUserGroup, "GET", "/user", GetBaseUserById)
@@ -392,6 +383,8 @@ func SaveBaseArticle(c *gin.Context) {
 	articleParam, _ := data("article")
 	article := domain.Article{}
 	err := mapstructure.Decode(articleParam, &article)
+	article.CreateBy = fmt.Sprint(GetUserIdByToken(c))
+	article.CreateTime = time.Now()
 	saveArticle, err := manage.SaveArticle(&article)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "保存错误"))
@@ -404,8 +397,9 @@ func UpdateBaseArticle(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	article, _ := data("article")
 	id, _ := data("id")
-
-	setArticle, b, err := manage.SetArticle(UtilStructToMap(cast.ToStringMap(article)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(article))
+	toMap["create_by"] = "fmt.Sprint(GetUserIdByToken(c))"
+	setArticle, b, err := manage.SetArticle(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -483,8 +477,8 @@ func UpdateBaseArticleTag(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	articleTag, _ := data("articleTag")
 	id, _ := data("id")
-
-	setArticleTag, b, err := manage.SetArticleTag(UtilStructToMap(cast.ToStringMap(articleTag)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(articleTag))
+	setArticleTag, b, err := manage.SetArticleTag(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -562,8 +556,8 @@ func UpdateBaseArticleTopic(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	articleTopic, _ := data("articleTopic")
 	id, _ := data("id")
-
-	setArticleTopic, b, err := manage.SetArticleTopic(UtilStructToMap(cast.ToStringMap(articleTopic)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(articleTopic))
+	setArticleTopic, b, err := manage.SetArticleTopic(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -641,8 +635,8 @@ func UpdateBaseAuthority(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	authority, _ := data("authority")
 	id, _ := data("id")
-
-	setAuthority, b, err := manage.SetAuthority(UtilStructToMap(cast.ToStringMap(authority)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(authority))
+	setAuthority, b, err := manage.SetAuthority(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -708,6 +702,7 @@ func SaveBaseBackAuthority(c *gin.Context) {
 	backAuthorityParam, _ := data("backAuthority")
 	backAuthority := domain.BackAuthority{}
 	err := mapstructure.Decode(backAuthorityParam, &backAuthority)
+	backAuthority.CreateTime = time.Now()
 	saveBackAuthority, err := manage.SaveBackAuthority(&backAuthority)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "保存错误"))
@@ -720,8 +715,8 @@ func UpdateBaseBackAuthority(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	backAuthority, _ := data("backAuthority")
 	id, _ := data("id")
-
-	setBackAuthority, b, err := manage.SetBackAuthority(UtilStructToMap(cast.ToStringMap(backAuthority)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(backAuthority))
+	setBackAuthority, b, err := manage.SetBackAuthority(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -799,8 +794,8 @@ func UpdateBaseBackMenu(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	backMenu, _ := data("backMenu")
 	id, _ := data("id")
-
-	setBackMenu, b, err := manage.SetBackMenu(UtilStructToMap(cast.ToStringMap(backMenu)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(backMenu))
+	setBackMenu, b, err := manage.SetBackMenu(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -878,8 +873,8 @@ func UpdateBaseBackRole(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	backRole, _ := data("backRole")
 	id, _ := data("id")
-
-	setBackRole, b, err := manage.SetBackRole(UtilStructToMap(cast.ToStringMap(backRole)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(backRole))
+	setBackRole, b, err := manage.SetBackRole(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -957,8 +952,8 @@ func UpdateBaseBackRoleAuthority(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	backRoleAuthority, _ := data("backRoleAuthority")
 	id, _ := data("id")
-
-	setBackRoleAuthority, b, err := manage.SetBackRoleAuthority(UtilStructToMap(cast.ToStringMap(backRoleAuthority)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(backRoleAuthority))
+	setBackRoleAuthority, b, err := manage.SetBackRoleAuthority(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -1036,8 +1031,8 @@ func UpdateBaseBackRoleMenu(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	backRoleMenu, _ := data("backRoleMenu")
 	id, _ := data("id")
-
-	setBackRoleMenu, b, err := manage.SetBackRoleMenu(UtilStructToMap(cast.ToStringMap(backRoleMenu)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(backRoleMenu))
+	setBackRoleMenu, b, err := manage.SetBackRoleMenu(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -1115,8 +1110,8 @@ func UpdateBaseDictData(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	dictData, _ := data("dictData")
 	id, _ := data("id")
-
-	setDictData, b, err := manage.SetDictData(UtilStructToMap(cast.ToStringMap(dictData)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(dictData))
+	setDictData, b, err := manage.SetDictData(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -1194,8 +1189,8 @@ func UpdateBaseDictType(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	dictType, _ := data("dictType")
 	id, _ := data("id")
-
-	setDictType, b, err := manage.SetDictType(UtilStructToMap(cast.ToStringMap(dictType)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(dictType))
+	setDictType, b, err := manage.SetDictType(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -1273,8 +1268,8 @@ func UpdateBaseGenTable(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	genTable, _ := data("genTable")
 	id, _ := data("id")
-
-	setGenTable, b, err := manage.SetGenTable(UtilStructToMap(cast.ToStringMap(genTable)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(genTable))
+	setGenTable, b, err := manage.SetGenTable(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -1352,8 +1347,8 @@ func UpdateBaseGenTableColumn(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	genTableColumn, _ := data("genTableColumn")
 	id, _ := data("id")
-
-	setGenTableColumn, b, err := manage.SetGenTableColumn(UtilStructToMap(cast.ToStringMap(genTableColumn)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(genTableColumn))
+	setGenTableColumn, b, err := manage.SetGenTableColumn(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -1431,8 +1426,8 @@ func UpdateBaseGoods(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	goods, _ := data("goods")
 	id, _ := data("id")
-
-	setGoods, b, err := manage.SetGoods(UtilStructToMap(cast.ToStringMap(goods)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(goods))
+	setGoods, b, err := manage.SetGoods(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -1510,8 +1505,8 @@ func UpdateBaseGoodsCommodityArea(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	goodsCommodityArea, _ := data("goodsCommodityArea")
 	id, _ := data("id")
-
-	setGoodsCommodityArea, b, err := manage.SetGoodsCommodityArea(UtilStructToMap(cast.ToStringMap(goodsCommodityArea)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(goodsCommodityArea))
+	setGoodsCommodityArea, b, err := manage.SetGoodsCommodityArea(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -1589,8 +1584,8 @@ func UpdateBaseGoodsCoupon(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	goodsCoupon, _ := data("goodsCoupon")
 	id, _ := data("id")
-
-	setGoodsCoupon, b, err := manage.SetGoodsCoupon(UtilStructToMap(cast.ToStringMap(goodsCoupon)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(goodsCoupon))
+	setGoodsCoupon, b, err := manage.SetGoodsCoupon(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -1668,8 +1663,8 @@ func UpdateBaseGoodsCouponUser(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	goodsCouponUser, _ := data("goodsCouponUser")
 	id, _ := data("id")
-
-	setGoodsCouponUser, b, err := manage.SetGoodsCouponUser(UtilStructToMap(cast.ToStringMap(goodsCouponUser)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(goodsCouponUser))
+	setGoodsCouponUser, b, err := manage.SetGoodsCouponUser(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -1687,6 +1682,88 @@ 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))
@@ -1735,6 +1812,8 @@ func SaveBaseGoodsIntroduction(c *gin.Context) {
 	goodsIntroductionParam, _ := data("goodsIntroduction")
 	goodsIntroduction := domain.GoodsIntroduction{}
 	err := mapstructure.Decode(goodsIntroductionParam, &goodsIntroduction)
+	goodsIntroduction.CreateBy = fmt.Sprint(GetUserIdByToken(c))
+	goodsIntroduction.CreateTime = time.Now()
 	saveGoodsIntroduction, err := manage.SaveGoodsIntroduction(&goodsIntroduction)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "保存错误"))
@@ -1747,8 +1826,9 @@ func UpdateBaseGoodsIntroduction(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	goodsIntroduction, _ := data("goodsIntroduction")
 	id, _ := data("id")
-
-	setGoodsIntroduction, b, err := manage.SetGoodsIntroduction(UtilStructToMap(cast.ToStringMap(goodsIntroduction)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(goodsIntroduction))
+	toMap["create_by"] = "fmt.Sprint(GetUserIdByToken(c))"
+	setGoodsIntroduction, b, err := manage.SetGoodsIntroduction(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -1814,6 +1894,8 @@ func SaveBaseGoodsOrder(c *gin.Context) {
 	goodsOrderParam, _ := data("goodsOrder")
 	goodsOrder := domain.GoodsOrder{}
 	err := mapstructure.Decode(goodsOrderParam, &goodsOrder)
+	goodsOrder.CreateBy = GetUserIdByToken(c)
+	goodsOrder.CreateTime = time.Now()
 	saveGoodsOrder, err := manage.SaveGoodsOrder(&goodsOrder)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "保存错误"))
@@ -1826,8 +1908,8 @@ func UpdateBaseGoodsOrder(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	goodsOrder, _ := data("goodsOrder")
 	id, _ := data("id")
-
-	setGoodsOrder, b, err := manage.SetGoodsOrder(UtilStructToMap(cast.ToStringMap(goodsOrder)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(goodsOrder))
+	setGoodsOrder, b, err := manage.SetGoodsOrder(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -1893,6 +1975,8 @@ func SaveBaseGoodsSku(c *gin.Context) {
 	goodsSkuParam, _ := data("goodsSku")
 	goodsSku := domain.GoodsSku{}
 	err := mapstructure.Decode(goodsSkuParam, &goodsSku)
+	goodsSku.CreateBy = fmt.Sprint(GetUserIdByToken(c))
+	goodsSku.CreateTime = time.Now()
 	saveGoodsSku, err := manage.SaveGoodsSku(&goodsSku)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "保存错误"))
@@ -1905,8 +1989,8 @@ func UpdateBaseGoodsSku(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	goodsSku, _ := data("goodsSku")
 	id, _ := data("id")
-
-	setGoodsSku, b, err := manage.SetGoodsSku(UtilStructToMap(cast.ToStringMap(goodsSku)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(goodsSku))
+	setGoodsSku, b, err := manage.SetGoodsSku(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -1984,8 +2068,8 @@ func UpdateBaseGoodsSkuCard(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	goodsSkuCard, _ := data("goodsSkuCard")
 	id, _ := data("id")
-
-	setGoodsSkuCard, b, err := manage.SetGoodsSkuCard(UtilStructToMap(cast.ToStringMap(goodsSkuCard)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(goodsSkuCard))
+	setGoodsSkuCard, b, err := manage.SetGoodsSkuCard(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -2063,8 +2147,8 @@ func UpdateBaseGoodsTag(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	goodsTag, _ := data("goodsTag")
 	id, _ := data("id")
-
-	setGoodsTag, b, err := manage.SetGoodsTag(UtilStructToMap(cast.ToStringMap(goodsTag)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(goodsTag))
+	setGoodsTag, b, err := manage.SetGoodsTag(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -2142,8 +2226,8 @@ func UpdateBaseGoodsTopic(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	goodsTopic, _ := data("goodsTopic")
 	id, _ := data("id")
-
-	setGoodsTopic, b, err := manage.SetGoodsTopic(UtilStructToMap(cast.ToStringMap(goodsTopic)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(goodsTopic))
+	setGoodsTopic, b, err := manage.SetGoodsTopic(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -2209,6 +2293,7 @@ func SaveBaseGoodsType(c *gin.Context) {
 	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, "保存错误"))
@@ -2221,8 +2306,8 @@ func UpdateBaseGoodsType(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	goodsType, _ := data("goodsType")
 	id, _ := data("id")
-
-	setGoodsType, b, err := manage.SetGoodsType(UtilStructToMap(cast.ToStringMap(goodsType)), 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
@@ -2300,8 +2385,8 @@ func UpdateBaseManageUser(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	manageUser, _ := data("manageUser")
 	id, _ := data("id")
-
-	setManageUser, b, err := manage.SetManageUser(UtilStructToMap(cast.ToStringMap(manageUser)), 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
@@ -2319,164 +2404,6 @@ func DeleteBaseManageUser(c *gin.Context) {
 	c.JSON(200, CreateResult())
 }
 
-func GetBaseRoleById(c *gin.Context) {
-	id := c.Query("id")
-	role, err := manage.GetRoleById(cast.ToInt64(id))
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "用户查询不存在"))
-		return
-	}
-	c.JSON(200, CreateResultData(role))
-	return
-}
-
-func GetBaseRoleList(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	param, _ := data("param")
-	pageNum, _ := data("pageNum")
-	pageSize, _ := data("pageSize")
-	role := domain.Role{}
-	err := mapstructure.Decode(param, &role)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "json转换错误"))
-		return
-	}
-	list, err := manage.GetRoleList(role, cast.ToInt(pageNum), cast.ToInt(pageSize))
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "查询错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(list))
-}
-
-func GetBaseRoleListInId(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	idsString, _ := data("ids")
-	var ids []int64
-	err := mapstructure.Decode([]byte(cast.ToString(idsString)), &ids)
-	list, err := manage.GetRoleListInId(ids)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "查询错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(list))
-}
-
-func SaveBaseRole(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	roleParam, _ := data("role")
-	role := domain.Role{}
-	err := mapstructure.Decode(roleParam, &role)
-	saveRole, err := manage.SaveRole(&role)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "保存错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(saveRole))
-}
-
-func UpdateBaseRole(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	role, _ := data("role")
-	id, _ := data("id")
-
-	setRole, b, err := manage.SetRole(UtilStructToMap(cast.ToStringMap(role)), cast.ToInt64(id))
-	if err != nil || !b {
-		c.JSON(200, CreateResultError(500, "修改错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(setRole))
-}
-
-func DeleteBaseRole(c *gin.Context) {
-	id := c.Query("id")
-	res := manage.DeleteRole(cast.ToInt64(id))
-	if !res {
-		c.JSON(200, CreateResultError(500, "删除错误"))
-		return
-	}
-	c.JSON(200, CreateResult())
-}
-
-func GetBaseRoleAuthorityById(c *gin.Context) {
-	id := c.Query("id")
-	roleAuthority, err := manage.GetBackRoleAuthorityById(cast.ToInt64(id))
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "用户查询不存在"))
-		return
-	}
-	c.JSON(200, CreateResultData(roleAuthority))
-	return
-}
-
-func GetBaseRoleAuthorityList(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	param, _ := data("param")
-	pageNum, _ := data("pageNum")
-	pageSize, _ := data("pageSize")
-	roleAuthority := domain.RoleAuthority{}
-	err := mapstructure.Decode(param, &roleAuthority)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "json转换错误"))
-		return
-	}
-	list, err := manage.GetRoleAuthorityList(roleAuthority, cast.ToInt(pageNum), cast.ToInt(pageSize))
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "查询错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(list))
-}
-
-func GetBaseRoleAuthorityListInId(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	idsString, _ := data("ids")
-	var ids []int64
-	err := mapstructure.Decode([]byte(cast.ToString(idsString)), &ids)
-	list, err := manage.GetRoleAuthorityListInId(ids)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "查询错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(list))
-}
-
-func SaveBaseRoleAuthority(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	roleAuthorityParam, _ := data("roleAuthority")
-	roleAuthority := domain.RoleAuthority{}
-	err := mapstructure.Decode(roleAuthorityParam, &roleAuthority)
-	saveRoleAuthority, err := manage.SaveRoleAuthority(&roleAuthority)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "保存错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(saveRoleAuthority))
-}
-
-func UpdateBaseRoleAuthority(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	roleAuthority, _ := data("roleAuthority")
-	id, _ := data("id")
-
-	setRoleAuthority, b, err := manage.SetRoleAuthority(UtilStructToMap(cast.ToStringMap(roleAuthority)), cast.ToInt64(id))
-	if err != nil || !b {
-		c.JSON(200, CreateResultError(500, "修改错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(setRoleAuthority))
-}
-
-func DeleteBaseRoleAuthority(c *gin.Context) {
-	id := c.Query("id")
-	res := manage.DeleteBackRoleAuthority(cast.ToInt64(id))
-	if !res {
-		c.JSON(200, CreateResultError(500, "删除错误"))
-		return
-	}
-	c.JSON(200, CreateResult())
-}
-
 func GetBaseUserById(c *gin.Context) {
 	id := c.Query("id")
 	user, err := manage.GetUserById(cast.ToInt64(id))
@@ -2537,8 +2464,8 @@ func UpdateBaseUser(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	user, _ := data("user")
 	id, _ := data("id")
-
-	setUser, b, err := manage.SetUser(UtilStructToMap(cast.ToStringMap(user)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(user))
+	setUser, b, err := manage.SetUser(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return
@@ -2616,8 +2543,8 @@ func UpdateBaseUserWallet(c *gin.Context) {
 	data := share.GetJsonAnyParam(c)
 	userWallet, _ := data("userWallet")
 	id, _ := data("id")
-
-	setUserWallet, b, err := manage.SetUserWallet(UtilStructToMap(cast.ToStringMap(userWallet)), cast.ToInt64(id))
+	toMap := UtilStructToMap(cast.ToStringMap(userWallet))
+	setUserWallet, b, err := manage.SetUserWallet(toMap, cast.ToInt64(id))
 	if err != nil || !b {
 		c.JSON(200, CreateResultError(500, "修改错误"))
 		return

router/HomeRouter.go

@@ -1,17 +1,29 @@
 package router
 
 import (
+	"demo/data/dao/manage"
+	"demo/data/domain"
 	"github.com/gin-gonic/gin"
 )
 
 func HomeRouter(engine *gin.RouterGroup) {
 	user := engine.Group("/home")
-	{
-		//user.POST("/", uploadHandler)
-		PushRouter(user, "POST", "/", getHomeData)
-	}
+	//user.GET("/search", GetSearchByKey)
+	PushRouter(user, "GET", "/", GetIndexBanner)
+	//获取文章详情
+	//user.GET("/:id", GetDetailData)
+	//PushRouter(user, "GET", "/:id", GetDetailData)
 }
-func getHomeData(c *gin.Context) {
 
-	c.JSON(200, CreateResult())
+// GetIndexBanner 获取首页的banner内容，以及下面相关的内容推荐
+func GetIndexBanner(c *gin.Context) {
+	//查询要显示的内容
+	banner := domain.GoodsIndexBanner{
+		Show: "1",
+	}
+	list, err := manage.GetGoodsIndexBannerList(banner, 0, 10)
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "系统查询错误"))
+	}
+	c.JSON(200, CreateResultData(list))
 }

router/OrderRouter.go

@@ -17,12 +17,13 @@ func OrderRouter(engine *gin.RouterGroup) {
 	{
 		//根据用户登录id获取用户登录信息
 		//order.POST("/submit", GetOrderData)
+		PushRouter(order, "POST", "/submit", CreateOrder)
 		PushRouter(order, "POST", "/list", GetOrderList)
 	}
 }
 
-// GetOrderData 创建订单
-func GetOrderData(c *gin.Context) {
+// CreateOrder GetOrderData 创建订单
+func CreateOrder(c *gin.Context) {
 	id := GetUserIdByToken(c)
 	if id == 0 {
 		return

router/Router.go

@@ -26,10 +26,14 @@ func InitRouter(apiGroup *gin.RouterGroup) {
 	TestRouth(apiGroup)
 	//订单，支付
 	OrderRouter(apiGroup)
+	BackGoodsRouter(apiGroup)
 	//-------------------
 	//后台管理系统
 	BackRouter(apiGroup)
 
+	//首页
+	HomeRouter(apiGroup)
+
 	//TODO 后台管理系统全部生成路由，别进行修改
 	BaseBackRouter(apiGroup)
 }