修复拉卡拉支付时间偏差
This commit is contained in:
@@ -14,6 +14,7 @@ import (
|
||||
"hfb_sys/backend/internal/modules/chat"
|
||||
"hfb_sys/backend/internal/modules/notification"
|
||||
"hfb_sys/backend/internal/modules/wallet"
|
||||
"hfb_sys/backend/internal/timeutil"
|
||||
"hfb_sys/backend/pkg/money"
|
||||
|
||||
"gorm.io/datatypes"
|
||||
@@ -1627,7 +1628,7 @@ func makeAccountSnapshot(account model.GameAccount) (datatypes.JSON, error) {
|
||||
func newOrderNo() (string, error) {
|
||||
// 生成格式:RO + YYYYMMDDHHMMSS + 3位随机数
|
||||
// 例如:RO20260603123456789
|
||||
now := time.Now()
|
||||
now := timeutil.ShanghaiNow()
|
||||
|
||||
// 时间部分:年月日时分秒 (14位)
|
||||
timeStr := now.Format("20060102150405")
|
||||
|
||||
@@ -5,6 +5,7 @@ import (
|
||||
"time"
|
||||
|
||||
"hfb_sys/backend/internal/model"
|
||||
"hfb_sys/backend/internal/timeutil"
|
||||
|
||||
"gorm.io/datatypes"
|
||||
)
|
||||
@@ -131,3 +132,29 @@ func TestArchiveListingAfterCheckoutMovesListingOffline(t *testing.T) {
|
||||
// - Order should enter completed or closed state
|
||||
_ = time.Now()
|
||||
}
|
||||
|
||||
func TestNewOrderNoUsesShanghaiTimeWhenLocalIsUTC(t *testing.T) {
|
||||
oldLocal := time.Local
|
||||
time.Local = time.UTC
|
||||
defer func() {
|
||||
time.Local = oldLocal
|
||||
}()
|
||||
|
||||
loc := timeutil.ShanghaiLocation()
|
||||
before := time.Now().In(loc)
|
||||
orderNo, err := newOrderNo()
|
||||
after := time.Now().In(loc)
|
||||
if err != nil {
|
||||
t.Fatalf("newOrderNo() error = %v", err)
|
||||
}
|
||||
if len(orderNo) != len("RO20260603123456789") {
|
||||
t.Fatalf("orderNo length = %d, want %d: %s", len(orderNo), len("RO20260603123456789"), orderNo)
|
||||
}
|
||||
parsed, err := time.ParseInLocation("20060102150405", orderNo[2:16], loc)
|
||||
if err != nil {
|
||||
t.Fatalf("parse order no time: %v", err)
|
||||
}
|
||||
if parsed.Before(before.Add(-2*time.Second)) || parsed.After(after.Add(2*time.Second)) {
|
||||
t.Fatalf("order no time = %s, want between %s and %s", parsed, before, after)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user