From a42f837535c57285d18934d14ea51d628ade83e7 Mon Sep 17 00:00:00 2001 From: HXY <2479895356@qq.com> Date: Mon, 7 Aug 2023 23:33:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=98=E6=96=B9=E6=9B=B4=E6=96=B0=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/dao/jinzhu/user.go | 41 +++++++++++------------------------ internal/dao/jinzhu/wallet.go | 11 +++++----- internal/model/web/xerror.go | 2 ++ 3 files changed, 21 insertions(+), 33 deletions(-) diff --git a/internal/dao/jinzhu/user.go b/internal/dao/jinzhu/user.go index d7d85e5f..d6f2691a 100644 --- a/internal/dao/jinzhu/user.go +++ b/internal/dao/jinzhu/user.go @@ -5,29 +5,29 @@ package jinzhu import ( - "strings" - "time" - "github.com/rocboss/paopao-ce/internal/core" + "github.com/rocboss/paopao-ce/internal/core/ms" "github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr" "gorm.io/gorm" + "strings" + "time" ) var ( - _ core.UserManageService = (*userManageServant)(nil) + _ core.UserManageService = (*userManageSrv)(nil) ) -type userManageServant struct { +type userManageSrv struct { db *gorm.DB } func newUserManageService(db *gorm.DB) core.UserManageService { - return &userManageServant{ + return &userManageSrv{ db: db, } } -func (s *userManageServant) GetUserByID(id int64) (*core.User, error) { +func (s *userManageSrv) GetUserByID(id int64) (*ms.User, error) { user := &dbr.User{ Model: &dbr.Model{ ID: id, @@ -36,28 +36,28 @@ func (s *userManageServant) GetUserByID(id int64) (*core.User, error) { return user.Get(s.db) } -func (s *userManageServant) GetUserByUsername(username string) (*core.User, error) { +func (s *userManageSrv) GetUserByUsername(username string) (*ms.User, error) { user := &dbr.User{ Username: username, } return user.Get(s.db) } -func (s *userManageServant) GetUserByPhone(phone string) (*core.User, error) { +func (s *userManageSrv) GetUserByPhone(phone string) (*ms.User, error) { user := &dbr.User{ Phone: phone, } return user.Get(s.db) } -func (s *userManageServant) GetUsersByIDs(ids []int64) ([]*core.User, error) { +func (s *userManageSrv) GetUsersByIDs(ids []int64) ([]*ms.User, error) { user := &dbr.User{} return user.List(s.db, &dbr.ConditionsT{ "id IN ?": ids, }, 0, 0) } -func (s *userManageServant) GetUsersByKeyword(keyword string) ([]*core.User, error) { +func (s *userManageSrv) GetUsersByKeyword(keyword string) ([]*ms.User, error) { user := &dbr.User{} keyword = strings.Trim(keyword, " ") + "%" if keyword == "%" { @@ -71,26 +71,11 @@ func (s *userManageServant) GetUsersByKeyword(keyword string) ([]*core.User, err } } -func (s *userManageServant) GetTagsByKeyword(keyword string) ([]*core.Tag, error) { - tag := &dbr.Tag{} - keyword = "%" + strings.Trim(keyword, " ") + "%" - if keyword == "%%" { - return tag.List(s.db, &dbr.ConditionsT{ - "ORDER": "quote_num DESC", - }, 0, 6) - } else { - return tag.List(s.db, &dbr.ConditionsT{ - "tag LIKE ?": keyword, - "ORDER": "quote_num DESC", - }, 0, 6) - } -} - -func (s *userManageServant) CreateUser(user *dbr.User) (*core.User, error) { +func (s *userManageSrv) CreateUser(user *dbr.User) (*ms.User, error) { return user.Create(s.db) } -func (s *userManageServant) UpdateUser(user *core.User) error { +func (s *userManageSrv) UpdateUser(user *ms.User) error { return s.db.Transaction(func(tx *gorm.DB) error { //获取用户的账单，判断是否赠送过 bills, err := (&dbr.WalletStatement{}).List(tx, &dbr.ConditionsT{ diff --git a/internal/dao/jinzhu/wallet.go b/internal/dao/jinzhu/wallet.go index 102548d6..b323d44e 100644 --- a/internal/dao/jinzhu/wallet.go +++ b/internal/dao/jinzhu/wallet.go @@ -7,6 +7,7 @@ package jinzhu import ( "github.com/rocboss/paopao-ce/internal/conf" "github.com/rocboss/paopao-ce/internal/core" + "github.com/rocboss/paopao-ce/internal/core/ms" "github.com/rocboss/paopao-ce/internal/dao/jinzhu/dbr" "gorm.io/gorm" "time" @@ -26,7 +27,7 @@ func newWalletService(db *gorm.DB) core.WalletService { } } -func (d *walletServant) GetRechargeByID(id int64) (*core.WalletRecharge, error) { +func (d *walletServant) GetRechargeByID(id int64) (*ms.WalletRecharge, error) { recharge := &dbr.WalletRecharge{ Model: &dbr.Model{ ID: id, @@ -37,7 +38,7 @@ func (d *walletServant) GetRechargeByID(id int64) (*core.WalletRecharge, error) } // 点击前往支付会创建支付数据 -func (d *walletServant) CreateRecharge(userId, amount int64) (*core.WalletRecharge, error) { +func (d *walletServant) CreateRecharge(userId, amount int64) (*ms.WalletRecharge, error) { recharge := &dbr.WalletRecharge{ UserID: userId, Amount: amount, @@ -46,7 +47,7 @@ func (d *walletServant) CreateRecharge(userId, amount int64) (*core.WalletRechar return recharge.Create(d.db) } -func (d *walletServant) GetUserWalletBills(userID int64, offset, limit int) ([]*core.WalletStatement, error) { +func (d *walletServant) GetUserWalletBills(userID int64, offset, limit int) ([]*ms.WalletStatement, error) { statement := &dbr.WalletStatement{ UserID: userID, } @@ -63,7 +64,7 @@ func (d *walletServant) GetUserWalletBillCount(userID int64) (int64, error) { return statement.Count(d.db, &dbr.ConditionsT{}) } -func (d *walletServant) HandleRechargeSuccess(recharge *core.WalletRecharge, tradeNo string) error { +func (d *walletServant) HandleRechargeSuccess(recharge *ms.WalletRecharge, tradeNo string) error { user, _ := (&dbr.User{ Model: &dbr.Model{ ID: recharge.UserID, @@ -111,7 +112,7 @@ func (d *walletServant) HandleRechargeSuccess(recharge *core.WalletRecharge, tra }) } -func (d *walletServant) HandlePostAttachmentBought(post *core.Post, user *core.User) error { +func (d *walletServant) HandlePostAttachmentBought(post *ms.Post, user *ms.User) error { return d.db.Transaction(func(tx *gorm.DB) error { // 扣除金额 if err := tx.Model(user).Update("balance", gorm.Expr("balance - ?", post.AttachmentPrice)).Error; err != nil { diff --git a/internal/model/web/xerror.go b/internal/model/web/xerror.go index 2ad34915..4f4bde57 100644 --- a/internal/model/web/xerror.go +++ b/internal/model/web/xerror.go @@ -96,4 +96,6 @@ var ( ErrUserNameEmpty = xerror.NewError(11003, "用户名为空") ErrDeleteUserKeyFailed = xerror.NewError(11004, "删除用户Share Key失败") ErrGetUserShareKeyCountFailed = xerror.NewError(11005, "获取用户Share Key数量失败") + + ErrNotImplemented = xerror.NewError(10501, "功能未实现") )