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

model/gmodel/fs_cart_logic.go

@@ -87,3 +87,10 @@ func (c *FsCartModel) GetUserCartsByIds(ctx context.Context, userId int64, ids [
 	err = c.db.WithContext(ctx).Model(&FsCart{}).Where("`id` in (?) and `user_id` = ?", ids, userId).Find(&resp).Error
 	return resp, err
 }
+
+func (c *FsCartModel) DeleteCartsByIds(ctx context.Context, ids []int64) ( err error) {
+	if len(ids) == 0 {
+		return
+	}
+	return c.db.WithContext(ctx).Model(&FsCart{}).Where("`id` in (?)", ids).Delete(&FsCart{}).Error
+}

model/gmodel/fs_order_logic.go

@@ -136,6 +136,21 @@ func (m *FsOrderModel) FindCount(ctx context.Context, countBuilder *gorm.DB, fil
 	}
 }
 
+func (m *FsOrderModel) FindOneByQuery(ctx context.Context, rowBuilder *gorm.DB, filterMap map[string]string) (*FsOrderRel, error) {
+	var resp FsOrderRel
+
+	if filterMap != nil {
+		rowBuilder = rowBuilder.Scopes(handler.FilterData(filterMap))
+	}
+
+	result := rowBuilder.WithContext(ctx).Limit(1).Find(&resp)
+	if result.Error != nil {
+		return nil, result.Error
+	} else {
+		return &resp, nil
+	}
+}
+
 // 事务
 func (m *FsOrderModel) 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_pay_logic.go

@@ -1,6 +1,11 @@
 package gmodel
 
-import "context"
+import (
+	"context"
+	"fusenapi/utils/handler"
+
+	"gorm.io/gorm"
+)
 
 func (p *FsPayModel) GetListByOrderNumber(ctx context.Context, sn string) (resp []FsPay, err error) {
 	err = p.db.WithContext(ctx).Model(&FsPay{}).Where("`order_number` = ? ", sn).Find(&resp).Error
@@ -33,6 +38,69 @@ func (p *FsPayModel) CreateOrUpdate(ctx context.Context, req *FsPay) (resp *FsPa
 	return req, err
 }
 
+func (m *FsPayModel) 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 *FsPayModel) FindCount(ctx context.Context, countBuilder *gorm.DB, filterMap map[string]string) (int64, error) {
+	var count int64
+
+	// 过滤
+	if filterMap != nil {
+		countBuilder = countBuilder.Scopes(handler.FilterData(filterMap))
+	}
+
+	result := countBuilder.WithContext(ctx).Limit(1).Count(&count)
+	if result.Error != nil {
+		return 0, result.Error
+	} else {
+		return count, nil
+	}
+}
+
+func (m *FsPayModel) FindOneByQuery(ctx context.Context, rowBuilder *gorm.DB, filterMap map[string]string) (*FsPay, error) {
+	var resp FsPay
+
+	if filterMap != nil {
+		rowBuilder = rowBuilder.Scopes(handler.FilterData(filterMap))
+	}
+
+	result := rowBuilder.WithContext(ctx).Limit(1).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()
+	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 *FsPayModel) TableName() string {
 	return m.name
 }

model/gmodel/fs_product_design_logic.go

@@ -35,6 +35,10 @@ func (d *FsProductDesignModel) UpdateBySn(ctx context.Context, sn string, data *
 	return d.db.WithContext(ctx).Model(&FsProductDesign{}).Where("`sn` = ?", sn).Updates(&data).Error
 }
 
+func (d *FsProductDesignModel) UpdateByIds(ctx context.Context, ids []int64, data *FsProductDesign) error {
+	return d.db.Table(d.name).WithContext(ctx).Model(&FsProductDesign{}).Where("`id` in ?", ids).Updates(&data).Error
+}
+
 func (m *FsProductDesignModel) TableName() string {
 	return m.name
 }

model/gmodel/fs_resource_logic.go

@@ -1,3 +1 @@
 package gmodel
-
-// TODO: 使用model的属性做你想做的

model/gmodel/var_gen.go

@@ -52,6 +52,7 @@ type AllModelsGen struct {
 	FsOrderDetailTemplate     *FsOrderDetailTemplateModel     // fs_order_detail_template 订单模板详细表
 	FsOrderRemark             *FsOrderRemarkModel             // fs_order_remark 订单备注表
 	FsPay                     *FsPayModel                     // fs_pay 支付记录
+	FsPayEvent                *FsPayEventModel                // fs_pay_event 支付回调事件日志
 	FsProduct                 *FsProductModel                 // fs_product 产品表
 	FsProductCopy1            *FsProductCopy1Model            // fs_product_copy1 产品表
 	FsProductDesign           *FsProductDesignModel           // fs_product_design 产品设计表
@@ -143,6 +144,7 @@ func NewAllModels(gdb *gorm.DB) *AllModelsGen {
 		FsOrderDetailTemplate:     NewFsOrderDetailTemplateModel(gdb),
 		FsOrderRemark:             NewFsOrderRemarkModel(gdb),
 		FsPay:                     NewFsPayModel(gdb),
+		FsPayEvent:                NewFsPayEventModel(gdb),
 		FsProduct:                 NewFsProductModel(gdb),
 		FsProductCopy1:            NewFsProductCopy1Model(gdb),
 		FsProductDesign:           NewFsProductDesignModel(gdb),