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

model/gmodel/fs_cart_logic.go

@@ -92,5 +92,5 @@ func (c *FsCartModel) DeleteCartsByIds(ctx context.Context, ids []int64) ( err e
 	if len(ids) == 0 {
 		return
 	}
-	return c.db.WithContext(ctx).Model(&FsCart{}).Where("`id` in (?)", ids).Delete(&FsCart{}).Error
+	return c.db.Table(c.name).WithContext(ctx).Model(&FsCart{}).Where("`id` in (?)", ids).Update("status", 0).Error
 }

model/gmodel/fs_cloud_render_log_logic.go

@@ -1,3 +1,9 @@
 package gmodel
 
+import "context"
+
 // TODO: 使用model的属性做你想做的
+
+func (r *FsCloudRenderLogModel) Create(ctx context.Context, data *FsCloudRenderLog) error {
+	return r.db.WithContext(ctx).Model(&FsCloudRenderLog{}).Create(data).Error
+}

model/gmodel/fs_order_logic.go

@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"time"
 
-	"fusenapi/utils/handler"
+	"fusenapi/utils/handlers"
 
 	"gorm.io/gorm"
 )
@@ -60,7 +60,7 @@ func (o *FsOrderModel) FindPageListByPage(ctx context.Context, rowBuilder *gorm.
 	var resp []*FsOrderRel
 	// 过滤
 	if filterMap != nil {
-		rowBuilder = rowBuilder.Scopes(handler.FilterData(filterMap))
+		rowBuilder = rowBuilder.Scopes(handlers.FilterData(filterMap))
 	}
 
 	// 排序
@@ -70,11 +70,11 @@ func (o *FsOrderModel) FindPageListByPage(ctx context.Context, rowBuilder *gorm.
 		for i := 0; i < s.NumField(); i++ {
 			fieldsMap[s.Field(i).Tag.Get("json")] = struct{}{}
 		}
-		rowBuilder = rowBuilder.Scopes(handler.OrderCheck(orderBy, fieldsMap))
+		rowBuilder = rowBuilder.Scopes(handlers.OrderCheck(orderBy, fieldsMap))
 	}
 
 	// 分页
-	rowBuilder = rowBuilder.Scopes(handler.Paginate(page, pageSize))
+	rowBuilder = rowBuilder.Scopes(handlers.Paginate(page, pageSize))
 
 	// 结果
 	result := rowBuilder.Debug().WithContext(ctx).Find(&resp)
@@ -125,7 +125,7 @@ func (m *FsOrderModel) FindCount(ctx context.Context, countBuilder *gorm.DB, fil
 
 	// 过滤
 	if filterMap != nil {
-		countBuilder = countBuilder.Scopes(handler.FilterData(filterMap))
+		countBuilder = countBuilder.Scopes(handlers.FilterData(filterMap))
 	}
 
 	result := countBuilder.WithContext(ctx).Limit(1).Count(&count)
@@ -140,7 +140,7 @@ func (m *FsOrderModel) FindOneByQuery(ctx context.Context, rowBuilder *gorm.DB,
 	var resp FsOrderRel
 
 	if filterMap != nil {
-		rowBuilder = rowBuilder.Scopes(handler.FilterData(filterMap))
+		rowBuilder = rowBuilder.Scopes(handlers.FilterData(filterMap))
 	}
 
 	result := rowBuilder.WithContext(ctx).Limit(1).Find(&resp)

model/gmodel/fs_pay_event_logic.go

@@ -1,2 +1,15 @@
 package gmodel
-// TODO: 使用model的属性做你想做的
+
+import "context"
+
+// TODO: 使用model的属性做你想做的
+
+func (p *FsPayEventModel) CreateOrUpdate(ctx context.Context, req *FsPayEvent) (resp *FsPayEvent, err error) {
+	rowBuilder := p.db.Table(p.name).WithContext(ctx)
+	if req.Id > 0 {
+		err = rowBuilder.Save(req).Error
+	} else {
+		err = rowBuilder.Create(req).Error
+	}
+	return req, err
+}

model/gmodel/fs_pay_logic.go

@@ -2,7 +2,8 @@ package gmodel
 
 import (
 	"context"
-	"fusenapi/utils/handler"
+	"fusenapi/utils/handlers"
+	"reflect"
 
 	"gorm.io/gorm"
 )
@@ -54,7 +55,7 @@ func (m *FsPayModel) FindCount(ctx context.Context, countBuilder *gorm.DB, filte
 
 	// 过滤
 	if filterMap != nil {
-		countBuilder = countBuilder.Scopes(handler.FilterData(filterMap))
+		countBuilder = countBuilder.Scopes(handlers.FilterData(filterMap))
 	}
 
 	result := countBuilder.WithContext(ctx).Limit(1).Count(&count)
@@ -69,7 +70,7 @@ func (m *FsPayModel) FindOneByQuery(ctx context.Context, rowBuilder *gorm.DB, fi
 	var resp FsPay
 
 	if filterMap != nil {
-		rowBuilder = rowBuilder.Scopes(handler.FilterData(filterMap))
+		rowBuilder = rowBuilder.Scopes(handlers.FilterData(filterMap))
 	}
 
 	result := rowBuilder.WithContext(ctx).Limit(1).Find(&resp)
@@ -80,6 +81,31 @@ func (m *FsPayModel) FindOneByQuery(ctx context.Context, rowBuilder *gorm.DB, fi
 	}
 }
 
+func (m *FsPayModel) FindAll(ctx context.Context, rowBuilder *gorm.DB, filterMap map[string]string, orderBy string) ([]*FsPay, error) {
+	var resp []*FsPay
+	// 过滤
+	if filterMap != nil {
+		rowBuilder = rowBuilder.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{}{}
+		}
+		rowBuilder = rowBuilder.Scopes(handlers.OrderCheck(orderBy, fieldsMap))
+	}
+
+	result := rowBuilder.WithContext(ctx).Find(&resp)
+	if result.Error != nil {
+		return nil, result.Error
+	} else {
+		return resp, nil
+	}
+}
+
 // 事务
 func (m *FsPayModel) Trans(ctx context.Context, fn func(ctx context.Context, connGorm *gorm.DB) error) error {
 	tx := m.db.Table(m.name).WithContext(ctx).Begin()

model/gmodel/fs_product_model3d_logic.go

@@ -93,3 +93,11 @@ func (d *FsProductModel3dModel) GetGroupPartListByProductIds(ctx context.Context
 		Group("product_id").Find(&resp).Error
 	return resp, err
 }
+func (d *FsProductModel3dModel) FindOneJoinSize(ctx context.Context, productId int64) (resp FsProductModel3d, err error) {
+	err = d.db.WithContext(ctx).Table(d.name+"as m").Joins("left join fs_product_size as s on m.size_id = s.id").
+		Select("m.*").
+		Where("m.product_id = ?", productId).
+		Where("(s.status= ? and m.tag = ?)", 1, 1).
+		Order("s.sort ASC").Take(&resp).Error
+	return resp, err
+}

model/gmodel/fs_product_template_v2_gen.go

@@ -22,6 +22,8 @@ type FsProductTemplateV2 struct {
 	Ctime        *int64  `gorm:"default:0;" json:"ctime"`                         // 添加时间
 	Tag          *string `gorm:"default:'';" json:"tag"`                          // 标签（用户自填）
 	IsDel        *int64  `gorm:"default:0;" json:"is_del"`                        // 是否删除 1删除
+	GroupOptions *string `gorm:"default:'';" json:"group_options"`                // 颜色分组
+	Version      *int64  `gorm:"default:0;" json:"version"`                       //
 }
 type FsProductTemplateV2Model struct {
 	db   *gorm.DB

model/gmodel/fs_product_template_v2_logic.go

@@ -106,3 +106,16 @@ func (t *FsProductTemplateV2Model) GetProductTemplateListByParams(ctx context.Co
 	err = db.Find(&resp).Error
 	return resp, err
 }
+
+// 获取第一个尺寸下的模板
+func (t *FsProductTemplateV2Model) FindOneByProductIdTagIdWithSizeTable(ctx context.Context, productId int64, tagId string) (resp *FsProductTemplateV2, err error) {
+	err = t.db.WithContext(ctx).Table(t.name+" as t").
+		Joins("left join fs_product_size as s on t.product_id = s.product_id").
+		Select("t.*").
+		Where("t.product_id = ? and t.tag = ? ", productId, tagId).
+		Where("t.status = ? and t.is_del = ?", 1, 0).
+		Where("s.status = ?", 1).
+		Order("s.sort ASC").
+		Take(&resp).Error
+	return resp, err
+}

model/gmodel/fs_refund_reason_logic.go

@@ -2,6 +2,7 @@ package gmodel
 
 import (
 	"context"
+	"fusenapi/utils/handlers"
 
 	"gorm.io/gorm"
 )
@@ -24,3 +25,43 @@ func (m *FsRefundReasonModel) Update(ctx context.Context, obj *FsRefundReason) e
 func (m *FsRefundReasonModel) UpdateByRefundReasonId(ctx context.Context, obj *FsRefundReason) error {
 	return m.db.WithContext(ctx).Model(obj).Where("`refund_reason_id` = ?", obj.RefundReasonId).Updates(obj).Error
 }
+
+func (m *FsRefundReasonModel) CreateOrUpdate(ctx context.Context, req *FsRefundReason) (resp *FsRefundReason, err error) {
+	rowBuilder := m.db.Table(m.name).WithContext(ctx)
+	if req.Id > 0 {
+		err = rowBuilder.Save(req).Error
+	} else {
+		err = rowBuilder.Create(req).Error
+	}
+	return req, err
+}
+
+func (m *FsRefundReasonModel) FindOneByQuery(ctx context.Context, rowBuilder *gorm.DB, filterMap map[string]string) (*FsRefundReason, error) {
+	var resp FsRefundReason
+
+	if filterMap != nil {
+		rowBuilder = rowBuilder.Scopes(handlers.FilterData(filterMap))
+	}
+
+	result := rowBuilder.WithContext(ctx).Limit(1).Find(&resp)
+	if result.Error != nil {
+		return nil, result.Error
+	} else {
+		return &resp, nil
+	}
+}
+
+func (m *FsRefundReasonModel) RowSelectBuilder(selectData []string) *gorm.DB {
+	var rowBuilder = m.db.Table(m.name)
+
+	if selectData != nil {
+		rowBuilder = rowBuilder.Select(selectData)
+	} else {
+		rowBuilder = rowBuilder.Select("*")
+	}
+	return rowBuilder
+}
+
+func (m *FsRefundReasonModel) TableName() string {
+	return m.name
+}

model/gmodel/fs_resource_gen.go

@@ -16,6 +16,8 @@ type FsResource struct {
 	UploadedAt   *time.Time `gorm:"index;default:'0000-00-00 00:00:00';" json:"uploaded_at"` // 上传时间
 	Metadata     *string    `gorm:"default:'';" json:"metadata"`                             // 元数据,json格式,存储图像分率
 	MetaKey1     *string    `gorm:"index;default:'';" json:"meta_key1"`                      // 需要关键信息查询的自定义属性1,可以动态增加
+	ApiType      *int64     `gorm:"default:1;" json:"api_type"`                              // 调用类型：1=对外，2=对内
+	BucketName   *string    `gorm:"default:'';" json:"bucket_name"`                          // 存储桶名
 }
 type FsResourceModel struct {
 	db   *gorm.DB

model/gmodel/fs_resource_logic.go

@@ -1 +1,84 @@
 package gmodel
+
+import (
+	"context"
+	"errors"
+	"fusenapi/utils/handlers"
+
+	"gorm.io/gorm"
+)
+
+// TODO: 使用model的属性做你想做的
+
+func (p *FsResourceModel) FindOneById(ctx context.Context, resourceId string) (*FsResource, error) {
+	var resp FsResource
+	result := p.db.Table(p.name).WithContext(ctx).Where("resource_id =?", resourceId).Take(&resp)
+	if result.Error != nil {
+		// 检查 ErrRecordNotFound 错误
+		if !errors.Is(result.Error, gorm.ErrRecordNotFound) {
+			return nil, result.Error
+		}
+	}
+	return &resp, nil
+}
+
+func (p *FsResourceModel) Create(ctx context.Context, req *FsResource) (resp *FsResource, err error) {
+	err = p.db.Table(p.name).WithContext(ctx).Create(req).Error
+	return req, err
+}
+
+func (p *FsResourceModel) Update(ctx context.Context, req *FsResource) (resp *FsResource, err error) {
+	err = p.db.Table(p.name).WithContext(ctx).Where("resource_id =?", req.ResourceId).Save(req).Error
+	return req, err
+}
+
+func (m *FsResourceModel) FindOneByQuery(ctx context.Context, rowBuilder *gorm.DB, filterMap map[string]string) (*FsResource, error) {
+	var resp FsResource
+
+	if filterMap != nil {
+		rowBuilder = rowBuilder.Scopes(handlers.FilterData(filterMap))
+	}
+
+	result := rowBuilder.WithContext(ctx).Limit(1).Find(&resp)
+	if result.Error != nil {
+		return nil, result.Error
+	} else {
+		return &resp, nil
+	}
+}
+
+func (m *FsResourceModel) RowSelectBuilder(selectData []string) *gorm.DB {
+	var rowBuilder = m.db.Table(m.name)
+
+	if selectData != nil {
+		rowBuilder = rowBuilder.Select(selectData)
+	} else {
+		rowBuilder = rowBuilder.Select("*")
+	}
+	return rowBuilder
+}
+
+// 事务
+func (m *FsResourceModel) Trans(ctx context.Context, fn func(ctx context.Context, connGorm *gorm.DB) error) error {
+	tx := m.db.Table(m.name).WithContext(ctx).Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
+	if err := tx.Error; err != nil {
+		return err
+	}
+
+	if err := fn(ctx, tx); err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return tx.Commit().Error
+}
+
+func (m *FsResourceModel) TableName() string {
+	return m.name
+}

model/gmodel/fs_tags_gen.go

@@ -18,6 +18,7 @@ type FsTags struct {
 	Description          *string `gorm:"default:'';" json:"description"`                  // 介绍 Seo
 	RecommendProduct     *string `gorm:"default:'';" json:"recommend_product"`            //
 	RecommendProductSort *string `gorm:"default:'';" json:"recommend_product_sort"`       //
+	Category             *int64  `gorm:"default:1;" json:"category"`                      // 分类：1前台用的 2后台用的
 }
 type FsTagsModel struct {
 	db   *gorm.DB

model/gmodel/fs_tags_logic.go

@@ -36,6 +36,7 @@ type GetAllTagByParamsReq struct {
 	OrderBy             string
 	LevelPrefixLeftLike string //右模糊
 	WithChild           bool   //是否包含子层级
+	Category            int64
 }
 
 func (t *FsTagsModel) GetAllTagByParams(ctx context.Context, req GetAllTagByParamsReq) (resp []FsTags, err error) {
@@ -46,6 +47,9 @@ func (t *FsTagsModel) GetAllTagByParams(ctx context.Context, req GetAllTagByPara
 	if req.Status != nil {
 		db = db.Where("`status` = ?", *req.Status)
 	}
+	if req.Category != 0 {
+		db = db.Where("`category` = ?", req.Category)
+	}
 	if req.LevelPrefixLeftLike != "" {
 		//查询子集
 		if req.WithChild {

model/gmodel/fs_user_material_gen.go

@@ -0,0 +1,25 @@
+package gmodel
+
+import (
+	"gorm.io/gorm"
+)
+
+// fs_user_material 用户素材表
+type FsUserMaterial struct {
+	Id          int64   `gorm:"primary_key;default:0;auto_increment;" json:"id"` // 用户 ID
+	Module      *string `gorm:"default:'';" json:"module"`                       // 所属模块:logo
+	UserId      *int64  `gorm:"index;default:0;" json:"user_id"`                 // 用户 ID
+	GuestId     *int64  `gorm:"index;default:0;" json:"guest_id"`                // 游客 ID
+	ResourceId  *string `gorm:"default:'';" json:"resource_id"`                  // 资源ID
+	ResourceUrl *string `gorm:"default:'';" json:"resource_url"`                 // 资源 URL
+	Metadata    *string `gorm:"default:'';" json:"metadata"`                     // 元数据,json格式,存储图像分率
+	CreateAt    *int64  `gorm:"default:0;" json:"create_at"`                     // 上传时间
+}
+type FsUserMaterialModel struct {
+	db   *gorm.DB
+	name string
+}
+
+func NewFsUserMaterialModel(db *gorm.DB) *FsUserMaterialModel {
+	return &FsUserMaterialModel{db: db, name: "fs_user_material"}
+}

model/gmodel/fs_user_material_logic.go

@@ -0,0 +1,72 @@
+package gmodel
+
+import (
+	"context"
+	"fusenapi/utils/handlers"
+	"reflect"
+
+	"gorm.io/gorm"
+)
+
+// TODO: 使用model的属性做你想做的
+
+func (p *FsUserMaterialModel) CreateOrUpdate(ctx context.Context, req *FsUserMaterial) (resp *FsUserMaterial, err error) {
+	rowBuilder := p.db.Table(p.name).WithContext(ctx)
+	if req.Id > 0 {
+		err = rowBuilder.Save(req).Error
+	} else {
+		err = rowBuilder.Create(req).Error
+	}
+	return req, err
+}
+
+func (m *FsUserMaterialModel) FindAll(ctx context.Context, rowBuilder *gorm.DB, filterMap map[string]string, orderBy string) ([]*FsUserMaterial, error) {
+	var resp []*FsUserMaterial
+	// 过滤
+	if filterMap != nil {
+		rowBuilder = rowBuilder.Scopes(handlers.FilterData(filterMap))
+	}
+
+	// 排序
+	if orderBy != "" {
+		var fieldsMap = make(map[string]struct{})
+		s := reflect.TypeOf(&FsUserMaterial{}).Elem() //通过反射获取type定义
+		for i := 0; i < s.NumField(); i++ {
+			fieldsMap[s.Field(i).Tag.Get("json")] = struct{}{}
+		}
+		rowBuilder = rowBuilder.Scopes(handlers.OrderCheck(orderBy, fieldsMap))
+	}
+
+	result := rowBuilder.WithContext(ctx).Find(&resp)
+	if result.Error != nil {
+		return nil, result.Error
+	} else {
+		return resp, nil
+	}
+}
+
+func (m *FsUserMaterialModel) RowSelectBuilder(selectData []string) *gorm.DB {
+	var rowBuilder = m.db.Table(m.name)
+
+	if selectData != nil {
+		rowBuilder = rowBuilder.Select(selectData)
+	} else {
+		rowBuilder = rowBuilder.Select("*")
+	}
+	return rowBuilder
+}
+
+// 获取最新记录
+func (m *FsUserMaterialModel) FindLatestOne(ctx context.Context, userId int64, guestId int64) (resp FsUserMaterial, err error) {
+	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)
+	}
+	err = db.Take(&resp).Error
+	return resp, err
+}

model/gmodel/var_gen.go

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