yystopf/shop
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIX]取值bug

Browse Source
This commit is contained in:
viletyy
2020-09-29 14:42:53 +08:00
parent 17ce95596b
commit 2051f39c3f
4 changed files with 105 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
service/employee_service/employee.go
View File

@@ -25,14 +25,14 @@ type Employee struct {
PageSize int
}
func (e *Employee) Add() error {
func (syncEmployee *Employee) Add() error {
employee := map[string]interface{}{
"avatar_url": e.AvatarUrl,
"username": e.Username,
"password": e.Password,
"department": e.Department,
"position": e.Position,
"state": e.State,
"avatar_url": syncEmployee.AvatarUrl,
"username": syncEmployee.Username,
"password": syncEmployee.Password,
"department": syncEmployee.Department,
"position": syncEmployee.Position,
"state": syncEmployee.State,
}
if err := models.AddEmployee(employee); err != nil {
@@ -42,22 +42,22 @@ func (e *Employee) Add() error {
return nil
}
func (e *Employee) Edit() error {
return models.EditEmployee(e.ID, map[string]interface{}{
"avatar_url": e.AvatarUrl,
"username": e.Username,
"password": e.Password,
"department": e.Department,
"position": e.Position,
"state": e.State,
func (syncEmployee *Employee) Edit() error {
return models.EditEmployee(syncEmployee.ID, map[string]interface{}{
"avatar_url": syncEmployee.AvatarUrl,
"username": syncEmployee.Username,
"password": syncEmployee.Password,
"department": syncEmployee.Department,
"position": syncEmployee.Position,
"state": syncEmployee.State,
})
}
func (e *Employee) Get() (*models.Employee, error) {
func (syncEmployee *Employee) Get() (*models.Employee, error) {
var cacheEmployee *models.Employee
cache := cache_service.Employee{
ID: e.ID,
ID: syncEmployee.ID,
}
key := cache.GetEmployeeKey()
if gredis.Exists(key) {
@@ -71,24 +71,24 @@ func (e *Employee) Get() (*models.Employee, error) {
}
}
if employee, err := models.GetEmployee(e.ID); err != nil {
if employee, err := models.GetEmployee(syncEmployee.ID); err != nil {
return nil, err
} else {
gredis.Set(key, employee, 3600)
//cacheEmployee.ID = employee.ID
return cacheEmployee, nil
return employee, nil
}
}
func (e *Employee) GetAll() ([]*models.Employee, error) {
func (syncEmployee *Employee) GetAll() ([]*models.Employee, error) {
var (
employees, cacheEmployees []*models.Employee
)
cache := cache_service.Employee{
State: e.State,
PageNum: e.PageNum,
PageSize: e.PageSize,
State: syncEmployee.State,
PageNum: syncEmployee.PageNum,
PageSize: syncEmployee.PageSize,
}
key := cache.GetEmployeesKey()
if gredis.Exists(key) {
@@ -101,7 +101,7 @@ func (e *Employee) GetAll() ([]*models.Employee, error) {
}
}
employees, err := models.GetEmployees(e.PageNum, e.PageSize, e.getMaps())
employees, err := models.GetEmployees(syncEmployee.PageNum, syncEmployee.PageSize, syncEmployee.getMaps())
if err != nil {
return nil, err
}
@@ -110,23 +110,23 @@ func (e *Employee) GetAll() ([]*models.Employee, error) {
return employees, nil
}
func (a *Employee) Delete() error {
return models.DeleteEmployee(a.ID)
func (syncEmployee *Employee) Delete() error {
return models.DeleteEmployee(syncEmployee.ID)
}
func (e *Employee) ExistByID() (bool, error) {
return models.ExistEmployeeByID(e.ID)
func (syncEmployee *Employee) ExistByID() (bool, error) {
return models.ExistEmployeeByID(syncEmployee.ID)
}
func (e *Employee) Count() (int, error) {
return models.GetEmployeeTotal(e.getMaps())
func (syncEmployee *Employee) Count() (int, error) {
return models.GetEmployeeTotal(syncEmployee.getMaps())
}
func (e *Employee) getMaps() map[string]interface{} {
func (syncEmployee *Employee) getMaps() map[string]interface{} {
maps := make(map[string]interface{})
maps["deleted_on"] = 0
if e.State != -1 {
maps["state"] = e.State
if syncEmployee.State != -1 {
maps["state"] = syncEmployee.State
}
return maps