rogee/quyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: update

Browse Source
This commit is contained in:
Rogee
2025-05-23 21:39:01 +08:00
parent f370887a71
commit f13ef4388e
20 changed files with 114 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backend/app/http/admin/medias.go
View File

@@ -19,8 +19,8 @@ type medias struct {
// @Bind pagination query
// @Bind query query
func (ctl *medias) List(ctx fiber.Ctx, pagination *requests.Pagination, query *ListQuery) (*requests.Pager, error) {
cond := model.MediasModel.BuildConditionWithKey(query.Keyword)
return model.MediasModel.List(ctx.Context(), pagination, cond)
cond := model.MediasModel().BuildConditionWithKey(query.Keyword)
return model.MediasModel().List(ctx.Context(), pagination, cond)
}
// Show media
@@ -28,7 +28,7 @@ func (ctl *medias) List(ctx fiber.Ctx, pagination *requests.Pagination, query *L
// @Router /admin/medias/:id [get]
// @Bind id path
func (ctl *medias) Show(ctx fiber.Ctx, id int64) error {
media, err := model.MediasModel.GetByID(ctx.Context(), id)
media, err := model.MediasModel().GetByID(ctx.Context(), id)
if err != nil {
return ctx.SendString("Media not found")
}
@@ -46,7 +46,7 @@ func (ctl *medias) Show(ctx fiber.Ctx, id int64) error {
// @Router /admin/medias/:id [delete]
// @Bind id path
func (ctl *medias) Delete(ctx fiber.Ctx, id int64) error {
media, err := model.MediasModel.GetByID(ctx.Context(), id)
media, err := model.MediasModel().GetByID(ctx.Context(), id)
if err != nil {
return ctx.SendString("Media not found")
}
@@ -55,7 +55,7 @@ func (ctl *medias) Delete(ctx fiber.Ctx, id int64) error {
return err
}
if err := model.MediasModel.Delete(ctx.Context(), id); err != nil {
if err := model.MediasModel().Delete(ctx.Context(), id); err != nil {
return err
}
return ctx.SendStatus(fiber.StatusNoContent)

14
backend/app/http/admin/orders.go
View File

@@ -28,25 +28,25 @@ type orders struct {
// @Bind pagination query
// @Bind query query
func (ctl *orders) List(ctx fiber.Ctx, pagination *requests.Pagination, query *OrderListQuery) (*requests.Pager, error) {
cond := model.OrdersModel.BuildConditionWithKey(query.OrderNumber, query.UserID)
return model.OrdersModel.List(ctx.Context(), pagination, cond)
cond := model.OrdersModel().BuildConditionWithKey(query.OrderNumber, query.UserID)
return model.OrdersModel().List(ctx.Context(), pagination, cond)
}
// Refund
// @Router /admin/orders/:id/refund [post]
// @Bind id path
func (ctl *orders) Refund(ctx fiber.Ctx, id int64) error {
order, err := model.OrdersModel.GetByID(ctx.Context(), id)
order, err := model.OrdersModel().GetByID(ctx.Context(), id)
if err != nil {
return err
}
user, err := model.UsersModel.GetByID(ctx.Context(), order.UserID)
user, err := model.UsersModel().GetByID(ctx.Context(), order.UserID)
if err != nil {
return err
}
post, err := model.PostsModel.GetByID(ctx.Context(), order.PostID)
post, err := model.PostsModel().GetByID(ctx.Context(), order.PostID)
if err != nil {
return err
}
@@ -61,7 +61,7 @@ func (ctl *orders) Refund(ctx fiber.Ctx, id int64) error {
}
order.Status = fields.OrderStatusRefundSuccess
if err := model.OrdersModel.Update(ctx.Context(), order); err != nil {
if err := order.Update(ctx.Context()); err != nil {
return errors.Wrap(err, "update order failed")
}
@@ -87,7 +87,7 @@ func (ctl *orders) Refund(ctx fiber.Ctx, id int64) error {
order.RefundTransactionID = resp.RefundId
order.Status = fields.OrderStatusRefundProcessing
if err := model.OrdersModel.Update(ctx.Context(), order); err != nil {
if err := order.Update(ctx.Context()); err != nil {
return err
}

20
backend/app/http/admin/posts.go
View File

@@ -28,7 +28,7 @@ func (ctl *posts) List(ctx fiber.Ctx, pagination *requests.Pagination, query *Li
// conds.Post_Status(fields.PostStatusPublished),
conds.Post_Like(query.Keyword),
}
pager, err := model.PostsModel.List(ctx.Context(), pagination, conds...)
pager, err := model.PostsModel().List(ctx.Context(), pagination, conds...)
if err != nil {
return nil, err
}
@@ -37,7 +37,7 @@ func (ctl *posts) List(ctx fiber.Ctx, pagination *requests.Pagination, query *Li
return item.ID
})
if len(postIds) > 0 {
postCntMap, err := model.PostsModel.BoughtStatistics(ctx.Context(), postIds)
postCntMap, err := model.PostsModel().BoughtStatistics(ctx.Context(), postIds)
if err != nil {
return pager, err
}
@@ -85,7 +85,7 @@ func (ctl *posts) Create(ctx fiber.Ctx, form *PostForm) error {
}
if form.Medias != nil {
medias, err := model.MediasModel.GetByIds(ctx.Context(), form.Medias)
medias, err := model.MediasModel().GetByIds(ctx.Context(), form.Medias)
if err != nil {
return err
}
@@ -111,7 +111,7 @@ func (ctl *posts) Create(ctx fiber.Ctx, form *PostForm) error {
// @Bind id path
// @Bind form body
func (ctl *posts) Update(ctx fiber.Ctx, id int64, form *PostForm) error {
post, err := model.PostsModel.GetByID(ctx.Context(), id)
post, err := model.PostsModel().GetByID(ctx.Context(), id)
if err != nil {
return err
}
@@ -125,7 +125,7 @@ func (ctl *posts) Update(ctx fiber.Ctx, id int64, form *PostForm) error {
post.Tags = fields.Json[[]string]{}
if form.Medias != nil {
medias, err := model.MediasModel.GetByIds(ctx.Context(), form.Medias)
medias, err := model.MediasModel().GetByIds(ctx.Context(), form.Medias)
if err != nil {
return err
}
@@ -150,7 +150,7 @@ func (ctl *posts) Update(ctx fiber.Ctx, id int64, form *PostForm) error {
// @Router /admin/posts/:id [delete]
// @Bind id path
func (ctl *posts) Delete(ctx fiber.Ctx, id int64) error {
post, err := model.PostsModel.GetByID(ctx.Context(), id)
post, err := model.PostsModel().GetByID(ctx.Context(), id)
if err != nil {
return err
}
@@ -175,12 +175,12 @@ type PostItem struct {
// @Router /admin/posts/:id [get]
// @Bind id path
func (ctl *posts) Show(ctx fiber.Ctx, id int64) (*PostItem, error) {
post, err := model.PostsModel.GetByID(ctx.Context(), id)
post, err := model.PostsModel().GetByID(ctx.Context(), id)
if err != nil {
return nil, err
}
medias, err := model.MediasModel.GetByIds(ctx.Context(), lo.Map(post.Assets.Data, func(asset fields.MediaAsset, _ int) int64 {
medias, err := model.MediasModel().GetByIds(ctx.Context(), lo.Map(post.Assets.Data, func(asset fields.MediaAsset, _ int) int64 {
return asset.Media
}))
if err != nil {
@@ -198,12 +198,12 @@ func (ctl *posts) Show(ctx fiber.Ctx, id int64) (*PostItem, error) {
// @Bind id path
// @Bind userId path
func (ctl *posts) SendTo(ctx fiber.Ctx, id, userId int64) error {
post, err := model.PostsModel.GetByID(ctx.Context(), id)
post, err := model.PostsModel().GetByID(ctx.Context(), id)
if err != nil {
return err
}
user, err := model.UsersModel.GetByID(ctx.Context(), userId)
user, err := model.UsersModel().GetByID(ctx.Context(), userId)
if err != nil {
return err
}

12
backend/app/http/admin/statistics.go
View File

@@ -29,31 +29,31 @@ func (s *statistics) statistics(ctx fiber.Ctx) (*StatisticsResponse, error) {
var err error
statistics.PostDraft, err = model.PostsModel.Count(ctx.Context(), table.Posts.Status.EQ(Int(int64(fields.PostStatusDraft))))
statistics.PostDraft, err = model.PostsModel().Count(ctx.Context(), table.Posts.Status.EQ(Int(int64(fields.PostStatusDraft))))
if err != nil {
return nil, err
}
statistics.PostPublished, err = model.PostsModel.Count(ctx.Context(), table.Posts.Status.EQ(Int(int64(fields.PostStatusPublished))))
statistics.PostPublished, err = model.PostsModel().Count(ctx.Context(), table.Posts.Status.EQ(Int(int64(fields.PostStatusPublished))))
if err != nil {
return nil, err
}
statistics.Media, err = model.MediasModel.Count(ctx.Context())
statistics.Media, err = model.MediasModel().Count(ctx.Context())
if err != nil {
return nil, err
}
statistics.Order, err = model.OrdersModel.Count(ctx.Context(), table.Orders.Status.EQ(Int(int64(fields.OrderStatusCompleted))))
statistics.Order, err = model.OrdersModel().Count(ctx.Context(), table.Orders.Status.EQ(Int(int64(fields.OrderStatusCompleted))))
if err != nil {
return nil, err
}
statistics.User, err = model.UsersModel.Count(ctx.Context(), BoolExp(Bool(true)))
statistics.User, err = model.UsersModel().Count(ctx.Context(), BoolExp(Bool(true)))
if err != nil {
return nil, err
}
statistics.Amount, err = model.OrdersModel.SumAmount(ctx.Context())
statistics.Amount, err = model.OrdersModel().SumAmount(ctx.Context())
if err != nil {
return nil, err
}

6
backend/app/http/admin/uploads.go
View File

@@ -38,7 +38,7 @@ type PreCheckResp struct {
// @Bind ext path
// @Bind mime query
func (up *uploads) PreUploadCheck(ctx fiber.Ctx, md5, ext, mime string) (*PreCheckResp, error) {
_, err := model.MediasModel.GetByHash(ctx.Context(), md5)
_, err := model.MediasModel().GetByHash(ctx.Context(), md5)
if err != nil && errors.Is(err, qrm.ErrNoRows) {
preSign, err := up.oss.PreSignUpload(ctx.Context(), fmt.Sprintf("%s.%s", md5, ext), mime)
if err != nil {
@@ -63,7 +63,7 @@ type PostUploadedForm struct {
// @Router /admin/uploads/post-uploaded-action [post]
// @Bind body body
func (up *uploads) PostUploadedAction(ctx fiber.Ctx, body *PostUploadedForm) error {
m, err := model.MediasModel.GetByHash(ctx.Context(), body.Md5)
m, err := model.MediasModel().GetByHash(ctx.Context(), body.Md5)
if err != nil && !errors.Is(err, qrm.ErrNoRows) {
return err
}
@@ -75,7 +75,7 @@ func (up *uploads) PostUploadedAction(ctx fiber.Ctx, body *PostUploadedForm) err
Hash: body.Md5,
Path: filepath.Join(UPLOAD_PATH, body.Md5+filepath.Ext(body.OriginalName)),
}
if err := model.MediasModel.Create(ctx.Context(), m); err != nil {
if err := model.MediasModel().Create(ctx.Context(), m); err != nil {
return err
}

10
backend/app/http/admin/users.go
View File

@@ -20,8 +20,8 @@ type users struct{}
// @Bind pagination query
// @Bind query query
func (ctl *users) List(ctx fiber.Ctx, pagination *requests.Pagination, query *UserListQuery) (*requests.Pager, error) {
cond := model.UsersModel.BuildConditionWithKey(query.Keyword)
return model.UsersModel.List(ctx.Context(), pagination, cond)
cond := model.UsersModel().BuildConditionWithKey(query.Keyword)
return model.UsersModel().List(ctx.Context(), pagination, cond)
}
// Show user
@@ -29,7 +29,7 @@ func (ctl *users) List(ctx fiber.Ctx, pagination *requests.Pagination, query *Us
// @Router /admin/users/:id [get]
// @Bind id path
func (ctl *users) Show(ctx fiber.Ctx, id int64) (*model.Users, error) {
return model.UsersModel.GetByID(ctx.Context(), id)
return model.UsersModel().GetByID(ctx.Context(), id)
}
// Articles show user bought articles
@@ -38,7 +38,7 @@ func (ctl *users) Show(ctx fiber.Ctx, id int64) (*model.Users, error) {
// @Bind id path
// @Bind pagination query
func (ctl *users) Articles(ctx fiber.Ctx, id int64, pagination *requests.Pagination) (*requests.Pager, error) {
return model.PostsModel.Bought(ctx.Context(), id, pagination)
return model.PostsModel().Bought(ctx.Context(), id, pagination)
}
type UserBalance struct {
@@ -51,7 +51,7 @@ type UserBalance struct {
// @Bind id path
// @Bind balance body
func (ctl *users) Balance(ctx fiber.Ctx, id int64, balance *UserBalance) error {
user, err := model.UsersModel.GetByID(ctx.Context(), id)
user, err := model.UsersModel().GetByID(ctx.Context(), id)
if err != nil {
return err
}

2
backend/app/http/auth.go
View File

@@ -89,7 +89,7 @@ func (ctl *auth) Login(ctx fiber.Ctx, code, state, redirect string) error {
Scope: token.Scope,
}),
}
user, err := model.UsersModel.GetUserByOpenIDOrCreate(ctx.Context(), token.GetOpenID(), userModel)
user, err := model.UsersModel().GetUserByOpenIDOrCreate(ctx.Context(), token.GetOpenID(), userModel)
if err != nil {
return errors.Wrap(err, "failed to get user by openid")
}

24
backend/app/http/posts.go
View File

@@ -45,7 +45,7 @@ func (ctl *posts) List(ctx fiber.Ctx, pagination *requests.Pagination, query *Li
conds.Post_Like(query.Keyword),
}
pager, err := model.PostsModel.List(ctx.Context(), pagination, conds...)
pager, err := model.PostsModel().List(ctx.Context(), pagination, conds...)
if err != nil {
log.WithError(err).Errorf("post list err: %v", err)
return nil, err
@@ -59,7 +59,7 @@ func (ctl *posts) List(ctx fiber.Ctx, pagination *requests.Pagination, query *Li
}
items := lo.FilterMap(pager.Items.([]model.Posts), func(item model.Posts, _ int) (PostItem, bool) {
medias, err := model.PostsModel.GetMediaByIds(ctx.Context(), item.HeadImages.Data)
medias, err := model.PostsModel().GetMediaByIds(ctx.Context(), item.HeadImages.Data)
if err != nil {
log.Errorf("GetMediaByIds err: %v", err)
return PostItem{}, false
@@ -118,7 +118,7 @@ type PostItem struct {
func (ctl *posts) Show(ctx fiber.Ctx, id int64, user *model.Users) (*PostItem, error) {
log.Infof("Fetching post with ID: %d", id)
post, err := model.PostsModel.GetByID(ctx.Context(), id, conds.Post_NotDeleted(), conds.Post_Status(fields.PostStatusPublished))
post, err := model.PostsModel().GetByID(ctx.Context(), id, conds.Post_NotDeleted(), conds.Post_Status(fields.PostStatusPublished))
if err != nil {
log.WithError(err).Errorf("GetByID err: %v", err)
return nil, err
@@ -129,7 +129,7 @@ func (ctl *posts) Show(ctx fiber.Ctx, id int64, user *model.Users) (*PostItem, e
return nil, err
}
medias, err := model.PostsModel.GetMediaByIds(ctx.Context(), post.HeadImages.Data)
medias, err := model.PostsModel().GetMediaByIds(ctx.Context(), post.HeadImages.Data)
if err != nil {
return nil, err
}
@@ -179,7 +179,7 @@ func (ctl *posts) Play(ctx fiber.Ctx, id int64, user *model.Users) (*PlayUrl, er
}
log.Infof("Fetching play URL for post ID: %d", id)
post, err := model.PostsModel.GetByID(ctx.Context(), id)
post, err := model.PostsModel().GetByID(ctx.Context(), id)
if err != nil {
log.WithError(err).Errorf("GetByID err: %v", err)
return nil, err
@@ -188,7 +188,7 @@ func (ctl *posts) Play(ctx fiber.Ctx, id int64, user *model.Users) (*PlayUrl, er
for _, asset := range post.Assets.Data {
if asset.Type == "video/mp4" && asset.Metas != nil && asset.Metas.Short == preview {
media, err := model.MediasModel.GetByID(ctx.Context(), asset.Media)
media, err := model.MediasModel().GetByID(ctx.Context(), asset.Media)
if err != nil {
log.WithError(err).Errorf("medias GetByID err: %v", err)
return nil, err
@@ -222,7 +222,7 @@ func (ctl *posts) Mine(ctx fiber.Ctx, pagination *requests.Pagination, query *Li
conds.Post_Status(fields.PostStatusPublished),
conds.Post_Like(query.Keyword),
}
pager, err := model.UsersModel.PostList(ctx.Context(), user.ID, pagination, conds...)
pager, err := model.UsersModel().PostList(ctx.Context(), user.ID, pagination, conds...)
if err != nil {
log.WithError(err).Errorf("post list err: %v", err)
return nil, err
@@ -231,7 +231,7 @@ func (ctl *posts) Mine(ctx fiber.Ctx, pagination *requests.Pagination, query *Li
postIds := lo.Map(pager.Items.([]model.Posts), func(item model.Posts, _ int) int64 { return item.ID })
if len(postIds) > 0 {
items := lo.FilterMap(pager.Items.([]model.Posts), func(item model.Posts, _ int) (PostItem, bool) {
medias, err := model.PostsModel.GetMediaByIds(ctx.Context(), item.HeadImages.Data)
medias, err := model.PostsModel().GetMediaByIds(ctx.Context(), item.HeadImages.Data)
if err != nil {
log.Errorf("GetMediaByIds err: %v", err)
return PostItem{}, false
@@ -279,19 +279,19 @@ func (ctl *posts) Buy(ctx fiber.Ctx, id int64, user *model.Users) (*wechat.JSAPI
return nil, errors.New("已经购买过了")
}
post, err := model.PostsModel.GetByID(ctx.Context(), id)
post, err := model.PostsModel().GetByID(ctx.Context(), id)
if err != nil {
return nil, errors.Wrapf(err, " failed to get post: %d", id)
}
payPrice := post.Price * int64(post.Discount) / 100
order, err := model.OrdersModel.Create(ctx.Context(), user.ID, post.ID)
order, err := model.OrdersModel().Create(ctx.Context(), user.ID, post.ID)
if err != nil {
return nil, errors.Wrap(err, "订单创建失败")
}
if user.Balance >= payPrice {
if err := model.OrdersModel.SetMeta(ctx.Context(), order.ID, func(om fields.OrderMeta) fields.OrderMeta {
if err := order.SetMeta(ctx.Context(), func(om fields.OrderMeta) fields.OrderMeta {
om.CostBalance = payPrice
return om
}); err != nil {
@@ -309,7 +309,7 @@ func (ctl *posts) Buy(ctx fiber.Ctx, id int64, user *model.Users) (*wechat.JSAPI
}
payPrice = payPrice - user.Balance
if err := model.OrdersModel.SetMeta(ctx.Context(), order.ID, func(om fields.OrderMeta) fields.OrderMeta {
if err := order.SetMeta(ctx.Context(), func(om fields.OrderMeta) fields.OrderMeta {
om.CostBalance = user.Balance
return om
}); err != nil {