From ff3e203423f296965472d1f09347cda5cfe3a786 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期五, 11 八月 2023 11:37:19 +0800 Subject: [PATCH] update --- service/serviceContract.go | 73 ++++++++++++++++++++++++------------ 1 files changed, 48 insertions(+), 25 deletions(-) diff --git a/service/serviceContract.go b/service/serviceContract.go index ed0fd26..eb901f2 100644 --- a/service/serviceContract.go +++ b/service/serviceContract.go @@ -1,13 +1,22 @@ 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) + for _, product := range serviceContract.Products { + serviceContract.AmountReceivable = serviceContract.AmountReceivable.Add(product.Amount.Mul(product.Price)) + } + serviceContract.AmountReceivable = serviceContract.AmountReceivable.Round(2) err := model.NewServiceContractSearch().Create(serviceContract) if err != nil { return ecode.SContractExist @@ -16,26 +25,25 @@ 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 amountReceivable decimal.Decimal + for _, product := range serviceContract.Products { + amountReceivable = serviceContract.AmountReceivable.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) if err != nil { return ecode.SContractSetErr @@ -44,20 +52,35 @@ 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) { +func (SContractService) GetServiceContractList(page, pageSize int, queryClass constvar.ServiceContractQueryClass, keywordType constvar.ServiceContractKeywordType, keyword string) ([]*model.ServiceContract, int64, int) { // get contact list - contacts, err := model.NewServiceContractSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll() + contacts, total, err := model.NewServiceContractSearch(). + SetKeyword(keyword). + SetKeywordType(keywordType). + SetQueryClass(queryClass). + SetPage(page, pageSize). + SetPreload(true). + Find() if err != nil { - return nil, ecode.SContractListErr + return nil, 0, ecode.SContractListErr } - return contacts, ecode.OK + return contacts, total, ecode.OK } -- Gitblit v1.8.0