From d4bf53dd19a45ef09a367babcf7a2ac04ae1d08f Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 17 十月 2023 14:31:31 +0800
Subject: [PATCH] bug修改
---
service/salesDetails.go | 1
model/salesReturn.go | 2
model/salesLeads.go | 4 +-
model/request/salesDetails.go | 1
service/serviceOrder.go | 1
api/v1/contract.go | 16 +++++--
model/contact.go | 2
model/serviceFollowup.go | 2
model/receipt.go | 2
model/serviceContract.go | 2
model/serviceOrder.go | 9 ++++
model/salesDetails.go | 10 ++++
middleware/user.go | 7 ++-
service/contract.go | 4 +-
model/salesRefund.go | 3 -
model/client.go | 6 +-
model/index.go | 3 +
model/subOrder.go | 2
18 files changed, 54 insertions(+), 23 deletions(-)
diff --git a/api/v1/contract.go b/api/v1/contract.go
index 8e05fa5..8041742 100644
--- a/api/v1/contract.go
+++ b/api/v1/contract.go
@@ -9,6 +9,7 @@
"aps_crm/pkg/ecode"
"aps_crm/utils"
"github.com/gin-gonic/gin"
+ "strconv"
)
type ContractApi struct{}
@@ -67,13 +68,18 @@
// @Success 200 {object} contextx.Response{}
// @Router /api/contract/delete [delete]
func (s *ContractApi) Delete(c *gin.Context) {
- var params request.DeleteContract
- ctx, ok := contextx.NewContext(c, ¶ms)
- if !ok {
+ id := c.Param("id")
+ ctx, _ := contextx.NewContext(c, nil)
+ if id == "" {
+ ctx.Fail(ecode.ParamsErr)
return
}
-
- errCode := contractService.DeleteContract(params.Ids)
+ atoi, err := strconv.Atoi(id)
+ if err != nil {
+ ctx.FailWithMsg(ecode.UnknownErr, "鏁版嵁杞崲澶辫触")
+ return
+ }
+ errCode := contractService.DeleteContract(atoi)
if errCode != ecode.OK {
ctx.Fail(errCode)
return
diff --git a/middleware/user.go b/middleware/user.go
index e852ac9..f1e4487 100644
--- a/middleware/user.go
+++ b/middleware/user.go
@@ -33,8 +33,11 @@
}
var whiteList = map[string]struct{}{ //鐧藉悕鍗曞湴鍧�鍒楄〃
- "/api/code/getCodeList": {},
- "/api/data/getAllData": {},
+ "/api/code/getCodeList": {},
+ "/api/data/getAllData": {},
+ "/api/serviceCollectionPlan/add": {},
+ "/api/bankAccount/list": {},
+ "/api/paymentType/list": {},
}
func CheckAuth(apiPath string, token string) bool {
diff --git a/model/client.go b/model/client.go
index 28d4a52..ca7509a 100644
--- a/model/client.go
+++ b/model/client.go
@@ -98,7 +98,7 @@
// 鏌ヨ鍏捣瀹㈡埛
if key == "public_sea" {
- db = db.Where("member_id = ?", constvar.UserTypeSuper)
+ db = db.Where("clients.member_id = ?", constvar.UserTypeSuper)
}
if key == "client_status" {
@@ -120,9 +120,9 @@
if key == "not_admin" {
if v == float64(constvar.NotAdminYes) {
- db = db.Where("member_id != ?", constvar.UserTypeSuper)
+ db = db.Where("clients.member_id != ?", constvar.UserTypeSuper)
} else {
- db = db.Where("member_id = ?", constvar.UserTypeSuper)
+ db = db.Where("clients.member_id = ?", constvar.UserTypeSuper)
}
}
diff --git a/model/contact.go b/model/contact.go
index c7ecfea..f47d4f3 100644
--- a/model/contact.go
+++ b/model/contact.go
@@ -73,7 +73,7 @@
for key, value := range slf.SearchMap {
switch v := value.(type) {
case string:
- if key == "name" || key == "position" || key == "phone" || key == "Number" {
+ if key == "name" || key == "position" || key == "phone" || key == "number" {
db = db.Where(key+" LIKE ?", "%"+v+"%")
}
diff --git a/model/index.go b/model/index.go
index 982fb0a..d3efc32 100644
--- a/model/index.go
+++ b/model/index.go
@@ -90,6 +90,9 @@
ServiceCollectionPlan{},
Receipt{},
ServiceOrder{},
+ CourierCompany{},
+ InvoiceStatus{},
+ InvoiceType{},
)
return err
}
diff --git a/model/receipt.go b/model/receipt.go
index 64c90cd..2ca94cf 100644
--- a/model/receipt.go
+++ b/model/receipt.go
@@ -173,7 +173,7 @@
db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
}
- err := db.Preload("Principal").Preload("Client").Preload("PaymentType").Preload("BankAccount").Find(&records).Error
+ err := db.Preload("Principal").Preload("Client").Preload("PaymentType").Preload("BankAccount").Order("created_at desc").Find(&records).Error
return records, total, err
}
diff --git a/model/request/salesDetails.go b/model/request/salesDetails.go
index d06e99d..8acf6a8 100644
--- a/model/request/salesDetails.go
+++ b/model/request/salesDetails.go
@@ -43,4 +43,5 @@
Keyword string `json:"keyword"`
SaleChanceId int `json:"saleChanceId"` //閿�鍞満浼歩d
ClientId int `json:"clientId"` //瀹㈡埛id
+ Number string `json:"number"` //閿�鍞瓙鍗曞彿
}
diff --git a/model/salesDetails.go b/model/salesDetails.go
index 7ae09ac..b82e761 100644
--- a/model/salesDetails.go
+++ b/model/salesDetails.go
@@ -79,6 +79,9 @@
if slf.ClientId != 0 {
db = db.Where("client_id = ?", slf.ClientId)
}
+ if slf.Number != "" {
+ db = db.Where("number = ?", slf.Number)
+ }
switch slf.KeywordType {
case constvar.SalesDetailsKeywordTypeCustomerName:
@@ -95,7 +98,7 @@
}
if len(slf.MemberIds) > 0 {
- db = db.Where("member_id in ?", slf.MemberIds)
+ db = db.Where("sales_details.member_id in ?", slf.MemberIds)
}
if slf.Preload {
@@ -201,6 +204,11 @@
return slf
}
+func (slf *SalesDetailsSearch) SetNumber(number string) *SalesDetailsSearch {
+ slf.Number = number
+ return slf
+}
+
func (slf *SalesDetailsSearch) UpdateByMap(upMap map[string]interface{}) error {
var (
db = slf.build()
diff --git a/model/salesLeads.go b/model/salesLeads.go
index 60b9017..f215ce4 100644
--- a/model/salesLeads.go
+++ b/model/salesLeads.go
@@ -9,7 +9,7 @@
type (
SalesLeads struct {
Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
- Name string `json:"name" gorm:"column:name;uniqueIndex:name_isDeleted_idx;;type:varchar(255);comment:鍏徃鍚嶇О"`
+ Name string `json:"name" gorm:"column:name;uniqueIndex:name_isDeleted_idx;;type:varchar(255);comment:瀹㈡埛鍚嶇О"`
IsDeleted bool `json:"-" gorm:"column:is_deleted;uniqueIndex:name_isDeleted_idx;type:tinyint(1);comment:鏄惁鍒犻櫎"`
Number string `json:"number" gorm:"column:number;type:varchar(255);comment:閿�鍞嚎绱㈢紪鍙�"`
ContactName string `json:"contact_name" gorm:"column:contact_name;type:varchar(255);comment:鑱旂郴浜哄鍚�"`
@@ -89,7 +89,7 @@
case int:
if key == "member_id" {
- db = db.Where("member_id = ?", v)
+ db = db.Where("sales_leads.member_id = ?", v)
}
}
}
diff --git a/model/salesRefund.go b/model/salesRefund.go
index 4a16620..380aa9a 100644
--- a/model/salesRefund.go
+++ b/model/salesRefund.go
@@ -112,7 +112,7 @@
}
if len(slf.MemberIds) > 0 {
- db = db.Where("member_id in ?", slf.MemberIds)
+ db = db.Where("sales_refund.member_id in ?", slf.MemberIds)
}
return db
@@ -216,7 +216,6 @@
var db = slf.build()
return db.Updates(data).Error
}
-
func (slf *SalesRefundSearch) SetMemberIds(memberIds []int) *SalesRefundSearch {
slf.MemberIds = memberIds
diff --git a/model/salesReturn.go b/model/salesReturn.go
index 296d13c..df99ba7 100644
--- a/model/salesReturn.go
+++ b/model/salesReturn.go
@@ -112,7 +112,7 @@
}
if len(slf.MemberIds) > 0 {
- db = db.Where("member_id in ?", slf.MemberIds)
+ db = db.Where("sales_return.member_id in ?", slf.MemberIds)
}
return db
diff --git a/model/serviceContract.go b/model/serviceContract.go
index a8fd896..8c8db4e 100644
--- a/model/serviceContract.go
+++ b/model/serviceContract.go
@@ -112,7 +112,7 @@
}
if len(slf.MemberIds) > 0 {
- db = db.Where("member_id in ?", slf.MemberIds)
+ db = db.Where("service_contract.member_id in ?", slf.MemberIds)
}
if slf.Preload {
diff --git a/model/serviceFollowup.go b/model/serviceFollowup.go
index fa12b97..0b62891 100644
--- a/model/serviceFollowup.go
+++ b/model/serviceFollowup.go
@@ -99,7 +99,7 @@
}
if len(slf.MemberIds) > 0 {
- db = db.Where("member_id in ?", slf.MemberIds)
+ db = db.Where("service_followup.member_id in ?", slf.MemberIds)
}
return db
diff --git a/model/serviceOrder.go b/model/serviceOrder.go
index 16291f8..f593b5c 100644
--- a/model/serviceOrder.go
+++ b/model/serviceOrder.go
@@ -69,6 +69,7 @@
PageSize int
Preload bool
ServiceManIds []int
+ Order string
}
)
@@ -92,6 +93,9 @@
}
if slf.SalesDetailsId != 0 {
db = db.Where("order_id = ?", slf.SalesDetailsId)
+ }
+ if slf.Order != "" {
+ db = db.Order(slf.Order)
}
if slf.Preload {
db = db.
@@ -207,6 +211,11 @@
return slf
}
+func (slf *ServiceOrderSearch) SetOrder(order string) *ServiceOrderSearch {
+ slf.Order = order
+ return slf
+}
+
func (slf *ServiceOrderSearch) First() (*ServiceOrder, error) {
var db = slf.build()
var record = new(ServiceOrder)
diff --git a/model/subOrder.go b/model/subOrder.go
index 6c35abc..0182500 100644
--- a/model/subOrder.go
+++ b/model/subOrder.go
@@ -75,7 +75,7 @@
db = db.Where(key+" = ?", v)
}
if key == "member_id" {
- db = db.Where("member_id = ?", v)
+ db = db.Where("sub_order.member_id = ?", v)
}
}
}
diff --git a/service/contract.go b/service/contract.go
index 2072299..2910f87 100644
--- a/service/contract.go
+++ b/service/contract.go
@@ -40,9 +40,9 @@
return contacts, total, ecode.OK
}
-func (ContractService) DeleteContract(ids []int) int {
+func (ContractService) DeleteContract(id int) int {
// delete client
- err := model.NewContractSearch().SetIds(ids).Delete()
+ err := model.NewContractSearch().SetId(id).Delete()
if err != nil {
return ecode.ContractDeleteErr
}
diff --git a/service/salesDetails.go b/service/salesDetails.go
index 6a18bbd..62653f1 100644
--- a/service/salesDetails.go
+++ b/service/salesDetails.go
@@ -122,6 +122,7 @@
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
diff --git a/service/serviceOrder.go b/service/serviceOrder.go
index 6598ad0..c7e30a7 100644
--- a/service/serviceOrder.go
+++ b/service/serviceOrder.go
@@ -48,6 +48,7 @@
SetServiceContractId(serviceContractId).
SetSalesDetailsId(salesDetailsId).
SetMemberIds(memberIds).
+ SetOrder("created_at desc").
Find()
if err != nil {
return nil, 0, ecode.DBErr
--
Gitblit v1.8.0