From 530fed8ec225453572d57b15c200ab062c335457 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 01 十一月 2023 19:20:21 +0800
Subject: [PATCH] 公海member_id使用0
---
service/salesDetails.go | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/service/salesDetails.go b/service/salesDetails.go
index fa497bf..dec2d36 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
@@ -114,12 +117,16 @@
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
}
--
Gitblit v1.8.0