From 6194956fa9d039eda543bc292e456909787eb066 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 16 十月 2023 14:49:58 +0800
Subject: [PATCH] Revert "aps grpc env"
---
service/quotation.go | 61 +++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 7 deletions(-)
diff --git a/service/quotation.go b/service/quotation.go
index f0bbdbe..3f32563 100644
--- a/service/quotation.go
+++ b/service/quotation.go
@@ -3,12 +3,22 @@
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)
+ //鏍规嵁閿�鍞満浼歩d鍘绘煡璇㈠鎴穒d
+ if quotation.ClientId == 0 {
+ record, err := model.NewSaleChanceSearch().SetId(quotation.SaleChanceId).Find()
+ if err != nil {
+ return ecode.SaleChanceNotExist
+ }
+ quotation.ClientId = record.ClientId
+ quotation.ContactId = record.ContactId
+ }
+ err := model.NewQuotationSearch(nil).Create(quotation)
if err != nil {
return ecode.QuotationExist
}
@@ -18,14 +28,51 @@
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
@@ -33,7 +80,7 @@
func (QuotationService) GetQuotationList(page, pageSize int, data map[string]interface{}) ([]*model.Quotation, int64, int) {
// get contact list
- contacts, total, err := model.NewQuotationSearch().SetPage(page, pageSize).SetSearchMap(data).FindAll()
+ contacts, total, err := model.NewQuotationSearch(nil).SetPage(page, pageSize).SetSearchMap(data).FindAll()
if err != nil {
return nil, 0, ecode.QuotationListErr
}
@@ -42,7 +89,7 @@
func (QuotationService) DeleteQuotation(ids []int) int {
// delete client
- err := model.NewQuotationSearch().SetIds(ids).Delete()
+ err := model.NewQuotationSearch(nil).SetIds(ids).Delete()
if err != nil {
return ecode.QuotationDeleteErr
}
--
Gitblit v1.8.0