From 5f815df137f6edaaaddf869097b7e2718324acc6 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 13 十月 2023 13:53:22 +0800
Subject: [PATCH] 跟进记录简单数据权限
---
service/serviceContract.go | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 63 insertions(+), 16 deletions(-)
diff --git a/service/serviceContract.go b/service/serviceContract.go
index eb901f2..9ca7751 100644
--- a/service/serviceContract.go
+++ b/service/serviceContract.go
@@ -5,6 +5,7 @@
"aps_crm/model"
"aps_crm/pkg/ecode"
"github.com/shopspring/decimal"
+ "gorm.io/gorm"
)
type SContractService struct{}
@@ -13,10 +14,15 @@
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.AmountReceivable = serviceContract.AmountReceivable.Add(product.Amount.Mul(product.Price))
+ serviceContract.AmountTotal = serviceContract.AmountTotal.Add(product.Amount.Mul(product.Price))
}
- serviceContract.AmountReceivable = serviceContract.AmountReceivable.Round(2)
+ 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
@@ -27,26 +33,59 @@
func (SContractService) UpdateServiceContract(serviceContract *model.ServiceContract) int {
// check serviceContract exist
- old, err := model.NewServiceContractSearch().SetId(serviceContract.Id).First()
+ old, err := model.NewServiceContractSearch().SetId(serviceContract.Id).SetPreload(true).First()
if err != nil {
return ecode.SContractNotExist
}
- var amountReceivable decimal.Decimal
+ var totalAmount decimal.Decimal
+ totalAmount = serviceContract.AmountTotal
+ newProducts, removedProducts := NewProductsService().PickDiffProducts(serviceContract.Products, old.Products)
for _, product := range serviceContract.Products {
- amountReceivable = serviceContract.AmountReceivable.Add(product.Amount.Mul(product.Price))
+ totalAmount = totalAmount.Add(product.Amount.Mul(product.Price))
}
- if amountReceivable.LessThan(serviceContract.AmountInvoiced) {
- return ecode.SContractProductPriceLowerThanInvoiceAmountErr
- }
- if amountReceivable.LessThan(serviceContract.AmountReceived) {
- return ecode.SContractProductPriceLowerThanReceivedAmountErr
- }
- serviceContract.AmountInvoiced = old.AmountReceived
- serviceContract.AmountReceived = old.AmountReceived
- serviceContract.AmountReceivable = amountReceivable.Round(2)
- err = model.NewServiceContractSearch().SetId(serviceContract.Id).Update(serviceContract)
+ serviceContract.AmountTotal = totalAmount.Round(2)
+ serviceContract.AmountReceivable = serviceContract.AmountTotal.Sub(serviceContract.AmountReceived)
+ serviceContract.AmountUnInvoiced = serviceContract.AmountTotal.Sub(serviceContract.AmountInvoiced)
+ err = model.WithTransaction(func(db *gorm.DB) error {
+ err := model.NewServiceContractSearch().SetId(serviceContract.Id).Update(serviceContract)
+ if err != nil {
+ return err
+ }
+ if len(removedProducts) > 0 {
+ removedProductIds := make([]uint, 0, len(removedProducts))
+ for _, product := range removedProducts {
+ removedProductIds = append(removedProductIds, product.Id)
+ }
+ err = model.NewProductSearch(db).SetIds(removedProductIds).Delete()
+ if err != nil {
+ return err
+ }
+ }
+ if len(newProducts) > 0 {
+ for _, p := range newProducts {
+ p.Id = 0
+ }
+ err = model.NewProductSearch(db).CreateBatch(newProducts)
+ if err != nil {
+ return err
+ }
+ var rel []*model.ServiceContractProduct
+ for _, p := range newProducts {
+ rel = append(rel, &model.ServiceContractProduct{
+ ServiceContractId: serviceContract.Id,
+ ProductId: p.Id,
+ })
+ }
+ err = model.NewServiceContractProductSearch().CreateBatch(rel)
+ if err != nil {
+ return err
+ }
+ }
+ return nil
+ })
+
if err != nil {
- return ecode.SContractSetErr
+ return ecode.DBErr
}
return ecode.OK
@@ -70,6 +109,14 @@
return ecode.OK
}
+func (SContractService) BatchDeleteServiceContract(ids []int) int {
+ err := model.NewServiceContractSearch().DeleteByIds(ids)
+ if err != nil {
+ return ecode.DBErr
+ }
+ 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().
--
Gitblit v1.8.0