对接

internal/data/gift/gift.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 	bizgift "kra/internal/biz/gift"
 	"kra/internal/data/ledger"
+	"kra/internal/utils/serial"
 	"strconv"
 	"strings"
 	"time"
@@ -26,7 +26,7 @@ type giftPO struct {
 	Description string         `gorm:"size:255"`
 	Tiers       string         `gorm:"type:text"`
 	Sort        int            `gorm:"default:0;index"`
-	Enabled     bool           `gorm:"default:true;index"`
+	Enabled     bool           `gorm:"index"`
 }
 
 func (giftPO) TableName() string { return "live_gifts" }
@@ -244,7 +244,11 @@ func (r *repo) Send(ctx context.Context, userID, roomID, giftID uint, quantity i
 			}
 		}
 		roomIDCopy, giftIDCopy := room.ID, gift.ID
-		row := ledger.GiftSendPO{SerialNo: newNumber("DS"), UserID: userID, RoomID: &roomIDCopy, RoomName: room.Name, AnchorUserID: room.AnchorUserID, AnchorName: room.AnchorName, GiftID: &giftIDCopy, GiftName: gift.Name, GiftIcon: gift.Icon, GiftPrice: gift.Price, Quantity: quantity, DiamondTotal: total, RateCents: rate, EquivalentCents: total * rate}
+		serialNo, err := serial.New("DS")
+		if err != nil {
+			return err
+		}
+		row := ledger.GiftSendPO{SerialNo: serialNo, UserID: userID, RoomID: &roomIDCopy, RoomName: room.Name, AnchorUserID: room.AnchorUserID, AnchorName: room.AnchorName, GiftID: &giftIDCopy, GiftName: gift.Name, GiftIcon: gift.Icon, GiftPrice: gift.Price, Quantity: quantity, DiamondTotal: total, RateCents: rate, EquivalentCents: total * rate}
 		if err := tx.Create(&row).Error; err != nil {
 			return err
 		}
@@ -295,6 +299,3 @@ func sendOrder(v string) string {
 	}
 	return "live_gift_sends.created_at DESC,live_gift_sends.id DESC"
 }
-func newNumber(prefix string) string {
-	return fmt.Sprintf("%s%s%06d", prefix, time.Now().Format("20060102150405"), time.Now().UnixNano()%1000000)
-}