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/salesReturn.go | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/service/salesReturn.go b/service/salesReturn.go
index 6ffec28..ab8fef5 100644
--- a/service/salesReturn.go
+++ b/service/salesReturn.go
@@ -3,6 +3,7 @@
import (
"aps_crm/constvar"
"aps_crm/model"
+ "aps_crm/model/request"
"aps_crm/pkg/ecode"
"github.com/shopspring/decimal"
"gorm.io/gorm"
@@ -16,6 +17,7 @@
salesReturn.AmountTotal = decimal.Zero
for _, product := range salesReturn.Products {
salesReturn.AmountTotal = salesReturn.AmountTotal.Add(product.Amount.Mul(product.Price))
+ product.Id = 0
}
salesReturn.AmountShouldRefund = salesReturn.AmountTotal
err := model.NewSalesReturnSearch().Create(salesReturn)
@@ -32,11 +34,11 @@
return ecode.SalesReturnNotExist
}
err = model.WithTransaction(func(db *gorm.DB) error {
- err = model.NewSalesReturnSearch().SetId(id).Delete()
+ err = model.NewSalesReturnSearch().SetOrm(db).SetId(id).Delete()
if err != nil {
return err
}
- err = model.NewSalesRefundSearch().SetSourceType(constvar.RefundSourceTypeSalesReturn).SetSourceId(id).Delete()
+ err = model.NewSalesRefundSearch().SetOrm(db).SetSourceType(constvar.RefundSourceTypeSalesReturn).SetSourceId(id).Delete()
if err != nil {
return err
}
@@ -123,13 +125,17 @@
return ecode.OK
}
-func (SalesReturnService) GetSalesReturnList(page, pageSize int, keywordType constvar.SalesReturnKeywordType, keyword string) ([]*model.SalesReturn, int64, int) {
+func (SalesReturnService) GetSalesReturnList(params request.GetSalesReturnList, memberIds []int) ([]*model.SalesReturn, int64, int) {
// get contact list
contacts, total, err := model.NewSalesReturnSearch().
- SetKeywordType(keywordType).
- SetKeyword(keyword).
- SetPage(page, pageSize).
+ SetKeywordType(params.KeywordType).
+ SetKeyword(params.Keyword).
+ SetPage(params.Page, params.PageSize).
+ SetSourceId(params.SourceId).
+ SetSourceType(params.SourceType).
+ SetClientId(params.ClientId).
SetPreload(true).
+ SetMemberIds(memberIds).
FindAll()
if err != nil {
return nil, 0, ecode.SalesReturnListErr
--
Gitblit v1.8.0