From 4e8d946913165901f25bb79add011d3c2df19792 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 11 八月 2023 14:30:29 +0800
Subject: [PATCH] fix
---
service/salesDetails.go | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/service/salesDetails.go b/service/salesDetails.go
index ba80cb1..81e10b2 100644
--- a/service/salesDetails.go
+++ b/service/salesDetails.go
@@ -1,13 +1,26 @@
package service
import (
+ "aps_crm/constvar"
"aps_crm/model"
"aps_crm/pkg/ecode"
+ "github.com/shopspring/decimal"
)
type SalesDetailsService struct{}
func (SalesDetailsService) AddSalesDetails(salesDetails *model.SalesDetails) int {
+ salesDetails.AmountReceivable = decimal.Zero.Round(2)
+ salesDetails.AmountInvoiced = decimal.Zero.Round(2)
+ salesDetails.AmountReceived = decimal.Zero.Round(2)
+ salesDetails.AmountUnInvoiced = decimal.Zero.Round(2)
+ salesDetails.AmountTotal = decimal.Zero.Round(2)
+ for _, product := range salesDetails.Products {
+ salesDetails.AmountTotal = salesDetails.AmountTotal.Add(product.Amount.Mul(product.Price))
+ }
+ salesDetails.AmountTotal = salesDetails.AmountTotal.Round(2)
+ salesDetails.AmountReceivable = salesDetails.AmountTotal
+ salesDetails.AmountUnInvoiced = salesDetails.AmountTotal
err := model.NewSalesDetailsSearch().Create(salesDetails)
if err != nil {
return ecode.SalesDetailsExist
@@ -17,7 +30,7 @@
}
func (SalesDetailsService) DeleteSalesDetails(id int) int {
- _, err := model.NewSalesDetailsSearch().SetId(id).Find()
+ _, err := model.NewSalesDetailsSearch().SetId(id).First()
if err != nil {
return ecode.SalesDetailsNotExist
}
@@ -31,10 +44,24 @@
func (SalesDetailsService) UpdateSalesDetails(salesDetails *model.SalesDetails) int {
// check salesDetails exist
- _, err := model.NewSalesDetailsSearch().SetId(salesDetails.Id).Find()
+ old, err := model.NewSalesDetailsSearch().SetId(salesDetails.Id).First()
if err != nil {
return ecode.SalesDetailsNotExist
}
+ var totalAmount decimal.Decimal
+ totalAmount = salesDetails.AmountTotal
+ newProducts, removedProducts := NewProductsService().PickDiffProducts(salesDetails.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)
+ }
+ salesDetails.AmountTotal = totalAmount.Round(2)
+ salesDetails.AmountReceivable = salesDetails.AmountTotal.Sub(salesDetails.AmountReceived)
+ salesDetails.AmountUnInvoiced = salesDetails.AmountTotal.Sub(salesDetails.AmountInvoiced)
err = model.NewSalesDetailsSearch().SetId(salesDetails.Id).Update(salesDetails)
if err != nil {
@@ -44,11 +71,14 @@
return ecode.OK
}
-func (SalesDetailsService) GetSalesDetailsList(page, pageSize int, keyword string) ([]*model.SalesDetails, int) {
+func (SalesDetailsService) GetSalesDetailsList(page, pageSize int, keywordType constvar.SalesDetailsKeywordType, keyword string) ([]*model.SalesDetails, int64, int) {
// get contact list
- contacts, err := model.NewSalesDetailsSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
+ contacts, total, err := model.NewSalesDetailsSearch().
+ SetPreload(true).
+ SetKeywordType(keywordType).
+ SetKeyword(keyword).SetPage(page, pageSize).FindAll()
if err != nil {
- return nil, ecode.SalesDetailsListErr
+ return nil, 0, ecode.SalesDetailsListErr
}
- return contacts, ecode.OK
+ return contacts, total, ecode.OK
}
--
Gitblit v1.8.0