From a6a1afb8799a75b205350e34d7e9d656a8165ac1 Mon Sep 17 00:00:00 2001 From: yml2213 Date: Sat, 23 May 2026 14:44:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E6=8E=89=E7=A7=9F=E6=9C=9F=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=94=99=E8=AF=AF=E4=B8=9C=E8=A5=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/internal/jobs/ordertimeout/job.go | 4 +- backend/internal/model/listing.go | 2 - .../internal/modules/dispute/repository.go | 4 +- backend/internal/modules/listing/dto.go | 4 -- .../internal/modules/listing/repository.go | 8 --- backend/internal/modules/listing/service.go | 3 - backend/internal/modules/order/README.md | 2 +- backend/internal/modules/order/dto.go | 2 - backend/internal/modules/order/handler.go | 2 +- backend/internal/modules/order/repository.go | 19 +++-- backend/internal/modules/order/service.go | 4 +- backend/internal/modules/systemconfig/dto.go | 6 -- .../modules/systemconfig/publish_options.go | 5 -- .../modules/systemconfig/repository.go | 2 +- .../internal/modules/systemconfig/service.go | 3 - backend/internal/modules/wallet/README.md | 2 +- backend/migrations/000001_init.sql | 2 - backend/seeds/dev_orders.sql | 20 +++--- frontend/src/api/listingOptions.ts | 20 ------ frontend/src/api/listings.ts | 4 -- frontend/src/api/orders.ts | 4 +- .../src/views/account/OrderCreateView.vue | 2 +- .../src/views/account/OrderDetailView.vue | 9 ++- frontend/src/views/account/OrdersView.vue | 5 +- .../src/views/admin/AdminDashboardView.vue | 4 +- .../views/admin/AdminListingDetailView.vue | 16 +++-- .../views/admin/AdminListingReviewView.vue | 10 ++- .../src/views/admin/AdminListingsView.vue | 12 ++-- .../src/views/admin/AdminOrderDetailView.vue | 5 +- frontend/src/views/admin/AdminOrdersView.vue | 4 +- .../views/admin/AdminSystemConfigsView.vue | 28 -------- .../src/views/admin/AdminWalletLedgerView.vue | 2 +- .../views/mobile/MobileListingDetailView.vue | 69 ++----------------- .../src/views/mobile/MobileOrdersView.vue | 10 +-- .../mobile/MobileSellerListingCreateView.vue | 19 ++--- frontend/src/views/mobile/listingDisplay.ts | 30 ++------ .../src/views/public/ListingDetailView.vue | 38 +++------- frontend/src/views/public/ListingsView.vue | 19 ++--- .../src/views/seller/SellerEarningsView.vue | 2 +- .../views/seller/SellerListingCreateView.vue | 25 +++---- .../src/views/seller/SellerListingsView.vue | 8 ++- 41 files changed, 127 insertions(+), 312 deletions(-) diff --git a/backend/internal/jobs/ordertimeout/job.go b/backend/internal/jobs/ordertimeout/job.go index 8d03519..644f4b9 100644 --- a/backend/internal/jobs/ordertimeout/job.go +++ b/backend/internal/jobs/ordertimeout/job.go @@ -254,7 +254,7 @@ func (j *Job) handleReturnOverdue(ctx context.Context, now time.Time, cfg thresh UserID: order.RenterID, Type: "timeout", Title: "订单已逾期未归还", - Content: "租期已超时，请尽快提交归还说明，避免进入申诉处理。", + Content: "订单已超过预计截止时间，请尽快提交归还说明，避免进入申诉处理。", BizType: "order", BizID: &orderID, }, @@ -262,7 +262,7 @@ func (j *Job) handleReturnOverdue(ctx context.Context, now time.Time, cfg thresh UserID: order.OwnerID, Type: "timeout", Title: "租客逾期未归还", - Content: "租客未在租期结束后及时归还，你可以发起申诉或等待客服处理。", + Content: "租客未在预计截止后及时归还，你可以发起申诉或等待客服处理。", BizType: "order", BizID: &orderID, }, diff --git a/backend/internal/model/listing.go b/backend/internal/model/listing.go index 9e84787..c137c31 100644 --- a/backend/internal/model/listing.go +++ b/backend/internal/model/listing.go @@ -36,8 +36,6 @@ type RentalListing struct { PriceDaily float64 `gorm:"type:decimal(12,2);not null;default:0" json:"price_daily"` PriceWeekly float64 `gorm:"type:decimal(12,2);not null;default:0" json:"price_weekly"` DepositAmount float64 `gorm:"type:decimal(12,2);not null;default:0" json:"deposit_amount"` - MinRentHours int `gorm:"not null;default:1" json:"min_rent_hours"` - MaxRentHours int `gorm:"not null;default:168" json:"max_rent_hours"` Status string `gorm:"size:32;not null;default:'draft'" json:"status"` ReviewStatus string `gorm:"size:32;not null;default:'none'" json:"review_status"` ReviewReason string `gorm:"size:255;not null;default:''" json:"review_reason"` diff --git a/backend/internal/modules/dispute/repository.go b/backend/internal/modules/dispute/repository.go index 494cccc..1933929 100644 --- a/backend/internal/modules/dispute/repository.go +++ b/backend/internal/modules/dispute/repository.go @@ -320,7 +320,7 @@ func buildArbitrationSettlement(order model.RentalOrder, req ArbitrateRequest) ( addRenterRefund(req.Amount, "仲裁部分退款") addOwnerIncome(total-req.Amount, "仲裁剩余金额结算给号主") case "release_deposit": - addOwnerIncome(order.RentAmount, "仲裁确认租金结算给号主") + addOwnerIncome(order.RentAmount, "仲裁确认订单金额结算给号主") addRenterRefund(order.DepositAmount, "仲裁释放押金给租客") case "deduct_deposit", "compensate_owner": deductAmount := req.Amount @@ -331,7 +331,7 @@ func buildArbitrationSettlement(order model.RentalOrder, req ArbitrateRequest) ( return settlement, ErrInvalidDispute } settlement.DepositDeductAmount = deductAmount - addOwnerIncome(order.RentAmount+deductAmount, "仲裁租金及押金赔付结算给号主") + addOwnerIncome(order.RentAmount+deductAmount, "仲裁订单金额及押金赔付结算给号主") addRenterRefund(order.DepositAmount-deductAmount, "仲裁退回剩余押金给租客") case "order_close": // Only release frozen funds. No available-balance settlement happens in development mode. diff --git a/backend/internal/modules/listing/dto.go b/backend/internal/modules/listing/dto.go index d8f7f7b..cbb26a8 100644 --- a/backend/internal/modules/listing/dto.go +++ b/backend/internal/modules/listing/dto.go @@ -22,8 +22,6 @@ type ListingDTO struct { PriceDaily float64 `json:"price_daily"` PriceWeekly float64 `json:"price_weekly"` DepositAmount float64 `json:"deposit_amount"` - MinRentHours int `json:"min_rent_hours"` - MaxRentHours int `json:"max_rent_hours"` Status string `json:"status"` ReviewStatus string `json:"review_status"` ReviewReason string `json:"review_reason"` @@ -45,8 +43,6 @@ type CreateRequest struct { PriceDaily float64 `json:"price_daily"` PriceWeekly float64 `json:"price_weekly"` DepositAmount float64 `json:"deposit_amount" binding:"required"` - MinRentHours int `json:"min_rent_hours" binding:"required"` - MaxRentHours int `json:"max_rent_hours" binding:"required"` } type UpdateRequest = CreateRequest diff --git a/backend/internal/modules/listing/repository.go b/backend/internal/modules/listing/repository.go index 6eff0d1..c6ebd1e 100644 --- a/backend/internal/modules/listing/repository.go +++ b/backend/internal/modules/listing/repository.go @@ -56,8 +56,6 @@ func (r *Repository) Create(ownerID uint64, req CreateRequest) (*ListingDTO, err PriceDaily: req.PriceDaily, PriceWeekly: req.PriceWeekly, DepositAmount: req.DepositAmount, - MinRentHours: req.MinRentHours, - MaxRentHours: req.MaxRentHours, Status: "draft", ReviewStatus: "none", } @@ -105,8 +103,6 @@ func (r *Repository) Update(ownerID uint64, listingID uint64, req UpdateRequest) listing.PriceDaily = req.PriceDaily listing.PriceWeekly = req.PriceWeekly listing.DepositAmount = req.DepositAmount - listing.MinRentHours = req.MinRentHours - listing.MaxRentHours = req.MaxRentHours listing.Status = "draft" listing.ReviewStatus = "none" listing.ReviewReason = "" @@ -470,8 +466,6 @@ func (row listingRow) toDTO() ListingDTO { PriceDaily: row.PriceDaily, PriceWeekly: row.PriceWeekly, DepositAmount: row.DepositAmount, - MinRentHours: row.MinRentHours, - MaxRentHours: row.MaxRentHours, Status: row.Status, ReviewStatus: row.ReviewStatus, ReviewReason: row.ReviewReason, @@ -502,8 +496,6 @@ func toDTO(account model.GameAccount, listing model.RentalListing) *ListingDTO { PriceDaily: listing.PriceDaily, PriceWeekly: listing.PriceWeekly, DepositAmount: listing.DepositAmount, - MinRentHours: listing.MinRentHours, - MaxRentHours: listing.MaxRentHours, Status: listing.Status, ReviewStatus: listing.ReviewStatus, ReviewReason: listing.ReviewReason, diff --git a/backend/internal/modules/listing/service.go b/backend/internal/modules/listing/service.go index a5625a7..12f7c07 100644 --- a/backend/internal/modules/listing/service.go +++ b/backend/internal/modules/listing/service.go @@ -146,9 +146,6 @@ func validateRequest(req CreateRequest) error { if req.PriceHourly <= 0 || req.DepositAmount < 0 { return ErrInvalidInput } - if req.MinRentHours <= 0 || req.MaxRentHours < req.MinRentHours { - return ErrInvalidInput - } if req.HafCoinAmount < 0 { return ErrInvalidInput } diff --git a/backend/internal/modules/order/README.md b/backend/internal/modules/order/README.md index 1202d40..f2779c5 100644 --- a/backend/internal/modules/order/README.md +++ b/backend/internal/modules/order/README.md @@ -1,3 +1,3 @@ # Order Module -订单状态机、账号交接、租期归还、超时处理。 +订单状态机、账号交接、归还、超时处理。 diff --git a/backend/internal/modules/order/dto.go b/backend/internal/modules/order/dto.go index 9cfd5db..d4c9f0a 100644 --- a/backend/internal/modules/order/dto.go +++ b/backend/internal/modules/order/dto.go @@ -20,7 +20,6 @@ type OrderDTO struct { LoginPlatform string `json:"login_platform"` RentStartAt *time.Time `json:"rent_start_at"` RentEndAt *time.Time `json:"rent_end_at"` - RentHours int `json:"rent_hours"` RentAmount float64 `json:"rent_amount"` DepositAmount float64 `json:"deposit_amount"` PlatformFee float64 `json:"platform_fee"` @@ -34,7 +33,6 @@ type OrderDTO struct { type CreateRequest struct { ListingID uint64 `json:"listing_id" binding:"required"` - RentHours int `json:"rent_hours" binding:"required"` } type SubmitHandoffRequest struct { diff --git a/backend/internal/modules/order/handler.go b/backend/internal/modules/order/handler.go index c6bce2a..ec27d34 100644 --- a/backend/internal/modules/order/handler.go +++ b/backend/internal/modules/order/handler.go @@ -282,7 +282,7 @@ func writeOrderError(c *gin.Context, err error) { case errors.Is(err, ErrDependencyUnavailable): response.ServiceUnavailable(c, "数据库未连接") case errors.Is(err, ErrInvalidRentHours): - response.BadRequest(c, "租期不符合规则") + response.BadRequest(c, "订单信息不符合规则") case errors.Is(err, ErrListingUnavailable): response.Error(c, http.StatusConflict, "listing_unavailable", "该账号暂不可租") case errors.Is(err, ErrCannotRentOwnListing): diff --git a/backend/internal/modules/order/repository.go b/backend/internal/modules/order/repository.go index 8dc53e7..024cfae 100644 --- a/backend/internal/modules/order/repository.go +++ b/backend/internal/modules/order/repository.go @@ -38,9 +38,6 @@ func (r *Repository) Create(renterID uint64, req CreateRequest) (*OrderDTO, erro if listing.OwnerID == renterID { return ErrCannotRentOwnListing } - if req.RentHours < listing.MinRentHours || req.RentHours > listing.MaxRentHours { - return ErrInvalidRentHours - } var account model.GameAccount if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&account, listing.AccountID).Error; err != nil { @@ -55,7 +52,8 @@ func (r *Repository) Create(renterID uint64, req CreateRequest) (*OrderDTO, erro return err } now := time.Now() - rentEnd := now.Add(time.Duration(req.RentHours) * time.Hour) + rentHours := internalOrderHours + rentEnd := now.Add(time.Duration(rentHours) * time.Hour) order := model.RentalOrder{ OrderNo: orderNo, ListingID: listing.ID, @@ -64,8 +62,8 @@ func (r *Repository) Create(renterID uint64, req CreateRequest) (*OrderDTO, erro RenterID: renterID, RentStartAt: &now, RentEndAt: &rentEnd, - RentHours: req.RentHours, - RentAmount: listing.PriceHourly * float64(req.RentHours), + RentHours: rentHours, + RentAmount: listing.PriceHourly * float64(rentHours), DepositAmount: listing.DepositAmount, PlatformFee: 0, AccountSnapshot: snapshot, @@ -86,7 +84,7 @@ func (r *Repository) Create(renterID uint64, req CreateRequest) (*OrderDTO, erro BalanceType: "frozen", BizType: "order_lock", BizNo: order.OrderNo, - Remark: "开发态模拟冻结租金和押金", + Remark: "开发态模拟冻结订单金额和押金", }, ); err != nil { return err @@ -272,7 +270,7 @@ func (r *Repository) ConfirmReceive(userID uint64, orderID uint64) error { UserID: order.OwnerID, Type: "handoff", Title: "租客已确认收号", - Content: "订单已进入租赁中。", + Content: "订单已进入使用中。", BizType: "order", BizID: &orderID, }); err != nil { @@ -399,7 +397,7 @@ func (r *Repository) ConfirmReturn(userID uint64, orderID uint64) error { BalanceType: "available", BizType: "owner_income", BizNo: order.OrderNo, - Remark: "订单完成模拟结算租金", + Remark: "订单完成模拟结算订单金额", }, wallet.Entry{ UserID: order.RenterID, @@ -427,7 +425,7 @@ func (r *Repository) ConfirmReturn(userID uint64, orderID uint64) error { UserID: order.OwnerID, Type: "settlement", Title: "订单已完成", - Content: "订单已完成，模拟租金已入账。", + Content: "订单已完成，模拟订单金额已入账。", BizType: "order", BizID: &orderID, }, @@ -727,7 +725,6 @@ func (row orderRow) toDTO() OrderDTO { LoginPlatform: row.LoginPlatform, RentStartAt: row.RentStartAt, RentEndAt: row.RentEndAt, - RentHours: row.RentHours, RentAmount: row.RentAmount, DepositAmount: row.DepositAmount, PlatformFee: row.PlatformFee, diff --git a/backend/internal/modules/order/service.go b/backend/internal/modules/order/service.go index cb29554..5f27be1 100644 --- a/backend/internal/modules/order/service.go +++ b/backend/internal/modules/order/service.go @@ -15,6 +15,8 @@ var ( ErrPermissionDenied = errors.New("permission denied") ) +const internalOrderHours = 24 + type Service struct { repo *Repository } @@ -27,7 +29,7 @@ func (s *Service) Create(userID uint64, req CreateRequest) (*OrderDTO, error) { if s.repo == nil { return nil, ErrDependencyUnavailable } - if req.ListingID == 0 || req.RentHours <= 0 { + if req.ListingID == 0 { return nil, ErrInvalidRentHours } return s.repo.Create(userID, req) diff --git a/backend/internal/modules/systemconfig/dto.go b/backend/internal/modules/systemconfig/dto.go index cd0b673..1404c60 100644 --- a/backend/internal/modules/systemconfig/dto.go +++ b/backend/internal/modules/systemconfig/dto.go @@ -83,7 +83,6 @@ type PublishRatioConfig struct { InsuranceBaseRatios []PublishInsuranceBaseRatio `json:"insurance_base_ratios"` ConfigItems []PublishRatioConfigItem `json:"config_items"` CoinCorrections []PublishCoinCorrection `json:"coin_corrections"` - RentRules []PublishRentRule `json:"rent_rules"` } type PublishInsuranceBaseRatio struct { @@ -103,8 +102,3 @@ type PublishCoinCorrection struct { ThresholdM float64 `json:"threshold_m"` Correction float64 `json:"correction"` } - -type PublishRentRule struct { - ThresholdM float64 `json:"threshold_m"` - Days int `json:"days"` -} diff --git a/backend/internal/modules/systemconfig/publish_options.go b/backend/internal/modules/systemconfig/publish_options.go index b309c3a..455b549 100644 --- a/backend/internal/modules/systemconfig/publish_options.go +++ b/backend/internal/modules/systemconfig/publish_options.go @@ -106,11 +106,6 @@ func DefaultPublishOptions() PublishOptionsDTO { {ThresholdM: 380, Correction: 4}, {ThresholdM: 530, Correction: 5}, }, - RentRules: []PublishRentRule{ - {ThresholdM: 300, Days: 7}, - {ThresholdM: 100, Days: 3}, - {ThresholdM: 0, Days: 1}, - }, }, } } diff --git a/backend/internal/modules/systemconfig/repository.go b/backend/internal/modules/systemconfig/repository.go index ca2d3e4..4c7fa27 100644 --- a/backend/internal/modules/systemconfig/repository.go +++ b/backend/internal/modules/systemconfig/repository.go @@ -31,7 +31,7 @@ var defaultConfigs = []defaultConfig{ {Key: "handoff.owner_submit_timeout_minutes", Value: "30", Description: "号主待交接超时分钟数"}, {Key: "handoff.renter_confirm_timeout_minutes", Value: "30", Description: "租客待确认收号超时分钟数"}, {Key: "handoff.owner_return_confirm_timeout_minutes", Value: "120", Description: "号主待确认归还超时分钟数"}, - {Key: "order.return_overdue_grace_minutes", Value: "10", Description: "租期到期后归还宽限分钟数"}, + {Key: "order.return_overdue_grace_minutes", Value: "10", Description: "预计截止后归还宽限分钟数"}, {Key: "deposit.min_amount", Value: "50", Description: "发布租号最低押金"}, {Key: "risk.sms_limit_per_phone_hour", Value: "5", Description: "单手机号每小时短信验证码次数"}, {Key: "risk.sms_limit_per_ip_hour", Value: "20", Description: "单 IP 每小时短信验证码次数"}, diff --git a/backend/internal/modules/systemconfig/service.go b/backend/internal/modules/systemconfig/service.go index 54269c2..f555f19 100644 --- a/backend/internal/modules/systemconfig/service.go +++ b/backend/internal/modules/systemconfig/service.go @@ -211,7 +211,4 @@ func normalizePublishOptions(options *PublishOptionsDTO) { if len(options.RatioConfig.CoinCorrections) == 0 { options.RatioConfig.CoinCorrections = defaults.RatioConfig.CoinCorrections } - if len(options.RatioConfig.RentRules) == 0 { - options.RatioConfig.RentRules = defaults.RatioConfig.RentRules - } } diff --git a/backend/internal/modules/wallet/README.md b/backend/internal/modules/wallet/README.md index 35701d8..977e3ce 100644 --- a/backend/internal/modules/wallet/README.md +++ b/backend/internal/modules/wallet/README.md @@ -1,3 +1,3 @@ # Wallet Module -押金冻结、租金结算、不可变资金流水。 +押金冻结、订单金额结算、不可变资金流水。 diff --git a/backend/migrations/000001_init.sql b/backend/migrations/000001_init.sql index c680a3a..a00c851 100644 --- a/backend/migrations/000001_init.sql +++ b/backend/migrations/000001_init.sql @@ -57,8 +57,6 @@ CREATE TABLE rental_listings ( price_daily DECIMAL(12,2) NOT NULL DEFAULT 0.00, price_weekly DECIMAL(12,2) NOT NULL DEFAULT 0.00, deposit_amount DECIMAL(12,2) NOT NULL DEFAULT 0.00, - min_rent_hours INT NOT NULL DEFAULT 1, - max_rent_hours INT NOT NULL DEFAULT 168, status VARCHAR(32) NOT NULL DEFAULT 'draft', review_status VARCHAR(32) NOT NULL DEFAULT 'none', review_reason VARCHAR(255) NOT NULL DEFAULT '', diff --git a/backend/seeds/dev_orders.sql b/backend/seeds/dev_orders.sql index 2fa7eb1..d22fb18 100644 --- a/backend/seeds/dev_orders.sql +++ b/backend/seeds/dev_orders.sql @@ -214,7 +214,7 @@ VALUES ( @owner_c, '三角洲行动', '微信', '扫码', '纯币180M/6格/6体/5负/80发AWM', - '扫码交接，资源适中，适合三日租。', + '扫码交接，资源适中，适合短期使用。', '黑鹰', 180000000, JSON_OBJECT( 'face_owner', '否', @@ -361,29 +361,29 @@ VALUES ); INSERT INTO rental_listings - (account_id, owner_id, price_hourly, price_daily, price_weekly, deposit_amount, min_rent_hours, max_rent_hours, status, review_status, published_at, created_at, updated_at) -SELECT id, owner_id, 29.76, 714.29, 5000.00, 120.00, 24, 168, 'published', 'approved', NOW() - INTERVAL 80 MINUTE, created_at, updated_at + (account_id, owner_id, price_hourly, price_daily, price_weekly, deposit_amount, status, review_status, published_at, created_at, updated_at) +SELECT id, owner_id, 29.76, 714.29, 5000.00, 120.00, 'published', 'approved', NOW() - INTERVAL 80 MINUTE, created_at, updated_at FROM game_accounts WHERE title = '纯币300M/6格/6体/6负/4六甲/6六头' UNION ALL -SELECT id, owner_id, 33.33, 800.00, 2400.00, 60.00, 24, 72, 'published', 'approved', NOW() - INTERVAL 70 MINUTE, created_at, updated_at +SELECT id, owner_id, 33.33, 800.00, 2400.00, 60.00, 'published', 'approved', NOW() - INTERVAL 70 MINUTE, created_at, updated_at FROM game_accounts WHERE title = '纯币120M/4格/5体/5负/2六头' UNION ALL -SELECT id, owner_id, 62.50, 1500.00, 1500.00, 80.00, 8, 24, 'published', 'approved', NOW() - INTERVAL 60 MINUTE, created_at, updated_at +SELECT id, owner_id, 62.50, 1500.00, 1500.00, 80.00, 'published', 'approved', NOW() - INTERVAL 60 MINUTE, created_at, updated_at FROM game_accounts WHERE title = '纯币60M/2格/4体/4负/1体验卡' UNION ALL -SELECT id, owner_id, 42.52, 1020.41, 7142.86, 180.00, 24, 168, 'published', 'approved', NOW() - INTERVAL 50 MINUTE, created_at, updated_at +SELECT id, owner_id, 42.52, 1020.41, 7142.86, 180.00, 'published', 'approved', NOW() - INTERVAL 50 MINUTE, created_at, updated_at FROM game_accounts WHERE title = '纯币500M/9格/7体/7负/10六头' UNION ALL -SELECT id, owner_id, 50.00, 1200.00, 3600.00, 100.00, 24, 72, 'published', 'approved', NOW() - INTERVAL 40 MINUTE, created_at, updated_at +SELECT id, owner_id, 50.00, 1200.00, 3600.00, 100.00, 'published', 'approved', NOW() - INTERVAL 40 MINUTE, created_at, updated_at FROM game_accounts WHERE title = '纯币180M/6格/6体/5负/80发AWM' UNION ALL -SELECT id, owner_id, 31.25, 750.00, 750.00, 50.00, 8, 24, 'published', 'approved', NOW() - INTERVAL 30 MINUTE, created_at, updated_at +SELECT id, owner_id, 31.25, 750.00, 750.00, 50.00, 'published', 'approved', NOW() - INTERVAL 30 MINUTE, created_at, updated_at FROM game_accounts WHERE title = '纯币90M/4格/5体/4负/3五级套' UNION ALL -SELECT id, owner_id, 25.79, 619.05, 4333.33, 120.00, 24, 168, 'published', 'approved', NOW() - INTERVAL 20 MINUTE, created_at, updated_at +SELECT id, owner_id, 25.79, 619.05, 4333.33, 120.00, 'published', 'approved', NOW() - INTERVAL 20 MINUTE, created_at, updated_at FROM game_accounts WHERE title = '纯币260M/6格/6体/6负/皮肤多' UNION ALL -SELECT id, owner_id, 35.71, 857.14, 6000.00, 160.00, 24, 168, 'published', 'approved', NOW() - INTERVAL 10 MINUTE, created_at, updated_at +SELECT id, owner_id, 35.71, 857.14, 6000.00, 160.00, 'published', 'approved', NOW() - INTERVAL 10 MINUTE, created_at, updated_at FROM game_accounts WHERE title = '纯币360M/9格/7体/6负/赠送六级弹'; INSERT INTO notifications (user_id, type, title, content, biz_type, biz_id, created_at) diff --git a/frontend/src/api/listingOptions.ts b/frontend/src/api/listingOptions.ts index cfb8a72..84a13d6 100644 --- a/frontend/src/api/listingOptions.ts +++ b/frontend/src/api/listingOptions.ts @@ -52,16 +52,10 @@ export interface PublishCoinCorrection { correction: number } -export interface PublishRentRule { - threshold_m: number - days: number -} - export interface PublishRatioConfig { insurance_base_ratios: PublishInsuranceBaseRatio[] config_items: PublishRatioConfigItem[] coin_corrections: PublishCoinCorrection[] - rent_rules: PublishRentRule[] } export interface ListingPublishOptions { @@ -109,7 +103,6 @@ export const emptyListingPublishOptions: ListingPublishOptions = { insurance_base_ratios: [], config_items: [], coin_corrections: [], - rent_rules: [], }, } @@ -208,7 +201,6 @@ function normalizeRatioConfig(value?: unknown): PublishRatioConfig { coin_corrections: normalizeCoinCorrections( Array.isArray(row.coin_corrections) ? row.coin_corrections : [], ), - rent_rules: normalizeRentRules(Array.isArray(row.rent_rules) ? row.rent_rules : []), } } @@ -251,18 +243,6 @@ function normalizeCoinCorrections(values: unknown[]): PublishCoinCorrection[] { .filter((item) => item.threshold_m >= 0 && item.correction > 0) } -function normalizeRentRules(values: unknown[]): PublishRentRule[] { - return values - .map((item) => { - const row = isRecord(item) ? item : {} - return { - threshold_m: readNumber(row.threshold_m), - days: Math.trunc(readNumber(row.days)), - } - }) - .filter((item) => item.threshold_m >= 0 && item.days > 0) -} - function readNumber(value: unknown) { const parsed = Number(value) return Number.isFinite(parsed) ? parsed : 0 diff --git a/frontend/src/api/listings.ts b/frontend/src/api/listings.ts index 94bdf18..5e84c7a 100644 --- a/frontend/src/api/listings.ts +++ b/frontend/src/api/listings.ts @@ -20,8 +20,6 @@ export interface Listing { price_daily: number price_weekly: number deposit_amount: number - min_rent_hours: number - max_rent_hours: number status: string review_status: string review_reason: string @@ -43,8 +41,6 @@ export interface ListingPayload { price_daily: number price_weekly: number deposit_amount: number - min_rent_hours: number - max_rent_hours: number } interface ApiResponse { diff --git a/frontend/src/api/orders.ts b/frontend/src/api/orders.ts index 4102fde..b15b8ff 100644 --- a/frontend/src/api/orders.ts +++ b/frontend/src/api/orders.ts @@ -14,7 +14,6 @@ export interface Order { login_platform: string rent_start_at?: string rent_end_at?: string - rent_hours: number rent_amount: number deposit_amount: number platform_fee: number @@ -44,10 +43,9 @@ interface ApiResponse { data: T } -export async function createOrder(listingId: number, rentHours: number) { +export async function createOrder(listingId: number) { const { data } = await apiClient.post>('/orders', { listing_id: listingId, - rent_hours: rentHours, }) return data.data } diff --git a/frontend/src/views/account/OrderCreateView.vue b/frontend/src/views/account/OrderCreateView.vue index 7067999..2850aed 100644 --- a/frontend/src/views/account/OrderCreateView.vue +++ b/frontend/src/views/account/OrderCreateView.vue @@ -3,7 +3,7 @@

Create Order

创建订单

-

确认租期、租金、押金和账号资产快照。

+

确认价格、押金和账号资产快照。

diff --git a/frontend/src/views/account/OrderDetailView.vue b/frontend/src/views/account/OrderDetailView.vue index 7045ad0..2ee0523 100644 --- a/frontend/src/views/account/OrderDetailView.vue +++ b/frontend/src/views/account/OrderDetailView.vue @@ -91,7 +91,7 @@ async function handleConfirmReceive() { confirming.value = true try { await confirmReceive(order.value.id) - ElMessage.success('已确认收号，订单进入租赁中') + ElMessage.success('已确认收号，订单进入使用中') await loadOrder() } catch (error) { ElMessage.error(readError(error, '确认收号失败')) @@ -197,7 +197,7 @@ function readError(error: unknown, fallback: string) { {{ order.handoff_status }}
- 租金 + 订单金额 ¥{{ order.rent_amount }}
@@ -207,9 +207,8 @@ function readError(error: unknown, fallback: string) {
-

租期：{{ order.rent_hours }} 小时

开始：{{ formatDateTime(order.rent_start_at, '未开始') }}

-

结束：{{ formatDateTime(order.rent_end_at, '未设置') }}

+

预计截止：{{ formatDateTime(order.rent_end_at, '未设置') }}

取消订单并释放账号 @@ -236,7 +235,7 @@ function readError(error: unknown, fallback: string) { class="order-panel" >

确认收号

-

确认账号可以正常登录后，订单会进入租赁中并重新计算租期结束时间。

+

确认账号可以正常登录后，订单会进入使用中并重新计算预计截止时间。

确认已收到账号
diff --git a/frontend/src/views/account/OrdersView.vue b/frontend/src/views/account/OrdersView.vue index 910ffa7..1164659 100644 --- a/frontend/src/views/account/OrdersView.vue +++ b/frontend/src/views/account/OrdersView.vue @@ -23,14 +23,13 @@ async function loadOrders() {

Orders

我的订单

-

跟踪待交接、租赁中、待归还、申诉中和已完成订单。

+

跟踪待交接、使用中、待归还、申诉中和已完成订单。

- - + diff --git a/frontend/src/views/admin/AdminDashboardView.vue b/frontend/src/views/admin/AdminDashboardView.vue index 455d3ee..360baa3 100644 --- a/frontend/src/views/admin/AdminDashboardView.vue +++ b/frontend/src/views/admin/AdminDashboardView.vue @@ -56,7 +56,7 @@ function money(value?: number) { {{ dashboard.metrics.total_orders }}
- 租赁中 + 使用中 {{ dashboard.metrics.renting_orders }}
@@ -119,7 +119,7 @@ function money(value?: number) { - + diff --git a/frontend/src/views/admin/AdminListingDetailView.vue b/frontend/src/views/admin/AdminListingDetailView.vue index 6591951..f1c840e 100644 --- a/frontend/src/views/admin/AdminListingDetailView.vue +++ b/frontend/src/views/admin/AdminListingDetailView.vue @@ -56,6 +56,10 @@ function money(value: number) { return `¥${Number(value || 0).toFixed(2)}` } +function listingPrice(row: Listing) { + return money(row.price_daily || row.price_hourly) +} + function extractObjectKey(url: string) { try { const parsed = new URL(url, window.location.origin) @@ -110,8 +114,8 @@ function readError(error: unknown, fallback: string) { {{ listing.review_status }}
- 时租 - {{ money(listing.price_hourly) }} + 价格 + {{ listingPrice(listing) }}
押金 @@ -132,13 +136,11 @@ function readError(error: unknown, fallback: string) {
-

号主与租期

+

号主与价格

号主：{{ listing.owner_phone || listing.owner_nickname || listing.owner_id }}

号主 ID：{{ listing.owner_id }}

-

最短租期：{{ listing.min_rent_hours }} 小时

-

最长租期：{{ listing.max_rent_hours }} 小时

-

日租：{{ money(listing.price_daily) }}

-

周租：{{ money(listing.price_weekly) }}

+

价格：{{ listingPrice(listing) }}

+

押金：{{ money(listing.deposit_amount) }}

diff --git a/frontend/src/views/admin/AdminListingReviewView.vue b/frontend/src/views/admin/AdminListingReviewView.vue index 653bc80..67511c0 100644 --- a/frontend/src/views/admin/AdminListingReviewView.vue +++ b/frontend/src/views/admin/AdminListingReviewView.vue @@ -62,6 +62,10 @@ function openEvidence(row: Listing) { evidenceListing.value = row } +function listingPrice(row: Listing) { + return `¥${Number(row.price_daily || row.price_hourly || 0).toFixed(2)}` +} + function extractObjectKey(url: string) { try { const parsed = new URL(url, window.location.origin) @@ -95,7 +99,7 @@ function readError(error: unknown, fallback: string) {

Review

商品审核

-

审核号主提交的账号资产、价格、押金和租期规则。

+

审核号主提交的账号资产、价格和押金。

刷新 @@ -107,7 +111,9 @@ function readError(error: unknown, fallback: string) { - + + +