Commit 74d8ba64 authored by shajiaiming's avatar shajiaiming

fix

parent eeb92e15
...@@ -2,7 +2,6 @@ package models ...@@ -2,7 +2,6 @@ package models
import ( import (
"bwallet/pkg/setting" "bwallet/pkg/setting"
"fmt"
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
) )
...@@ -65,7 +64,6 @@ func GetRecord(id int) (*LiveTitleRecord, error) { ...@@ -65,7 +64,6 @@ func GetRecord(id int) (*LiveTitleRecord, error) {
func GetLiveTitleRecord(pageNum, pageSize int, maps interface{}) ([]*LiveTitleRecord, error) { func GetLiveTitleRecord(pageNum, pageSize int, maps interface{}) ([]*LiveTitleRecord, error) {
var live []*LiveTitleRecord var live []*LiveTitleRecord
fmt.Println(maps)
err := db.Debug().Where(maps).Preload("LiveInfo").Order("create_time desc").Offset(pageNum).Limit(pageSize).Find(&live).Error err := db.Debug().Where(maps).Preload("LiveInfo").Order("create_time desc").Offset(pageNum).Limit(pageSize).Find(&live).Error
if err != nil && err != gorm.ErrRecordNotFound { if err != nil && err != gorm.ErrRecordNotFound {
return nil, err return nil, err
......
...@@ -2,6 +2,7 @@ package models ...@@ -2,6 +2,7 @@ package models
import ( import (
"bwallet/pkg/setting" "bwallet/pkg/setting"
"fmt"
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
"time" "time"
) )
...@@ -77,8 +78,15 @@ func GetManagerTotal(maps interface{}) (int, error) { ...@@ -77,8 +78,15 @@ func GetManagerTotal(maps interface{}) (int, error) {
func GetManagers(pageNum, pageSize int, maps interface{}) ([]*Manager, error) { func GetManagers(pageNum, pageSize int, maps interface{}) ([]*Manager, error) {
var manager []*Manager var manager []*Manager
var uid int32
err := db.Where(maps).Order("uid desc").Offset(pageNum).Limit(pageSize).Find(&manager).Error for key, val := range maps.(map[string]interface{}) {
if ("uid" == key) {
uid = val.(int32)
delete(maps.(map[string]interface{}),"uid")
}
}
fmt.Println(maps)
err := db.Debug().Where(maps).Where("uid <> ?", uid).Order("uid desc").Offset(pageNum).Limit(pageSize).Find(&manager).Error
if err != nil && err != gorm.ErrRecordNotFound { if err != nil && err != gorm.ErrRecordNotFound {
return nil, err return nil, err
} }
......
...@@ -2,7 +2,6 @@ package gredis ...@@ -2,7 +2,6 @@ package gredis
import ( import (
"bwallet/pkg/util" "bwallet/pkg/util"
"fmt"
"github.com/gomodule/redigo/redis" "github.com/gomodule/redigo/redis"
"time" "time"
) )
...@@ -27,7 +26,6 @@ func NewRedisCache(db int, host string, defaultExpiration time.Duration) Cache { ...@@ -27,7 +26,6 @@ func NewRedisCache(db int, host string, defaultExpiration time.Duration) Cache {
Dial: func() (redis.Conn, error) { Dial: func() (redis.Conn, error) {
conn, err := redis.Dial("tcp", host, redis.DialDatabase(db)) conn, err := redis.Dial("tcp", host, redis.DialDatabase(db))
if err != nil { if err != nil {
fmt.Println(err)
return nil, err return nil, err
} }
return conn, nil return conn, nil
......
...@@ -7,7 +7,6 @@ import ( ...@@ -7,7 +7,6 @@ import (
"bwallet/pkg/util" "bwallet/pkg/util"
"bwallet/service/manager_service" "bwallet/service/manager_service"
"bwallet/validate_service" "bwallet/validate_service"
"fmt"
"github.com/Unknwon/com" "github.com/Unknwon/com"
"github.com/astaxie/beego/validation" "github.com/astaxie/beego/validation"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
...@@ -43,7 +42,6 @@ func AddManager(c *gin.Context) { ...@@ -43,7 +42,6 @@ func AddManager(c *gin.Context) {
manager_service.UserName = manager.UserName manager_service.UserName = manager.UserName
count, err := manager_service.Count() count, err := manager_service.Count()
if count > 0 || err != nil { if count > 0 || err != nil {
fmt.Println(count, err)
handler.SendResponse(c, errno.ErrExistUser, nil) handler.SendResponse(c, errno.ErrExistUser, nil)
return return
} }
...@@ -93,6 +91,7 @@ func GetManagers(c *gin.Context) { ...@@ -93,6 +91,7 @@ func GetManagers(c *gin.Context) {
manager_service := manager_service.Manager{ manager_service := manager_service.Manager{
UserName: username, UserName: username,
Status: status, Status: status,
Uid: int32(user.UserInfo.Uid),
PlatformId: platform_id, PlatformId: platform_id,
PageNum: util.GetPage(c), PageNum: util.GetPage(c),
PageSize: util.GetLimit(c), PageSize: util.GetLimit(c),
......
...@@ -59,7 +59,6 @@ func (a *Article) Get() (*models.Article, error) { ...@@ -59,7 +59,6 @@ func (a *Article) Get() (*models.Article, error) {
condition.Add("sign", sign) condition.Add("sign", sign)
req.URL.RawQuery = condition.Encode() req.URL.RawQuery = condition.Encode()
//fmt.Println(req.URL.String())
r, err := http.DefaultClient.Do(req) r, err := http.DefaultClient.Do(req)
if err != nil { if err != nil {
return nil, err return nil, err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment