Merge branch 'zq'

zhangqian

2023-08-16 87cad05224d857ec0e113ae03b006d2a52ec3049

 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:负责人id"`
      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:退货状态"`            //退货状态id
      SalesReturnStatus   SalesReturnStatus              `json:"SalesReturnStatus" gorm:"foreignKey:SalesReturnStatusId"`                                //退货状态
      CreatorId           int                            `json:"-" gorm:"column:creator_id;type:int;comment:创建人id"`                                      //创建人ID
@@ -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
   }
)

@@ -59,6 +60,9 @@
   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 {
@@ -114,7 +118,7 @@
   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
@@ -131,16 +135,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