yml/hfb_sys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

实现结账流程：替换旧归还逻辑为完整结账-修正-争议流程

Browse Source 
- 新增 order_checkouts 表，支持结账明细（消耗/押金扣除/退回/号主入账）
- 租客发起结账 → 号主确认 → 已完成（正常路径）
- 号主修改结账 → 租客确认修正 → 已完成（修正路径）
- 结账阶段任一方发起争议 → 后台仲裁 → 已完成/已关闭/异常（争议路径）
- 争议模块适配结账争议类型，仲裁结果新增 mark_abnormal
- 超时任务适配新的 pending_checkout_confirm 状态
- 前端结账明细面板、发起结账/确认/修正/拒绝表单全部实现
- 移除旧的 SubmitReturn/ConfirmReturn 接口
This commit is contained in:
yml2213
2026-05-24 02:17:36 +08:00
parent 25e5599e0a
commit 3631e70321
29 changed files with 991 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/jobs/ordertimeout/job.go
+12 -12
View File
@@ -253,16 +253,16 @@ func (j *Job) handleReturnOverdue(ctx context.Context, now time.Time, cfg thresh
notification.Entry{
UserID: order.RenterID,
Type: "timeout",
Title: "订单已逾期未归还",
Content: "订单已超过预计截止时间，请尽快提交归还说明，避免进入申诉处理。",
Title: "订单已逾期未结账",
Content: "订单已超过预计截止时间，请尽快发起结账，避免进入申诉处理。",
BizType: "order",
BizID: &orderID,
},
notification.Entry{
UserID: order.OwnerID,
Type: "timeout",
Title: "租客逾期未归还",
Content: "租客未在预计截止后及时归还，你可以发起申诉或等待客服处理。",
Title: "租客逾期未结账",
Content: "租客未在预计截止后及时发起结账，你可以发起申诉或等待客服处理。",
BizType: "order",
BizID: &orderID,
},
@@ -281,7 +281,7 @@ func (j *Job) handleReturnOverdue(ctx context.Context, now time.Time, cfg thresh
func (j *Job) handleOwnerReturnConfirmTimeout(ctx context.Context, now time.Time, cfg thresholds) (int, error) {
var rows []model.RentalOrder
err := j.db.WithContext(ctx).
Where("status = ? AND handoff_status = ? AND updated_at <= ?", "pending_return_confirm", "pending_owner_return_confirm", now.Add(-time.Duration(cfg.OwnerReturnConfirmTimeoutMinutes)*time.Minute)).
Where("status = ? AND handoff_status = ? AND updated_at <= ?", "pending_checkout_confirm", "pending_owner_checkout", now.Add(-time.Duration(cfg.OwnerReturnConfirmTimeoutMinutes)*time.Minute)).
Order("id ASC").
Limit(100).
Find(&rows).Error
@@ -290,28 +290,28 @@ func (j *Job) handleOwnerReturnConfirmTimeout(ctx context.Context, now time.Time
}
count := 0
for _, row := range rows {
if err := j.updateOrder(ctx, row.ID, "order.timeout.owner_return_confirm", func(tx *gorm.DB, order *model.RentalOrder) (string, error) {
if order.Status != "pending_return_confirm" || order.HandoffStatus != "pending_owner_return_confirm" {
if err := j.updateOrder(ctx, row.ID, "order.timeout.owner_checkout_confirm", func(tx *gorm.DB, order *model.RentalOrder) (string, error) {
if order.Status != "pending_checkout_confirm" || order.HandoffStatus != "pending_owner_checkout" {
return "", nil
}
before := snapshot(order)
order.Status = "abnormal"
order.HandoffStatus = "owner_return_confirm_timeout"
order.HandoffStatus = "owner_checkout_confirm_timeout"
orderID := order.ID
if err := notification.Append(tx,
notification.Entry{
UserID: order.RenterID,
Type: "timeout",
Title: "号主确认归还超时",
Content: "号主未在规定时间内确认归还，订单已进入客服复核状态。",
Title: "号主确认结账超时",
Content: "号主未在规定时间内确认结账，订单已进入客服复核状态。",
BizType: "order",
BizID: &orderID,
},
notification.Entry{
UserID: order.OwnerID,
Type: "timeout",
Title: "确认归还已超时",
Content: "你未在规定时间内确认归还，订单已进入客服复核状态。",
Title: "确认结账已超时",
Content: "你未在规定时间内确认结账，订单已进入客服复核状态。",
BizType: "order",
BizID: &orderID,
},