hy/yumi-golang
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复最后一份红包死锁

Browse Source
This commit is contained in:
hy001 2026-05-23 11:10:52 +08:00
parent e4911e7732
commit 0a11372d96
3 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/model/voice_room_red_packet_models.go
View File

@ -76,12 +76,12 @@ func (VoiceRoomRedPacket) TableName() string { return "voice_room_red_packet" }
// VoiceRoomRedPacketSlice 保存红包预拆分份额。 // VoiceRoomRedPacketSlice 保存红包预拆分份额。
type VoiceRoomRedPacketSlice struct { type VoiceRoomRedPacketSlice struct {
ID int64 `gorm:"column:id;primaryKey"` ID int64 `gorm:"column:id;primaryKey;index:idx_voice_room_red_packet_slice_claim_order,priority:4"`
PacketID int64 `gorm:"column:packet_id;uniqueIndex:uk_voice_room_red_packet_slice,priority:1;index:idx_voice_room_red_packet_slice_claim,priority:1"` PacketID int64 `gorm:"column:packet_id;uniqueIndex:uk_voice_room_red_packet_slice,priority:1;index:idx_voice_room_red_packet_slice_claim,priority:1;index:idx_voice_room_red_packet_slice_claim_order,priority:1"`
PacketNo string `gorm:"column:packet_no;size:64"` PacketNo string `gorm:"column:packet_no;size:64"`
SortNo int `gorm:"column:sort_no;uniqueIndex:uk_voice_room_red_packet_slice,priority:2"` SortNo int `gorm:"column:sort_no;uniqueIndex:uk_voice_room_red_packet_slice,priority:2;index:idx_voice_room_red_packet_slice_claim_order,priority:3"`
Amount int64 `gorm:"column:amount"` Amount int64 `gorm:"column:amount"`
Status string `gorm:"column:status;size:32;index:idx_voice_room_red_packet_slice_claim,priority:2"` Status string `gorm:"column:status;size:32;index:idx_voice_room_red_packet_slice_claim,priority:2;index:idx_voice_room_red_packet_slice_claim_order,priority:2"`
ClaimUserID *int64 `gorm:"column:claim_user_id"` ClaimUserID *int64 `gorm:"column:claim_user_id"`
ClaimRecordID *int64 `gorm:"column:claim_record_id"` ClaimRecordID *int64 `gorm:"column:claim_record_id"`
CreateTime time.Time `gorm:"column:create_time"` CreateTime time.Time `gorm:"column:create_time"`

8
internal/service/voiceroomredpacket/claim.go
View File

@ -182,6 +182,12 @@ func (s *Service) completeClaimWallet(ctx context.Context, claim model.VoiceRoom
} }
now := time.Now() now := time.Now()
if err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error { if err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
var lockedPacket model.VoiceRoomRedPacket
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).
Where("id = ?", claim.PacketID).
First(&lockedPacket).Error; err != nil {
return err
}
if err := tx.Model(&model.VoiceRoomRedPacketClaim{}). if err := tx.Model(&model.VoiceRoomRedPacketClaim{}).
Where("id = ?", claim.ID). Where("id = ?", claim.ID).
Updates(map[string]any{ Updates(map[string]any{
@ -200,7 +206,7 @@ func (s *Service) completeClaimWallet(ctx context.Context, claim model.VoiceRoom
return err return err
} }
return tx.Model(&model.VoiceRoomRedPacket{}). return tx.Model(&model.VoiceRoomRedPacket{}).
Where("id = ? AND remain_count = 0 AND status = ?", claim.PacketID, packetStatusActive). Where("id = ? AND remain_count = 0 AND status = ?", lockedPacket.ID, packetStatusActive).
Updates(map[string]any{ Updates(map[string]any{
"status": packetStatusFinished, "status": packetStatusFinished,
"update_time": now, "update_time": now,

29
migrations/050_voice_room_red_packet_slice_claim_order_index.sql Normal file
View File

@ -0,0 +1,29 @@
SET @current_schema := DATABASE();
SET @voice_room_red_packet_slice_claim_order_idx_columns := (
SELECT GROUP_CONCAT(column_name ORDER BY seq_in_index)
FROM information_schema.statistics
WHERE table_schema = @current_schema
AND table_name = 'voice_room_red_packet_slice'
AND index_name = 'idx_voice_room_red_packet_slice_claim_order'
);
SET @drop_voice_room_red_packet_slice_claim_order_idx_sql := IF(
@voice_room_red_packet_slice_claim_order_idx_columns IS NOT NULL
AND @voice_room_red_packet_slice_claim_order_idx_columns <> 'packet_id,status,sort_no,id',
'ALTER TABLE `voice_room_red_packet_slice` DROP INDEX `idx_voice_room_red_packet_slice_claim_order`',
'SELECT 1'
);
PREPARE drop_voice_room_red_packet_slice_claim_order_idx_stmt FROM @drop_voice_room_red_packet_slice_claim_order_idx_sql;
EXECUTE drop_voice_room_red_packet_slice_claim_order_idx_stmt;
DEALLOCATE PREPARE drop_voice_room_red_packet_slice_claim_order_idx_stmt;
SET @add_voice_room_red_packet_slice_claim_order_idx_sql := IF(
@voice_room_red_packet_slice_claim_order_idx_columns IS NULL
OR @voice_room_red_packet_slice_claim_order_idx_columns <> 'packet_id,status,sort_no,id',
'ALTER TABLE `voice_room_red_packet_slice` ADD INDEX `idx_voice_room_red_packet_slice_claim_order` (`packet_id`, `status`, `sort_no`, `id`)',
'SELECT 1'
);
PREPARE add_voice_room_red_packet_slice_claim_order_idx_stmt FROM @add_voice_room_red_packet_slice_claim_order_idx_sql;
EXECUTE add_voice_room_red_packet_slice_claim_order_idx_stmt;
DEALLOCATE PREPARE add_voice_room_red_packet_slice_claim_order_idx_stmt;