Bläddra i källkod

修改大部分接口

Administrator 2 år sedan
förälder
incheckning
62530d0995

+ 3 - 3
data/dao/DetailDao.go

@@ -8,7 +8,7 @@ import (
 )
 
 // SelectGoodsDetailById 获取相同的商品详情
-func SelectGoodsDetailById(skuId int) (vo.DetailVo, error) {
+func SelectGoodsDetailById(skuId int64) (vo.DetailVo, error) {
 	detailVo := vo.DetailVo{}
 	var caId = -1
 	//================查询sku========================
@@ -153,7 +153,7 @@ func GetSkuByKey(key string, pageNum, pageSize int) (vo.BaseListVo, string, erro
 	r1, err := configs.Engine.Cols("id").Where("name like ?", sqlKey).Or("tag like ?", sqlKey).
 		//去重
 		Distinct("id").Rows(&tag)
-	var inTags = make([]int, 0)
+	var inTags = make([]int64, 0)
 	for r1.Next() {
 		r1.Scan(&tag)
 		inTags = append(inTags, tag.Id)
@@ -167,7 +167,7 @@ func GetSkuByKey(key string, pageNum, pageSize int) (vo.BaseListVo, string, erro
 	if err != nil {
 		return vo, "商品查询错误", err
 	}
-	var goodsInTags = make([]int, 0)
+	var goodsInTags = make([]int64, 0)
 	for r2.Next() {
 		r2.Scan(&goods)
 		goodsInTags = append(goodsInTags, goods.Id)

+ 3 - 3
data/dao/OrderDao.go

@@ -13,17 +13,16 @@ func SelectSkuBySkuId(skuId int) (domain.GoodsSku, error) {
 	if err != nil {
 		return sku, err
 	}
-
 	return sku, nil
 }
 
+// CreateOrder 创建订单
 func CreateOrder(order *domain.GoodsOrder) (*domain.GoodsOrder, error) {
 	id, err := configs.Engine.Table("goods_order").Insert(&order)
 	fmt.Println("is id? ", id)
 	if err != nil {
 		return order, err
 	}
-	//configs.Engine.Table("goods_order").Where("create_by = ?", order.CreateBy).Desc("create_time").Get(&order)
 	fmt.Println("order is ", order)
 	return order, err
 }
@@ -33,7 +32,7 @@ func OrderPaySuccess(orderId int) {
 	configs.Engine.ID(orderId).Cols("state").Update(map[string]any{"state": 1})
 }
 
-// 获取订单集合
+// GetOrderByUserId 获取订单集合
 func GetOrderByUserId(userId int) ([]domain.GoodsOrder, error) {
 	order := domain.GoodsOrder{}
 	rows, err := configs.Engine.Table("goods_order").Where("create_by = ?", userId).Desc("create_time").Rows(&order)
@@ -79,6 +78,7 @@ func GetUserCouponByUserId(userId int) ([]domain.CouponUserJDM, error) {
 	return couponUserJDMs, nil
 }
 
+// GetListGoodsOrder 获取用户的订单信息
 func GetListGoodsOrder(state string, userId, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var goodsOrder domain.GoodsOrder
 	Session := configs.Engine.Table("goods_order")

+ 9 - 9
data/dao/manage/ArticleDao.go

@@ -30,22 +30,22 @@ func GetInIdListArticle(ids []int) ([]domain.Article, error) {
 }
 
 func GetListArticle(article domain.Article, pageNum, pageSize int) (vo.BaseListVo, error) {
-	rows, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Rows(&article)
+	var arr []domain.Article
+	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &article)
 	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, 0)
-	for rows.Next() {
-		var u domain.Article
-		rows.Scan(&u)
-		vo.List = append(vo.List, u)
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
 	}
-	//查询数量
-	count, err := configs.Engine.Count(&article)
-	vo.Total = int(count)
+	vo.Total = int(Count)
 	return vo, nil
 }
 

+ 9 - 9
data/dao/manage/ArticleTagDao.go

@@ -30,22 +30,22 @@ func GetInIdListArticleTag(ids []int) ([]domain.ArticleTag, error) {
 }
 
 func GetListArticleTag(articleTag domain.ArticleTag, pageNum, pageSize int) (vo.BaseListVo, error) {
-	rows, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Rows(&articleTag)
+	var arr []domain.ArticleTag
+	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &articleTag)
 	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, 0)
-	for rows.Next() {
-		var u domain.ArticleTag
-		rows.Scan(&u)
-		vo.List = append(vo.List, u)
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
 	}
-	//查询数量
-	count, err := configs.Engine.Count(&articleTag)
-	vo.Total = int(count)
+	vo.Total = int(Count)
 	return vo, nil
 }
 

+ 9 - 9
data/dao/manage/ArticleTopicDao.go

@@ -21,22 +21,22 @@ func GetInIdListArticleTopic(ids []int) ([]domain.ArticleTopic, error) {
 }
 
 func GetListArticleTopic(articleTopic domain.ArticleTopic, pageNum, pageSize int) (vo.BaseListVo, error) {
-	rows, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Rows(&articleTopic)
+	var arr []domain.ArticleTopic
+	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &articleTopic)
 	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, 0)
-	for rows.Next() {
-		var u domain.ArticleTopic
-		rows.Scan(&u)
-		vo.List = append(vo.List, u)
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
 	}
-	//查询数量
-	count, err := configs.Engine.Count(&articleTopic)
-	vo.Total = int(count)
+	vo.Total = int(Count)
 	return vo, nil
 }
 

+ 9 - 9
data/dao/manage/AuthorityDao.go

@@ -30,22 +30,22 @@ func GetInIdListAuthority(ids []int) ([]domain.Authority, error) {
 }
 
 func GetListAuthority(authority domain.Authority, pageNum, pageSize int) (vo.BaseListVo, error) {
-	rows, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Rows(&authority)
+	var arr []domain.Authority
+	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &authority)
 	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, 0)
-	for rows.Next() {
-		var u domain.Authority
-		rows.Scan(&u)
-		vo.List = append(vo.List, u)
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
 	}
-	//查询数量
-	count, err := configs.Engine.Count(&authority)
-	vo.Total = int(count)
+	vo.Total = int(Count)
 	return vo, nil
 }
 

+ 9 - 9
data/dao/manage/GoodsCommodityAreaDao.go

@@ -30,22 +30,22 @@ func GetInIdListGoodsCommodityArea(ids []int) ([]domain.GoodsCommodityArea, erro
 }
 
 func GetListGoodsCommodityArea(goodsCommodityArea domain.GoodsCommodityArea, pageNum, pageSize int) (vo.BaseListVo, error) {
-	rows, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Rows(&goodsCommodityArea)
+	var arr []domain.GoodsCommodityArea
+	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goodsCommodityArea)
 	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, 0)
-	for rows.Next() {
-		var u domain.GoodsCommodityArea
-		rows.Scan(&u)
-		vo.List = append(vo.List, u)
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
 	}
-	//查询数量
-	count, err := configs.Engine.Count(&goodsCommodityArea)
-	vo.Total = int(count)
+	vo.Total = int(Count)
 	return vo, nil
 }
 

+ 9 - 9
data/dao/manage/GoodsCouponDao.go

@@ -30,22 +30,22 @@ func GetInIdListGoodsCoupon(ids []int) ([]domain.GoodsCoupon, error) {
 }
 
 func GetListGoodsCoupon(goodsCoupon domain.GoodsCoupon, pageNum, pageSize int) (vo.BaseListVo, error) {
-	rows, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Rows(&goodsCoupon)
+	var arr []domain.GoodsCoupon
+	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goodsCoupon)
 	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, 0)
-	for rows.Next() {
-		var u domain.GoodsCoupon
-		rows.Scan(&u)
-		vo.List = append(vo.List, u)
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
 	}
-	//查询数量
-	count, err := configs.Engine.Count(&goodsCoupon)
-	vo.Total = int(count)
+	vo.Total = int(Count)
 	return vo, nil
 }
 

+ 9 - 9
data/dao/manage/GoodsCouponUserDao.go

