From 81b6e4fb5859e273ba54d04e65739733eb7efeee Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 21 七月 2023 15:55:53 +0800
Subject: [PATCH] fix
---
service/contact.go | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/service/contact.go b/service/contact.go
index 59bf587..c62bc8a 100644
--- a/service/contact.go
+++ b/service/contact.go
@@ -3,6 +3,7 @@
import (
"aps_crm/model"
"aps_crm/pkg/ecode"
+ "aps_crm/pkg/mysqlx"
"gorm.io/gorm"
)
@@ -15,15 +16,14 @@
return code
}
- tx := model.NewContactSearch().Orm.Begin()
-
+ tx := mysqlx.GetDB().Begin()
// check isFirst
errCode := setFirstContact(tx, contact)
if errCode != ecode.OK {
return errCode
}
- err := model.NewContactSearch().Create(contact)
+ err := model.NewContactSearch(tx).Create(contact)
if err != nil {
tx.Rollback()
return ecode.ContactExist
@@ -35,13 +35,13 @@
func (ContactService) DeleteContact(id int) int {
// check contact exist
- _, err := model.NewContactSearch().SetId(id).First()
+ _, err := model.NewContactSearch(nil).SetId(id).First()
if err != nil {
return ecode.ContactNotExist
}
// delete contact
- err = model.NewContactSearch().SetId(id).Delete()
+ err = model.NewContactSearch(nil).SetId(id).Delete()
if err != nil {
return ecode.ContactDeleteErr
}
@@ -50,7 +50,7 @@
func (ContactService) GetContactList() ([]*model.ContactDetail, int) {
// get contact list
- contacts, err := model.NewContactSearch().FindAll()
+ contacts, err := model.NewContactSearch(nil).FindAll()
if err != nil {
return nil, ecode.ContactListErr
}
@@ -59,7 +59,7 @@
func (ContactService) UpdateContact(contact *model.Contact) int {
// check contact exist
- _, err := model.NewContactSearch().SetId(contact.Id).First()
+ _, err := model.NewContactSearch(nil).SetId(contact.Id).First()
if err != nil {
return ecode.ContactNotExist
}
@@ -69,14 +69,14 @@
return code
}
- tx := model.NewContactSearch().Orm.Begin()
+ tx := mysqlx.GetDB().Begin()
code = setFirstContact(tx, contact)
if code != ecode.OK {
return code
}
// update contact
- err = model.NewContactSearch().SetId(contact.Id).Update(contact)
+ err = model.NewContactSearch(tx).SetId(contact.Id).Update(contact)
if err != nil {
tx.Rollback()
return ecode.ContactUpdateErr
@@ -100,7 +100,7 @@
func setFirstContact(tx *gorm.DB, contact *model.Contact) int {
if contact.IsFirst && contact.ClientId != 0 {
- err := model.NewContactSearch().SetClientId(contact.ClientId).UpdateByMap(map[string]interface{}{
+ err := model.NewContactSearch(tx).SetClientId(contact.ClientId).UpdateByMap(map[string]interface{}{
"is_first": false,
})
if err != nil {
@@ -114,7 +114,7 @@
// CheckContactExist check contact exist
func CheckContactExist(id int) int {
- tmp, err := model.NewContactSearch().SetId(id).First()
+ tmp, err := model.NewContactSearch(nil).SetId(id).First()
if err != nil {
return ecode.ContactNotExist
}
--
Gitblit v1.8.0