From c5a0eb549cba2cd358a2d0496c44f3a289f15d9c Mon Sep 17 00:00:00 2001 From: wangpengfei <274878379@qq.com> Date: 星期一, 28 八月 2023 14:22:06 +0800 Subject: [PATCH] fix --- service/invoice.go | 211 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 185 insertions(+), 26 deletions(-) diff --git a/service/invoice.go b/service/invoice.go index 9bd1b91..895c415 100644 --- a/service/invoice.go +++ b/service/invoice.go @@ -1,9 +1,11 @@ package service import ( + "aps_crm/constvar" "aps_crm/model" "aps_crm/model/request" "aps_crm/pkg/ecode" + "github.com/shopspring/decimal" "gorm.io/gorm" ) @@ -15,37 +17,122 @@ func (InvoiceService) AddInvoice(invoice *model.Invoice) int { - err := model.WithTransaction(func(db *gorm.DB) error { - err := model.NewInvoiceSearch().Create(invoice) + if invoice.SourceType == constvar.InvoiceSourceTypeServiceContract { //鏇存柊鏈嶅姟鍚堝悓宸插紑绁ㄩ噾棰� + serviceContract, err := model.NewServiceContractSearch().SetId(invoice.SourceId).SetPreload(true).First() if err != nil { - return err + return ecode.DBErr } - //if invoice.SourceType == constvar.InvoiceSourceTypeServiceContract { - // contract,err := model.NewServiceContractSearch().SetId(invoice.SourceId).First() - // if err != nil { - // return err - // } - // AmountInvoiced := contract.AmountReceived.Add() - // err := model.NewServiceContractSearch().SetId(invoice.SourceId).UpdateByMap(map[string]interface{}{ - // "amount_received" : - // }) - // if err != nil { - // return err - // } - //} - - return nil - }) - - if err != nil { - return ecode.DBErr + var amountInvoiced, amountNotInvoiced decimal.Decimal + rightProducts := NewProductsService().PickRightProducts(invoice.Products, serviceContract.Products) + for _, product := range rightProducts { + amountInvoiced = serviceContract.AmountInvoiced.Add(product.Amount.Mul(product.Price)) + amountNotInvoiced = serviceContract.AmountUnInvoiced.Sub(product.Amount.Mul(product.Price)) + } + amountInvoiced = amountInvoiced.Round(2) + amountNotInvoiced = amountNotInvoiced.Round(2) + err = model.WithTransaction(func(db *gorm.DB) error { + err = model.NewInvoiceSearch().Create(invoice) + if err != nil { + return err + } + return model.NewServiceContractSearch().SetId(invoice.SourceId).UpdateByMap(map[string]interface{}{ + "amount_invoiced": amountInvoiced, + "amount_not_invoiced": amountNotInvoiced, + }) + }) + if err != nil { + return ecode.DBErr + } + } else if invoice.SourceType == constvar.InvoiceSourceTypeServiceContract { //鏇存柊閿�鍞槑缁嗗凡寮�绁ㄩ噾棰� + salesDetails, err := model.NewSalesDetailsSearch().SetId(invoice.SourceId).SetPreload(true).First() + if err != nil { + return ecode.DBErr + } + var amountInvoiced, amountNotInvoiced decimal.Decimal + rightProducts := NewProductsService().PickRightProducts(invoice.Products, salesDetails.Products) + for _, product := range rightProducts { + amountInvoiced = salesDetails.AmountInvoiced.Add(product.Amount.Mul(product.Price)) + amountNotInvoiced = salesDetails.AmountUnInvoiced.Sub(product.Amount.Mul(product.Price)) + } + amountInvoiced = amountInvoiced.Round(2) + amountNotInvoiced = amountNotInvoiced.Round(2) + err = model.WithTransaction(func(db *gorm.DB) error { + err = model.NewInvoiceSearch().Create(invoice) + if err != nil { + return err + } + return model.NewSalesDetailsSearch().SetId(invoice.SourceId).UpdateByMap(map[string]interface{}{ + "amount_invoiced": amountInvoiced, + "amount_not_invoiced": amountNotInvoiced, + }) + }) + if err != nil { + return ecode.DBErr + } } return ecode.OK } func (InvoiceService) DeleteInvoice(id int) int { - err := model.NewInvoiceSearch().SetId(id).Delete() + invoice, err := model.NewInvoiceSearch().SetId(id).First() + if err != nil { + return ecode.DBErr + } + if invoice.SourceType == constvar.InvoiceSourceTypeServiceContract { //鏇存柊鏈嶅姟鍚堝悓宸插紑绁ㄩ噾棰� + serviceContract, err := model.NewServiceContractSearch().SetId(invoice.SourceId).SetPreload(true).First() + if err != nil { + return ecode.DBErr + } + var amountInvoiced, amountNotInvoiced decimal.Decimal + rightProducts := NewProductsService().PickRightProducts(invoice.Products, serviceContract.Products) + for _, product := range rightProducts { + amountInvoiced = serviceContract.AmountInvoiced.Sub(product.Amount.Mul(product.Price)) + amountNotInvoiced = serviceContract.AmountUnInvoiced.Add(product.Amount.Mul(product.Price)) + } + amountInvoiced = amountInvoiced.Round(2) + amountNotInvoiced = amountNotInvoiced.Round(2) + err = model.WithTransaction(func(db *gorm.DB) error { + err := model.NewInvoiceSearch().SetId(id).Delete() + if err != nil { + return err + } + return model.NewServiceContractSearch().SetId(invoice.SourceId).UpdateByMap(map[string]interface{}{ + "amount_invoiced": amountInvoiced, + "amount_not_invoiced": amountNotInvoiced, + }) + }) + if err != nil { + return ecode.DBErr + } + } else if invoice.SourceType == constvar.InvoiceSourceTypeServiceContract { //鏇存柊閿�鍞槑缁嗗凡寮�绁ㄩ噾棰� + salesDetails, err := model.NewSalesDetailsSearch().SetId(invoice.SourceId).SetPreload(true).First() + if err != nil { + return ecode.DBErr + } + var amountInvoiced, amountNotInvoiced decimal.Decimal + rightProducts := NewProductsService().PickRightProducts(invoice.Products, salesDetails.Products) + for _, product := range rightProducts { + amountInvoiced = salesDetails.AmountInvoiced.Sub(product.Amount.Mul(product.Price)) + amountNotInvoiced = salesDetails.AmountUnInvoiced.Add(product.Amount.Mul(product.Price)) + } + amountInvoiced = amountInvoiced.Round(2) + amountNotInvoiced = amountNotInvoiced.Round(2) + err = model.WithTransaction(func(db *gorm.DB) error { + err := model.NewInvoiceSearch().SetId(id).Delete() + if err != nil { + return err + } + return model.NewSalesDetailsSearch().SetId(invoice.SourceId).UpdateByMap(map[string]interface{}{ + "amount_invoiced": amountInvoiced, + "amount_not_invoiced": amountNotInvoiced, + }) + }) + if err != nil { + return ecode.DBErr + } + } + if err != nil { return ecode.DBErr } @@ -79,9 +166,81 @@ } func (InvoiceService) UpdateInvoice(invoice *model.Invoice) int { - err := model.NewInvoiceSearch().SetId(invoice.Id).Save(invoice) - if err != nil { - return ecode.DBErr + if invoice.SourceType == constvar.InvoiceSourceTypeServiceContract { + serviceContract, err := model.NewServiceContractSearch().SetId(invoice.SourceId).SetPreload(true).First() + if err != nil { + return ecode.DBErr + } + var amountInvoiced, amountNotInvoiced decimal.Decimal + newProducts, removedProducts := NewProductsService().PickDiffProducts(invoice.Products, serviceContract.Products) + for _, product := range newProducts { + amountInvoiced = serviceContract.AmountInvoiced.Add(product.Amount.Mul(product.Price)) + amountNotInvoiced = serviceContract.AmountUnInvoiced.Sub(product.Amount.Mul(product.Price)) + } + removedProductIds := make([]uint, 0, len(removedProducts)) + for _, product := range removedProducts { + amountInvoiced = serviceContract.AmountInvoiced.Sub(product.Amount.Mul(product.Price)) + amountNotInvoiced = serviceContract.AmountUnInvoiced.Add(product.Amount.Mul(product.Price)) + 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).Update(invoice) + if err != nil { + return err + } + if len(removedProductIds) > 0 { + err = model.NewInvoiceProductSearch().SetInvoiceId(invoice.Id).SetProductIds(removedProductIds).Delete() + if err != nil { + return err + } + } + return model.NewServiceContractSearch().SetId(invoice.SourceId).UpdateByMap(map[string]interface{}{ + "amount_invoiced": amountInvoiced, + "amount_not_invoiced": amountNotInvoiced, + }) + }) + if err != nil { + return ecode.DBErr + } + } else if invoice.SourceType == constvar.InvoiceSourceTypeServiceContract { //鏇存柊閿�鍞槑缁嗗凡寮�绁ㄩ噾棰� + salesDetails, err := model.NewSalesDetailsSearch().SetId(invoice.SourceId).SetPreload(true).First() + if err != nil { + return ecode.DBErr + } + var amountInvoiced, amountNotInvoiced decimal.Decimal + newProducts, removedProducts := NewProductsService().PickDiffProducts(invoice.Products, salesDetails.Products) + for _, product := range newProducts { + amountInvoiced = salesDetails.AmountInvoiced.Add(product.Amount.Mul(product.Price)) + amountNotInvoiced = salesDetails.AmountUnInvoiced.Sub(product.Amount.Mul(product.Price)) + } + removedProductIds := make([]uint, 0, len(removedProducts)) + for _, product := range removedProducts { + amountInvoiced = salesDetails.AmountInvoiced.Sub(product.Amount.Mul(product.Price)) + amountNotInvoiced = salesDetails.AmountUnInvoiced.Add(product.Amount.Mul(product.Price)) + removedProductIds = append(removedProductIds, product.Id) + } + amountInvoiced = amountInvoiced.Round(2) + err = model.WithTransaction(func(db *gorm.DB) error { + err = model.NewInvoiceSearch().SetId(invoice.Id).Update(invoice) + if err != nil { + return err + } + if len(removedProductIds) > 0 { + err = model.NewInvoiceProductSearch().SetInvoiceId(invoice.Id).SetProductIds(removedProductIds).Delete() + if err != nil { + return err + } + } + return model.NewSalesDetailsSearch().SetId(invoice.SourceId).UpdateByMap(map[string]interface{}{ + "amount_invoiced": amountInvoiced, + "amount_not_invoiced": amountNotInvoiced, + }) + }) + if err != nil { + return ecode.DBErr + } } return ecode.OK } -- Gitblit v1.8.0