From c5a0eb549cba2cd358a2d0496c44f3a289f15d9c Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 28 八月 2023 14:22:06 +0800
Subject: [PATCH] fix
---
service/quotation.go | 78 ++++++++++++++++++++++++++++-----------
1 files changed, 56 insertions(+), 22 deletions(-)
diff --git a/service/quotation.go b/service/quotation.go
index 13b03b1..ede0edc 100644
--- a/service/quotation.go
+++ b/service/quotation.go
@@ -3,12 +3,13 @@
import (
"aps_crm/model"
"aps_crm/pkg/ecode"
+ "aps_crm/pkg/mysqlx"
)
type QuotationService struct{}
func (QuotationService) AddQuotation(quotation *model.Quotation) int {
- err := model.NewQuotationSearch().Create(quotation)
+ err := model.NewQuotationSearch(nil).Create(quotation)
if err != nil {
return ecode.QuotationExist
}
@@ -16,39 +17,72 @@
return ecode.OK
}
-func (QuotationService) DeleteQuotation(id int) int {
- _, err := model.NewQuotationSearch().SetId(id).Find()
- if err != nil {
- return ecode.QuotationNotExist
- }
-
- err = model.NewQuotationSearch().SetId(id).Delete()
- if err != nil {
- return ecode.QuotationNotExist
- }
- return ecode.OK
-}
-
func (QuotationService) UpdateQuotation(quotation *model.Quotation) int {
// check quotation exist
- _, err := model.NewQuotationSearch().SetId(quotation.Id).Find()
+ tmp, err := model.NewQuotationSearch(nil).SetId(quotation.Id).Find()
if err != nil {
return ecode.QuotationNotExist
}
- err = model.NewQuotationSearch().SetId(quotation.Id).Update(quotation)
- if err != nil {
- return ecode.QuotationSetErr
+ if len(quotation.Products) == 0 {
+ err = model.NewQuotationSearch(nil).SetId(quotation.Id).Update(quotation)
+ if err != nil {
+ return ecode.QuotationSetErr
+ }
+ } else {
+ tx := mysqlx.GetDB().Begin()
+ err = tx.Model(tmp).Association("Products").Clear()
+ if err != nil {
+ tx.Rollback()
+ return ecode.QuotationSetErr
+ }
+
+ err = model.NewQuotationSearch(tx).SetId(quotation.Id).Update(quotation)
+ if err != nil {
+ tx.Rollback()
+ return ecode.QuotationSetErr
+ }
+
+ for _, product := range quotation.Products {
+ if product.Id == 0 {
+ err = model.NewProductSearch(tx).Create(&product)
+ if err != nil {
+ tx.Rollback()
+ return ecode.QuotationSetErr
+ }
+ } else {
+ err = model.NewProductSearch(tx).SetId(product.Id).Update(&product)
+ if err != nil {
+ tx.Rollback()
+ return ecode.QuotationSetErr
+ }
+ }
+ err = tx.Model(&tmp).Association("Products").Append(&product)
+ if err != nil {
+ tx.Rollback()
+ return ecode.QuotationSetErr
+ }
+ }
+ tx.Commit()
}
return ecode.OK
}
-func (QuotationService) GetQuotationList(page, pageSize int, keyword string) ([]*model.Quotation, int) {
+func (QuotationService) GetQuotationList(page, pageSize int, data map[string]interface{}) ([]*model.Quotation, int64, int) {
// get contact list
- contacts, err := model.NewQuotationSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
+ contacts, total, err := model.NewQuotationSearch(nil).SetPage(page, pageSize).SetSearchMap(data).FindAll()
if err != nil {
- return nil, ecode.QuotationListErr
+ return nil, 0, ecode.QuotationListErr
}
- return contacts, ecode.OK
+ return contacts, total, ecode.OK
+}
+
+func (QuotationService) DeleteQuotation(ids []int) int {
+ // delete client
+ err := model.NewQuotationSearch(nil).SetIds(ids).Delete()
+ if err != nil {
+ return ecode.QuotationDeleteErr
+ }
+ return ecode.OK
}
--
Gitblit v1.8.0