From 3369456ac6de01e8703a9b38537406ec7c550bc5 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 25 八月 2023 11:05:45 +0800
Subject: [PATCH] fix
---
model/salesReturn.go | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/model/salesReturn.go b/model/salesReturn.go
index 17aa2de..41c7150 100644
--- a/model/salesReturn.go
+++ b/model/salesReturn.go
@@ -20,7 +20,7 @@
Repository string `json:"repository" gorm:"column:repository;type:varchar(255);comment:浠撳簱"`
MemberId int `json:"memberId" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"`
Member User `json:"Member" gorm:"foreignKey:MemberId"`
- ReturnDate string `json:"returnDate" gorm:"column:return_date;type:datetime(3);comment:閫�璐ф棩鏈�"` //閫�璐ф棩鏈�
+ ReturnDate string `json:"returnDate" gorm:"column:return_date;type:varchar(255);comment:閫�璐ф棩鏈�"` //閫�璐ф棩鏈�
SalesReturnStatusId int `json:"salesReturnStatusId" gorm:"column:sales_return_status;type:int;comment:閫�璐х姸鎬�"` //閫�璐х姸鎬乮d
SalesReturnStatus SalesReturnStatus `json:"SalesReturnStatus" gorm:"foreignKey:SalesReturnStatusId"` //閫�璐х姸鎬�
CreatorId int `json:"-" gorm:"column:creator_id;type:int;comment:鍒涘缓浜篿d"` //鍒涘缓浜篒D
@@ -29,7 +29,7 @@
Products []*Product `json:"products" gorm:"many2many:salesReturn_product;"` //閫�璐т骇鍝�
AmountShouldRefund decimal.Decimal `gorm:"column:amount_should_refund;type:decimal(12,2);comment:搴旈��娆鹃噾棰�" json:"amountShouldRefund"` // 搴旈��娆鹃噾棰�
AmountHasRefund decimal.Decimal `gorm:"column:amount_has_refund;type:decimal(12,2);comment:宸查��娆鹃噾棰�" json:"amountHasRefund"` // 宸查��娆鹃噾棰�
-
+ AmountTotal decimal.Decimal `gorm:"column:amount_total;type:decimal(12,2);comment:閫�璐т骇鍝佹�婚噾棰�" json:"-"`
CrmModel
}
@@ -43,6 +43,7 @@
PageNum int
PageSize int
Preload bool
+ Ids []int
}
)
@@ -55,10 +56,18 @@
}
}
+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 {
db = db.Where("id = ?", slf.Id)
+ }
+ if len(slf.Ids) != 0 {
+ db = db.Where("id in ?", slf.Ids)
}
if slf.Preload {
@@ -103,12 +112,18 @@
return db.Delete(&SalesReturn{}).Error
}
+func (slf *SalesReturnSearch) DeleteByIds(ids []int) error {
+ var db = slf.build()
+ db = db.Where("id in ?", ids)
+ return db.Delete(&SalesReturn{}).Error
+}
+
func (slf *SalesReturnSearch) Update(record *SalesReturn) error {
var db = slf.build()
return db.Updates(record).Error
}
-func (slf *SalesReturnSearch) Find() (*SalesReturn, error) {
+func (slf *SalesReturnSearch) First() (*SalesReturn, error) {
var db = slf.build()
var record = new(SalesReturn)
err := db.First(record).Error
@@ -125,16 +140,28 @@
if slf.PageNum > 0 && slf.PageSize > 0 {
db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
}
-
err := db.Preload("Member").Preload("Client").Preload("Products").Order("id desc").Find(&records).Error
return records, total, err
}
+func (slf *SalesReturnSearch) Find() ([]*SalesReturn, error) {
+ var db = slf.build()
+ var records = make([]*SalesReturn, 0)
+
+ err := db.Find(&records).Error
+ return records, err
+}
+
func (slf *SalesReturnSearch) SetId(id int) *SalesReturnSearch {
slf.Id = id
return slf
}
+func (slf *SalesReturnSearch) SetIds(id []int) *SalesReturnSearch {
+ slf.Ids = id
+ return slf
+}
+
func (slf *SalesReturnSearch) SetKeyword(keyword string) *SalesReturnSearch {
slf.Keyword = keyword
return slf
--
Gitblit v1.8.0