From f80c6068d5e2ae5b9101125497b4de88726e1d9e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 07 四月 2024 21:44:58 +0800
Subject: [PATCH] 发货接口增加仓库ID
---
service/salesDetails.go | 102 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 76 insertions(+), 26 deletions(-)
diff --git a/service/salesDetails.go b/service/salesDetails.go
index a2e5ad8..4e10826 100644
--- a/service/salesDetails.go
+++ b/service/salesDetails.go
@@ -1,8 +1,8 @@
package service
import (
- "aps_crm/constvar"
"aps_crm/model"
+ "aps_crm/model/request"
"aps_crm/pkg/ecode"
"github.com/shopspring/decimal"
"gorm.io/gorm"
@@ -22,6 +22,9 @@
salesDetails.AmountTotal = salesDetails.AmountTotal.Round(2)
salesDetails.AmountReceivable = salesDetails.AmountTotal
salesDetails.AmountUnInvoiced = salesDetails.AmountTotal
+ for _, product := range salesDetails.Products {
+ product.Id = 0
+ }
err := model.NewSalesDetailsSearch().Create(salesDetails)
if err != nil {
return ecode.SalesDetailsExist
@@ -53,46 +56,58 @@
func (SalesDetailsService) UpdateSalesDetails(salesDetails *model.SalesDetails) int {
// check salesDetails exist
- old, err := model.NewSalesDetailsSearch().SetId(salesDetails.Id).First()
+ old, err := model.NewSalesDetailsSearch().SetId(salesDetails.Id).SetPreload(true).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 {
+ for _, product := range salesDetails.Products {
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)
+ newProducts, removedProducts := NewProductsService().PickDiffProducts(salesDetails.Products, old.Products)
err = model.WithTransaction(func(db *gorm.DB) error {
err = model.NewSalesDetailsSearch().SetId(salesDetails.Id).Update(salesDetails)
if err != nil {
return err
}
- err = model.NewProductSearch(db).SetIds(removedProductIds).Delete()
- if err != nil {
- return err
+ if len(removedProducts) > 0 {
+ removedProductIds := make([]uint, 0, len(removedProducts))
+ for _, product := range removedProducts {
+ totalAmount = totalAmount.Sub(product.Amount.Mul(product.Price))
+ removedProductIds = append(removedProductIds, product.Id)
+ }
+ err = model.NewProductSearch(db).SetIds(removedProductIds).Delete()
+ if err != nil {
+ return err
+ }
}
- err = model.NewProductSearch(db).CreateBatch(newProducts)
- 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.SalesDetailsProduct
+ for _, p := range newProducts {
+ rel = append(rel, &model.SalesDetailsProduct{
+ SalesDetailsId: salesDetails.Id,
+ ProductId: p.Id,
+ })
+ }
+ err = model.NewSalesDetailsProductSearch().CreateBatch(rel)
+ if err != nil {
+ return err
+ }
}
- var rel []*model.SalesDetailsProduct
- for _, p := range newProducts {
- rel = append(rel, &model.SalesDetailsProduct{
- SalesDetailsId: salesDetails.Id,
- ProductId: p.Id,
- })
- }
- return model.NewSalesDetailsProductSearch().CreateBatch(rel)
+ return nil
+
})
if err != nil {
@@ -102,14 +117,49 @@
return ecode.OK
}
-func (SalesDetailsService) GetSalesDetailsList(page, pageSize int, keywordType constvar.SalesDetailsKeywordType, keyword string) ([]*model.SalesDetails, int64, int) {
+func (SalesDetailsService) GetSalesDetailsList(params request.GetSalesDetailsList, memberIds []int) ([]*model.SalesDetails, int64, int) {
// get contact list
contacts, total, err := model.NewSalesDetailsSearch().
SetPreload(true).
- SetKeywordType(keywordType).
- SetKeyword(keyword).SetPage(page, pageSize).FindAll()
+ SetMemberIds(memberIds).
+ SetKeywordType(params.KeywordType).
+ SetSaleChanceId(params.SaleChanceId).
+ SetClientId(params.ClientId).
+ SetNumber(params.Number).
+ SetKeyword(params.Keyword).SetPage(params.Page, params.PageSize).FindAll()
if err != nil {
return nil, 0, ecode.SalesDetailsListErr
}
return contacts, total, ecode.OK
}
+
+func (SalesDetailsService) GetSalesDetails(saleDetailID int) (*model.SalesDetails, error) {
+ return model.NewSalesDetailsSearch().SetId(saleDetailID).SetPreload(true).First()
+}
+
+func (SalesDetailsService) GetSalesDetailsByNumber(number string) (*model.SalesDetails, error) {
+ return model.NewSalesDetailsSearch().SetNumber(number).SetPreload(true).First()
+}
+
+func (SalesDetailsService) GetDeliveryOrder(saleDetailID int) ([]*model.DeliveryOrder, error) {
+ // get contact list
+ orders, err := model.NewDeliveryOrderSearch().SetSalesDetailsID(saleDetailID).FindAll()
+ return orders, err
+}
+
+func (slf SalesDetailsService) GetProducts(saleDetailNumber string) (products []*model.Product, err error) {
+ salesDetails, err := slf.GetSalesDetailsByNumber(saleDetailNumber)
+ if err != nil {
+ return nil, err
+ }
+ // get contact list
+ salesDetailsProducts, err := model.NewSalesDetailsProductSearch().SetSalesDetailsId(salesDetails.Id).FindAll()
+ if err != nil {
+ return
+ }
+ productIDs := make([]uint, 0)
+ for _, v := range salesDetailsProducts {
+ productIDs = append(productIDs, v.ProductId)
+ }
+ return model.NewProductSearch(nil).SetIds(productIDs).FindAll()
+}
--
Gitblit v1.8.0