添加会员模块 #20

yumosx · 2025-06-15T06:48:03Z

No description provided.

codecov · 2025-06-15T06:50:13Z

Codecov Report

Attention: Patch coverage is 0% with 773 lines in your changes missing coverage. Please review.

Please upload report for BASE (main@ea035c9). Learn more about missing BASE report.

Files with missing lines	Patch %	Lines
api/gen/ai/v1/ai.pb.go	0.00%	333 Missing ⚠️
api/gen/ai/v1/ai_grpc.pb.go	0.00%	200 Missing ⚠️
internal/repository/dao/quota.go	0.00%	119 Missing ⚠️
internal/web/quota.go	0.00%	81 Missing ⚠️
internal/repository/quota.go	0.00%	28 Missing ⚠️
internal/service/quota.go	0.00%	12 Missing ⚠️

Additional details and impacted files

@@          Coverage Diff           @@
##             main     #20   +/-   ##
======================================
  Coverage        ?   1.51%           
======================================
  Files           ?      38           
  Lines           ?    2249           
  Branches        ?       0           
======================================
  Hits            ?      34           
  Misses          ?    2214           
  Partials        ?       1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

flycash · 2025-07-02T06:29:23Z

internal/repository/dao/quota.go

+}
+
+// Deduct 扣减
+func (dao *QuotaDao) Deduct(ctx context.Context, uid int64, amount int64) error {


这部分逻辑挪上去 service 里面，并且你不需要使用悲观锁，用乐观锁来控制。

悲观锁性能太差了

flycash · 2025-07-02T06:30:56Z

internal/service/quota.go

+	return &QuotaService{repo: repo}
+}
+
+func (q *QuotaService) CreateQuota(ctx context.Context, quota domain.Quota) error {


把这个修改为 Create 修改为 Create Or Incr 的语义。也就是要么是创建，要么是增加 quota 里面金额，quota里面金额可以是负数。

这里也需要有一个额外的参数 key，保证幂等。

flycash · 2025-07-02T06:33:30Z

internal/service/quota.go

+	return q.repo.CreateQuota(ctx, quota)
+}
+
+func (q *QuotaService) CreateTempQuota(ctx context.Context, quota domain.TempQuota) error {


在 TempQuota 里面加一个 key 字段，string，作为唯一索引，我想到这个东西是需要考虑去重的。

flycash · 2025-07-02T06:34:26Z

internal/service/quota.go

+	return q.repo.GetQuota(ctx, uid)
+}
+
+func (q *QuotaService) Deduct(ctx context.Context, uid int64, amount int64) error {


这个要做成幂等的，所以还需要一个 key 的参数，作为去重。为此，你可以额外引入一个 DeductRecord 的记录表，一方面是去重，一方面也是记录整个金额的变化。

DeductRecord 这个名字不太好，因为那边 CreateOr Incr 的语义也同样需要去重。改为 QuotaRecord 表。

flycash · 2025-07-02T06:37:26Z

internal/web/quota.go

+
+func (q *QuotaHandler) PublicRoutes(server *gin.Engine) {
+	group := server.Group("/quota")
+	group.POST("/create", ginx.BS(q.CreateTempQuota))


你这是不是重复注册了 1.CreateTempQuota？这里进一步分 tmpG := group.Group("/tmp")

flycash · 2025-07-07T08:54:03Z

internal/service/quota.go

+func (q *QuotaService) Deduct(ctx context.Context, uid int64, amount int64, key string) error {
+	key1 := fmt.Sprintf("temp_%s", key)
+	key2 := fmt.Sprintf("quota_%s", key)


不是这么用的，意思是扣减是一个整体，记录到 QuotaRecord 中。换言之，虽然额度分成了 Quota 和 temp Quota 两个，但是扣减这个，只会有一条 QuotaRecord。

我感觉就是在 service 里面操作数据库事务这个东西我还没说过怎么操作，那么你就挪回去 dao 里面。然后逻辑是这样的：

Begin() insertQuotaRecord() // 检测是否成功 // 成功往后执行 // 往后执行后续的扣减逻辑。

然后要记住在扣减的时候，要注意用 CAS 操作来解决并发问题。因为你要考虑两个 goroutine，一个扣减 10，一个扣减 20 这种并发的情况。

flycash · 2025-07-09T13:36:28Z

internal/repository/dao/quota.go

+			Ctime:  now,
+			Utime:  now,
+		}
+		result := tx.Clauses(clause.OnConflict{


这个逻辑不对。是这样的：

如果 QuotaRecord 插入成功，说明这是一个新请求，那么就往后执行，后面的操作是对的

如果 QuotaRecord 插入失败，就说明要么数据库有问题，要么是重复请求，直接结束整个事务，返回 error。

flycash · 2025-07-09T13:37:43Z

internal/repository/dao/quota.go

+		}
+		tq := &tempQuotas[i]
+		deduct := tq.Amount
+		if deduct > remain {


还用 min 方法就可以，现在我记得 SDK 自带了泛型的 min 方法

flycash · 2025-07-09T13:38:56Z

internal/repository/dao/quota.go

+	remain := amount
+
+	// 先扣临时额度
+	for i := range tempQuotas {


这里可以直接用 tmpQuota, i := range 的写法，在 golint 里面忽略掉这个检测。

flycash · 2025-07-09T13:40:23Z

internal/repository/dao/quota.go

+			Updates(map[string]any{
+				"amount":          gorm.Expr("amount - ?", remain),
+				"utime":           now,
+				"last_clear_time": now,


这个不要更新，last_clear_time 是用户必须要在负数之后重置成功成为了正数，才需要修改。

flycash · 2025-07-09T13:41:32Z

internal/repository/dao/quota.go

+		if update.RowsAffected == 0 {
+			continue // 这条被其他并发扣完，跳过
+		}
+		remain -= deduct


把前面的 remain < 0 break 的检测挪动到这后面

<= 0 应该是直接 return 了。

flycash · 2025-07-09T13:42:27Z

internal/repository/dao/quota.go

+	}
+
+	// 如果还有剩余，从主额度扣
+	if remain > 0 {


当前面你用 <= 0 return 之后，这边就不需要检测 remain 了

flycash · 2025-07-09T13:44:14Z

errs/errs.go

@@ -18,4 +18,7 @@ import (
 	"errors"
 )

-var ErrBizConfigNotFound = errors.New("biz config not found")
+var (
+	DeductAmount         = errors.New("扣减失败")


所有的 error 都用 Err 作为名字前缀，然后额外加一个叫做 ErrInsufficientQuota，明确是额度不足，后续可以想到业务方可能会检测Insufficient 错误，然后提示用户充值。

flycash · 2025-07-09T13:47:55Z

把对应的 CI 问题都修一下。

yumosx · 2025-07-09T16:26:47Z

把对应的 CI 问题都修一下。

明哥你给 proto 生成的 go 文件干没了，导致ci 全没了😂

flycash · 2025-07-10T15:06:54Z

internal/repository/dao/quota.go

+			Ctime:  now,
+			Utime:  now,
+		}
+		result := tx.Clauses(clause.OnConflict{


类似于 SaveQuota，你这里也是直接插入 Record，插入成功了才算是去重了，才需要执行后续的步骤。

internal/repository/dao/quota.go

flycash · 2025-07-12T13:44:24Z

.github/workflows/go-fmt.yml

-
+        run: | 
+          go install golang.org/x/tools/cmd/goimports@latest
+          go install mvdan.cc/gofumpt@latest


为啥需要这个？

我觉得还是删了吧，有一个基本的格式化的就可以了，多了我也遭不住。

flycash · 2025-07-12T14:04:53Z

errs/errs.go

-var ErrBizConfigNotFound = errors.New("biz config not found")
+var (
+	ErrDeductAmountFailed = errors.New("扣减失败")
+	ErrBizConfigNotFound  = errors.New("biz config not found")


大哥都改了，都改为中文

flycash · 2025-07-12T14:05:46Z

internal/repository/dao/quota.go

+	return &QuotaDao{db: db}
+}
+
+func (dao *QuotaDao) SaveTempQuota(ctx context.Context, quota TempQuota) error {


Tmp Quota 是不需要 Save 的，就是直接插入。如果是重复请求就直接报错。

flycash · 2025-07-12T14:06:24Z

internal/repository/dao/quota.go

+
+		return tx.Clauses(clause.OnConflict{
+			Columns: []clause.Column{{Name: "key"}},
+			DoUpdates: clause.Assignments(map[string]any{


这边记得改为 amount 相加

而后整个方法改名为 AddQuota。从 service 一路重命名下来。

flycash · 2025-07-12T14:08:12Z

internal/repository/dao/quota.go

+		err := tx.Where("amount > ? and uid = ?", 0, uid).First(&quota).Error
+		if err != nil {
+			// 表示找不到可以扣减的temp
+			if errors.Is(err, gorm.ErrRecordNotFound) {


这里要加一个测试用例，测试这个场景。

flycash · 2025-07-12T14:13:00Z

internal/web/quota.go

+	return &QuotaHandler{svc: svc}
+}
+
+func (q *QuotaHandler) PublicRoutes(_ *gin.Engine) {}


这种空方法用不上的就直接删了

flycash · 2025-07-12T14:13:50Z

internal/test/quota_test.go

+	}
+
+	for _, tc := range testcases {
+		t.Run(tc.name, func(t *testing.T) {


这个 Handler 你可以在 setup suite 的时候就直接搞好。然后包括 mock session 啥的，都可以直接用 AnyTime 确保可以用多次 Claims 方法，并且都返回同一个值。

flycash · 2025-07-12T14:14:19Z

internal/web/quota.go

+	return slice.Map[domain.TempQuota, QuotaResponse](tempQuotaList, func(idx int, src domain.TempQuota) QuotaResponse {
+		return QuotaResponse{
+			Amount:    src.Amount,
+			StartTime: time.Unix(src.StartTime, 0).Format("2006-01-02 15:04:05"),


后端不要格式化，直接返回时间戳毫秒数。

flycash · 2025-07-12T14:15:34Z

internal/web/quota.go

+		return systemErrorResult, nil
+	}
+
+	start, _ := q.toTimestamp(req.StartTime)


这里假设前端返回的是 unix 毫秒数。

flycash · 2025-07-12T14:16:00Z

internal/web/quota.go

+
+	err := q.svc.SaveTempQuota(ctx, domain.TempQuota{Amount: req.Amount, Uid: uid, StartTime: start, EndTime: end})
+	if err != nil {
+		return systemErrorResult, nil


return systemErrorResult, err
这样 ginx 会帮你记录这个错误，其余地方也一样。

add quota

8864527

yumosx added 5 commits June 15, 2025 16:24

fix typo

f9b38d0

add deduct

33f17f8

add the quota

65cdc59

handler: add quota

6c93dcc

fix ci

f05e5c2

flycash reviewed Jul 2, 2025

View reviewed changes

update

e190998

flycash reviewed Jul 7, 2025

View reviewed changes

update deduct method

7737096

flycash reviewed Jul 9, 2025

View reviewed changes

yumosx added 4 commits July 9, 2025 23:57

update and add tests

ef5c009

fix lint

f5f9675

fix package

de2286b

fix

eaeb1f7

yumosx added 4 commits July 10, 2025 00:36

add the pb.go

a96b0fb

fix path

fe10e1f

fix

84129ec

update test

2216361

flycash reviewed Jul 10, 2025

View reviewed changes

yumosx added 6 commits July 11, 2025 00:24

update

7efd4db

update the deduct

1f420bd

删除不必要的指令

671269b

remove the error

5deee10

fix the deduct

97cb475

fix

34fd888

flycash reviewed Jul 12, 2025

View reviewed changes

添加 会员 模块 #20

Are you sure you want to change the base?

添加 会员 模块 #20

Uh oh!

Conversation

yumosx commented Jun 15, 2025

Uh oh!

codecov bot commented Jun 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

flycash commented Jul 9, 2025

Uh oh!

yumosx commented Jul 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

添加会员模块 #20

添加会员模块 #20

codecov bot commented Jun 15, 2025 •

edited

Loading

yumosx commented Jul 9, 2025 •

edited

Loading