zhengchiliu/zt-closet-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix：支付

Browse Source
This commit is contained in:
zhengchiliu
2026-09-14 02:57:13 +08:00
parent 714d8ff396
commit 32a0b87e9e
3 changed files with 148 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/service/adreward.go
+24 -4
View File
@@ -41,6 +41,12 @@ func (s *AdRewardService) Grant(ctx context.Context, userID int64, request *dto.
return nil, errcode.AdRewardInvalid.WithDetails("该激励类型未配置发放数量")
}
// 变更前后取「有效剩余」，仅用于流水展示；权威数值以额度凭证表为准。
before := int64(0)
if eff, qerr := getEffectiveQuota(ctx, userID, quotaType); qerr == nil {
before = eff.Remain
}
grant := &mysqlmodel.QuotaGrant{
UserID: userID,
QuotaType: quotaType,
@@ -50,12 +56,26 @@ func (s *AdRewardService) Grant(ctx context.Context, userID int64, request *dto.
ExpireTime: todayEndUnix(), // 当天 23:59:59 到期
RefID: request.RefID,
}
if err := mysqldao.NewQuotaGrantDao().QuotaGrantCreate(ctx, grant); err != nil {
if isDuplicateKey(err) {
return nil, errcode.AdRewardClaimed
}
// 流水 order_no 复用广告记录ID（与凭证 ref_id 一致，便于回溯；非空故不影响唯一索引幂等）。
flow := &mysqlmodel.QuotaFlowLog{
QuotaFlowUUID: genUUID(),
UserID: userID,
ChangeTarget: QuotaChangeTargetAdjust,
ChangeType: QuotaChangeTypeActivity,
ChangeNum: amount,
OldValue: before,
NewValue: before + amount,
OrderNo: request.RefID,
QuotaType: quotaType,
Reason: "广告激励赠送",
}
created, err := mysqldao.NewQuotaGrantDao().QuotaGrantCreateWithFlow(ctx, grant, flow)
if err != nil {
return nil, errcode.DatabaseError
}
if !created {
return nil, errcode.AdRewardClaimed // 凭证已存在：重复领取。
}
return &dto.AdRewardGrantResponse{
RefID: request.RefID,
internal/service/order.go
+71 -8
View File
@@ -578,12 +578,14 @@ func (s *OrderService) doGrantBenefit(ctx context.Context, task *mysqlmodel.Bene
}
}
// grantQuotaGrant 发放额度凭证（替代原 grantQuota 累加 user_quotas.total）。
// grantQuotaGrant 发放额度凭证（替代原 grantQuota 累加 user_quotas.total），并同步写「额度明细」流水。
// 会员包（goods_type=1）凭证跟随 VIP（expire_time=0）；加量包按商品 valid_days 设置独立到期时间。
// ref_id 复用订单号，配合 (ref_id, quota_type) 唯一索引实现幂等。
// ref_id 复用订单号，配合 (ref_id, quota_type) 唯一索引实现幂等；流水与凭证同事务写入，
// 保证「额度到账」与「额度明细」一致（此前只写凭证不写流水，导致购买后额度明细为空）。
func (s *OrderService) grantQuotaGrant(ctx context.Context, task *mysqlmodel.BenefitGrantTask, quotaType int8) *errcode.Error {
source := QuotaGrantSourceMember
expireTime := int64(0) // 0 表示跟随 VIP
reason := "购买会员赠送"
if goods, err := s.goodsDao.GoodsGetByID(ctx, task.GoodsID); err == nil && goods.GoodsType != GoodsTypeMember {
// 加量包：独立有效期，从发放时刻起算 valid_days 天；未配置则兜底 30 天。
@@ -593,6 +595,13 @@ func (s *OrderService) grantQuotaGrant(ctx context.Context, task *mysqlmodel.Ben
days = 30
}
expireTime = nowUnix() + days*86400
reason = "购买加量包赠送"
}
// 变更前后取「有效剩余」，仅用于流水展示；权威数值以额度凭证表为准。
before := int64(0)
if eff, qerr := getEffectiveQuota(ctx, task.UserID, quotaType); qerr == nil {
before = eff.Remain
}
grant := &mysqlmodel.QuotaGrant{
@@ -604,10 +613,19 @@ func (s *OrderService) grantQuotaGrant(ctx context.Context, task *mysqlmodel.Ben
ExpireTime: expireTime,
RefID: task.OrderNo,
}
if err := mysqldao.NewQuotaGrantDao().QuotaGrantCreate(ctx, grant); err != nil {
if isDuplicateKey(err) {
return nil // 已发放，幂等。
}
flow := &mysqlmodel.QuotaFlowLog{
QuotaFlowUUID: genUUID(),
UserID: task.UserID,
ChangeTarget: QuotaChangeTargetAdjust,
ChangeType: QuotaChangeTypePurchase,
ChangeNum: task.Amount,
OldValue: before,
NewValue: before + task.Amount,
OrderNo: task.OrderNo,
QuotaType: quotaType,
Reason: reason,
}
if _, err := mysqldao.NewQuotaGrantDao().QuotaGrantCreateWithFlow(ctx, grant, flow); err != nil {
return errcode.DatabaseError
}
return nil
@@ -677,16 +695,61 @@ func (s *OrderService) settleRefundSuccess(ctx context.Context, order *mysqlmode
}
// revokeOrderBenefits 退款成功后回退该订单发放的会员天数并失效赠送额度凭证。
// 会员天数走 revokeVIP；额度类通过失效凭证回收（未用部分回收，已用部分不追回，凭证软删除后不计入有效额度）。
// 会员天数走 revokeVIP；额度类通过失效凭证回收（未用部分回收，已用部分不追回，凭证软删除后不计入有效额度），
// 并在同一事务内写「退款回收」流水，保证额度明细能看到回收记录。
func (s *OrderService) revokeOrderBenefits(ctx context.Context, order *mysqlmodel.Order) {
if order.MemberDays > 0 {
s.revokeVIP(ctx, order.UserID, order.MemberDays, order.OrderNo)
}
if err := mysqldao.NewQuotaGrantDao().QuotaGrantInvalidateByRefID(ctx, order.OrderNo); err != nil {
flows := s.buildQuotaRevokeFlows(ctx, order)
if err := mysqldao.NewQuotaGrantDao().QuotaGrantInvalidateByRefIDWithFlows(ctx, order.OrderNo, flows); err != nil {
slog.WarnContext(ctx, "invalidate quota grants failed", "order_no", order.OrderNo, "error", err)
}
}
// buildQuotaRevokeFlows 构造退款回收流水：按该订单的额度凭证逐类记录回收量。
// 已用部分不追回，故变更量只记未用量 (amount - used)；已全部用掉的凭证不写流水。
func (s *OrderService) buildQuotaRevokeFlows(ctx context.Context, order *mysqlmodel.Order) []*mysqlmodel.QuotaFlowLog {
grants, err := mysqldao.NewQuotaGrantDao().QuotaGrantListByRefID(ctx, order.OrderNo)
if err != nil {
slog.WarnContext(ctx, "list quota grants for revoke failed", "order_no", order.OrderNo, "error", err)
return nil
}
flows := make([]*mysqlmodel.QuotaFlowLog, 0, len(grants))
// 每类额度的当前有效剩余，逐张凭证递减（同一订单同类凭证通常只有一张，此处做通用处理）。
current := make(map[int8]int64, len(grants))
computed := make(map[int8]bool, len(grants))
for i := range grants {
g := grants[i]
revoke := g.Amount - g.Used
if revoke <= 0 {
continue // 已全部用掉，无可回收额度。
}
if !computed[g.QuotaType] {
if eff, qerr := getEffectiveQuota(ctx, order.UserID, g.QuotaType); qerr == nil {
current[g.QuotaType] = eff.Remain
}
computed[g.QuotaType] = true
}
before := current[g.QuotaType]
current[g.QuotaType] = before - revoke
flows = append(flows, &mysqlmodel.QuotaFlowLog{
QuotaFlowUUID: genUUID(),
UserID: order.UserID,
ChangeTarget: QuotaChangeTargetAdjust,
ChangeType: QuotaChangeTypeRefundRevoke,
ChangeNum: -revoke,
OldValue: before,
NewValue: before - revoke,
OrderNo: order.OrderNo,
QuotaType: g.QuotaType,
Reason: "退款回收未使用的赠送额度",
})
}
return flows
}
// revokeVIP 幂等回退会员天数（退款回收）。
func (s *OrderService) revokeVIP(ctx context.Context, userID, memberDays int64, orderNo string) {
user, err := s.userDao.UserGetByID(ctx, userID)