From 05582688724c78bc70a7bc860193c67677f6c8cf Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期六, 28 十月 2023 10:46:37 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm --- model/salesRefund.go | 46 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 39 insertions(+), 7 deletions(-) diff --git a/model/salesRefund.go b/model/salesRefund.go index d4aadd8..e593902 100644 --- a/model/salesRefund.go +++ b/model/salesRefund.go @@ -16,8 +16,8 @@ Client Client `json:"client" gorm:"foreignKey:ClientId"` Number string `json:"number" gorm:"column:number;type:varchar(255);comment:閫�娆惧崟鍙�"` SourceType constvar.RefundSourceType `gorm:"column:source_type;type:int;not null;default 0;comment:鏉ユ簮绫诲瀷锛�1閿�鍞��璐э級" json:"sourceType"` // 鏉ユ簮绫诲瀷锛�1閿�鍞��璐э級 - SourceId int `gorm:"column:source_id;type:int;not null;default 0;comment:婧愬崟id " json:"sourceId"` // 婧愬崟id - Source SalesReturn `gorm:"foreignKey:SourceId" json:"Source"` + SalesReturnId int `gorm:"column:source_id;type:int;not null;default 0;comment:婧愬崟id " json:"sourceId"` // 婧愬崟id + SalesReturn SalesReturn `gorm:"foreignKey:SalesReturnId" json:"salesReturn"` MemberId int `json:"memberId" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"` Member User `json:"member" gorm:"foreignKey:MemberId"` RefundDate string `json:"refundDate" gorm:"column:refund_date;type:varchar(255);comment:閫�娆炬棩鏈�"` @@ -78,16 +78,16 @@ db = db.Where("source_type = ?", slf.SourceType) } - if slf.SourceId != 0 { - db = db.Where("source_id = ?", slf.SourceId) + if slf.SalesReturnId != 0 { + db = db.Where("source_id = ?", slf.SalesReturnId) } if slf.Preload { db = db.Preload("Client"). Preload("PaymentType"). Preload("BankAccount"). - Preload("Source"). - Preload("Products") + Preload("Products"). + Preload("SalesReturn") } if slf.KeywordType != "" { switch slf.KeywordType { @@ -115,6 +115,9 @@ if len(slf.MemberIds) > 0 { db = db.Where("sales_refund.member_id in ?", slf.MemberIds) + } + if slf.Number != "" { + db = db.Where("number = ?", slf.Number) } return db @@ -169,6 +172,30 @@ return records, total, err } +func (slf *SalesRefundSearch) Count() (int64, error) { + var db = slf.build() + var total int64 + err := db.Count(&total).Error + return total, err +} + +func (slf *SalesRefundSearch) MaxAutoIncr() (int, error) { + type Result struct { + Max int + } + + var ( + result Result + db = slf.build() + ) + + err := db.Select("MAX(id) as max").Scan(&result).Error + if err != nil { + return result.Max, fmt.Errorf("max err: %v", err) + } + return result.Max, nil +} + func (slf *SalesRefundSearch) SetId(id int) *SalesRefundSearch { slf.Id = id return slf @@ -185,7 +212,7 @@ } func (slf *SalesRefundSearch) SetSourceId(id int) *SalesRefundSearch { - slf.SourceId = id + slf.SalesReturnId = id return slf } @@ -214,6 +241,11 @@ return slf } +func (slf *SalesRefundSearch) SetNumber(number string) *SalesRefundSearch { + slf.Number = number + return slf +} + func (slf *SalesRefundSearch) UpdateByMap(data map[string]interface{}) error { var db = slf.build() return db.Updates(data).Error -- Gitblit v1.8.0