feat: update models
This commit is contained in:
@@ -82,13 +82,13 @@ func (w *BalancePayNotifyWorker) Work(ctx context.Context, job *Job[BalancePayNo
|
||||
defer tx.Rollback()
|
||||
|
||||
// update user balance
|
||||
err = model.UsersModel.SetBalance(ctx, user.ID, user.Balance-payPrice)
|
||||
err = user.SetBalance(ctx, user.Balance-payPrice)
|
||||
if err != nil {
|
||||
log.WithError(err).Error("SetBalance error")
|
||||
return JobCancel(errors.Wrap(err, "set user balance failed"))
|
||||
}
|
||||
|
||||
if err := model.UsersModel.BuyPosts(context.Background(), order.UserID, order.PostID, order.Price); err != nil {
|
||||
if err := user.BuyPosts(context.Background(), order.PostID, order.Price); err != nil {
|
||||
log.Errorf("BuyPosts error:%v", err)
|
||||
return errors.Wrap(err, "BuyPosts error")
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@ import (
|
||||
"time"
|
||||
|
||||
. "github.com/riverqueue/river"
|
||||
"github.com/sirupsen/logrus"
|
||||
_ "go.ipao.vip/atom"
|
||||
"go.ipao.vip/atom/contracts"
|
||||
)
|
||||
@@ -13,7 +12,7 @@ var _ contracts.CronJob = (*CronJob)(nil)
|
||||
|
||||
// @provider(cronjob)
|
||||
type CronJob struct {
|
||||
log *logrus.Entry `inject:"false"`
|
||||
// log *logrus.Entry `inject:"false"`
|
||||
}
|
||||
|
||||
// Prepare implements contracts.CronJob.
|
||||
|
||||
@@ -47,7 +47,7 @@ func (w *RemoveFileWorker) Work(ctx context.Context, job *Job[RemoveFile]) error
|
||||
|
||||
// Check if the file exists
|
||||
if _, err := os.Stat(job.Args.FilePath); os.IsNotExist(err) {
|
||||
log.Warn("File does not exist: %v", job.Args.FilePath)
|
||||
log.Warnf("File does not exist: %v", job.Args.FilePath)
|
||||
return nil
|
||||
}
|
||||
// Remove the file
|
||||
|
||||
@@ -106,7 +106,7 @@ func (w *VideoExtractHeadImageWorker) Work(ctx context.Context, job *Job[VideoEx
|
||||
return errors.Wrap(err, "failed to upload image to OSS")
|
||||
}
|
||||
|
||||
if w.job.Add(&RemoveFile{FilePath: output}); err != nil {
|
||||
if err := w.job.Add(&RemoveFile{FilePath: output}); err != nil {
|
||||
log.Errorf("Error removing original file: %v", err)
|
||||
}
|
||||
|
||||
@@ -116,11 +116,11 @@ func (w *VideoExtractHeadImageWorker) Work(ctx context.Context, job *Job[VideoEx
|
||||
}
|
||||
|
||||
dst := filepath.Join(w.app.StoragePath, media.Path)
|
||||
if w.job.Add(&RemoveFile{FilePath: dst}); err != nil {
|
||||
if err := w.job.Add(&RemoveFile{FilePath: dst}); err != nil {
|
||||
log.Errorf("Error removing original file: %v", err)
|
||||
}
|
||||
|
||||
if w.job.Add(&PublishDraftPosts{MediaHash: media.Hash}); err != nil {
|
||||
if err := w.job.Add(&PublishDraftPosts{MediaHash: media.Hash}); err != nil {
|
||||
log.Errorf("Error adding job: %v", err)
|
||||
return errors.Wrap(err, "failed to add job")
|
||||
}
|
||||
|
||||
@@ -119,7 +119,7 @@ func (w *VideoStoreShortWorker) Work(ctx context.Context, job *Job[VideoStoreSho
|
||||
log.Infof("Media record created with path: %s and hash: %s", filePath, fileMd5)
|
||||
|
||||
log.Infof("pending remove local storage file %s", job.Args.FilePath)
|
||||
if w.job.Add(&RemoveFile{FilePath: job.Args.FilePath}); err != nil {
|
||||
if err := w.job.Add(&RemoveFile{FilePath: job.Args.FilePath}); err != nil {
|
||||
log.Errorf("Error removing original file: %v", err)
|
||||
}
|
||||
|
||||
|
||||
@@ -92,13 +92,13 @@ func (w *WechatPayNotifyWorker) Work(ctx context.Context, job *Job[WechatPayNoti
|
||||
defer tx.Rollback()
|
||||
|
||||
// update user balance
|
||||
err = model.UsersModel.SetBalance(ctx, user.ID, user.Balance-meta.CostBalance)
|
||||
err = user.SetBalance(ctx, user.Balance-meta.CostBalance)
|
||||
if err != nil {
|
||||
log.WithError(err).Error("SetBalance error")
|
||||
return JobCancel(errors.Wrap(err, "set user balance failed"))
|
||||
}
|
||||
|
||||
if err := model.UsersModel.BuyPosts(context.Background(), order.UserID, order.PostID, order.Price); err != nil {
|
||||
if err := user.BuyPosts(context.Background(), order.PostID, order.Price); err != nil {
|
||||
log.Errorf("BuyPosts error:%v", err)
|
||||
return errors.Wrap(err, "BuyPosts error")
|
||||
}
|
||||
|
||||
@@ -53,6 +53,12 @@ func (w *WechatRefundNotifyWorker) Work(ctx context.Context, job *Job[WechatRefu
|
||||
return err
|
||||
}
|
||||
|
||||
user, err := model.UsersModel.GetByID(context.Background(), order.UserID)
|
||||
if err != nil {
|
||||
log.Errorf("GetByID error:%v", err)
|
||||
return err
|
||||
}
|
||||
|
||||
meta := order.Meta.Data
|
||||
meta.RefundNotify = notify
|
||||
order.Status = fields.OrderStatusRefundProcessing
|
||||
@@ -76,7 +82,7 @@ func (w *WechatRefundNotifyWorker) Work(ctx context.Context, job *Job[WechatRefu
|
||||
defer tx.Rollback()
|
||||
|
||||
if order.Status == fields.OrderStatusRefundSuccess {
|
||||
if err := model.UsersModel.RevokePosts(context.Background(), order.UserID, order.PostID); err != nil {
|
||||
if err := user.RevokePosts(context.Background(), order.PostID); err != nil {
|
||||
log.Errorf("RevokePosts error:%v", err)
|
||||
return errors.Wrap(err, "RevokePosts error")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user