diff --git a/backend/internal/modules/dispute/arbitration.go b/backend/internal/modules/dispute/arbitration.go index 488e8dc..b844a20 100644 --- a/backend/internal/modules/dispute/arbitration.go +++ b/backend/internal/modules/dispute/arbitration.go @@ -337,7 +337,7 @@ func buildArbitrationHandoffContent(req ArbitrateRequest, settlement arbitration content += "\n结算给号主:" + money.FormatWithSymbol(settlement.OwnerIncomeAmountCent) } if settlement.DepositDeductAmountCent > 0 { - content += "\n押金扣除:" + money.FormatWithSymbol(settlement.DepositDeductAmountCent) + content += "\n押金赔付扣除:" + money.FormatWithSymbol(settlement.DepositDeductAmountCent) } return content } diff --git a/backend/internal/modules/order/checkout.go b/backend/internal/modules/order/checkout.go index 2241d65..764974e 100644 --- a/backend/internal/modules/order/checkout.go +++ b/backend/internal/modules/order/checkout.go @@ -139,7 +139,12 @@ func (r *Repository) CounterCheckout(ctx context.Context, userID uint64, orderID First(&checkout).Error; err != nil { return err } - next, err := buildCheckout(order, checkout.InitiatedBy, checkoutStatusCountered, checkout.Content, req.EvidenceURLS, req.ConsumableAmountCent, req.CoinConsumedM, req.OtherAmountCent, req.DepositDeductAmountCent, true) + // 号主修正只认押金赔付扣除;other 与 deduct 对齐,避免双字段语义分裂 + depositDeductCent := req.DepositDeductAmountCent + if depositDeductCent <= 0 && req.OtherAmountCent > 0 { + depositDeductCent = req.OtherAmountCent + } + next, err := buildCheckout(order, checkout.InitiatedBy, checkoutStatusCountered, checkout.Content, req.EvidenceURLS, req.ConsumableAmountCent, req.CoinConsumedM, depositDeductCent, depositDeductCent, true) if err != nil { return err } diff --git a/frontend/src/features/admin/views/AdminOrderDetailView.vue b/frontend/src/features/admin/views/AdminOrderDetailView.vue index f508516..9303c69 100644 --- a/frontend/src/features/admin/views/AdminOrderDetailView.vue +++ b/frontend/src/features/admin/views/AdminOrderDetailView.vue @@ -821,7 +821,7 @@ function paymentPaidAt(record: AdminPayment) {
{{ moneyCent(order.checkout.owner_income_amount_cent) }}
-
押金扣除
+
押金赔付扣除
{{ moneyCent(order.checkout.deposit_deduct_amount_cent) }}
diff --git a/frontend/src/features/orders/components/OrderResourceUsageEditor.vue b/frontend/src/features/orders/components/OrderResourceUsageEditor.vue index 20edf46..39fb1e8 100644 --- a/frontend/src/features/orders/components/OrderResourceUsageEditor.vue +++ b/frontend/src/features/orders/components/OrderResourceUsageEditor.vue @@ -107,7 +107,7 @@ function updateNumberField(field: 'coin_consumed_m' | 'otherAmountYuan', event: 订单快照 {{ quantity(props.snapshotHafCoinM) }}M,预计剩余 {{ quantity(props.remainingHafCoinM) }}M
- + - - -