feat:优化项目信息
This commit is contained in:
@ -19,7 +19,7 @@ type (
|
||||
// BankInfo 银行卡信息
|
||||
BankInfo struct {
|
||||
ID string `json:"id"`
|
||||
*model2.UserManageBank
|
||||
*model2.UserBank
|
||||
}
|
||||
// BankParams 银行卡参数信息
|
||||
BankParams struct {
|
||||
@ -39,21 +39,21 @@ func (c *BankParams) checkBankCard() bool {
|
||||
|
||||
// List 列表信息
|
||||
func (c *Bank) List() ([]*BankInfo, error) {
|
||||
mUserManageBank := model.NewUserManageBank()
|
||||
mUserManageBank := model.NewUserBank()
|
||||
|
||||
out := make([]*model2.UserManageBank, 0)
|
||||
out := make([]*model2.UserBank, 0)
|
||||
|
||||
where := []*model2.ModelWhereOrder{&model2.ModelWhereOrder{
|
||||
Where: model2.NewWhere("uid", c.UID),
|
||||
Order: model2.NewOrder("is_default", model2.OrderModeToDesc),
|
||||
}}
|
||||
if err := model2.Find(mUserManageBank.UserManageBank, &out, where...); err != nil {
|
||||
if err := model2.Find(mUserManageBank.UserBank, &out, where...); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
list := make([]*BankInfo, 0)
|
||||
|
||||
for _, v := range out {
|
||||
list = append(list, &BankInfo{ID: v.GetEncodeID(), UserManageBank: v})
|
||||
list = append(list, &BankInfo{ID: v.GetEncodeID(), UserBank: v})
|
||||
}
|
||||
return list, nil
|
||||
}
|
||||
@ -75,11 +75,11 @@ func (c *Bank) Bind(params *BankParams, captcha string) error {
|
||||
if !params.checkBankCard() {
|
||||
return errors.New("银行卡信息错误")
|
||||
}
|
||||
mUserManageBank := model.NewUserManageBank()
|
||||
mUserManageBank := model.NewUserBank()
|
||||
|
||||
var count int64
|
||||
|
||||
if err = model2.Count(mUserManageBank.UserManageBank, &count, model2.NewWhere("bank_card", params.BankCard)); err != nil {
|
||||
if err = model2.Count(mUserManageBank.UserBank, &count, model2.NewWhere("bank_card", params.BankCard)); err != nil {
|
||||
return err
|
||||
} else if count > 0 {
|
||||
return errors.New("当前银行卡已被注册")
|
||||
@ -90,20 +90,20 @@ func (c *Bank) Bind(params *BankParams, captcha string) error {
|
||||
mUserManageBank.BankCard = params.BankCard
|
||||
mUserManageBank.BankName = params.BankName
|
||||
|
||||
if err = model2.Count(mUserManageBank.UserManageBank, &count, model2.NewWhere("uid", c.UID)); err != nil {
|
||||
if err = model2.Count(mUserManageBank.UserBank, &count, model2.NewWhere("uid", c.UID)); err != nil {
|
||||
return err
|
||||
} else if count <= 0 {
|
||||
mUserManageBank.IsDefault = model2.UserManageBankDefaultForYes
|
||||
mUserManageBank.IsDefault = model2.UserBankDefaultForYes
|
||||
}
|
||||
return model2.Create(mUserManageBank.UserManageBank)
|
||||
return model2.Create(mUserManageBank.UserBank)
|
||||
}
|
||||
|
||||
// Unbind 解绑,直接删除
|
||||
func (c *Bank) Unbind(id uint64) error {
|
||||
mUserManageBank := model.NewUserManageBank()
|
||||
mUserManageBank := model.NewUserBank()
|
||||
mUserManageBank.ID = id
|
||||
|
||||
isExist, err := model2.FirstField(mUserManageBank.UserManageBank, []string{"id", "uid"})
|
||||
isExist, err := model2.FirstField(mUserManageBank.UserBank, []string{"id", "uid"})
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
|
Reference in New Issue
Block a user