Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth

model/gmodel/fs_merchant_category_logic.go

@@ -1,8 +1,15 @@
 package gmodel
 
-import "context"
+import (
+	"context"
+	"fusenapi/utils/handlers"
+	"reflect"
+
+	"gorm.io/gorm"
+)
 
 // TODO: 使用model的属性做你想做的
+
 func (m *FsMerchantCategoryModel) FindOne(ctx context.Context, id int64) (resp *FsMerchantCategory, err error) {
 	err = m.db.WithContext(ctx).Model(&FsMerchantCategory{}).Where("id = ? and status = ?", id, 1).Take(&resp).Error
 	return resp, err
@@ -11,3 +18,37 @@ func (m *FsMerchantCategoryModel) FindRandOne(ctx context.Context) (resp *FsMerc
 	err = m.db.WithContext(ctx).Model(&FsMerchantCategory{}).Where("status = ?", 1).Order("RAND()").Take(&resp).Error
 	return resp, err
 }
+
+func (m *FsMerchantCategoryModel) BuilderDB(ctx context.Context, selectData []string) *gorm.DB {
+	if selectData != nil {
+		return m.db.WithContext(ctx).Select(selectData)
+	} else {
+		return m.db.WithContext(ctx).Select("*")
+	}
+}
+
+func (m *FsMerchantCategoryModel) FindAll(gormDB *gorm.DB, filterMap map[string]string, orderBy string) ([]*FsMerchantCategory, error) {
+	var resp []*FsMerchantCategory
+
+	// 过滤
+	if filterMap != nil {
+		gormDB = gormDB.Scopes(handlers.FilterData(filterMap))
+	}
+
+	// 排序
+	if orderBy != "" {
+		var fieldsMap = make(map[string]struct{})
+		s := reflect.TypeOf(&FsOrder{}).Elem() //通过反射获取type定义
+		for i := 0; i < s.NumField(); i++ {
+			fieldsMap[s.Field(i).Tag.Get("json")] = struct{}{}
+		}
+		gormDB = gormDB.Scopes(handlers.OrderCheck(orderBy, fieldsMap))
+	}
+
+	result := gormDB.Find(&resp)
+	if result.Error != nil {
+		return nil, result.Error
+	} else {
+		return resp, nil
+	}
+}

model/gmodel/fs_product_template_tags_gen.go

@@ -8,9 +8,10 @@ import (
 type FsProductTemplateTags struct {
 	Id       int64   `gorm:"primary_key;default:0;auto_increment;" json:"id"` // ID
 	Title    *string `gorm:"default:'';" json:"title"`                        // 标题
-	CoverImg *string `gorm:"default:'';" json:"cover_img"`                    // 封面图
+	Cover    *string `gorm:"default:'';" json:"cover"`                        // 封面图
 	Status   *int64  `gorm:"default:0;" json:"status"`                        // 状态 1：可用
 	CreateAt *int64  `gorm:"default:0;" json:"create_at"`                     // 创建时间
+	Groups   *string `gorm:"default:'';" json:"groups"`                       // 分组信息
 }
 type FsProductTemplateTagsModel struct {
 	db   *gorm.DB

model/gmodel/fs_product_template_tags_logic.go

@@ -32,3 +32,14 @@ func (pt *FsProductTemplateTagsModel) GetList(ctx context.Context, page, limit i
 	err = db.Offset(offset).Limit(limit).Find(&resp).Error
 	return resp, err
 }
+func (pt *FsProductTemplateTagsModel) GetListByTitles(ctx context.Context, titles []string, limit int, orderBy string) (resp []FsProductTemplateTags, err error) {
+	if len(titles) == 0 {
+		return nil, nil
+	}
+	db := pt.db.WithContext(ctx).Model(&FsProductTemplateTags{}).Where("`title` in (?) and `status` = ?", titles, 1)
+	if orderBy != "" {
+		db = db.Order(orderBy)
+	}
+	err = db.Limit(limit).Find(&resp).Error
+	return resp, err
+}

model/gmodel/fs_user_info_gen.go

@@ -0,0 +1,25 @@
+package gmodel
+
+import (
+	"gorm.io/gorm"
+)
+
+// fs_user_info 用户信息表
+type FsUserInfo struct {
+	Id       int64   `gorm:"primary_key;default:0;auto_increment;" json:"id"` // ID
+	Module   *string `gorm:"default:'';" json:"module"`                       // 所属模块
+	UserId   *int64  `gorm:"index;default:0;" json:"user_id"`                 // 用户 ID
+	GuestId  *int64  `gorm:"index;default:0;" json:"guest_id"`                // 访客 ID
+	Metadata *string `gorm:"default:'';" json:"metadata"`                     // 元数据,json格式
+	MetaKey1 *string `gorm:"default:'';" json:"meta_key1"`                    // 需要关键信息查询的自定义属性1,可以动态增加
+	Ctime    *int64  `gorm:"default:0;" json:"ctime"`                         //
+	Utime    *int64  `gorm:"default:0;" json:"utime"`                         //
+}
+type FsUserInfoModel struct {
+	db   *gorm.DB
+	name string
+}
+
+func NewFsUserInfoModel(db *gorm.DB) *FsUserInfoModel {
+	return &FsUserInfoModel{db: db, name: "fs_user_info"}
+}

model/gmodel/fs_user_info_logic.go

@@ -0,0 +1,44 @@
+package gmodel
+
+// TODO: 使用model的属性做你想做的
+
+import (
+	"context"
+	"fusenapi/utils/handlers"
+
+	"gorm.io/gorm"
+)
+
+// TODO: 使用model的属性做你想做的
+
+func (m *FsUserInfoModel) BuilderDB(ctx context.Context, selectData []string) *gorm.DB {
+	if selectData != nil {
+		return m.db.WithContext(ctx).Select(selectData)
+	} else {
+		return m.db.WithContext(ctx).Select("*")
+	}
+}
+
+func (m *FsUserInfoModel) FindOne(gormDB *gorm.DB, filterMap map[string]string) (*FsUserInfo, error) {
+	var resp FsUserInfo
+
+	if filterMap != nil {
+		gormDB = gormDB.Scopes(handlers.FilterData(filterMap))
+	}
+
+	result := gormDB.Limit(1).Find(&resp)
+	if result.Error != nil {
+		return nil, result.Error
+	} else {
+		return &resp, nil
+	}
+}
+
+func (p *FsUserInfoModel) CreateOrUpdate(gormDB *gorm.DB, req *FsUserInfo) (resp *FsUserInfo, err error) {
+	if req.Id > 0 {
+		err = gormDB.Save(req).Error
+	} else {
+		err = gormDB.Create(req).Error
+	}
+	return req, err
+}

model/gmodel/fs_user_material_logic.go

@@ -61,12 +61,9 @@ func (m *FsUserMaterialModel) FindLatestOne(ctx context.Context, userId int64, g
 	if userId == 0 && guestId == 0 {
 		return FsUserMaterial{}, nil
 	}
-	db := m.db.WithContext(ctx).Model(&FsUserMaterial{}).Order("id DESC")
-	if userId != 0 {
-		db = db.Where("`user_id` = ?", userId)
-	} else {
-		db = db.Where("`guest_id` = ?", guestId)
-	}
+	db := m.db.WithContext(ctx).Model(&FsUserMaterial{}).
+		Where("`user_id` = ? and `guest_id` = ?", userId, guestId).
+		Order("id DESC")
 	err = db.Take(&resp).Error
 	return resp, err
 }
@@ -75,3 +72,8 @@ func (m *FsUserMaterialModel) FindOneById(ctx context.Context, id int64) (resp *
 	err = m.db.WithContext(ctx).Model(&FsUserMaterial{}).Where("id = ?", id).Take(&resp).Error
 	return resp, err
 }
+func (m *FsUserMaterialModel) GetListByUser(ctx context.Context, userId, guestId int64, limit int) (resp *FsUserMaterial, err error) {
+	err = m.db.WithContext(ctx).Model(&FsUserMaterial{}).
+		Where("`user_id` = ? and `guest_id` = ?", userId, guestId).Order("id DESC").Limit(limit).Find(&resp).Error
+	return resp, err
+}

model/gmodel/var_gen.go

@@ -90,6 +90,7 @@ type AllModelsGen struct {
 	FsTrade                   *FsTradeModel                   // fs_trade
 	FsUser                    *FsUserModel                    // fs_user 用户表
 	FsUserDesign              *FsUserDesignModel              // fs_user_design 废弃表
+	FsUserInfo                *FsUserInfoModel                // fs_user_info 用户信息表
 	FsUserMaterial            *FsUserMaterialModel            // fs_user_material 用户素材表
 	FsUserStock               *FsUserStockModel               // fs_user_stock 用户云仓库存
 	FsWebSet                  *FsWebSetModel                  // fs_web_set 网站配置表
@@ -184,6 +185,7 @@ func NewAllModels(gdb *gorm.DB) *AllModelsGen {
 		FsTrade:                   NewFsTradeModel(gdb),
 		FsUser:                    NewFsUserModel(gdb),
 		FsUserDesign:              NewFsUserDesignModel(gdb),
+		FsUserInfo:                NewFsUserInfoModel(gdb),
 		FsUserMaterial:            NewFsUserMaterialModel(gdb),
 		FsUserStock:               NewFsUserStockModel(gdb),
 		FsWebSet:                  NewFsWebSetModel(gdb),