部分内容修改

data/dao/manage/Dao.go

@@ -81,16 +81,16 @@ func Get2ArticleList(query domain.ArticleQuery, pageNum, pageSize int) (vo.BaseL
 		session.Where("image = ?", query.Image)
 	}
 
-	if query.PublishTime != "" {
-		session.Where("publish_time = ?", query.PublishTime)
+	if query.PublishTimeStart != "" || query.PublishTimeEnd != "" {
+		session.Where("publish_time between ? and ?", query.PublishTimeStart, query.PublishTimeEnd)
 	}
 
-	if query.EyeFill != 0 {
-		session.Where("eye_fill = ?", query.EyeFill)
+	if query.EyeFillStart != 0 || query.EyeFillEnd != 0 {
+		session.Where("eye_fill between ? and ?", query.EyeFillStart, query.EyeFillEnd)
 	}
 
-	if query.LikeCount != 0 {
-		session.Where("like_count = ?", query.LikeCount)
+	if query.LikeCountStart != 0 || query.LikeCountEnd != 0 {
+		session.Where("like_count between ? and ?", query.LikeCountStart, query.LikeCountEnd)
 	}
 
 	if query.CreateBy != "" {
@@ -110,9 +110,9 @@ func Get2ArticleList(query domain.ArticleQuery, pageNum, pageSize int) (vo.BaseL
 	}
 
 	if query.ArticleDesc != "" {
-		session.Where("article_desc = ?", query.ArticleDesc)
+		session.Where("article_desc like ?", "%"+query.ArticleDesc+"%")
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -211,7 +211,7 @@ func Get2ArticleTagList(query domain.ArticleTagQuery, pageNum, pageSize int) (vo
 	}
 
 	if query.TagDesc != "" {
-		session.Where("tag_desc = ?", query.TagDesc)
+		session.Where("tag_desc like ?", "%"+query.TagDesc+"%")
 	}
 
 	if query.TagTextColor != "" {
@@ -221,7 +221,7 @@ func Get2ArticleTagList(query domain.ArticleTagQuery, pageNum, pageSize int) (vo
 	if query.TagBackgroundColor != "" {
 		session.Where("tag_background_color = ?", query.TagBackgroundColor)
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -320,13 +320,13 @@ func Get2ArticleTopicList(query domain.ArticleTopicQuery, pageNum, pageSize int)
 	}
 
 	if query.TopicName != "" {
-		session.Where("topic_name = ?", query.TopicName)
+		session.Where("topic_name like ?", "%"+query.TopicName+"%")
 	}
 
 	if query.TopicDesc != "" {
-		session.Where("topic_desc = ?", query.TopicDesc)
+		session.Where("topic_desc like ?", "%"+query.TopicDesc+"%")
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -538,7 +538,7 @@ func Get2BackMenuList(query domain.BackMenuQuery, pageNum, pageSize int) (vo.Bas
 	}
 
 	if query.BackMenuName != "" {
-		session.Where("back_menu_name = ?", query.BackMenuName)
+		session.Where("back_menu_name like ?", "%"+query.BackMenuName+"%")
 	}
 
 	if query.BackMenuPater != 0 {
@@ -554,17 +554,17 @@ func Get2BackMenuList(query domain.BackMenuQuery, pageNum, pageSize int) (vo.Bas
 	}
 
 	if query.Remark != "" {
-		session.Where("remark = ?", query.Remark)
+		session.Where("remark like ?", "%"+query.Remark+"%")
 	}
 
 	if query.BackRouterPath != "" {
-		session.Where("back_router_path = ?", query.BackRouterPath)
+		session.Where("back_router_path like ?", "%"+query.BackRouterPath+"%")
 	}
 
 	if query.State != "" {
 		session.Where("state = ?", query.State)
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -659,9 +659,9 @@ func Get2BackRoleList(query domain.BackRoleQuery, pageNum, pageSize int) (vo.Bas
 	}
 
 	if query.RoleName != "" {
-		session.Where("role_name = ?", query.RoleName)
+		session.Where("role_name like ?", "%"+query.RoleName+"%")
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -762,7 +762,7 @@ func Get2BackRoleAuthorityList(query domain.BackRoleAuthorityQuery, pageNum, pag
 	if query.AuthorityId != 0 {
 		session.Where("authority_id = ?", query.AuthorityId)
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -863,7 +863,7 @@ func Get2BackRoleMenuList(query domain.BackRoleMenuQuery, pageNum, pageSize int)
 	if query.MenuId != 0 {
 		session.Where("menu_id = ?", query.MenuId)
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -958,25 +958,25 @@ func Get2GenTableList(query domain.GenTableQuery, pageNum, pageSize int) (vo.Bas
 	}
 
 	if query.TableName != "" {
-		session.Where("table_name = ?", query.TableName)
+		session.Where("table_name like ?", "%"+query.TableName+"%")
 	}
 
 	if query.TableComment != "" {
-		session.Where("table_comment = ?", query.TableComment)
+		session.Where("table_comment like ?", "%"+query.TableComment+"%")
 	}
 
 	if query.Name != "" {
-		session.Where("name = ?", query.Name)
+		session.Where("name like ?", "%"+query.Name+"%")
 	}
 
 	if query.RouterName != "" {
-		session.Where("router_name = ?", query.RouterName)
+		session.Where("router_name like ?", "%"+query.RouterName+"%")
 	}
 
 	if query.Remark != "" {
-		session.Where("remark = ?", query.Remark)
+		session.Where("remark like ?", "%"+query.Remark+"%")
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -1079,19 +1079,19 @@ func Get2GenTableColumnList(query domain.GenTableColumnQuery, pageNum, pageSize
 	}
 
 	if query.ColumnComment != "" {
-		session.Where("column_comment = ?", query.ColumnComment)
+		session.Where("column_comment like ?", "%"+query.ColumnComment+"%")
 	}
 
 	if query.ColumnType != "" {
-		session.Where("column_type = ?", query.ColumnType)
+		session.Where("column_type like ?", "%"+query.ColumnType+"%")
 	}
 
 	if query.GoType != "" {
-		session.Where("go_type = ?", query.GoType)
+		session.Where("go_type like ?", "%"+query.GoType+"%")
 	}
 
 	if query.GoField != "" {
-		session.Where("go_field = ?", query.GoField)
+		session.Where("go_field like ?", "%"+query.GoField+"%")
 	}
 
 	if query.IsKey != "" {
@@ -1115,13 +1115,13 @@ func Get2GenTableColumnList(query domain.GenTableColumnQuery, pageNum, pageSize
 	}
 
 	if query.DictType != "" {
-		session.Where("dict_type = ?", query.DictType)
+		session.Where("dict_type like ?", "%"+query.DictType+"%")
 	}
 
 	if query.ColumnName != "" {
-		session.Where("column_name = ?", query.ColumnName)
+		session.Where("column_name like ?", "%"+query.ColumnName+"%")
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -1234,7 +1234,7 @@ func Get2GoodsList(query domain.GoodsQuery, pageNum, pageSize int) (vo.BaseListV
 	if query.TagIds != "" {
 		session.Where("tag_ids = ?", query.TagIds)
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -1333,7 +1333,7 @@ func Get2GoodsCommodityAreaList(query domain.GoodsCommodityAreaQuery, pageNum, p
 	}
 
 	if query.CommodityAreaName != "" {
-		session.Where("commodity_area_name = ?", query.CommodityAreaName)
+		session.Where("commodity_area_name like ?", "%"+query.CommodityAreaName+"%")
 	}
 
 	if query.DetailImage != "" {
@@ -1343,7 +1343,7 @@ func Get2GoodsCommodityAreaList(query domain.GoodsCommodityAreaQuery, pageNum, p
 	if query.DetailIntroductionId != 0 {
 		session.Where("detail_introduction_id = ?", query.DetailIntroductionId)
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -1442,7 +1442,7 @@ func Get2GoodsCouponList(query domain.GoodsCouponQuery, pageNum, pageSize int) (
 	}
 
 	if query.CouponDesc != "" {
-		session.Where("coupon_desc = ?", query.CouponDesc)
+		session.Where("coupon_desc like ?", "%"+query.CouponDesc+"%")
 	}
 
 	if query.CashBackPoint != 0 {
@@ -1481,10 +1481,10 @@ func Get2GoodsCouponList(query domain.GoodsCouponQuery, pageNum, pageSize int) (
 		session.Where("validity = ?", query.Validity)
 	}
 
-	if query.ValidityPeriod != "" {
-		session.Where("validity_period = ?", query.ValidityPeriod)
+	if query.ValidityPeriodStart != "" || query.ValidityPeriodEnd != "" {
+		session.Where("validity_period between ? and ?", query.ValidityPeriodStart, query.ValidityPeriodEnd)
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -1593,7 +1593,7 @@ func Get2GoodsCouponUserList(query domain.GoodsCouponUserQuery, pageNum, pageSiz
 	if query.State != "" {
 		session.Where("state = ?", query.State)
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -1688,7 +1688,7 @@ func Get2GoodsIntroductionList(query domain.GoodsIntroductionQuery, pageNum, pag
 	}
 
 	if query.GoodsArticleName != "" {
-		session.Where("goods_article_name = ?", query.GoodsArticleName)
+		session.Where("goods_article_name like ?", "%"+query.GoodsArticleName+"%")
 	}
 
 	if query.GoodsArticle != "" {
@@ -1710,7 +1710,7 @@ func Get2GoodsIntroductionList(query domain.GoodsIntroductionQuery, pageNum, pag
 	if query.UpdateTime != "" {
 		session.Where("update_time = ?", query.UpdateTime)
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -1805,27 +1805,27 @@ func Get2GoodsOrderList(query domain.GoodsOrderQuery, pageNum, pageSize int) (vo
 	}
 
 	if query.OrderName != "" {
-		session.Where("order_name = ?", query.OrderName)
+		session.Where("order_name like ?", "%"+query.OrderName+"%")
 	}
 
 	if query.SkuId != 0 {
 		session.Where("sku_id = ?", query.SkuId)
 	}
 
-	if query.Count != 0 {
-		session.Where("count = ?", query.Count)
+	if query.CountStart != 0 || query.CountEnd != 0 {
+		session.Where("count between ? and ?", query.CountStart, query.CountEnd)
 	}
 
-	if query.Price != 0 {
-		session.Where("price = ?", query.Price)
+	if query.PriceStart != 0 || query.PriceEnd != 0 {
+		session.Where("price between ? and ?", query.PriceStart, query.PriceEnd)
 	}
 
-	if query.TotalPrice != 0 {
-		session.Where("total_price = ?", query.TotalPrice)
+	if query.TotalPriceStart != 0 || query.TotalPriceEnd != 0 {
+		session.Where("total_price between ? and ?", query.TotalPriceStart, query.TotalPriceEnd)
 	}
 
 	if query.ContactInformation != "" {
-		session.Where("contact_information = ?", query.ContactInformation)
+		session.Where("contact_information like ?", "%"+query.ContactInformation+"%")
 	}
 
 	if query.CouponUserId != 0 {
@@ -1847,7 +1847,7 @@ func Get2GoodsOrderList(query domain.GoodsOrderQuery, pageNum, pageSize int) (vo
 	if query.OtherData != "" {
 		session.Where("other_data = ?", query.OtherData)
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -1946,7 +1946,7 @@ func Get2GoodsSkuList(query domain.GoodsSkuQuery, pageNum, pageSize int) (vo.Bas
 	}
 
 	if query.SkuName != "" {
-		session.Where("sku_name = ?", query.SkuName)
+		session.Where("sku_name like ?", "%"+query.SkuName+"%")
 	}
 
 	if query.Price != 0 {
@@ -1973,10 +1973,10 @@ func Get2GoodsSkuList(query domain.GoodsSkuQuery, pageNum, pageSize int) (vo.Bas
 		session.Where("create_by = ?", query.CreateBy)
 	}
 
-	if query.CreateTime != "" {
-		session.Where("create_time = ?", query.CreateTime)
+	if query.CreateTimeStart != "" || query.CreateTimeEnd != "" {
+		session.Where("create_time between ? and ?", query.CreateTimeStart, query.CreateTimeEnd)
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -2071,7 +2071,7 @@ func Get2GoodsSkuCardList(query domain.GoodsSkuCardQuery, pageNum, pageSize int)
 	}
 
 	if query.CardName != "" {
-		session.Where("card_name = ?", query.CardName)
+		session.Where("card_name like ?", "%"+query.CardName+"%")
 	}
 
 	if query.State != "" {
@@ -2087,15 +2087,15 @@ func Get2GoodsSkuCardList(query domain.GoodsSkuCardQuery, pageNum, pageSize int)
 	}
 
 	if query.CardKey != "" {
-		session.Where("card_key = ?", query.CardKey)
+		session.Where("card_key like ?", "%"+query.CardKey+"%")
 	}
 
 	if query.Use != "" {
 		session.Where("use = ?", query.Use)
 	}
 
-	if query.UploadTime != "" {
-		session.Where("upload_time = ?", query.UploadTime)
+	if query.UploadTimeStart != "" || query.UploadTimeEnd != "" {
+		session.Where("upload_time between ? and ?", query.UploadTimeStart, query.UploadTimeEnd)
 	}
 
 	if query.SkuId != 0 {
@@ -2105,7 +2105,7 @@ func Get2GoodsSkuCardList(query domain.GoodsSkuCardQuery, pageNum, pageSize int)
 	if query.Sort != "" {
 		session.Where("sort = ?", query.Sort)
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -2210,7 +2210,7 @@ func Get2GoodsTagList(query domain.GoodsTagQuery, pageNum, pageSize int) (vo.Bas
 	if query.Tag != "" {
 		session.Where("tag = ?", query.Tag)
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -2313,13 +2313,13 @@ func Get2GoodsTypeList(query domain.GoodsTypeQuery, pageNum, pageSize int) (vo.B
 	}
 
 	if query.TypeName != "" {
-		session.Where("type_name = ?", query.TypeName)
+		session.Where("type_name like ?", "%"+query.TypeName+"%")
 	}
 
-	if query.CreateTime != "" {
-		session.Where("create_time = ?", query.CreateTime)
+	if query.CreateTimeStart != "" || query.CreateTimeEnd != "" {
+		session.Where("create_time between ? and ?", query.CreateTimeStart, query.CreateTimeEnd)
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -2414,7 +2414,7 @@ func Get2UserList(query domain.UserQuery, pageNum, pageSize int) (vo.BaseListVo,
 	}
 
 	if query.Username != "" {
-		session.Where("username = ?", query.Username)
+		session.Where("username like ?", "%"+query.Username+"%")
 	}
 
 	if query.Password != "" {
@@ -2438,15 +2438,15 @@ func Get2UserList(query domain.UserQuery, pageNum, pageSize int) (vo.BaseListVo,
 	}
 
 	if query.Phone != "" {
-		session.Where("phone = ?", query.Phone)
+		session.Where("phone like ?", "%"+query.Phone+"%")
 	}
 
 	if query.Email != "" {
-		session.Where("email = ?", query.Email)
+		session.Where("email like ?", "%"+query.Email+"%")
 	}
 
 	if query.Name != "" {
-		session.Where("name = ?", query.Name)
+		session.Where("name like ?", "%"+query.Name+"%")
 	}
 
 	if query.Avatar != "" {
@@ -2460,7 +2460,7 @@ func Get2UserList(query domain.UserQuery, pageNum, pageSize int) (vo.BaseListVo,
 	if query.InviterBy != 0 {
 		session.Where("inviter_by = ?", query.InviterBy)
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -2558,18 +2558,18 @@ func Get2UserWalletList(query domain.UserWalletQuery, pageNum, pageSize int) (vo
 		session.Where("user_id = ?", query.UserId)
 	}
 
-	if query.Balance != 0 {
-		session.Where("balance = ?", query.Balance)
+	if query.BalanceStart != 0 || query.BalanceEnd != 0 {
+		session.Where("balance between ? and ?", query.BalanceStart, query.BalanceEnd)
 	}
 
-	if query.PromotionAmount != 0 {
-		session.Where("promotion_amount = ?", query.PromotionAmount)
+	if query.PromotionAmountStart != 0 || query.PromotionAmountEnd != 0 {
+		session.Where("promotion_amount between ? and ?", query.PromotionAmountStart, query.PromotionAmountEnd)
 	}
 
-	if query.RechargeAmount != 0 {
-		session.Where("recharge_amount = ?", query.RechargeAmount)
+	if query.RechargeAmountStart != 0 || query.RechargeAmountEnd != 0 {
+		session.Where("recharge_amount between ? and ?", query.RechargeAmountStart, query.RechargeAmountEnd)
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -2668,15 +2668,15 @@ func Get2DictDataList(query domain.DictDataQuery, pageNum, pageSize int) (vo.Bas
 	}
 
 	if query.DictLabel != "" {
-		session.Where("dict_label = ?", query.DictLabel)
+		session.Where("dict_label like ?", "%"+query.DictLabel+"%")
 	}
 
 	if query.DictValue != "" {
-		session.Where("dict_value = ?", query.DictValue)
+		session.Where("dict_value like ?", "%"+query.DictValue+"%")
 	}
 
 	if query.DictType != "" {
-		session.Where("dict_type = ?", query.DictType)
+		session.Where("dict_type like ?", "%"+query.DictType+"%")
 	}
 
 	if query.Status != "" {
@@ -2692,9 +2692,9 @@ func Get2DictDataList(query domain.DictDataQuery, pageNum, pageSize int) (vo.Bas
 	}
 
 	if query.Remark != "" {
-		session.Where("remark = ?", query.Remark)
+		session.Where("remark like ?", "%"+query.Remark+"%")
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -2789,11 +2789,11 @@ func Get2DictTypeList(query domain.DictTypeQuery, pageNum, pageSize int) (vo.Bas
 	}
 
 	if query.DictName != "" {
-		session.Where("dict_name = ?", query.DictName)
+		session.Where("dict_name like ?", "%"+query.DictName+"%")
 	}
 
 	if query.DictType != "" {
-		session.Where("dict_type = ?", query.DictType)
+		session.Where("dict_type like ?", "%"+query.DictType+"%")
 	}
 
 	if query.Status != "" {
@@ -2801,9 +2801,9 @@ func Get2DictTypeList(query domain.DictTypeQuery, pageNum, pageSize int) (vo.Bas
 	}
 
 	if query.Remark != "" {
-		session.Where("remark = ?", query.Remark)
+		session.Where("remark like ?", "%"+query.Remark+"%")
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -2846,139 +2846,6 @@ func DeleteDictType(id int64) bool {
 	return i > 0
 }
 
-func GetManageUserById(id int64) (domain.ManageUser, error) {
-	var manageUser domain.ManageUser
-	_, err := configs.Engine.Table("manage_user").Where("id = ?", id).Get(&manageUser)
-	if err != nil {
-		return manageUser, err
-	}
-	return manageUser, nil
-}
-
-func GetManageUserListInId(ids []int64) ([]domain.ManageUser, error) {
-	rows, err := configs.Engine.Table("manage_user").In("id", ids).Rows(&domain.ManageUser{})
-	if err != nil {
-		return make([]domain.ManageUser, 0), err
-	}
-	defer rows.Close()
-	var list []domain.ManageUser
-	for rows.Next() {
-		var u domain.ManageUser
-		rows.Scan(&u)
-		list = append(list, u)
-	}
-	return list, nil
-}
-
-func GetManageUserList(manageUser domain.ManageUser, pageNum, pageSize int) (vo.BaseListVo, error) {
-	var arr []domain.ManageUser
-	Count, err := configs.Engine.Table("manage_user").Limit(pageSize, (pageNum-1)*pageSize).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, len(arr))
-	for i, v := range arr {
-		vo.List[i] = v
-	}
-	vo.Total = int(Count)
-	return vo, nil
-}
-func Get2ManageUserList(query domain.ManageUserQuery, pageNum, pageSize int) (vo.BaseListVo, error) {
-	var arr []domain.ManageUser
-	session := configs.Engine.Table("manage_user").Limit(pageSize, (pageNum-1)*pageSize)
-
-	if query.Id != 0 {
-		session.Where("id = ?", query.Id)
-	}
-
-	if query.Name != "" {
-		session.Where("name = ?", query.Name)
-	}
-
-	if query.Username != "" {
-		session.Where("username = ?", query.Username)
-	}
-
-	if query.Password != "" {
-		session.Where("password = ?", query.Password)
-	}
-
-	if query.CreationTime != 0 {
-		session.Where("creation_time = ?", query.CreationTime)
-	}
-
-	if query.LoginTime != 0 {
-		session.Where("login_time = ?", query.LoginTime)
-	}
-
-	if query.Status != "" {
-		session.Where("status = ?", query.Status)
-	}
-
-	if query.RoleId != 0 {
-		session.Where("role_id = ?", query.RoleId)
-	}
-
-	if query.Phone != "" {
-		session.Where("phone = ?", query.Phone)
-	}
-
-	if query.Email != "" {
-		session.Where("email = ?", query.Email)
-	}
-
-	if query.Avatar != "" {
-		session.Where("avatar = ?", query.Avatar)
-	}
-	Count, err := session.FindAndCount(&arr, &query)
-	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 SaveManageUser(manageUser *domain.ManageUser) (domain.ManageUser, error) {
-	_, err := configs.Engine.Table("manage_user").Insert(&manageUser)
-	if err != nil {
-		return *manageUser, err
-	}
-	return *manageUser, nil
-}
-
-func SetManageUser(manageUserMap map[string]interface{}, id int64) (domain.ManageUser, bool, error) {
-	var manageUser domain.ManageUser
-	_, err := configs.Engine.Table("manage_user").Where("id = ?", id).Update(manageUserMap)
-	if err != nil {
-		return manageUser, false, err
-	}
-	return manageUser, true, nil
-}
-
-func DeleteManageUser(id int64) bool {
-	var manageUser domain.ManageUser
-	i, err := configs.Engine.Table("manage_user").Where("id = ?", id).Delete(&manageUser)
-	if err != nil {
-		return false
-	}
-	return i > 0
-}
-
 func GetShopTopicById(id int64) (domain.ShopTopic, error) {
 	var shopTopic domain.ShopTopic
 	_, err := configs.Engine.Table("shop_topic").Where("id = ?", id).Get(&shopTopic)
@@ -3043,17 +2910,17 @@ func Get2ShopTopicList(query domain.ShopTopicQuery, pageNum, pageSize int) (vo.B
 	}
 
 	if query.TopicName != "" {
-		session.Where("topic_name = ?", query.TopicName)
+		session.Where("topic_name like ?", "%"+query.TopicName+"%")
 	}
 
 	if query.TopicDesc != "" {
-		session.Where("topic_desc = ?", query.TopicDesc)
+		session.Where("topic_desc like ?", "%"+query.TopicDesc+"%")
 	}
 
 	if query.TypeIds != "" {
 		session.Where("type_ids = ?", query.TypeIds)
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -3148,7 +3015,7 @@ func Get2ShopAdviceCarouselList(query domain.ShopAdviceCarouselQuery, pageNum, p
 	}
 
 	if query.Name != "" {
-		session.Where("name = ?", query.Name)
+		session.Where("name like ?", "%"+query.Name+"%")
 	}
 
 	if query.ToId != 0 {
@@ -3194,7 +3061,7 @@ func Get2ShopAdviceCarouselList(query domain.ShopAdviceCarouselQuery, pageNum, p
 	if query.ToType != "" {
 		session.Where("to_type = ?", query.ToType)
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -3295,7 +3162,7 @@ func Get2ShopTopicSkuList(query domain.ShopTopicSkuQuery, pageNum, pageSize int)
 	if query.SkuId != 0 {
 		session.Where("sku_id = ?", query.SkuId)
 	}
-	Count, err := session.FindAndCount(&arr, &query)
+	Count, err := session.FindAndCount(&arr)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err

data/domain/Query.go

@@ -1,21 +1,24 @@
 package domain
 
 type ArticleQuery struct {
-	Id             int64  `xorm:"id"  json:"id"`                           // id
-	ArticleTitle   string `xorm:"article_title"  json:"articleTitle"`      // 文章名称
-	ArticleContent string `xorm:"article_content"  json:"articleContent"`  // 文章内容
-	State          string `xorm:"state"  json:"state"`                     // 状态
-	ArticleTagIds  string `xorm:"article_tag_ids"  json:"articleTagIds"`   // 文章标签
-	ArticleTopicId int64  `xorm:"article_topic_id"  json:"articleTopicId"` // 文章主题id
-	Image          string `xorm:"image"  json:"image"`                     // 图片
-	PublishTime    string `xorm:"publish_time"  json:"publishTime"`        // 发表时间
-	EyeFill        int64  `xorm:"eye_fill"  json:"eyeFill"`                // 浏览量
-	LikeCount      int64  `xorm:"like_count"  json:"likeCount"`            // 点赞量
-	CreateBy       string `xorm:"create_by"  json:"createBy"`              // 创建人
-	CreateTime     string `xorm:"create_time"  json:"createTime"`          // 创建时间
-	UpdateBy       string `xorm:"update_by"  json:"updateBy"`              // 更新人
-	UpdateTime     string `xorm:"update_time"  json:"updateTime"`          // 更新时间
-	ArticleDesc    string `xorm:"article_desc"  json:"articleDesc"`        // 文章简介
+	Id               int64  `xorm:"id"  json:"id"`                           // id
+	ArticleTitle     string `xorm:"article_title"  json:"articleTitle"`      // 文章名称
+	ArticleContent   string `xorm:"article_content"  json:"articleContent"`  // 文章内容
+	State            string `xorm:"state"  json:"state"`                     // 状态
+	ArticleTagIds    string `xorm:"article_tag_ids"  json:"articleTagIds"`   // 文章标签
+	ArticleTopicId   int64  `xorm:"article_topic_id"  json:"articleTopicId"` // 文章主题id
+	Image            string `xorm:"image"  json:"image"`                     // 图片
+	PublishTimeStart string `xorm:"publish_time"  json:"publishTime"`        // 发表时间
+	PublishTimeEnd   string `xorm:"publish_time"  json:publishTime"`         // 发表时间
+	EyeFillStart     int64  `xorm:"eye_fill"  json:"eyeFill"`                // 浏览量
+	EyeFillEnd       int64  `xorm:"eye_fill"  json:"eyeFill"`                // 浏览量
+	LikeCountStart   int64  `xorm:"like_count"  json:"likeCount"`            // 点赞量
+	LikeCountEnd     int64  `xorm:"like_count"  json:"likeCount"`            // 点赞量
+	CreateBy         string `xorm:"create_by"  json:"createBy"`              // 创建人
+	CreateTime       string `xorm:"create_time"  json:"createTime"`          // 创建时间
+	UpdateBy         string `xorm:"update_by"  json:"updateBy"`              // 更新人
+	UpdateTime       string `xorm:"update_time"  json:"updateTime"`          // 更新时间
+	ArticleDesc      string `xorm:"article_desc"  json:"articleDesc"`        // 文章简介
 }
 
 type ArticleTagQuery struct {
@@ -117,19 +120,20 @@ type GoodsCommodityAreaQuery struct {
 }
 
 type GoodsCouponQuery struct {
-	Id               int64   `xorm:"id"  json:"id"`                               // id
-	CouponName       string  `xorm:"coupon_name"  json:"couponName"`              // 优惠券名称
-	CouponDesc       string  `xorm:"coupon_desc"  json:"couponDesc"`              // 优惠券描述
-	CashBackPoint    float64 `xorm:"cash_back_point"  json:"cashBackPoint"`       // 满x
-	CashBackPrice    float64 `xorm:"cash_back_price"  json:"cashBackPrice"`       // 减x
-	ConditionByTopic string  `xorm:"condition_by_topic"  json:"conditionByTopic"` // 主题可用，id
-	ConditionByType  string  `xorm:"condition_by_type"  json:"conditionByType"`   // 类型可用，id
-	ConditionByGoods string  `xorm:"condition_by_goods"  json:"conditionByGoods"` // 商品可用，id
-	GrantCount       string  `xorm:"grant_count"  json:"grantCount"`              // 发放数量
-	Count            int64   `xorm:"count"  json:"count"`                         // 优惠券余量
-	ReceiveType      string  `xorm:"receive_type"  json:"receiveType"`            // 领取条件
-	Validity         string  `xorm:"validity"  json:"validity"`                   // 有效性，领取开始计时(ClaimTiming)，固定时间(FixedTime)
-	ValidityPeriod   string  `xorm:"validity_period"  json:"validityPeriod"`      // 有效期
+	Id                  int64   `xorm:"id"  json:"id"`                               // id
+	CouponName          string  `xorm:"coupon_name"  json:"couponName"`              // 优惠券名称
+	CouponDesc          string  `xorm:"coupon_desc"  json:"couponDesc"`              // 优惠券描述
+	CashBackPoint       float64 `xorm:"cash_back_point"  json:"cashBackPoint"`       // 满x
+	CashBackPrice       float64 `xorm:"cash_back_price"  json:"cashBackPrice"`       // 减x
+	ConditionByTopic    string  `xorm:"condition_by_topic"  json:"conditionByTopic"` // 主题可用，id
+	ConditionByType     string  `xorm:"condition_by_type"  json:"conditionByType"`   // 类型可用，id
+	ConditionByGoods    string  `xorm:"condition_by_goods"  json:"conditionByGoods"` // 商品可用，id
+	GrantCount          string  `xorm:"grant_count"  json:"grantCount"`              // 发放数量
+	Count               int64   `xorm:"count"  json:"count"`                         // 优惠券余量
+	ReceiveType         string  `xorm:"receive_type"  json:"receiveType"`            // 领取条件
+	Validity            string  `xorm:"validity"  json:"validity"`                   // 有效性，领取开始计时(ClaimTiming)，固定时间(FixedTime)
+	ValidityPeriodStart string  `xorm:"validity_period"  json:"validityPeriod"`      // 有效期
+	ValidityPeriodEnd   string  `xorm:"validity_period"  json:validityPeriod"`       // 有效期
 }
 
 type GoodsCouponUserQuery struct {
@@ -154,9 +158,12 @@ type GoodsOrderQuery struct {
 	Id                 int64   `xorm:"id"  json:"id"`                                  // id
 	OrderName          string  `xorm:"order_name"  json:"orderName"`                   // 订单名
 	SkuId              int64   `xorm:"sku_id"  json:"skuId"`                           // skuid
-	Count              int64   `xorm:"count"  json:"count"`                            // 购买数量
-	Price              float64 `xorm:"price"  json:"price"`                            // 单价
-	TotalPrice         float64 `xorm:"total_price"  json:"totalPrice"`                 // 总价
+	CountStart         int64   `xorm:"count"  json:"count"`                            // 购买数量
+	CountEnd           int64   `xorm:"count"  json:"count"`                            // 购买数量
+	PriceStart         float64 `xorm:"price"  json:"price"`                            // 单价
+	PriceEnd           float64 `xorm:"price"  json:"price"`                            // 单价
+	TotalPriceStart    float64 `xorm:"total_price"  json:"totalPrice"`                 // 总价
+	TotalPriceEnd      float64 `xorm:"total_price"  json:"totalPrice"`                 // 总价
 	ContactInformation string  `xorm:"contact_information"  json:"contactInformation"` // 联系方式
 	CouponUserId       int64   `xorm:"coupon_user_id"  json:"couponUserId"`            // 使用的优惠券
 	State              string  `xorm:"state"  json:"state"`                            // 支付状态，0待支付，1待发货，2已发货，3订单完成，4订单异常
@@ -175,20 +182,22 @@ type GoodsSkuQuery struct {
 	CommodityAreaId  int64   `xorm:"commodity_area_id"  json:"commodityAreaId"`  // 属地id
 	GoodsId          int64   `xorm:"goods_id"  json:"goodsId"`                   // 商品id
 	CreateBy         string  `xorm:"create_by"  json:"createBy"`                 // 创建人
-	CreateTime       string  `xorm:"create_time"  json:"createTime"`             // 创建时间
+	CreateTimeStart  string  `xorm:"create_time"  json:"createTime"`             // 创建时间
+	CreateTimeEnd    string  `xorm:"create_time"  json:createTime"`              // 创建时间
 }
 
 type GoodsSkuCardQuery struct {
-	Id         int64  `xorm:"id"  json:"id"`                  // id
-	CardName   string `xorm:"card_name"  json:"cardName"`     // 卡种名称
-	State      string `xorm:"state"  json:"state"`            // 状态，0未使用，1已用，2过期
-	Count      int64  `xorm:"count"  json:"count"`            // 库存
-	TotalCount string `xorm:"total_count"  json:"totalCount"` // 总数
-	CardKey    string `xorm:"card_key"  json:"cardKey"`       // 卡密
-	Use        string `xorm:"use"  json:"use"`                // 是否已用
-	UploadTime string `xorm:"upload_time"  json:"uploadTime"` // 入库时间
-	SkuId      int64  `xorm:"sku_id"  json:"skuId"`           // 商品规格绑定
-	Sort       string `xorm:"sort"  json:"sort"`              // 排序，出售优先级
+	Id              int64  `xorm:"id"  json:"id"`                  // id
+	CardName        string `xorm:"card_name"  json:"cardName"`     // 卡种名称
+	State           string `xorm:"state"  json:"state"`            // 状态，0未使用，1已用，2过期
+	Count           int64  `xorm:"count"  json:"count"`            // 库存
+	TotalCount      string `xorm:"total_count"  json:"totalCount"` // 总数
+	CardKey         string `xorm:"card_key"  json:"cardKey"`       // 卡密
+	Use             string `xorm:"use"  json:"use"`                // 是否已用
+	UploadTimeStart string `xorm:"upload_time"  json:"uploadTime"` // 入库时间
+	UploadTimeEnd   string `xorm:"upload_time"  json:uploadTime"`  // 入库时间
+	SkuId           int64  `xorm:"sku_id"  json:"skuId"`           // 商品规格绑定
+	Sort            string `xorm:"sort"  json:"sort"`              // 排序，出售优先级
 }
 
 type GoodsTagQuery struct {
@@ -199,11 +208,12 @@ type GoodsTagQuery struct {
 }
 
 type GoodsTypeQuery struct {
-	Id         int64  `xorm:"id"  json:"id"`                  //
-	Sort       int64  `xorm:"sort"  json:"sort"`              // 排序
-	TypeImage  string `xorm:"type_image"  json:"typeImage"`   // 类型图片
-	TypeName   string `xorm:"type_name"  json:"typeName"`     // 商品类别名称
-	CreateTime string `xorm:"create_time"  json:"createTime"` // 创建时间
+	Id              int64  `xorm:"id"  json:"id"`                  //
+	Sort            int64  `xorm:"sort"  json:"sort"`              // 排序
+	TypeImage       string `xorm:"type_image"  json:"typeImage"`   // 类型图片
+	TypeName        string `xorm:"type_name"  json:"typeName"`     // 商品类别名称
+	CreateTimeStart string `xorm:"create_time"  json:"createTime"` // 创建时间
+	CreateTimeEnd   string `xorm:"create_time"  json:createTime"`  // 创建时间
 }
 
 type UserQuery struct {
@@ -223,11 +233,14 @@ type UserQuery struct {
 }
 
 type UserWalletQuery struct {
-	Id              int64   `xorm:"id"  json:"id"`                            // id
-	UserId          int64   `xorm:"user_id"  json:"userId"`                   // 用户id
-	Balance         float64 `xorm:"balance"  json:"balance"`                  // 余额
-	PromotionAmount float64 `xorm:"promotion_amount"  json:"promotionAmount"` // 推广获取总金额
-	RechargeAmount  float64 `xorm:"recharge_amount"  json:"rechargeAmount"`   // 充值金额
+	Id                   int64   `xorm:"id"  json:"id"`                            // id
+	UserId               int64   `xorm:"user_id"  json:"userId"`                   // 用户id
+	BalanceStart         float64 `xorm:"balance"  json:"balance"`                  // 余额
+	BalanceEnd           float64 `xorm:"balance"  json:"balance"`                  // 余额
+	PromotionAmountStart float64 `xorm:"promotion_amount"  json:"promotionAmount"` // 推广获取总金额
+	PromotionAmountEnd   float64 `xorm:"promotion_amount"  json:"promotionAmount"` // 推广获取总金额
+	RechargeAmountStart  float64 `xorm:"recharge_amount"  json:"rechargeAmount"`   // 充值金额
+	RechargeAmountEnd    float64 `xorm:"recharge_amount"  json:"rechargeAmount"`   // 充值金额
 }
 
 type DictDataQuery struct {
@@ -250,23 +263,9 @@ type DictTypeQuery struct {
 	Remark   string `xorm:"remark"  json:"remark"`      // 备注
 }
 
-type ManageUserQuery struct {
-	Id           int64  `xorm:"id"  json:"id"`                      //
-	Name         string `xorm:"name"  json:"name"`                  // 名称
-	Username     string `xorm:"username"  json:"username"`          // 账号
-	Password     string `xorm:"password"  json:"password"`          // 密码
-	CreationTime int64  `xorm:"creation_time"  json:"creationTime"` // 账号创建时间
-	LoginTime    int64  `xorm:"login_time"  json:"loginTime"`       // 登录时间
-	Status       string `xorm:"status"  json:"status"`              // 账号状态
-	RoleId       int64  `xorm:"role_id"  json:"roleId"`             // 角色id
-	Phone        string `xorm:"phone"  json:"phone"`                // 手机
-	Email        string `xorm:"email"  json:"email"`                // 邮箱
-	Avatar       string `xorm:"avatar"  json:"avatar"`              // 头像
-}
-
 type ShopTopicQuery struct {
 	Id             int64  `xorm:"id"  json:"id"`                           //
-	Sort           string `xorm:"sort"  json:"sort"`                       //
+	Sort           string `xorm:"sort"  json:"sort"`                       // 排序
 	ParentId       int64  `xorm:"parent_id"  json:"parentId"`              // 父级id
 	TopicPageImage string `xorm:"topic_page_image"  json:"topicPageImage"` // 主题首页图片
 	TopicName      string `xorm:"topic_name"  json:"topicName"`            // 主题名称

router/BaseBackRouter.go

@@ -272,16 +272,6 @@ func BaseDictTypeRouter(group *gin.RouterGroup) {
 	PushRouter(BaseArticleGroup, "DELETE", "/dictType", DeleteBaseDictType)
 }
 
-func BaseManageUserRouter(group *gin.RouterGroup) {
-	BaseArticleGroup := group.Group("/back/base")
-	PushRouter(BaseArticleGroup, "GET", "/manageUser", GetBaseManageUserById)
-	PushRouter(BaseArticleGroup, "POST", "/manageUser/list", GetBaseManageUserList)
-	PushRouter(BaseArticleGroup, "POST", "/manageUser/in", GetBaseManageUserListInId)
-	PushRouter(BaseArticleGroup, "POST", "/manageUser", SaveBaseManageUser)
-	PushRouter(BaseArticleGroup, "PUT", "/manageUser", UpdateBaseManageUser)
-	PushRouter(BaseArticleGroup, "DELETE", "/manageUser", DeleteBaseManageUser)
-}
-
 func BaseShopTopicRouter(group *gin.RouterGroup) {
 	BaseArticleGroup := group.Group("/back/base")
 	PushRouter(BaseArticleGroup, "GET", "/shopTopic", GetBaseShopTopicById)
@@ -2300,88 +2290,6 @@ func DeleteBaseDictType(c *gin.Context) {
 	c.JSON(200, CreateResult())
 }
 
-// ================ManageUser ==============================
-func GetBaseManageUserById(c *gin.Context) {
-	id := c.Query("id")
-	manageUser, err := manage.GetManageUserById(cast.ToInt64(id))
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "用户查询不存在"))
-		return
-	}
-	c.JSON(200, CreateResultData(manageUser))
-	return
-}
-
-func GetBaseManageUserList(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	param, _ := data("param")
-	pageNum, _ := data("pageNum")
-	pageSize, _ := data("pageSize")
-	manageUser := domain.ManageUserQuery{}
-	err := mapstructure.Decode(param, &manageUser)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "json转换错误"))
-		return
-	}
-	list, err := manage.Get2ManageUserList(manageUser, cast.ToInt(pageNum), cast.ToInt(pageSize))
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "查询错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(list))
-}
-
-func GetBaseManageUserListInId(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	idsString, _ := data("ids")
-	var ids []int64
-	err := mapstructure.Decode([]byte(cast.ToString(idsString)), &ids)
-	list, err := manage.GetManageUserListInId(ids)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "查询错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(list))
-}
-
-func SaveBaseManageUser(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	manageUserParam, _ := data("manageUser")
-	manageUser := domain.ManageUser{}
-	err := mapstructure.Decode(manageUserParam, &manageUser)
-
-	saveManageUser, err := manage.SaveManageUser(&manageUser)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "保存错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(saveManageUser))
-}
-
-func UpdateBaseManageUser(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	manageUser, _ := data("manageUser")
-	id, _ := data("id")
-	toMap := UtilStructToMap(cast.ToStringMap(manageUser))
-
-	setManageUser, b, err := manage.SetManageUser(toMap, cast.ToInt64(id))
-	if err != nil || !b {
-		c.JSON(200, CreateResultError(500, "修改错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(setManageUser))
-}
-
-func DeleteBaseManageUser(c *gin.Context) {
-	id := c.Query("id")
-	res := manage.DeleteManageUser(cast.ToInt64(id))
-	if !res {
-		c.JSON(200, CreateResultError(500, "删除错误"))
-		return
-	}
-	c.JSON(200, CreateResult())
-}
-
 // ================ShopTopic 商品主题==============================
 func GetBaseShopTopicById(c *gin.Context) {
 	id := c.Query("id")