fix

wangpengfei

2023-08-28 c5a0eb549cba2cd358a2d0496c44f3a289f15d9c

 model/serviceContract.go

@@ -17,6 +17,7 @@
      Client                  Client                `json:"client" gorm:"foreignKey:ClientId"`
      Number                  string                `json:"number" gorm:"column:number;type:varchar(255);comment:合同编号"`
      MemberId                int                   `json:"memberId" gorm:"column:member_id;type:int;comment:负责人id"`
      Member                  User                  `json:"member" gorm:"foreignKey:MemberId"`
      ContactId               int                   `json:"contactId" gorm:"column:contact_id;type:int;comment:联系人id"`
      Contact                 Contact               `json:"contact" gorm:"foreignKey:ContactId"`
      SaleChanceId            int                   `json:"saleChanceId" gorm:"column:sale_chance_id;type:int;comment:销售机会id"`
@@ -35,12 +36,13 @@
      ServiceTimes            int                   `json:"serviceTimes" gorm:"column:service_times;type:int;comment:服务次数"`
      Terms                   string                `json:"terms" gorm:"column:terms;type:text;comment:条款"`
      Remark                  string                `json:"remark" gorm:"column:remark;type:text;comment:备注"`
      AmountReceivable        decimal.Decimal       `gorm:"amount_receivable" json:"amountReceivable"` // 应收金额
      AmountReceived          decimal.Decimal       `gorm:"amount_received" json:"amountReceived"`     // 已收金额
      AmountInvoiced          decimal.Decimal       `gorm:"amount_invoiced" json:"amountInvoiced"`     // 已开票金额
      AmountUnInvoiced        decimal.Decimal       `gorm:"-" json:"amountUnInvoiced"`                 // 未开票金额
      AmountReceivable        decimal.Decimal       `gorm:"column:amount_receivable;type:decimal(12,2);comment:应收金额" json:"amountReceivable"`    // 应收金额
      AmountReceived          decimal.Decimal       `gorm:"column:amount_received;type:decimal(12,2);comment:已收金额" json:"amountReceived"`        // 已收金额
      AmountInvoiced          decimal.Decimal       `gorm:"column:amount_invoiced;type:decimal(12,2);comment:已开票金额" json:"amountInvoiced"`       // 已开票金额
      AmountUnInvoiced        decimal.Decimal       `gorm:"column:amount_not_invoiced;type:decimal(12,2);comment:未开票金额" json:"amountUnInvoiced"` // 未开票金额
      AmountTotal             decimal.Decimal       `gorm:"column:amount_total;type:decimal(12,2);comment:价税合计" json:"amountTotal"`              // 价税合计
      Products                []*Product            `json:"products" gorm:"many2many:service_contract_product;"`
      gorm.Model              `json:"-"`
      CrmModel
   }

   ServiceContractSearch struct {
@@ -56,7 +58,7 @@
   }
)

func (ServiceContract) TableName() string {
func (slf *ServiceContract) TableName() string {
   return "service_contract"
}

@@ -108,6 +110,9 @@
   }
   if slf.Preload {
      db = db.
         Preload("Client").
         Preload("Member").
         Preload("Contact").
         Preload("SaleChance").
         Preload("SalesDetails").
         Preload("Quotation").
@@ -138,6 +143,12 @@
   return db.Delete(&ServiceContract{}).Error
}

func (slf *ServiceContractSearch) DeleteByIds(ids []int) error {
   var db = slf.build()
   db = db.Where("id in ?", ids)
   return db.Delete(&ServiceContract{}).Error
}

func (slf *ServiceContractSearch) Find() ([]*ServiceContract, int64, error) {
   var db = slf.build()
   var records = make([]*ServiceContract, 0)
@@ -149,7 +160,7 @@
      db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
   }

   err := db.Find(&records).Error
   err := db.Order("id desc").Order("id desc").Find(&records).Error
   return records, total, err
}

@@ -216,3 +227,40 @@

   return record, nil
}

func (slf *ServiceContractSearch) AmountReceivableAdd(tx *gorm.DB, id int, amount decimal.Decimal) error {
   slf.Orm = tx
   record, err := slf.SetId(id).First()
   if err != nil {
      return err
   }
   amount = record.AmountReceivable.Add(amount)
   return slf.UpdateByMap(map[string]interface{}{"amount_receivable": amount})
}
func (slf *ServiceContractSearch) AmountReceivedAdd(tx *gorm.DB, id int, amount decimal.Decimal) error {
   slf.Orm = tx
   record, err := slf.SetId(id).First()
   if err != nil {
      return err
   }
   amount = record.AmountReceived.Add(amount)
   return slf.UpdateByMap(map[string]interface{}{"amount_received": amount})
}
func (slf *ServiceContractSearch) AmountInvoicedAdd(tx *gorm.DB, id int, amount decimal.Decimal) error {
   slf.Orm = tx
   record, err := slf.SetId(id).First()
   if err != nil {
      return err
   }
   amount = record.AmountInvoiced.Add(amount)
   return slf.UpdateByMap(map[string]interface{}{"amount_invoiced": amount})
}
func (slf *ServiceContractSearch) AmountNotInvoicedAdd(tx *gorm.DB, id int, amount decimal.Decimal) error {
   slf.Orm = tx
   record, err := slf.SetId(id).First()
   if err != nil {
      return err
   }
   amount = record.AmountUnInvoiced.Add(amount)
   return slf.UpdateByMap(map[string]interface{}{"amount_not_invoiced": amount})
}