From 9ec9a4987cb5fe4a3bd39d61029add5c51d3ab92 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期六, 02 十二月 2023 11:00:26 +0800
Subject: [PATCH] 添加来源
---
service/invoice.go | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/service/invoice.go b/service/invoice.go
index d1500f1..339674a 100644
--- a/service/invoice.go
+++ b/service/invoice.go
@@ -43,7 +43,7 @@
if err != nil {
return ecode.DBErr
}
- } else if invoice.SourceType == constvar.InvoiceSourceTypeServiceContract { //鏇存柊閿�鍞槑缁嗗凡寮�绁ㄩ噾棰�
+ } else if invoice.SourceType == constvar.InvoiceSourceTypeSaleDetail { //鏇存柊閿�鍞槑缁嗗凡寮�绁ㄩ噾棰�
salesDetails, err := model.NewSalesDetailsSearch().SetId(invoice.SourceId).SetPreload(true).First()
if err != nil {
return ecode.DBErr
@@ -139,8 +139,8 @@
return ecode.OK
}
-func (InvoiceService) GetInvoiceList() ([]*model.Invoice, int64, int) {
- list, total, err := model.NewInvoiceSearch().Find()
+func (InvoiceService) GetInvoiceList(params request.GetInvoiceList) ([]*model.Invoice, int64, int) {
+ list, total, err := model.NewInvoiceSearch().SetSourceId(params.SourceId).SetSourceType(params.SourceType).SetPrincipalIds(params.PrincipalIds).Find()
if err != nil {
return nil, 0, ecode.DBErr
}
@@ -184,8 +184,9 @@
removedProductIds = append(removedProductIds, product.Id)
}
amountInvoiced = amountInvoiced.Round(2)
+ amountNotInvoiced = amountNotInvoiced.Round(2)
err = model.WithTransaction(func(db *gorm.DB) error {
- err = model.NewInvoiceSearch().SetId(invoice.Id).Save(invoice)
+ err = model.NewInvoiceSearch().SetId(invoice.Id).Update(invoice)
if err != nil {
return err
}
@@ -222,7 +223,7 @@
}
amountInvoiced = amountInvoiced.Round(2)
err = model.WithTransaction(func(db *gorm.DB) error {
- err = model.NewInvoiceSearch().SetId(invoice.Id).Save(invoice)
+ err = model.NewInvoiceSearch().SetId(invoice.Id).Update(invoice)
if err != nil {
return err
}
--
Gitblit v1.8.0