feat:完善信息
This commit is contained in:
@ -8,18 +8,19 @@ import (
|
||||
|
||||
type Logout struct {
|
||||
*service.SessionEnterprise
|
||||
local uint64
|
||||
}
|
||||
|
||||
type LogoutHandle func(enterprise *service.SessionEnterprise, local uint64) *Logout
|
||||
type LogoutHandle func(enterprise *service.SessionEnterprise) *Logout
|
||||
|
||||
func (c *Logout) Launch() error {
|
||||
service.Publish(config.EventForRedisHashDestroy, config.RedisKeyForAccount, utils.UintToString(c.UID))
|
||||
if c.UID > 0 {
|
||||
service.Publish(config.EventForRedisHashDestroy, config.RedisKeyForAccount, utils.UintToString(c.UID))
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func NewLogout() LogoutHandle {
|
||||
return func(enterprise *service.SessionEnterprise, local uint64) *Logout {
|
||||
return &Logout{enterprise, local}
|
||||
return func(enterprise *service.SessionEnterprise) *Logout {
|
||||
return &Logout{enterprise}
|
||||
}
|
||||
}
|
||||
|
@ -13,8 +13,8 @@ func (c *Config) Basic() {
|
||||
}
|
||||
|
||||
// Config 配置信息
|
||||
func (c *Config) Config() {
|
||||
|
||||
func (c *Config) Config() map[string]interface{} {
|
||||
return config2.SystemConfig
|
||||
}
|
||||
|
||||
// Identity 身份信息
|
||||
|
@ -1,7 +1,9 @@
|
||||
package identity
|
||||
|
||||
import (
|
||||
"SciencesServer/app/api/enterprise/model"
|
||||
"SciencesServer/app/api/manage/controller"
|
||||
model2 "SciencesServer/app/common/model"
|
||||
"SciencesServer/app/service"
|
||||
)
|
||||
|
||||
@ -12,12 +14,46 @@ type Instance struct {
|
||||
|
||||
type InstanceHandle func(enterprise *service.SessionEnterprise, local string) *Instance
|
||||
|
||||
type (
|
||||
// InstanceForExpert 专家信息
|
||||
InstanceForExpert struct {
|
||||
*model.UserManageForExpert
|
||||
ID string `json:"id"`
|
||||
}
|
||||
)
|
||||
|
||||
// Expert 专家列表
|
||||
func (c *Instance) Expert(name, mobile string, page, pageSize int) (*controller.ReturnPages, error) {
|
||||
return nil, nil
|
||||
mUserManage := model.NewUserManage()
|
||||
|
||||
where := make([]*model2.ModelWhere, 0)
|
||||
|
||||
if name != "" {
|
||||
where = append(where, model2.NewWhereLike("m.name", name))
|
||||
}
|
||||
if mobile != "" {
|
||||
where = append(where, model2.NewWhereLike("u.mobile", mobile))
|
||||
}
|
||||
var count int64
|
||||
|
||||
out, err := mUserManage.Expert(page, pageSize, &count, where...)
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
list := make([]*InstanceForExpert, 0)
|
||||
|
||||
for _, v := range out {
|
||||
mUserManage.ID = v.ID
|
||||
list = append(list, &InstanceForExpert{
|
||||
UserManageForExpert: v, ID: mUserManage.GetEncodeID(),
|
||||
})
|
||||
}
|
||||
return &controller.ReturnPages{Data: list, Count: count}, nil
|
||||
}
|
||||
|
||||
func NewIdentity() InstanceHandle {
|
||||
func NewInstance() InstanceHandle {
|
||||
return func(enterprise *service.SessionEnterprise, local string) *Instance {
|
||||
return &Instance{
|
||||
SessionEnterprise: enterprise,
|
||||
|
@ -9,37 +9,37 @@ import (
|
||||
"errors"
|
||||
)
|
||||
|
||||
type Back struct {
|
||||
type Bank struct {
|
||||
*service.SessionEnterprise
|
||||
}
|
||||
|
||||
type BackHandle func(enterprise *service.SessionEnterprise) *Back
|
||||
type BankHandle func(enterprise *service.SessionEnterprise) *Bank
|
||||
|
||||
type (
|
||||
// BackInfo 银行卡信息
|
||||
BackInfo struct {
|
||||
// BankInfo 银行卡信息
|
||||
BankInfo struct {
|
||||
ID string `json:"id"`
|
||||
*model2.UserManageBank
|
||||
}
|
||||
// BackParams 银行卡参数信息
|
||||
BackParams struct {
|
||||
Name, IDCard, BackCard, BackName string
|
||||
// BankParams 银行卡参数信息
|
||||
BankParams struct {
|
||||
Name, IDCard, BankCard, BankName string
|
||||
}
|
||||
)
|
||||
|
||||
// checkIDCard 验证身份证号
|
||||
func (c *BackParams) checkIDCard() bool {
|
||||
func (c *BankParams) checkIDCard() bool {
|
||||
return utils.ValidateIDCard(c.IDCard)
|
||||
}
|
||||
|
||||
// checkBankCard 验证银行卡号
|
||||
func (c *BackParams) checkBankCard() bool {
|
||||
func (c *BankParams) checkBankCard() bool {
|
||||
return true
|
||||
}
|
||||
|
||||
// List 列表信息
|
||||
func (c *Back) List() ([]*BackInfo, error) {
|
||||
mUserManageBack := model.NewUserManageBank()
|
||||
func (c *Bank) List() ([]*BankInfo, error) {
|
||||
mUserManageBank := model.NewUserManageBank()
|
||||
|
||||
out := make([]*model2.UserManageBank, 0)
|
||||
|
||||
@ -47,19 +47,19 @@ func (c *Back) List() ([]*BackInfo, error) {
|
||||
Where: model2.NewWhere("uid", c.ManageUID),
|
||||
Order: model2.NewOrder("is_default", model2.OrderModeToDesc),
|
||||
}}
|
||||
if err := model2.Find(mUserManageBack.UserManageBank, &out, where...); err != nil {
|
||||
if err := model2.Find(mUserManageBank.UserManageBank, &out, where...); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
list := make([]*BackInfo, 0)
|
||||
list := make([]*BankInfo, 0)
|
||||
|
||||
for _, v := range out {
|
||||
list = append(list, &BackInfo{ID: v.GetEncodeID(), UserManageBank: v})
|
||||
list = append(list, &BankInfo{ID: v.GetEncodeID(), UserManageBank: v})
|
||||
}
|
||||
return list, nil
|
||||
}
|
||||
|
||||
// Bind 绑定
|
||||
func (c *Back) Bind(params *BackParams, captcha string) error {
|
||||
func (c *Bank) Bind(params *BankParams, captcha string) error {
|
||||
pass, err := handle.NewCaptcha().Validate(&handle.CaptchaSms{
|
||||
Mobile: c.Mobile, Captcha: captcha,
|
||||
})
|
||||
@ -75,48 +75,48 @@ func (c *Back) Bind(params *BackParams, captcha string) error {
|
||||
if !params.checkBankCard() {
|
||||
return errors.New("银行卡信息错误")
|
||||
}
|
||||
mUserManageBack := model.NewUserManageBank()
|
||||
mUserManageBank := model.NewUserManageBank()
|
||||
|
||||
var count int64
|
||||
|
||||
if err = model2.Count(mUserManageBack.UserManageBank, &count, model2.NewWhere("back_card", params.BackCard)); err != nil {
|
||||
if err = model2.Count(mUserManageBank.UserManageBank, &count, model2.NewWhere("bank_card", params.BankCard)); err != nil {
|
||||
return err
|
||||
} else if count > 0 {
|
||||
return errors.New("当前银行卡已被注册")
|
||||
}
|
||||
mUserManageBack.UID = c.ManageUID
|
||||
mUserManageBack.Name = params.Name
|
||||
mUserManageBack.IDCard = params.IDCard
|
||||
mUserManageBack.BankCard = params.BackCard
|
||||
mUserManageBack.BackName = params.BackName
|
||||
mUserManageBank.UID = c.ManageUID
|
||||
mUserManageBank.Name = params.Name
|
||||
mUserManageBank.IDCard = params.IDCard
|
||||
mUserManageBank.BankCard = params.BankCard
|
||||
mUserManageBank.BankName = params.BankName
|
||||
|
||||
if err = model2.Count(mUserManageBack.UserManageBank, &count, model2.NewWhere("uid", c.ManageUID)); err != nil {
|
||||
if err = model2.Count(mUserManageBank.UserManageBank, &count, model2.NewWhere("uid", c.ManageUID)); err != nil {
|
||||
return err
|
||||
} else if count <= 0 {
|
||||
mUserManageBack.IsDefault = model2.UserManageBankDefaultForYes
|
||||
mUserManageBank.IsDefault = model2.UserManageBankDefaultForYes
|
||||
}
|
||||
return model2.Create(mUserManageBack.UserManageBank)
|
||||
return model2.Create(mUserManageBank.UserManageBank)
|
||||
}
|
||||
|
||||
// Unbind 解绑,直接删除
|
||||
func (c *Back) Unbind(id uint64) error {
|
||||
mUserManageBack := model.NewUserManageBank()
|
||||
mUserManageBack.ID = id
|
||||
func (c *Bank) Unbind(id uint64) error {
|
||||
mUserManageBank := model.NewUserManageBank()
|
||||
mUserManageBank.ID = id
|
||||
|
||||
isExist, err := model2.FirstField(mUserManageBack.UserManageBank, []string{"id", "uid"})
|
||||
isExist, err := model2.FirstField(mUserManageBank.UserManageBank, []string{"id", "uid"})
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
} else if !isExist {
|
||||
return errors.New("操作错误,绑定信息不存在")
|
||||
} else if mUserManageBack.UID != c.ManageUID {
|
||||
} else if mUserManageBank.UID != c.ManageUID {
|
||||
return errors.New("无权限操作")
|
||||
}
|
||||
return model2.Delete(mUserManageBack)
|
||||
return model2.Delete(mUserManageBank)
|
||||
}
|
||||
|
||||
func NewBack() BackHandle {
|
||||
return func(enterprise *service.SessionEnterprise) *Back {
|
||||
return &Back{enterprise}
|
||||
func NewBank() BankHandle {
|
||||
return func(enterprise *service.SessionEnterprise) *Bank {
|
||||
return &Bank{enterprise}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user