@@ -30,22 +30,22 @@ func GetInIdListGoodsCouponUser(ids []int) ([]domain.GoodsCouponUser, error) {
 }
 
 func GetListGoodsCouponUser(goodsCouponUser domain.GoodsCouponUser, pageNum, pageSize int) (vo.BaseListVo, error) {
-	rows, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Rows(&goodsCouponUser)
+	var arr []domain.GoodsCouponUser
+	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goodsCouponUser)
 	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, 0)
-	for rows.Next() {
-		var u domain.GoodsCouponUser
-		rows.Scan(&u)
-		vo.List = append(vo.List, u)
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
 	}
-	//查询数量
-	count, err := configs.Engine.Count(&goodsCouponUser)
-	vo.Total = int(count)
+	vo.Total = int(Count)
 	return vo, nil
 }
 

+ 9 - 9
data/dao/manage/GoodsDao.go

@@ -30,22 +30,22 @@ func GetInIdListGoods(ids []int) ([]domain.Goods, error) {
 }
 
 func GetListGoods(goods domain.Goods, pageNum, pageSize int) (vo.BaseListVo, error) {
-	rows, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Rows(&goods)
+	var arr []domain.Goods
+	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goods)
 	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, 0)
-	for rows.Next() {
-		var u domain.Goods
-		rows.Scan(&u)
-		vo.List = append(vo.List, u)
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
 	}
-	//查询数量
-	count, err := configs.Engine.Count(&goods)
-	vo.Total = int(count)
+	vo.Total = int(Count)
 	return vo, nil
 }
 

+ 9 - 9
data/dao/manage/GoodsIntroductionDao.go

@@ -30,22 +30,22 @@ func GetInIdListGoodsIntroduction(ids []int) ([]domain.GoodsIntroduction, error)
 }
 
 func GetListGoodsIntroduction(goodsIntroduction domain.GoodsIntroduction, pageNum, pageSize int) (vo.BaseListVo, error) {
-	rows, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Rows(&goodsIntroduction)
+	var arr []domain.GoodsIntroduction
+	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goodsIntroduction)
 	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, 0)
-	for rows.Next() {
-		var u domain.GoodsIntroduction
-		rows.Scan(&u)
-		vo.List = append(vo.List, u)
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
 	}
-	//查询数量
-	count, err := configs.Engine.Count(&goodsIntroduction)
-	vo.Total = int(count)
+	vo.Total = int(Count)
 	return vo, nil
 }
 

+ 9 - 9
data/dao/manage/GoodsOrderDao.go

@@ -30,22 +30,22 @@ func GetInIdListGoodsOrder(ids []int) ([]domain.GoodsOrder, error) {
 }
 
 func GetListGoodsOrder(goodsOrder domain.GoodsOrder, pageNum, pageSize int) (vo.BaseListVo, error) {
-	rows, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Rows(&goodsOrder)
+	var arr []domain.GoodsOrder
+	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goodsOrder)
 	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, 0)
-	for rows.Next() {
-		var u domain.GoodsOrder
-		rows.Scan(&u)
-		vo.List = append(vo.List, u)
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
 	}
-	//查询数量
-	count, err := configs.Engine.Count(&goodsOrder)
-	vo.Total = int(count)
+	vo.Total = int(Count)
 	return vo, nil
 }
 

+ 9 - 9
data/dao/manage/GoodsSkuCardDao.go

@@ -30,22 +30,22 @@ func GetInIdListGoodsSkuCard(ids []int) ([]domain.GoodsSkuCard, error) {
 }
 
 func GetListGoodsSkuCard(goodsSkuCard domain.GoodsSkuCard, pageNum, pageSize int) (vo.BaseListVo, error) {
-	rows, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Rows(&goodsSkuCard)
+	var arr []domain.GoodsSkuCard
+	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goodsSkuCard)
 	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, 0)
-	for rows.Next() {
-		var u domain.GoodsSkuCard
-		rows.Scan(&u)
-		vo.List = append(vo.List, u)
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
 	}
-	//查询数量
-	count, err := configs.Engine.Count(&goodsSkuCard)
-	vo.Total = int(count)
+	vo.Total = int(Count)
 	return vo, nil
 }
 

+ 10 - 10
data/dao/manage/GoodsSkuDao.go

@@ -15,7 +15,7 @@ func GetByIdGoodsSku(id int) (domain.GoodsSku, error) {
 	return goodsSku, nil
 }
 
-func GetInIdListGoodsSku(ids []int) ([]domain.GoodsSku, error) {
+func GetInIdListGoodsSku(ids []int64) ([]domain.GoodsSku, error) {
 	rows, err := configs.Engine.In("id", ids).Rows(&domain.GoodsSku{})
 	if err != nil {
 		return make([]domain.GoodsSku, 0), err
@@ -30,22 +30,22 @@ func GetInIdListGoodsSku(ids []int) ([]domain.GoodsSku, error) {
 }
 
 func GetListGoodsSku(goodsSku domain.GoodsSku, pageNum, pageSize int) (vo.BaseListVo, error) {
-	rows, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Rows(&goodsSku)
+	var arr []domain.GoodsSku
+	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goodsSku)
 	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, 0)
-	for rows.Next() {
-		var u domain.GoodsSku
-		rows.Scan(&u)
-		vo.List = append(vo.List, u)
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
 	}
-	//查询数量
-	count, err := configs.Engine.Count(&goodsSku)
-	vo.Total = int(count)
+	vo.Total = int(Count)
 	return vo, nil
 }
 

+ 9 - 9
data/dao/manage/GoodsTagDao.go

@@ -30,22 +30,22 @@ func GetInIdListGoodsTag(ids []int) ([]domain.GoodsTag, error) {
 }
 
 func GetListGoodsTag(goodsTag domain.GoodsTag, pageNum, pageSize int) (vo.BaseListVo, error) {
-	rows, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Rows(&goodsTag)
+	var arr []domain.GoodsTag
+	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goodsTag)
 	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, 0)
-	for rows.Next() {
-		var u domain.GoodsTag
-		rows.Scan(&u)
-		vo.List = append(vo.List, u)
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
 	}
-	//查询数量
-	count, err := configs.Engine.Count(&goodsTag)
-	vo.Total = int(count)
+	vo.Total = int(Count)
 	return vo, nil
 }
 

+ 9 - 9
data/dao/manage/GoodsTopicDao.go

@@ -30,22 +30,22 @@ func GetInIdListGoodsTopic(ids []int) ([]domain.GoodsTopic, error) {
 }
 
 func GetListGoodsTopic(goodsTopic domain.GoodsTopic, pageNum, pageSize int) (vo.BaseListVo, error) {
-	rows, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Rows(&goodsTopic)
+	var arr []domain.GoodsTopic
+	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").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, 0)
-	for rows.Next() {
-		var u domain.GoodsTopic
-		rows.Scan(&u)
-		vo.List = append(vo.List, u)
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
 	}
-	//查询数量
-	count, err := configs.Engine.Count(&goodsTopic)
-	vo.Total = int(count)
+	vo.Total = int(Count)
 	return vo, nil
 }
 

+ 9 - 9
data/dao/manage/GoodsTypeDao.go

@@ -30,22 +30,22 @@ func GetInIdListGoodsType(ids []int) ([]domain.GoodsType, error) {
 }
 
 func GetListGoodsType(goodsType domain.GoodsType, pageNum, pageSize int) (vo.BaseListVo, error) {
-	rows, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Rows(&goodsType)
+	var arr []domain.GoodsType
+	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goodsType)
 	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, 0)
-	for rows.Next() {
-		var u domain.GoodsType
-		rows.Scan(&u)
-		vo.List = append(vo.List, u)
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
 	}
-	//查询数量
-	count, err := configs.Engine.Count(&goodsType)
-	vo.Total = int(count)
+	vo.Total = int(Count)
 	return vo, nil
 }
 

+ 9 - 9
data/dao/manage/ManageUserDao.go

@@ -30,22 +30,22 @@ func GetInIdListManageUser(ids []int) ([]domain.ManageUser, error) {
 }
 
 func GetListManageUser(manageUser domain.ManageUser, pageNum, pageSize int) (vo.BaseListVo, error) {
-	rows, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Rows(&manageUser)
+	var arr []domain.ManageUser
+	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &manageUser)
 	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, 0)
