From e1c0fe2768d32f79920ceda92383981d4ff12058 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 15 三月 2024 10:07:50 +0800
Subject: [PATCH] 获取销售明细产品信息
---
service/salesReturn.go | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/service/salesReturn.go b/service/salesReturn.go
index b7362f4..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)
@@ -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