From 4a598a4d1289039928bab05e14dd5735ad219a0f Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 13 十月 2023 16:48:22 +0800
Subject: [PATCH] bug修改
---
service/quotation.go | 9 +++++++++
router/index.go | 5 ++---
api/v1/contract.go | 15 ++++++++-------
model/quotation.go | 1 +
api/v1/quotation.go | 1 +
model/request/quotation.go | 1 +
6 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/api/v1/contract.go b/api/v1/contract.go
index 6e432b3..f1702f7 100644
--- a/api/v1/contract.go
+++ b/api/v1/contract.go
@@ -117,13 +117,14 @@
//}
contractModel = model.Contract{
- ClientId: contract.ClientId,
- MemberId: contract.MemberId,
- Number: contract.Number,
- QuotationId: contract.QuotationId,
- StatusId: contract.StatusId,
- File: contract.File,
- CodeStandID: contract.CodeStandID,
+ ClientId: contract.ClientId,
+ MemberId: contract.MemberId,
+ Number: contract.Number,
+ QuotationId: contract.QuotationId,
+ StatusId: contract.StatusId,
+ File: contract.File,
+ CodeStandID: contract.CodeStandID,
+ ContractName: contract.ContractName,
}
return ecode.OK, contractModel
diff --git a/api/v1/quotation.go b/api/v1/quotation.go
index 4fd996c..a6f8790 100644
--- a/api/v1/quotation.go
+++ b/api/v1/quotation.go
@@ -151,6 +151,7 @@
quotationModel.File = quotation.File
quotationModel.Products = quotation.Products
quotationModel.CodeStandID = quotation.CodeStandID
+ quotationModel.QuotationName = quotation.QuotationName
return ecode.OK, quotationModel
diff --git a/model/quotation.go b/model/quotation.go
index f2f23b7..09c4718 100644
--- a/model/quotation.go
+++ b/model/quotation.go
@@ -9,6 +9,7 @@
// Quotation 鎶ヤ环鍗�
Quotation struct {
Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+ QuotationName string `json:"quotationName" gorm:"column:quotation_name;type:varchar(255);comment:鎶ヤ环鍗曞悕绉�"`
ClientId int `json:"client_id" gorm:"column:client_id;type:int;comment:瀹㈡埛id"`
Number string `json:"number" gorm:"column:number;type:varchar(255);comment:鎶ヤ环鍗曞彿"`
QuotationStatusId int `json:"quotation_status_id" gorm:"column:quotation_status_id;type:int;comment:鎶ヤ环鍗曠姸鎬乮d"`
diff --git a/model/request/quotation.go b/model/request/quotation.go
index 729b825..a0d1425 100644
--- a/model/request/quotation.go
+++ b/model/request/quotation.go
@@ -10,6 +10,7 @@
}
type Quotation struct {
+ QuotationName string `json:"quotationName"` //鎶ヤ环鍗曞悕绉�
ClientId int `json:"client_id"`
Number string `json:"number"`
QuotationStatusId int `json:"quotation_status_id"`
diff --git a/router/index.go b/router/index.go
index c9d55be..8913ffe 100644
--- a/router/index.go
+++ b/router/index.go
@@ -4,7 +4,6 @@
v1 "aps_crm/api/v1"
"aps_crm/conf"
_ "aps_crm/docs"
- "aps_crm/middleware"
"fmt"
"github.com/gin-contrib/cors"
"github.com/gin-gonic/gin"
@@ -112,10 +111,10 @@
PrivateGroup := Router.Group("api")
//PrivateGroup.Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
- PrivateGroup.Use(middleware.JWTAuth2())
+ //PrivateGroup.Use(middleware.JWTAuth2())
//PrivateGroup.Use(middleware.CasbinHandler())
{
- routerGroup.InitJwtRouter(PrivateGroup) // jwt鐩稿叧璺敱
+ //routerGroup.InitJwtRouter(PrivateGroup) // jwt鐩稿叧璺敱
//routerGroup.InitUserRouter(PrivateGroup) // 娉ㄥ唽鐢ㄦ埛璺敱
routerGroup.InitCountryRouter(PrivateGroup) // 娉ㄥ唽country璺敱
routerGroup.InitProvinceRouter(PrivateGroup) // 娉ㄥ唽province璺敱
diff --git a/service/quotation.go b/service/quotation.go
index ede0edc..3f32563 100644
--- a/service/quotation.go
+++ b/service/quotation.go
@@ -9,6 +9,15 @@
type QuotationService struct{}
func (QuotationService) AddQuotation(quotation *model.Quotation) int {
+ //鏍规嵁閿�鍞満浼歩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
--
Gitblit v1.8.0