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

fix: update issues

Browse Source
This commit is contained in:
yanghao05
2025-04-18 10:41:07 +08:00
parent 2780d16edc
commit 2854afec53
4 changed files with 68 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,16 +2,15 @@ package http
import (
_ "embed"
"encoding/json"
"strings"
"text/template"
"time"
"quyun/app/models"
"quyun/app/requests"
"quyun/database/fields"
"quyun/database/schemas/public/model"
"quyun/providers/wepay"
"github.com/go-pay/gopay/wechat/v3"
"github.com/gofiber/fiber/v3"
"github.com/gofiber/fiber/v3/log"
"github.com/pkg/errors"
@@ -33,7 +32,11 @@ type posts struct {
// @Bind user local
func (ctl *posts) List(ctx fiber.Ctx, pagination *requests.Pagination, query *ListQuery, user *model.Users) (*requests.Pager, error) {
cond := models.Posts.BuildConditionWithKey(query.Keyword)
return models.Posts.List(ctx.Context(), pagination, cond)
return models.Posts.List(ctx.Context(), pagination, cond, func(item model.Posts) model.Posts {
item.Assets = fields.ToJson([]fields.MediaAsset{})
item.Content = ""
return item
})
}
// Show
@@ -49,32 +52,27 @@ func (ctl *posts) Show(ctx fiber.Ctx, id int64) (*model.Posts, error) {
// @Bind query query
func (ctl *posts) Mine(ctx fiber.Ctx, pagination *requests.Pagination, query *ListQuery) (*requests.Pager, error) {
log.Infof("Fetching posts for user with pagination: %+v and keyword: %v", pagination, query.Keyword)
return models.Users.PostList(ctx.Context(), 1, pagination, query.Keyword)
return models.Users.PostList(ctx.Context(), 1, pagination, query.Keyword, func(item model.Posts) model.Posts {
item.Assets = fields.ToJson([]fields.MediaAsset{})
item.Content = ""
return item
})
}
//go:embed buy.html.tpl
var buyTpl string
// Buy
// @Router /api/posts/buy/:id [get]
// @Bind id path
func (ctl *posts) Buy(ctx fiber.Ctx, id int64) error {
var userId int64 = 1
user, err := models.Users.GetByID(ctx.Context(), userId)
if err != nil {
return errors.Wrapf(err, " failed to get user: %d", userId)
}
// @Bind user local
func (ctl *posts) Buy(ctx fiber.Ctx, id int64, user *model.Users) (*wechat.JSAPIPayParams, error) {
post, err := models.Posts.GetByID(ctx.Context(), id)
if err != nil {
return errors.Wrapf(err, " failed to get post: %d", id)
return nil, errors.Wrapf(err, " failed to get post: %d", id)
}
// create order
order, err := models.Orders.Create(ctx.Context(), userId, post.ID)
order, err := models.Orders.Create(ctx.Context(), user.ID, post.ID)
if err != nil {
return errors.Wrap(err, "订单创建失败")
return nil, errors.Wrap(err, "订单创建失败")
}
prePayResp, err := ctl.wepay.V3TransactionJsapi(ctx.Context(), func(bm *wepay.BodyMap) {
@@ -86,30 +84,8 @@ func (ctl *posts) Buy(ctx fiber.Ctx, id int64) error {
})
if err != nil {
log.Errorf("wepay.V3TransactionJsapi err: %v", err)
return errors.Wrap(err, "微信支付失败")
return nil, errors.Wrap(err, "微信支付失败")
}
signature, err := prePayResp.PaySignOfJSAPI()
if err != nil {
return errors.Wrap(err, "failed to get pay sign")
}
// render buyTpl with html/template
tpl, err := template.New("buy").Parse(buyTpl)
if err != nil {
return errors.Wrap(err, "failed to parse template")
}
signatureBytes, err := json.Marshal(signature)
if err != nil {
return errors.Wrap(err, "failed to marshal signature")
}
var buf strings.Builder
if err := tpl.Execute(&buf, map[string]interface{}{"signature": string(signatureBytes)}); err != nil {
return errors.Wrap(err, "failed to execute template")
}
ctx.Set("Content-Type", "text/html; charset=utf-8")
return ctx.SendString(buf.String())
return prePayResp.PaySignOfJSAPI()
}