From f84d9c46574a2cd663105859035bc17891270923 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 14 八月 2023 10:41:54 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
service/serviceContract.go | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/service/serviceContract.go b/service/serviceContract.go
index 45907c8..6da4367 100644
--- a/service/serviceContract.go
+++ b/service/serviceContract.go
@@ -4,11 +4,24 @@
"aps_crm/constvar"
"aps_crm/model"
"aps_crm/pkg/ecode"
+ "github.com/shopspring/decimal"
)
type SContractService struct{}
func (SContractService) AddServiceContract(serviceContract *model.ServiceContract) int {
+ serviceContract.AmountReceivable = decimal.Zero.Round(2)
+ serviceContract.AmountInvoiced = decimal.Zero.Round(2)
+ serviceContract.AmountReceived = decimal.Zero.Round(2)
+ serviceContract.AmountUnInvoiced = decimal.Zero.Round(2)
+ serviceContract.AmountTotal = decimal.Zero.Round(2)
+ for _, product := range serviceContract.Products {
+ serviceContract.AmountTotal = serviceContract.AmountTotal.Add(product.Amount.Mul(product.Price))
+ }
+ serviceContract.AmountTotal = serviceContract.AmountTotal.Round(2)
+ serviceContract.AmountReceivable = serviceContract.AmountTotal
+ serviceContract.AmountUnInvoiced = serviceContract.AmountTotal
+
err := model.NewServiceContractSearch().Create(serviceContract)
if err != nil {
return ecode.SContractExist
@@ -19,10 +32,24 @@
func (SContractService) UpdateServiceContract(serviceContract *model.ServiceContract) int {
// check serviceContract exist
- _, err := model.NewServiceContractSearch().SetId(serviceContract.Id).Find()
+ old, err := model.NewServiceContractSearch().SetId(serviceContract.Id).First()
if err != nil {
return ecode.SContractNotExist
}
+ var totalAmount decimal.Decimal
+ totalAmount = serviceContract.AmountTotal
+ newProducts, removedProducts := NewProductsService().PickDiffProducts(serviceContract.Products, old.Products)
+ for _, product := range newProducts {
+ totalAmount = totalAmount.Add(product.Amount.Mul(product.Price))
+ }
+ removedProductIds := make([]uint, 0, len(removedProducts))
+ for _, product := range removedProducts {
+ totalAmount = totalAmount.Sub(product.Amount.Mul(product.Price))
+ removedProductIds = append(removedProductIds, product.Id)
+ }
+ serviceContract.AmountTotal = totalAmount.Round(2)
+ serviceContract.AmountReceivable = serviceContract.AmountTotal.Sub(serviceContract.AmountReceived)
+ serviceContract.AmountUnInvoiced = serviceContract.AmountTotal.Sub(serviceContract.AmountInvoiced)
err = model.NewServiceContractSearch().SetId(serviceContract.Id).Update(serviceContract)
if err != nil {
@@ -56,7 +83,9 @@
SetKeyword(keyword).
SetKeywordType(keywordType).
SetQueryClass(queryClass).
- SetPage(page, pageSize).FindAll()
+ SetPage(page, pageSize).
+ SetPreload(true).
+ Find()
if err != nil {
return nil, 0, ecode.SContractListErr
}
--
Gitblit v1.8.0