-	for rows.Next() {
-		var u domain.ManageUser
-		rows.Scan(&u)
-		vo.List = append(vo.List, u)
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
 	}
-	//查询数量
-	count, err := configs.Engine.Count(&manageUser)
-	vo.Total = int(count)
+	vo.Total = int(Count)
 	return vo, nil
 }
 

+ 9 - 9
data/dao/manage/RoleAuthorityDao.go

@@ -21,22 +21,22 @@ func GetInIdListRoleAuthority(ids []int) ([]domain.RoleAuthority, error) {
 }
 
 func GetListRoleAuthority(roleAuthority domain.RoleAuthority, pageNum, pageSize int) (vo.BaseListVo, error) {
-	rows, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Rows(&roleAuthority)
+	var arr []domain.RoleAuthority
+	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").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, 0)
-	for rows.Next() {
-		var u domain.RoleAuthority
-		rows.Scan(&u)
-		vo.List = append(vo.List, u)
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
 	}
-	//查询数量
-	count, err := configs.Engine.Count(&roleAuthority)
-	vo.Total = int(count)
+	vo.Total = int(Count)
 	return vo, nil
 }
 

+ 9 - 9
data/dao/manage/RoleDao.go

@@ -30,22 +30,22 @@ func GetInIdListRole(ids []int) ([]domain.Role, error) {
 }
 
 func GetListRole(role domain.Role, pageNum, pageSize int) (vo.BaseListVo, error) {
-	rows, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Rows(&role)
+	var arr []domain.Role
+	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").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, 0)
-	for rows.Next() {
-		var u domain.Role
-		rows.Scan(&u)
-		vo.List = append(vo.List, u)
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
 	}
-	//查询数量
-	count, err := configs.Engine.Count(&role)
-	vo.Total = int(count)
+	vo.Total = int(Count)
 	return vo, nil
 }
 

+ 9 - 9
data/dao/manage/UserDao.go

@@ -30,22 +30,22 @@ func GetInIdListUser(ids []int) ([]domain.User, error) {
 }
 
 func GetListUser(user domain.User, pageNum, pageSize int) (vo.BaseListVo, error) {
-	rows, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Rows(&user)
+	var arr []domain.User
+	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &user)
 	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, 0)
-	for rows.Next() {
-		var u domain.User
-		rows.Scan(&u)
-		vo.List = append(vo.List, u)
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
 	}
-	//查询数量
-	count, err := configs.Engine.Count(&user)
-	vo.Total = int(count)
+	vo.Total = int(Count)
 	return vo, nil
 }
 

+ 9 - 9
data/dao/manage/UserWalletDao.go

@@ -30,22 +30,22 @@ func GetInIdListUserWallet(ids []int) ([]domain.UserWallet, error) {
 }
 
 func GetListUserWallet(userWallet domain.UserWallet, pageNum, pageSize int) (vo.BaseListVo, error) {
-	rows, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Rows(&userWallet)
+	var arr []domain.UserWallet
+	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &userWallet)
 	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, 0)
-	for rows.Next() {
-		var u domain.UserWallet
-		rows.Scan(&u)
-		vo.List = append(vo.List, u)
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
 	}
-	//查询数量
-	count, err := configs.Engine.Count(&userWallet)
-	vo.Total = int(count)
+	vo.Total = int(Count)
 	return vo, nil
 }
 

+ 179 - 179
data/domain/DoMain.go

@@ -1,303 +1,303 @@
 package domain
 
 import (
-    "fmt"
-    "time"
+	"fmt"
+	"time"
 )
 
-//Article 
+// Article
 type Article struct {
-    Id int `json:"id"`// 11 0 注释:id
-    ArticleTitle string `xorm:"article_title"  json:"articleTitle"`// 255 0 注释:文章名称
-    ArticeContent string `xorm:"artice_content"  json:"articeContent"`// 0 0 注释:文章内容
-    State string `xorm:"state"  json:"state"`// 255 0 注释:状态
-    ArticeTagIds string `xorm:"artice_tag_ids"  json:"articeTagIds"`// 255 0 注释:文章标签
-    ArticeTopicId int `xorm:"artice_topic_id"  json:"articeTopicId"`// 11 0 注释:文章主题id
-    Image string `xorm:"image"  json:"image"`// 255 0 注释:图片
-    PublishTime time.Time `xorm:"publish_time"  json:"publishTime"`// 0 0 注释:发表时间
-    EyeFill int `xorm:"eye_fill"  json:"eyeFill"`// 11 0 注释:浏览量
-    LikeCount int `xorm:"like_count"  json:"likeCount"`// 255 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 注释:更新时间
+	Id            int64     `json:"id"`                                    // 11 0 注释:id
+	ArticleTitle  string    `xorm:"article_title"  json:"articleTitle"`    // 255 0 注释:文章名称
+	ArticeContent string    `xorm:"artice_content"  json:"articeContent"`  // 0 0 注释:文章内容
+	State         string    `xorm:"state"  json:"state"`                   // 255 0 注释:状态
+	ArticeTagIds  string    `xorm:"artice_tag_ids"  json:"articeTagIds"`   // 255 0 注释:文章标签
+	ArticeTopicId int       `xorm:"artice_topic_id"  json:"articeTopicId"` // 11 0 注释:文章主题id
+	Image         string    `xorm:"image"  json:"image"`                   // 255 0 注释:图片
+	PublishTime   time.Time `xorm:"publish_time"  json:"publishTime"`      // 0 0 注释:发表时间
+	EyeFill       int       `xorm:"eye_fill"  json:"eyeFill"`              // 11 0 注释:浏览量
+	LikeCount     int       `xorm:"like_count"  json:"likeCount"`          // 255 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 Article) String() string {
-    return fmt.Sprint("Article{Id:", receiver.Id, ",ArticleTitle:", receiver.ArticleTitle, ",ArticeContent:", receiver.ArticeContent, ",State:", receiver.State, ",ArticeTagIds:", receiver.ArticeTagIds, ",ArticeTopicId:", receiver.ArticeTopicId, ",Image:", receiver.Image, ",PublishTime:", receiver.PublishTime, ",EyeFill:", receiver.EyeFill, ",LikeCount:", receiver.LikeCount, ",CreateBy:", receiver.CreateBy, ",CreateTime:", receiver.CreateTime, ",UpdateBy:", receiver.UpdateBy, ",UpdateTime:", receiver.UpdateTime, "}")
+	return fmt.Sprint("Article{Id:", receiver.Id, ",ArticleTitle:", receiver.ArticleTitle, ",ArticeContent:", receiver.ArticeContent, ",State:", receiver.State, ",ArticeTagIds:", receiver.ArticeTagIds, ",ArticeTopicId:", receiver.ArticeTopicId, ",Image:", receiver.Image, ",PublishTime:", receiver.PublishTime, ",EyeFill:", receiver.EyeFill, ",LikeCount:", receiver.LikeCount, ",CreateBy:", receiver.CreateBy, ",CreateTime:", receiver.CreateTime, ",UpdateBy:", receiver.UpdateBy, ",UpdateTime:", receiver.UpdateTime, "}")
 }
 
-//ArticleTag 
+// ArticleTag
 type ArticleTag struct {
-    Id int `json:"id"`// 11 0 注释:
-    TagName string `xorm:"tag_name"  json:"tagName"`// 255 0 注释:标签名
-    TagDesc string `xorm:"tag_desc"  json:"tagDesc"`// 255 0 注释:标签描述
+	Id      int64  `json:"id"`                       // 11 0 注释:
+	TagName string `xorm:"tag_name"  json:"tagName"` // 255 0 注释:标签名
+	TagDesc string `xorm:"tag_desc"  json:"tagDesc"` // 255 0 注释:标签描述
 }
 
 func (receiver ArticleTag) String() string {
-    return fmt.Sprint("ArticleTag{Id:", receiver.Id, ",TagName:", receiver.TagName, ",TagDesc:", receiver.TagDesc, "}")
+	return fmt.Sprint("ArticleTag{Id:", receiver.Id, ",TagName:", receiver.TagName, ",TagDesc:", receiver.TagDesc, "}")
 }
 
