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/serviceContract.go | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/service/serviceContract.go b/service/serviceContract.go
index cdf87b7..c4fed1c 100644
--- a/service/serviceContract.go
+++ b/service/serviceContract.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"
@@ -47,7 +47,7 @@
serviceContract.AmountReceivable = serviceContract.AmountTotal.Sub(serviceContract.AmountReceived)
serviceContract.AmountUnInvoiced = serviceContract.AmountTotal.Sub(serviceContract.AmountInvoiced)
err = model.WithTransaction(func(db *gorm.DB) error {
- err := model.NewServiceContractSearch().Create(serviceContract)
+ err := model.NewServiceContractSearch().SetId(serviceContract.Id).Update(serviceContract)
if err != nil {
return err
}
@@ -117,13 +117,18 @@
return ecode.OK
}
-func (SContractService) GetServiceContractList(page, pageSize int, queryClass constvar.ServiceContractQueryClass, keywordType constvar.ServiceContractKeywordType, keyword string) ([]*model.ServiceContract, int64, int) {
+func (SContractService) GetServiceContractList(params request.GetServiceContractList, memberIds []int) ([]*model.ServiceContract, int64, int) {
// get contact list
contacts, total, err := model.NewServiceContractSearch().
- SetKeyword(keyword).
- SetKeywordType(keywordType).
- SetQueryClass(queryClass).
- SetPage(page, pageSize).
+ SetKeyword(params.Keyword).
+ SetKeywordType(params.KeywordType).
+ SetQueryClass(params.QueryClass).
+ SetPage(params.Page, params.PageSize).
+ SetSalesDetailsId(params.SalesDetailsId).
+ SetQuotationId(params.QuotationId).
+ SetSaleChanceId(params.SaleChanceId).
+ SetContactId(params.ContactId).
+ SetMemberIds(memberIds).
SetPreload(true).
Find()
if err != nil {
--
Gitblit v1.8.0