Merge remote-tracking branch 'origin/dev' into test

@@ -180,6 +180,7 @@ func getStatistics(userId int64, transactionContext *transaction.TransactionCont
 	Statistics["developOrdersMoney"] = 0
 	Statistics["developOrdersMoney"] = 0
 	Statistics["appDividend"] = 0
 	Statistics["appDividend"] = 0
 	Statistics["appOrdersMoney"] = 0
 	Statistics["appOrdersMoney"] = 0
+	Statistics["totalCount"] = len(partnerIds)
 	return Statistics, nil
 	return Statistics, nil
 }
 }
 
 

 package event
 package event
 
 
-import (
-	"github.com/tiptok/gocomm/xa/eda"
-	"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/application/event/subscriber"
-	devent "gitlab.fjmaimaimai.com/mmm-go/partner/pkg/domain/event"
-)
-
 func InitEventCenter() {
 func InitEventCenter() {
-	eda.RegisterSubscribe(&devent.AccessTokenEvent{}, &subscriber.AuthCacheSubscribe{})
-	eda.RegisterSubscribe(&devent.RefreshTokenEvent{}, &subscriber.AuthCacheSubscribe{})
+	//eda.RegisterSubscribe(&devent.AccessTokenEvent{}, &subscriber.AuthCacheSubscribe{})
+	//eda.RegisterSubscribe(&devent.RefreshTokenEvent{}, &subscriber.AuthCacheSubscribe{})
 }
 }

@@ -204,7 +204,7 @@ func (svr *PgLoginService) GetCompanyList(funcGetCompanyIds func() []int64) []*d
 	if len(companies) == 0 {
 	if len(companies) == 0 {
 		return companyList
 		return companyList
 	}
 	}
-	if _, v, e := CompanyRepository.Find(map[string]interface{}{"inCompanyIds": companies, "status": 1, "sortByCreateTime": domain.DESC}); e != nil {
+	if _, v, e := CompanyRepository.Find(map[string]interface{}{"inCompanyIds": companies, "enable": 1, "sortByCreateTime": domain.DESC}); e != nil {
 		log.Error(e)
 		log.Error(e)
 		return companyList
 		return companyList
 	} else {
 	} else {

@@ -69,7 +69,8 @@ func (repository *CompanyRepository) Find(queryOptions map[string]interface{}) (
 		companyIds, _ := companies.([]int64)
 		companyIds, _ := companies.([]int64)
 		query.Where("id in (?)", pg.In(companyIds))
 		query.Where("id in (?)", pg.In(companyIds))
 	}
 	}
-	query.SetWhere("status = ?", "status")
+	//query.SetWhere("status = ?", "status")
+	query.SetWhere(`enable = ?`, "enable")
 	query.SetOrder(`create_at`, "sortByCreateTime")
 	query.SetOrder(`create_at`, "sortByCreateTime")
 	var err error
 	var err error
 	if query.AffectRow, err = query.SelectAndCount(); err != nil {
 	if query.AffectRow, err = query.SelectAndCount(); err != nil {

@@ -12,6 +12,6 @@ func init() {
 	beego.InsertFilter("/*", beego.BeforeExec, middleware.CreateRequstLogFilter(Logger))
 	beego.InsertFilter("/*", beego.BeforeExec, middleware.CreateRequstLogFilter(Logger))
 	beego.InsertFilter("/*", beego.AfterExec, middleware.CreateResponseLogFilter(Logger), false)
 	beego.InsertFilter("/*", beego.AfterExec, middleware.CreateResponseLogFilter(Logger), false)
 
 
-	beego.InsertFilter("/v1/*", beego.BeforeExec, middleware.CheckJWTToken)
-	beego.InsertFilter("/v2/*", beego.BeforeExec, middleware.CheckJWTToken)
+	//beego.InsertFilter("/v1/*", beego.BeforeExec, middleware.CheckJWTToken)
+	//beego.InsertFilter("/v2/*", beego.BeforeExec, middleware.CheckJWTToken)
 }
 }