-//ArticleTopic 
+// ArticleTopic
 type ArticleTopic struct {
-    Id int `json:"id"`// 11 0 注释:
-    Image string `xorm:"image"  json:"image"`// 255 0 注释:图片
-    TopicName string `xorm:"topic_name"  json:"topicName"`// 255 0 注释:主题名称
-    TopicDesc string `xorm:"topic_desc"  json:"topicDesc"`// 255 0 注释:主题描述
+	Id        int64  `json:"id"`                           // 11 0 注释:
+	Image     string `xorm:"image"  json:"image"`          // 255 0 注释:图片
+	TopicName string `xorm:"topic_name"  json:"topicName"` // 255 0 注释:主题名称
+	TopicDesc string `xorm:"topic_desc"  json:"topicDesc"` // 255 0 注释:主题描述
 }
 
 func (receiver ArticleTopic) String() string {
-    return fmt.Sprint("ArticleTopic{Id:", receiver.Id, ",Image:", receiver.Image, ",TopicName:", receiver.TopicName, ",TopicDesc:", receiver.TopicDesc, "}")
+	return fmt.Sprint("ArticleTopic{Id:", receiver.Id, ",Image:", receiver.Image, ",TopicName:", receiver.TopicName, ",TopicDesc:", receiver.TopicDesc, "}")
 }
 
-//Authority 
+// Authority
 type Authority struct {
-    Id int `json:"id"`// 11 0 注释:
-    AuthorityName string `xorm:"authority_name"  json:"authorityName"`// 255 0 注释:
-    AuthorityPath string `xorm:"authority_path"  json:"authorityPath"`// 255 0 注释:
+	Id            int64  `json:"id"`                                   // 11 0 注释:
+	AuthorityName string `xorm:"authority_name"  json:"authorityName"` // 255 0 注释:
+	AuthorityPath string `xorm:"authority_path"  json:"authorityPath"` // 255 0 注释:
 }
 
 func (receiver Authority) String() string {
-    return fmt.Sprint("Authority{Id:", receiver.Id, ",AuthorityName:", receiver.AuthorityName, ",AuthorityPath:", receiver.AuthorityPath, "}")
+	return fmt.Sprint("Authority{Id:", receiver.Id, ",AuthorityName:", receiver.AuthorityName, ",AuthorityPath:", receiver.AuthorityPath, "}")
 }
 
-//Goods 
+// Goods
 type Goods struct {
-    Id int `json:"id"`// 11 0 注释:id
-    TypeId int `xorm:"type_id"  json:"typeId"`// 11 0 注释:分类id
-    GoodsName string `xorm:"goods_name"  json:"goodsName"`// 255 0 注释:商品名字
-    IntroductionId int `xorm:"introduction_id"  json:"introductionId"`// 11 0 注释:商品介绍id
-    SalesVolume int `xorm:"sales_volume"  json:"salesVolume"`// 255 0 注释:近30天销量
-    TagIds string `xorm:"tag_ids"  json:"tagIds"`// 255 0 注释:商品标签
+	Id             int64  `json:"id"`                                     // 11 0 注释:id
+	TypeId         int    `xorm:"type_id"  json:"typeId"`                 // 11 0 注释:分类id
+	GoodsName      string `xorm:"goods_name"  json:"goodsName"`           // 255 0 注释:商品名字
+	IntroductionId int    `xorm:"introduction_id"  json:"introductionId"` // 11 0 注释:商品介绍id
+	SalesVolume    int    `xorm:"sales_volume"  json:"salesVolume"`       // 255 0 注释:近30天销量
+	TagIds         string `xorm:"tag_ids"  json:"tagIds"`                 // 255 0 注释:商品标签
 }
 
 func (receiver Goods) String() string {
-    return fmt.Sprint("Goods{Id:", receiver.Id, ",TypeId:", receiver.TypeId, ",GoodsName:", receiver.GoodsName, ",IntroductionId:", receiver.IntroductionId, ",SalesVolume:", receiver.SalesVolume, ",TagIds:", receiver.TagIds, "}")
+	return fmt.Sprint("Goods{Id:", receiver.Id, ",TypeId:", receiver.TypeId, ",GoodsName:", receiver.GoodsName, ",IntroductionId:", receiver.IntroductionId, ",SalesVolume:", receiver.SalesVolume, ",TagIds:", receiver.TagIds, "}")
 }
 
-//GoodsCommodityArea 
+// GoodsCommodityArea
 type GoodsCommodityArea struct {
-    Id int `json:"id"`// 11 0 注释:id
-    GoodsId int `xorm:"goods_id"  json:"goodsId"`// 11 0 注释:商品id
-    CommodityAreaName string `xorm:"commodity_area_name"  json:"commodityAreaName"`// 255 0 注释:商品属地名称
-    DetailImage string `xorm:"detail_image"  json:"detailImage"`// 255 0 注释:详情图片
-    DetailIntroductionId int `xorm:"detail_introduction_id"  json:"detailIntroductionId"`// 11 0 注释:相关文本详情id
+	Id                   int64  `json:"id"`                                                  // 11 0 注释:id
+	GoodsId              int    `xorm:"goods_id"  json:"goodsId"`                            // 11 0 注释:商品id
+	CommodityAreaName    string `xorm:"commodity_area_name"  json:"commodityAreaName"`       // 255 0 注释:商品属地名称
+	DetailImage          string `xorm:"detail_image"  json:"detailImage"`                    // 255 0 注释:详情图片
+	DetailIntroductionId int    `xorm:"detail_introduction_id"  json:"detailIntroductionId"` // 11 0 注释:相关文本详情id
 }
 
 func (receiver GoodsCommodityArea) String() string {
-    return fmt.Sprint("GoodsCommodityArea{Id:", receiver.Id, ",GoodsId:", receiver.GoodsId, ",CommodityAreaName:", receiver.CommodityAreaName, ",DetailImage:", receiver.DetailImage, ",DetailIntroductionId:", receiver.DetailIntroductionId, "}")
+	return fmt.Sprint("GoodsCommodityArea{Id:", receiver.Id, ",GoodsId:", receiver.GoodsId, ",CommodityAreaName:", receiver.CommodityAreaName, ",DetailImage:", receiver.DetailImage, ",DetailIntroductionId:", receiver.DetailIntroductionId, "}")
 }
 
-//GoodsCoupon 优惠券
+// GoodsCoupon 优惠券
 type GoodsCoupon struct {
-    Id int `json:"id"`// 11 0 注释:id
-    CouponName string `xorm:"coupon_name"  json:"couponName"`// 255 0 注释:优惠券名称
-    CouponDesc string `xorm:"coupon_desc"  json:"couponDesc"`// 255 0 注释:优惠券描述
-    CashBackPoint float64 `xorm:"cash_back_point"  json:"cashBackPoint"`// 11 0 注释:满x
-    CashBackPrice float64 `xorm:"cash_back_price"  json:"cashBackPrice"`// 10 2 注释:减x
-    ConditionByTopic string `xorm:"condition_by_topic"  json:"conditionByTopic"`// 255 0 注释:主题可用,id
-    ConditionByType string `xorm:"condition_by_type"  json:"conditionByType"`// 255 0 注释:类型可用,id
-    ConditionByGoods string `xorm:"condition_by_goods"  json:"conditionByGoods"`// 255 0 注释:商品可用,id
-    Count int `xorm:"count"  json:"count"`// 255 0 注释:优惠券数量
-    ReceiveType string `xorm:"receive_type"  json:"receiveType"`// 255 0 注释:领取条件
-    Validity string `xorm:"validity"  json:"validity"`// 255 0 注释:有效性,领取开始计时(ClaimTiming),固定时间(FixedTime)
-    ValidityPeriod time.Time `xorm:"validity_period"  json:"validityPeriod"`// 0 0 注释:有效期
+	Id               int64     `json:"id"`                                          // 11 0 注释:id
+	CouponName       string    `xorm:"coupon_name"  json:"couponName"`              // 255 0 注释:优惠券名称
+	CouponDesc       string    `xorm:"coupon_desc"  json:"couponDesc"`              // 255 0 注释:优惠券描述
+	CashBackPoint    float64   `xorm:"cash_back_point"  json:"cashBackPoint"`       // 11 2 注释:满x
+	CashBackPrice    float64   `xorm:"cash_back_price"  json:"cashBackPrice"`       // 11 2 注释:减x
+	ConditionByTopic string    `xorm:"condition_by_topic"  json:"conditionByTopic"` // 255 0 注释:主题可用,id
+	ConditionByType  string    `xorm:"condition_by_type"  json:"conditionByType"`   // 255 0 注释:类型可用,id
+	ConditionByGoods string    `xorm:"condition_by_goods"  json:"conditionByGoods"` // 255 0 注释:商品可用,id
+	GrantCount       string    `xorm:"grant_count"  json:"grantCount"`              // 255 0 注释:发放数量
+	Count            int       `xorm:"count"  json:"count"`                         // 255 0 注释:优惠券余量
+	ReceiveType      string    `xorm:"receive_type"  json:"receiveType"`            // 255 0 注释:领取条件
+	Validity         string    `xorm:"validity"  json:"validity"`                   // 255 0 注释:有效性,领取开始计时(ClaimTiming),固定时间(FixedTime)
+	ValidityPeriod   time.Time `xorm:"validity_period"  json:"validityPeriod"`      // 0 0 注释:有效期
 }
 
 func (receiver GoodsCoupon) String() string {
-    return fmt.Sprint("GoodsCoupon{Id:", receiver.Id, ",CouponName:", receiver.CouponName, ",CouponDesc:", receiver.CouponDesc, ",CashBackPoint:", receiver.CashBackPoint, ",CashBackPrice:", receiver.CashBackPrice, ",ConditionByTopic:", receiver.ConditionByTopic, ",ConditionByType:", receiver.ConditionByType, ",ConditionByGoods:", receiver.ConditionByGoods, ",Count:", receiver.Count, ",ReceiveType:", receiver.ReceiveType, ",Validity:", receiver.Validity, ",ValidityPeriod:", receiver.ValidityPeriod, "}")
+	return fmt.Sprint("GoodsCoupon{Id:", receiver.Id, ",CouponName:", receiver.CouponName, ",CouponDesc:", receiver.CouponDesc, ",CashBackPoint:", receiver.CashBackPoint, ",CashBackPrice:", receiver.CashBackPrice, ",ConditionByTopic:", receiver.ConditionByTopic, ",ConditionByType:", receiver.ConditionByType, ",ConditionByGoods:", receiver.ConditionByGoods, ",GrantCount:", receiver.GrantCount, ",Count:", receiver.Count, ",ReceiveType:", receiver.ReceiveType, ",Validity:", receiver.Validity, ",ValidityPeriod:", receiver.ValidityPeriod, "}")
 }
 
-//GoodsCouponUser 优惠券领取
+// GoodsCouponUser 优惠券领取
 type GoodsCouponUser struct {
-    Id int `json:"id"`// 11 0 注释:id
-    UserId int `xorm:"user_id"  json:"userId"`// 11 0 注释:用户id
-    CouponId int `xorm:"coupon_id"  json:"couponId"`// 11 0 注释:优惠券id
-    CollectionTime time.Time `xorm:"collection_time"  json:"collectionTime"`// 0 0 注释:领取时间
-    State string `xorm:"state"  json:"state"`// 255 0 注释:状态,已使用2,未使用1,已过期0
+	Id             int64     `json:"id"`                                     // 11 0 注释:id
+	UserId         int       `xorm:"user_id"  json:"userId"`                 // 11 0 注释:用户id
+	CouponId       int       `xorm:"coupon_id"  json:"couponId"`             // 11 0 注释:优惠券id
+	CollectionTime time.Time `xorm:"collection_time"  json:"collectionTime"` // 0 0 注释:领取时间
+	State          string    `xorm:"state"  json:"state"`                    // 255 0 注释:状态,已使用2,未使用1,已过期0
 }
 
 func (receiver GoodsCouponUser) String() string {
-    return fmt.Sprint("GoodsCouponUser{Id:", receiver.Id, ",UserId:", receiver.UserId, ",CouponId:", receiver.CouponId, ",CollectionTime:", receiver.CollectionTime, ",State:", receiver.State, "}")
+	return fmt.Sprint("GoodsCouponUser{Id:", receiver.Id, ",UserId:", receiver.UserId, ",CouponId:", receiver.CouponId, ",CollectionTime:", receiver.CollectionTime, ",State:", receiver.State, "}")
 }
 
-//GoodsIntroduction 商品介绍
+// GoodsIntroduction 商品介绍
 type GoodsIntroduction struct {
-    Id int `json:"id"`// 11 0 注释:文章id
-    GoodsArticleName string `xorm:"goods_article_name"  json:"goodsArticleName"`// 255 0 注释:商品文章名
-    GoodsArticle string `xorm:"goods_article"  json:"goodsArticle"`// 0 0 注释:商品文章
-    CreateBy string `xorm:"create_by"  json:"createBy"`// 0 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 注释:更新时间
+	Id               int64     `json:"id"`                                          // 11 0 注释:文章id
+	GoodsArticleName string    `xorm:"goods_article_name"  json:"goodsArticleName"` // 255 0 注释:商品文章名
+	GoodsArticle     string    `xorm:"goods_article"  json:"goodsArticle"`          // 0 0 注释:商品文章
+	CreateBy         string    `xorm:"create_by"  json:"createBy"`                  // 0 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 GoodsIntroduction) String() string {
-    return fmt.Sprint("GoodsIntroduction{Id:", receiver.Id, ",GoodsArticleName:", receiver.GoodsArticleName, ",GoodsArticle:", receiver.GoodsArticle, ",CreateBy:", receiver.CreateBy, ",CreateTime:", receiver.CreateTime, ",UpdateBy:", receiver.UpdateBy, ",UpdateTime:", receiver.UpdateTime, "}")
+	return fmt.Sprint("GoodsIntroduction{Id:", receiver.Id, ",GoodsArticleName:", receiver.GoodsArticleName, ",GoodsArticle:", receiver.GoodsArticle, ",CreateBy:", receiver.CreateBy, ",CreateTime:", receiver.CreateTime, ",UpdateBy:", receiver.UpdateBy, ",UpdateTime:", receiver.UpdateTime, "}")
 }
 
-//GoodsOrder 
+// GoodsOrder
 type GoodsOrder struct {
-    Id int `json:"id"`// 11 0 注释:id
-    OrderName string `xorm:"order_name"  json:"orderName"`// 255 0 注释:订单名
-    SkuId int `xorm:"sku_id"  json:"skuId"`// 11 0 注释:skuid
-    Count int `xorm:"count"  json:"count"`// 11 0 注释:购买数量
-    Price float64 `xorm:"price"  json:"price"`// 10 2 注释:单价
-    TotalPrice float64 `xorm:"total_price"  json:"totalPrice"`// 10 2 注释:总价
-    ContactInformation string `xorm:"contact_information"  json:"contactInformation"`// 255 0 注释:联系方式
-    CouponUserId int `xorm:"coupon_user_id"  json:"couponUserId"`// 11 0 注释:使用的优惠券
-    State string `xorm:"state"  json:"state"`// 10 0 注释:支付状态,0未支付,1已支付,2关闭订单,3订单异常
-    CreateBy int `xorm:"create_by"  json:"createBy"`// 255 0 注释:用户id
-    CreateTime time.Time `xorm:"create_time"  json:"createTime"`// 0 0 注释:订单创建时间
+	Id                 int64     `json:"id"`                                             // 11 0 注释:id
+	OrderName          string    `xorm:"order_name"  json:"orderName"`                   // 255 0 注释:订单名
+	SkuId              int       `xorm:"sku_id"  json:"skuId"`                           // 11 0 注释:skuid
+	Count              int       `xorm:"count"  json:"count"`                            // 11 0 注释:购买数量
+	Price              float64   `xorm:"price"  json:"price"`                            // 10 2 注释:单价
+	TotalPrice         float64   `xorm:"total_price"  json:"totalPrice"`                 // 10 2 注释:总价
+	ContactInformation string    `xorm:"contact_information"  json:"contactInformation"` // 255 0 注释:联系方式
+	CouponUserId       int64     `xorm:"coupon_user_id"  json:"couponUserId"`            // 11 0 注释:使用的优惠券
+	State              string    `xorm:"state"  json:"state"`                            // 10 0 注释:支付状态,0待支付,1待发货,2已发货,3订单完成,4订单异常
+	CreateBy           int       `xorm:"create_by"  json:"createBy"`                     // 255 0 注释:用户id
+	CreateTime         time.Time `xorm:"create_time"  json:"createTime"`                 // 0 0 注释:订单创建时间
 }
 
 func (receiver GoodsOrder) String() string {
-    return fmt.Sprint("GoodsOrder{Id:", receiver.Id, ",OrderName:", receiver.OrderName, ",SkuId:", receiver.SkuId, ",Count:", receiver.Count, ",Price:", receiver.Price, ",TotalPrice:", receiver.TotalPrice, ",ContactInformation:", receiver.ContactInformation, ",CouponUserId:", receiver.CouponUserId, ",State:", receiver.State, ",CreateBy:", receiver.CreateBy, ",CreateTime:", receiver.CreateTime, "}")
+	return fmt.Sprint("GoodsOrder{Id:", receiver.Id, ",OrderName:", receiver.OrderName, ",SkuId:", receiver.SkuId, ",Count:", receiver.Count, ",Price:", receiver.Price, ",TotalPrice:", receiver.TotalPrice, ",ContactInformation:", receiver.ContactInformation, ",CouponUserId:", receiver.CouponUserId, ",State:", receiver.State, ",CreateBy:", receiver.CreateBy, ",CreateTime:", receiver.CreateTime, "}")
 }
 
