Merge branch 'hotfix'

zhangqian

2023-08-25 b0c07ddee23e2d54d03636f08af19f0934857cf4

Merge branch 'hotfix'

 model/salesRefund.go

@@ -54,6 +54,11 @@
    }
}

func (slf *SalesRefundSearch) SetOrm(tx *gorm.DB) *SalesRefundSearch {
    slf.Orm = tx
    return slf
}

func (slf *SalesRefundSearch) build() *gorm.DB {
    var db = slf.Orm.Model(&SalesRefund{})
    if slf.Id != 0 {
@@ -64,6 +69,14 @@
        db = db.Where("id in ?", slf.Ids)
    }

    if slf.SourceType != 0 {
        db = db.Where("source_type = ?", slf.SourceType)
    }

    if slf.SourceId != 0 {
        db = db.Where("source_id = ?", slf.SourceId)
    }

    if slf.Preload {
        db = db.Preload("Client").
            Preload("PaymentType").

 model/salesReturn.go

@@ -56,6 +56,11 @@
    }
}

func (slf *SalesReturnSearch) SetOrm(tx *gorm.DB) *SalesReturnSearch {
    slf.Orm = tx
    return slf
}

func (slf *SalesReturnSearch) build() *gorm.DB {
    var db = slf.Orm.Model(&SalesReturn{})
    if slf.Id != 0 {

 service/salesReturn.go

@@ -32,11 +32,11 @@
        return ecode.SalesReturnNotExist
    }
    err = model.WithTransaction(func(db *gorm.DB) error {
        err = model.NewSalesReturnSearch().SetId(id).Delete()
        err = model.NewSalesReturnSearch().SetOrm(db).SetId(id).Delete()
        if err != nil {
            return err
        }
        err = model.NewSalesRefundSearch().SetSourceType(constvar.RefundSourceTypeSalesReturn).SetSourceId(id).Delete()
        err = model.NewSalesRefundSearch().SetOrm(db).SetSourceType(constvar.RefundSourceTypeSalesReturn).SetSourceId(id).Delete()
        if err != nil {
            return err
        }