对接

internal/data/recharge/recharge.go

@@ -3,7 +3,6 @@ package recharge
 import (
 	"context"
 	"errors"
-	"fmt"
 	"strconv"
 	"strings"
 	"time"
@@ -13,6 +12,7 @@ import (
 
 	biz "kra/internal/biz/recharge"
 	"kra/internal/data/ledger"
+	"kra/internal/utils/serial"
 )
 
 type Provider interface{ DB() *gorm.DB }
@@ -39,7 +39,7 @@ func (r *repo) SavePlans(ctx context.Context, plans []*biz.Plan) error {
 			return err
 		}
 		for _, p := range plans {
-			if err := tx.Create(&ledger.RechargePlanPO{Sort: p.Sort, Diamonds: p.Diamonds, AmountCents: p.AmountCents, Enabled: true}).Error; err != nil {
+			if err := tx.Create(&ledger.RechargePlanPO{Sort: p.Sort, Diamonds: p.Diamonds, AmountCents: p.AmountCents, Enabled: p.Enabled}).Error; err != nil {
 				return err
 			}
 		}
@@ -127,7 +127,11 @@ func (r *repo) Create(ctx context.Context, userID, planID uint) (*biz.Order, err
 			rate = v
 		}
 	}
-	v := ledger.RechargeOrderPO{OrderNo: number("CZ"), UserID: userID, Diamonds: plan.Diamonds, AmountCents: plan.AmountCents, RateCents: rate}
+	orderNo, err := serial.New("CZ")
+	if err != nil {
+		return nil, err
+	}
+	v := ledger.RechargeOrderPO{OrderNo: orderNo, UserID: userID, Diamonds: plan.Diamonds, AmountCents: plan.AmountCents, RateCents: rate}
 	if err := r.db(ctx).Create(&v).Error; err != nil {
 		return nil, err
 	}
@@ -185,7 +189,3 @@ func orderBy(v string) string {
 	}
 	return "live_recharge_orders.created_at DESC"
 }
-
-func number(p string) string {
-	return fmt.Sprintf("%s%s%06d", p, time.Now().Format("20060102150405"), time.Now().UnixNano()%1000000)
-}