-//GoodsSku 
+// GoodsSku
 type GoodsSku struct {
-    Id int `json:"id"`// 11 0 注释:
-    SkuImage string `xorm:"sku_image"  json:"skuImage"`// 255 0 注释:sku图片
-    SkuName string `xorm:"sku_name"  json:"skuName"`// 255 0 注释:商品sku名字
-    Price float64 `xorm:"price"  json:"price"`// 10 2 注释:现在价格
-    HistoricalPrices float64 `xorm:"historical_prices"  json:"historicalPrices"`// 10 2 注释:历史价格
-    InventoryNumber int `xorm:"inventory_number"  json:"inventoryNumber"`// 11 0 注释:库存
-    CommodityAreaId int `xorm:"commodity_area_id"  json:"commodityAreaId"`// 11 0 注释:属地id
-    GoodsId int `xorm:"goods_id"  json:"goodsId"`// 11 0 注释:商品id
-    CreateBy string `xorm:"create_by"  json:"createBy"`// 255 0 注释:创建人
-    CreateTime time.Time `xorm:"create_time"  json:"createTime"`// 0 0 注释:创建时间
+	Id               int64     `json:"id"`                                         // 11 0 注释:
+	SkuImage         string    `xorm:"sku_image"  json:"skuImage"`                 // 255 0 注释:sku图片
+	SkuName          string    `xorm:"sku_name"  json:"skuName"`                   // 255 0 注释:商品sku名字
+	Price            float64   `xorm:"price"  json:"price"`                        // 10 2 注释:现在价格
+	HistoricalPrices float64   `xorm:"historical_prices"  json:"historicalPrices"` // 10 2 注释:历史价格
+	InventoryNumber  int       `xorm:"inventory_number"  json:"inventoryNumber"`   // 11 0 注释:库存
+	CommodityAreaId  int       `xorm:"commodity_area_id"  json:"commodityAreaId"`  // 11 0 注释:属地id
+	GoodsId          int       `xorm:"goods_id"  json:"goodsId"`                   // 11 0 注释:商品id
+	CreateBy         string    `xorm:"create_by"  json:"createBy"`                 // 255 0 注释:创建人
+	CreateTime       time.Time `xorm:"create_time"  json:"createTime"`             // 0 0 注释:创建时间
 }
 
 func (receiver GoodsSku) String() string {
-    return fmt.Sprint("GoodsSku{Id:", receiver.Id, ",SkuImage:", receiver.SkuImage, ",SkuName:", receiver.SkuName, ",Price:", receiver.Price, ",HistoricalPrices:", receiver.HistoricalPrices, ",InventoryNumber:", receiver.InventoryNumber, ",CommodityAreaId:", receiver.CommodityAreaId, ",GoodsId:", receiver.GoodsId, ",CreateBy:", receiver.CreateBy, ",CreateTime:", receiver.CreateTime, "}")
+	return fmt.Sprint("GoodsSku{Id:", receiver.Id, ",SkuImage:", receiver.SkuImage, ",SkuName:", receiver.SkuName, ",Price:", receiver.Price, ",HistoricalPrices:", receiver.HistoricalPrices, ",InventoryNumber:", receiver.InventoryNumber, ",CommodityAreaId:", receiver.CommodityAreaId, ",GoodsId:", receiver.GoodsId, ",CreateBy:", receiver.CreateBy, ",CreateTime:", receiver.CreateTime, "}")
 }
 
-//GoodsSkuCard 
+// GoodsSkuCard
 type GoodsSkuCard struct {
-    Id int `json:"id"`// 11 0 注释:id
-    CardName string `xorm:"card_name"  json:"cardName"`// 255 0 注释:卡种名称
-    State string `xorm:"state"  json:"state"`// 255 0 注释:状态,0未使用,1已用,2过期
-    Count int `xorm:"count"  json:"count"`// 11 0 注释:库存
-    TotalCount string `xorm:"total_count"  json:"totalCount"`// 255 0 注释:总数
-    CardKey string `xorm:"card_key"  json:"cardKey"`// 255 0 注释:卡密
-    Use string `xorm:"use"  json:"use"`// 5 0 注释:是否已用
-    UploadTime time.Time `xorm:"upload_time"  json:"uploadTime"`// 0 0 注释:入库时间
-    SkuId int `xorm:"sku_id"  json:"skuId"`// 11 0 注释:商品规格绑定
-    Sort string `xorm:"sort"  json:"sort"`// 255 0 注释:排序,出售优先级
+	Id         int64     `json:"id"`                             // 11 0 注释:id
+	CardName   string    `xorm:"card_name"  json:"cardName"`     // 255 0 注释:卡种名称
+	State      string    `xorm:"state"  json:"state"`            // 255 0 注释:状态,0未使用,1已用,2过期
+	Count      int       `xorm:"count"  json:"count"`            // 11 0 注释:库存
+	TotalCount string    `xorm:"total_count"  json:"totalCount"` // 255 0 注释:总数
+	CardKey    string    `xorm:"card_key"  json:"cardKey"`       // 255 0 注释:卡密
+	Use        string    `xorm:"use"  json:"use"`                // 5 0 注释:是否已用
+	UploadTime time.Time `xorm:"upload_time"  json:"uploadTime"` // 0 0 注释:入库时间
+	SkuId      int       `xorm:"sku_id"  json:"skuId"`           // 11 0 注释:商品规格绑定
+	Sort       string    `xorm:"sort"  json:"sort"`              // 255 0 注释:排序,出售优先级
 }
 
 func (receiver GoodsSkuCard) String() string {
-    return fmt.Sprint("GoodsSkuCard{Id:", receiver.Id, ",CardName:", receiver.CardName, ",State:", receiver.State, ",Count:", receiver.Count, ",TotalCount:", receiver.TotalCount, ",CardKey:", receiver.CardKey, ",Use:", receiver.Use, ",UploadTime:", receiver.UploadTime, ",SkuId:", receiver.SkuId, ",Sort:", receiver.Sort, "}")
+	return fmt.Sprint("GoodsSkuCard{Id:", receiver.Id, ",CardName:", receiver.CardName, ",State:", receiver.State, ",Count:", receiver.Count, ",TotalCount:", receiver.TotalCount, ",CardKey:", receiver.CardKey, ",Use:", receiver.Use, ",UploadTime:", receiver.UploadTime, ",SkuId:", receiver.SkuId, ",Sort:", receiver.Sort, "}")
 }
 
