From b0c07ddee23e2d54d03636f08af19f0934857cf4 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 25 八月 2023 10:32:56 +0800
Subject: [PATCH] Merge branch 'hotfix'
---
model/salesReturn.go | 5 +++++
model/salesRefund.go | 13 +++++++++++++
service/salesReturn.go | 4 ++--
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/model/salesRefund.go b/model/salesRefund.go
index 233aa72..02582a0 100644
--- a/model/salesRefund.go
+++ b/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").
diff --git a/model/salesReturn.go b/model/salesReturn.go
index 5149d5f..41c7150 100644
--- a/model/salesReturn.go
+++ b/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 {
diff --git a/service/salesReturn.go b/service/salesReturn.go
index 6ffec28..b7362f4 100644
--- a/service/salesReturn.go
+++ b/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
}
--
Gitblit v1.8.0