From 2f0aa60ce2e10be53d9c865a6177bf731e182203 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 17 八月 2023 11:15:41 +0800
Subject: [PATCH] fix
---
service/serviceContract.go | 88 +++++++++++++++++++++++++++++++------------
1 files changed, 63 insertions(+), 25 deletions(-)
diff --git a/service/serviceContract.go b/service/serviceContract.go
index ed0fd26..93b7b3a 100644
--- a/service/serviceContract.go
+++ b/service/serviceContract.go
@@ -1,13 +1,27 @@
package service
import (
+ "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
@@ -16,25 +30,26 @@
return ecode.OK
}
-func (SContractService) DeleteServiceContract(id int) int {
- _, err := model.NewServiceContractSearch().SetId(id).Find()
- if err != nil {
- return ecode.SContractNotExist
- }
-
- err = model.NewServiceContractSearch().SetId(id).Delete()
- if err != nil {
- return ecode.SContractNotExist
- }
- return ecode.OK
-}
-
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 {
@@ -44,20 +59,43 @@
return ecode.OK
}
-func (SContractService) GetServiceContractByContractId(contractId int) ([]*model.ServiceContract, int) {
- list, err := model.NewServiceContractSearch().SetId(contractId).FindAll()
- if err != nil {
- return nil, ecode.SContractListErr
- }
+//func (SContractService) GetServiceContractByContractId(contractId int) ([]*model.ServiceContract, int) {
+// list, err := model.NewServiceContractSearch().SetId(contractId).FindAll()
+// if err != nil {
+// return nil, ecode.SContractListErr
+// }
+//
+// return list, ecode.OK
+//}
- return list, ecode.OK
+func (SContractService) DeleteServiceContract(ids []int) int {
+ // delete client
+ err := model.NewServiceContractSearch().SetIds(ids).Delete()
+ if err != nil {
+ return ecode.SContractDeleteErr
+ }
+ return ecode.OK
}
-func (SContractService) GetServiceContractList(page, pageSize int, keyword string) ([]*model.ServiceContract, int) {
- // get contact list
- contacts, err := model.NewServiceContractSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
+func (SContractService) BatchDeleteServiceContract(ids []int) int {
+ err := model.NewServiceContractSearch().DeleteByIds(ids)
if err != nil {
- return nil, ecode.SContractListErr
+ return ecode.DBErr
}
- return contacts, ecode.OK
+ return ecode.OK
+}
+
+func (SContractService) GetServiceContractList(page, pageSize int, queryClass constvar.ServiceContractQueryClass, keywordType constvar.ServiceContractKeywordType, keyword string) ([]*model.ServiceContract, int64, int) {
+ // get contact list
+ contacts, total, err := model.NewServiceContractSearch().
+ SetKeyword(keyword).
+ SetKeywordType(keywordType).
+ SetQueryClass(queryClass).
+ SetPage(page, pageSize).
+ SetPreload(true).
+ Find()
+ if err != nil {
+ return nil, 0, ecode.SContractListErr
+ }
+ return contacts, total, ecode.OK
}
--
Gitblit v1.8.0