-//GoodsTag 
+// GoodsTag
 type GoodsTag struct {
-    Id int `json:"id"`// 11 0 注释:id
-    Name string `xorm:"name"  json:"name"`// 255 0 注释:名字
-    IconUrl string `xorm:"icon_url"  json:"iconUrl"`// 255 0 注释:图标路径
-    Tag string `xorm:"tag"  json:"tag"`// 255 0 注释:标签
+	Id      int64  `json:"id"`                       // 11 0 注释:id
+	Name    string `xorm:"name"  json:"name"`        // 255 0 注释:名字
+	IconUrl string `xorm:"icon_url"  json:"iconUrl"` // 255 0 注释:图标路径
+	Tag     string `xorm:"tag"  json:"tag"`          // 255 0 注释:标签
 }
 
 func (receiver GoodsTag) String() string {
-    return fmt.Sprint("GoodsTag{Id:", receiver.Id, ",Name:", receiver.Name, ",IconUrl:", receiver.IconUrl, ",Tag:", receiver.Tag, "}")
+	return fmt.Sprint("GoodsTag{Id:", receiver.Id, ",Name:", receiver.Name, ",IconUrl:", receiver.IconUrl, ",Tag:", receiver.Tag, "}")
 }
 
-//GoodsTopic 
+// GoodsTopic
 type GoodsTopic struct {
-    Id int `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
+	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, "}")
+	return fmt.Sprint("GoodsTopic{Id:", receiver.Id, ",TopicPageImage:", receiver.TopicPageImage, ",TopicName:", receiver.TopicName, ",TopicDesc:", receiver.TopicDesc, ",TypeIds:", receiver.TypeIds, "}")
 }
 
-//GoodsType 商品分类
+// GoodsType 商品分类
 type GoodsType struct {
-    Id int `json:"id"`// 11 0 注释:
-    Sort int `xorm:"sort"  json:"sort"`// 11 0 注释:排序
-    TypeImage string `xorm:"type_image"  json:"typeImage"`// 50 0 注释:类型图片
-    TypeName string `xorm:"type_name"  json:"typeName"`// 255 0 注释:商品类别名称
-    CreateTime time.Time `xorm:"create_time"  json:"createTime"`// 0 0 注释:创建时间
+	Id         int64     `json:"id"`                             // 11 0 注释:
+	Sort       int       `xorm:"sort"  json:"sort"`              // 11 0 注释:排序
+	TypeImage  string    `xorm:"type_image"  json:"typeImage"`   // 50 0 注释:类型图片
+	TypeName   string    `xorm:"type_name"  json:"typeName"`     // 255 0 注释:商品类别名称
+	CreateTime time.Time `xorm:"create_time"  json:"createTime"` // 0 0 注释:创建时间
 }
 
 func (receiver GoodsType) String() string {
-    return fmt.Sprint("GoodsType{Id:", receiver.Id, ",Sort:", receiver.Sort, ",TypeImage:", receiver.TypeImage, ",TypeName:", receiver.TypeName, ",CreateTime:", receiver.CreateTime, "}")
+	return fmt.Sprint("GoodsType{Id:", receiver.Id, ",Sort:", receiver.Sort, ",TypeImage:", receiver.TypeImage, ",TypeName:", receiver.TypeName, ",CreateTime:", receiver.CreateTime, "}")
 }
 
-//ManageUser 
+// ManageUser
 type ManageUser struct {
-    Id int `json:"id"`// 11 0 注释:
-    Name string `xorm:"name"  json:"name"`// 255 0 注释:名称
-    Username string `xorm:"username"  json:"username"`// 255 0 注释:账号
-    Password string `xorm:"password"  json:"password"`// 255 0 注释:密码
-    CreationTime int `xorm:"creation_time"  json:"creationTime"`// 11 0 注释:账号创建时间
-    LoginTime int `xorm:"login_time"  json:"loginTime"`// 11 0 注释:登录时间
-    Status string `xorm:"status"  json:"status"`// 255 0 注释:账号状态
-    RoleId int `xorm:"role_id"  json:"roleId"`// 11 0 注释:角色id
-    Phone string `xorm:"phone"  json:"phone"`// 255 0 注释:手机
-    Email string `xorm:"email"  json:"email"`// 255 0 注释:邮箱
-    Avatar string `xorm:"avatar"  json:"avatar"`// 255 0 注释:头像
+	Id           int64  `json:"id"`                                 // 11 0 注释:
+	Name         string `xorm:"name"  json:"name"`                  // 255 0 注释:名称
+	Username     string `xorm:"username"  json:"username"`          // 255 0 注释:账号
+	Password     string `xorm:"password"  json:"password"`          // 255 0 注释:密码
+	CreationTime int    `xorm:"creation_time"  json:"creationTime"` // 11 0 注释:账号创建时间
+	LoginTime    int    `xorm:"login_time"  json:"loginTime"`       // 11 0 注释:登录时间
+	Status       string `xorm:"status"  json:"status"`              // 255 0 注释:账号状态
+	RoleId       int    `xorm:"role_id"  json:"roleId"`             // 11 0 注释:角色id
+	Phone        string `xorm:"phone"  json:"phone"`                // 255 0 注释:手机
+	Email        string `xorm:"email"  json:"email"`                // 255 0 注释:邮箱
+	Avatar       string `xorm:"avatar"  json:"avatar"`              // 255 0 注释:头像
 }
 
 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, "}")
+	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 
+// Role
 type Role struct {
-    Id int `json:"id"`// 11 0 注释:
-    RoleName string `xorm:"role_name"  json:"roleName"`// 255 0 注释:
+	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, "}")
+	return fmt.Sprint("Role{Id:", receiver.Id, ",RoleName:", receiver.RoleName, "}")
 }
 
-//RoleAuthority 
+// RoleAuthority
 type RoleAuthority struct {
-    AuthorityId int `xorm:"authority_id"  json:"authorityId"`// 11 0 注释:
-    RoleId int `xorm:"role_id"  json:"roleId"`// 11 0 注释:
+	AuthorityId int `xorm:"authority_id"  json:"authorityId"` // 11 0 注释:
+	RoleId      int `xorm:"role_id"  json:"roleId"`           // 11 0 注释:
 }
 
 func (receiver RoleAuthority) String() string {
-    return fmt.Sprint("RoleAuthority{AuthorityId:", receiver.AuthorityId, ",RoleId:", receiver.RoleId, "}")
+	return fmt.Sprint("RoleAuthority{AuthorityId:", receiver.AuthorityId, ",RoleId:", receiver.RoleId, "}")
 }
 
-//User 
+// User
 type User struct {
-    Id int `json:"id"`// 11 0 注释:
-    Username string `xorm:"username"  json:"username"`// 255 0 注释:账号
-    Password string `xorm:"password"  json:"password"`// 255 0 注释:密码
-    CreationTime int `xorm:"creation_time"  json:"creationTime"`// 11 0 注释:账号创建时间
-    LoginTime int `xorm:"login_time"  json:"loginTime"`// 11 0 注释:登录时间
-    Status string `xorm:"status"  json:"status"`// 255 0 注释:账号状态
-    RoleId int `xorm:"role_id"  json:"roleId"`// 11 0 注释:角色id
-    Phone string `xorm:"phone"  json:"phone"`// 255 0 注释:手机
-    Email string `xorm:"email"  json:"email"`// 255 0 注释:邮箱
-    Name string `xorm:"name"  json:"name"`// 255 0 注释:用户名
-    Avatar string `xorm:"avatar"  json:"avatar"`// 255 0 注释:头像
-    RecommendCode string `xorm:"recommend_code"  json:"recommendCode"`// 255 0 注释:推荐码
+	Id            int64  `json:"id"`                                   // 11 0 注释:
+	Username      string `xorm:"username"  json:"username"`            // 255 0 注释:账号
+	Password      string `xorm:"password"  json:"password"`            // 255 0 注释:密码
+	CreationTime  int    `xorm:"creation_time"  json:"creationTime"`   // 11 0 注释:账号创建时间
+	LoginTime     int    `xorm:"login_time"  json:"loginTime"`         // 11 0 注释:登录时间
+	Status        string `xorm:"status"  json:"status"`                // 255 0 注释:账号状态
+	RoleId        int    `xorm:"role_id"  json:"roleId"`               // 11 0 注释:角色id
+	Phone         string `xorm:"phone"  json:"phone"`                  // 255 0 注释:手机
+	Email         string `xorm:"email"  json:"email"`                  // 255 0 注释:邮箱
+	Name          string `xorm:"name"  json:"name"`                    // 255 0 注释:用户名
+	Avatar        string `xorm:"avatar"  json:"avatar"`                // 255 0 注释:头像
+	RecommendCode string `xorm:"recommend_code"  json:"recommendCode"` // 255 0 注释:推荐码
 }
 
 func (receiver User) String() string {
-    return fmt.Sprint("User{Id:", receiver.Id, ",Username:", receiver.Username, ",Password:", receiver.Password, ",CreationTime:", receiver.CreationTime, ",LoginTime:", receiver.LoginTime, ",Status:", receiver.Status, ",RoleId:", receiver.RoleId, ",Phone:", receiver.Phone, ",Email:", receiver.Email, ",Name:", receiver.Name, ",Avatar:", receiver.Avatar, ",RecommendCode:", receiver.RecommendCode, "}")
+	return fmt.Sprint("User{Id:", receiver.Id, ",Username:", receiver.Username, ",Password:", receiver.Password, ",CreationTime:", receiver.CreationTime, ",LoginTime:", receiver.LoginTime, ",Status:", receiver.Status, ",RoleId:", receiver.RoleId, ",Phone:", receiver.Phone, ",Email:", receiver.Email, ",Name:", receiver.Name, ",Avatar:", receiver.Avatar, ",RecommendCode:", receiver.RecommendCode, "}")
 }
 
-//UserWallet 
+// UserWallet
 type UserWallet struct {
-    Id int `json:"id"`// 11 0 注释:id
-    UserId int `xorm:"user_id"  json:"userId"`// 11 0 注释:用户id
-    Balance float64 `xorm:"balance"  json:"balance"`// 65 0 注释:余额
-    PromotionAmount float64 `xorm:"promotion_amount"  json:"promotionAmount"`// 20 2 注释:推广获取总金额
-    RechargeAmount float64 `xorm:"recharge_amount"  json:"rechargeAmount"`// 20 2 注释:充值金额
+	Id              int64   `json:"id"`                                       // 11 0 注释:id
+	UserId          int     `xorm:"user_id"  json:"userId"`                   // 11 0 注释:用户id
+	Balance         float64 `xorm:"balance"  json:"balance"`                  // 65 0 注释:余额
+	PromotionAmount float64 `xorm:"promotion_amount"  json:"promotionAmount"` // 20 2 注释:推广获取总金额
+	RechargeAmount  float64 `xorm:"recharge_amount"  json:"rechargeAmount"`   // 20 2 注释:充值金额
 }
 
 func (receiver UserWallet) String() string {
-    return fmt.Sprint("UserWallet{Id:", receiver.Id, ",UserId:", receiver.UserId, ",Balance:", receiver.Balance, ",PromotionAmount:", receiver.PromotionAmount, ",RechargeAmount:", receiver.RechargeAmount, "}")
+	return fmt.Sprint("UserWallet{Id:", receiver.Id, ",UserId:", receiver.UserId, ",Balance:", receiver.Balance, ",PromotionAmount:", receiver.PromotionAmount, ",RechargeAmount:", receiver.RechargeAmount, "}")
 }
-

+ 2 - 2
data/domain/vo/DetailVo.go

@@ -13,7 +13,7 @@ type DetailVo struct {
 }
 
 type DetailGoodsVo struct {
-	GoodsId     int               `xorm:"'id'" json:"id"`
+	GoodsId     int64             `xorm:"'id'" json:"id"`
 	Name        string            `xorm:"'name'" json:"name"`
 	SalesVolume int               `xorm:"'sales_volume'" json:"sales_volume"`
 	Type        domain.GoodsType  `xorm:"'type'" json:"type"`
@@ -21,7 +21,7 @@ type DetailGoodsVo struct {
 }
 
 type DetailSkuVo struct {
-	NowSkuId int               `json:"sku"`     //当前sku
+	NowSkuId int64             `json:"sku"`     //当前sku
 	SkuList  []domain.GoodsSku `json:"skuList"` //相同区的
 }
 

+ 1 - 0
go.mod

@@ -51,6 +51,7 @@ require (
 	github.com/syndtr/goleveldb v1.0.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
+	github.com/wechatpay-apiv3/wechatpay-go v0.2.18 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
 	golang.org/x/arch v0.7.0 // indirect

+ 3 - 0
go.sum

@@ -2,6 +2,7 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU=
+github.com/agiledragon/gomonkey v2.0.2+incompatible/go.mod h1:2NGfXu1a80LLr2cmWXGBDaHEjb1idR6+FVlX5T3D9hw=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
 github.com/bytedance/sonic v1.11.3 h1:jRN+yEjakWh8aK5FzrciUHG8OFXK+4/KrAX/ysEtHAA=
@@ -156,6 +157,8 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
 github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+github.com/wechatpay-apiv3/wechatpay-go v0.2.18 h1:vj5tvSmnEIz3ZsnFNNUzg+3Z46xgNMJbrO4aD4wP15w=
+github.com/wechatpay-apiv3/wechatpay-go v0.2.18/go.mod h1:A254AUBVB6R+EqQFo3yTgeh7HtyqRRtN2w9hQSOrd4Q=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=

+ 1 - 1
router/DetailRouter.go

@@ -27,7 +27,7 @@ func GetDetailData(c *gin.Context) {
 		return
 	}
 
-	vo, err := dao.SelectGoodsDetailById(id)
+	vo, err := dao.SelectGoodsDetailById(int64(id))
 	if err != nil {
 		c.JSON(200, CreateResultError(400, "查询失败"))
 		return

+ 2 - 2
router/OrderRouter.go

@@ -46,7 +46,7 @@ func GetOrderData(c *gin.Context) {
 	order := &domain.GoodsOrder{}
 	order.SkuId = cast.ToInt(skuId)
 	order.Count = cast.ToInt(count)
-	order.CouponUserId = cast.ToInt(couponUserId)
+	order.CouponUserId = cast.ToInt64(couponUserId)
 	order.ContactInformation = cast.ToString(contactInformation)
 
 	order.OrderName = fmt.Sprint(sku.SkuName, "【x", count, "】")
@@ -81,7 +81,7 @@ func GetOrderList(c *gin.Context) {
 		return
 	}
 	orders, err := dao.GetOrderByUserId(id)
-	var ids = make([]int, 0)
+	var ids = make([]int64, 0)
 	for _, order := range orders {
 		ids = append(ids, order.CouponUserId)
 	}

+ 13 - 33
router/TestRouter.go

@@ -1,47 +1,27 @@
 package router
 
 import (
+	"demo/data/dao/manage"
+	"demo/share"
 	"github.com/gin-gonic/gin"
+	"github.com/spf13/cast"
 )
 
 func TestRouth(engine *gin.RouterGroup) {
 	user := engine.Group("/test")
 	user.Use(LoginInterceptor())
 	{
-		user.GET("/get", testGet)
-		user.POST("/post", testPost)
-		user.PUT("/put", testPut)
-		user.DELETE("/delete", testDelete)
-
+		user.GET("/order/pay", OrderSubmit)
 	}
-
 }
 
-func testGet(c *gin.Context) {
-	c.JSON(200, gin.H{
-		"message": "get",
-		"code":    200,
-		"data":    make(map[string]interface{}),
-	})
-}
-func testPost(c *gin.Context) {
-	c.JSON(200, gin.H{
-		"message": "post",
-		"code":    200,
-		"data":    make(map[string]interface{}),
-	})
-}
-func testPut(c *gin.Context) {
-	c.JSON(200, gin.H{
-		"message": "put",
-		"code":    200,
-		"data":    make(map[string]interface{}),
-	})
-}
-func testDelete(c *gin.Context) {
-	c.JSON(200, gin.H{
-		"message": "delete",
-		"code":    200,
-		"data":    make(map[string]interface{}),
-	})
+func OrderSubmit(c *gin.Context) {
+	param := share.GetJsonAnyParam(c)
+	orderId, _ := param("orderId")
+
+	order, b, err := manage.SetGoodsOrder(map[string]interface{}{"state": 1}, cast.ToInt(orderId))
+	if err != nil || !b {
+		c.JSON(200, CreateResultError(400, "订单不存在"))
+	}
+	c.JSON(200, CreateResultData(order))
 }