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

优化退款审核逻辑：驳回分恢复订单/关闭订单两种，优化状态标签，清理无用脚本

Browse Source 
- AdminRejectRefund 新增 action 参数：restore 恢复订单至待交接，close 关闭订单并下架
- 前端驳回改为弹窗双选项：仅驳回恢复订单 / 驳回并关闭
- 清空 frontend placeholder 文件
- handleFileUpload 并发控制优化：清空上传列表时重置计数和 OCR 槽位
- v-for key 改为 _id 避免预览串图
- preview-src-list 改为单图预览
- deploy-prod.sh 新增 docker image/builder prune 自动清理垃圾
- scripts/ 删除无用的压测文件（load_stress.go 等 4 个）
This commit is contained in:
yml2213
2026-06-28 22:09:24 +08:00
parent 782a5cbd02
commit 3215e1c8c5
5 changed files with 154 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/modules/order/admin_actions.go
+42 -5
View File
@@ -385,19 +385,56 @@ func (r *Repository) AdminApproveRefund(ctx context.Context, orderID uint64) err
return nil
}
// AdminRejectRefund 客服驳回退款申请，清除退款状态和金额。
func (r *Repository) AdminRejectRefund(ctx context.Context, orderID uint64) error {
// AdminRejectRefund 客服驳回退款申请。
// action: "restore" 恢复订单至待交接继续流转；"close" 关闭订单并归档商品。
func (r *Repository) AdminRejectRefund(ctx context.Context, orderID uint64, action string) error {
return r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
var order model.RentalOrder
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&order, orderID).Error; err != nil {
assets, err := r.lockOrderAssets(tx, orderID)
if err != nil {
return err
}
order := assets.Order
listing := assets.Listing
account := assets.Account
if order.RefundStatus != refundStatusPendingReview {
return errors.New("订单不处于待审核退款状态")
}
order.RefundStatus = "none"
order.RefundAmountCent = 0
return tx.Save(&order).Error
switch action {
case "restore":
if order.Status != orderStatusCancelled {
return errors.New("仅已取消的订单可以恢复")
}
order.Status = orderStatusPendingHandoff
order.HandoffStatus = handoffStatusPendingOwner
order.SettlementStatus = settlementStatusUnsettled
order.SettledAt = nil
reserveListingForOrder(listing)
markAssetsRented(listing, account)
case "close":
now := time.Now()
order.Status = orderStatusClosed
order.HandoffStatus = handoffStatusAdminClosed
order.SettlementStatus = settlementStatusClosed
order.SettledAt = &now
archiveAssets(listing, account)
default:
return errors.New("无效的驳回操作，可选 restore 或 close")
}
if err := tx.Save(order).Error; err != nil {
return err
}
if err := tx.Save(listing).Error; err != nil {
return err
}
return tx.Save(account).Error
})
}
backend/internal/modules/order/handler_admin.go
+8 -1
View File
@@ -113,7 +113,14 @@ func (h *Handler) AdminRejectRefund(c *gin.Context) {
if !ok {
return
}
if err := h.service.AdminRejectRefund(c.Request.Context(), orderID); err != nil {
var req struct {
Action string `json:"action" binding:"required"`
}
if err := c.ShouldBindJSON(&req); err != nil {
response.BadRequest(c, "请指定驳回操作类型")
return
}
if err := h.service.AdminRejectRefund(c.Request.Context(), orderID, req.Action); err != nil {
writeOrderError(c, err)
return
}
backend/internal/modules/order/service.go
+2 -2
View File
@@ -236,14 +236,14 @@ func (s *Service) AdminApproveRefund(ctx context.Context, orderID uint64) error
return s.repo.AdminApproveRefund(ctx, orderID)
}
func (s *Service) AdminRejectRefund(ctx context.Context, orderID uint64) error {
func (s *Service) AdminRejectRefund(ctx context.Context, orderID uint64, action string) error {
if s.repo == nil {
return ErrDependencyUnavailable
}
if orderID == 0 {
return ErrOrderCannotComplete
}
return s.repo.AdminRejectRefund(ctx, orderID)
return s.repo.AdminRejectRefund(ctx, orderID, action)
}
func (s *Service) ListPendingRefund(ctx context.Context) ([]OrderDTO, error) {
frontend/src/features/admin/views/AdminRefundReviewView.vue
+99 -9
View File
@@ -18,6 +18,8 @@ import { adminPath } from '@/shared/utils/adminPath'
const router = useRouter()
const loading = ref(false)
const submitting = ref(false)
const rejectVisible = ref(false)
const rejectOrder = ref<Order | null>(null)
const orders = ref<Order[]>([])
async function loadOrders() {
@@ -34,7 +36,7 @@ async function loadOrders() {
async function handleApprove(row: Order) {
try {
await ElMessageBox.confirm(
`确认通过「${row.order_no}」的退款申请？通过后将原路退回 ${formatCentWithSymbol(row.refund_amount_cent || 0)}。`,
`确认通过「${row.order_no}」的退款申请？通过后将原路退回 ${formatCentWithSymbol(row.refund_amount_cent || 0)}，订单取消。`,
'退款审核通过确认',
{ confirmButtonText: '通过退款', cancelButtonText: '取消', type: 'warning' }
)
@@ -53,20 +55,28 @@ async function handleApprove(row: Order) {
}
}
async function handleReject(row: Order) {
function openReject(row: Order) {
rejectOrder.value = row
rejectVisible.value = true
}
async function handleRejectRestore() {
if (!rejectOrder.value) return
const row = rejectOrder.value
try {
await ElMessageBox.confirm(
`确认驳回「${row.order_no}」的退款申请？驳回后不再退款。`,
'退款审核驳回确认',
{ confirmButtonText: '驳回退款', cancelButtonText: '取消', type: 'warning' }
`确认仅驳回「${row.order_no}」的退款申请？驳回后订单将恢复至待交接状态，可继续流转。`,
'驳回退款确认',
{ confirmButtonText: '驳回退款（恢复订单）', cancelButtonText: '取消', type: 'warning' }
)
} catch {
return
}
submitting.value = true
try {
await adminRejectRefund(row.id)
ElMessage.success(`退款审核已驳回，${row.order_no} 不再退款`)
await adminRejectRefund(row.id, 'restore')
ElMessage.success(`退款已驳回，${row.order_no} 已恢复至待交接状态`)
rejectVisible.value = false
await loadOrders()
} catch (error) {
ElMessage.error(readError(error, '驳回退款失败'))
@@ -75,6 +85,31 @@ async function handleReject(row: Order) {
}
}
async function handleRejectClose() {
if (!rejectOrder.value) return
const row = rejectOrder.value
try {
await ElMessageBox.confirm(
`确认驳回「${row.order_no}」退款并关闭订单？关闭后商品将下架归档，订单不可再操作。`,
'驳回退款并关闭订单确认',
{ confirmButtonText: '驳回退款并关闭订单', cancelButtonText: '取消', type: 'warning' }
)
} catch {
return
}
submitting.value = true
try {
await adminRejectRefund(row.id, 'close')
ElMessage.success(`退款已驳回，${row.order_no} 已关闭`)
rejectVisible.value = false
await loadOrders()
} catch (error) {
ElMessage.error(readError(error, '驳回退款并关闭失败'))
} finally {
submitting.value = false
}
}
function openDetail(order: Order) {
router.push(adminPath(`orders/${order.id}`))
}
@@ -166,14 +201,47 @@ onMounted(loadOrders)
type="danger"
size="small"
:loading="submitting"
@click="handleReject(order)"
@click="openReject(order)"
>
驳回退款
驳回
</el-button>
</div>
</div>
</div>
</div>
<!-- 驳回弹窗 -->
<el-dialog
v-model="rejectVisible"
title="驳回退款"
width="420px"
>
<div v-if="rejectOrder" class="reject-dialog">
<p class="reject-tip">请选择驳回方式：</p>
<div class="reject-options">
<el-button
type="primary"
:loading="submitting"
@click="handleRejectRestore"
>
驳回退款（恢复订单）
</el-button>
<p class="option-desc">仅驳回退款请求，订单恢复至待交接状态，交接流程可继续</p>
<el-button
type="danger"
:loading="submitting"
@click="handleRejectClose"
>
驳回退款并关闭订单
</el-button>
<p class="option-desc">驳回退款且关闭订单，商品下架归档，订单不可再操作</p>
</div>
</div>
<template #footer>
<el-button @click="rejectVisible = false">取消</el-button>
</template>
</el-dialog>
</div>
</template>
@@ -278,4 +346,26 @@ onMounted(loadOrders)
padding-top: 12px;
border-top: 1px solid var(--el-border-color-lighter);
}
.reject-dialog {
text-align: center;
}
.reject-tip {
margin-bottom: 16px;
color: var(--el-text-color-regular);
}
.reject-options {
display: flex;
flex-direction: column;
gap: 8px;
}
.option-desc {
font-size: 12px;
color: var(--el-text-color-secondary);
margin: 0 0 12px 0;
text-align: left;
}
</style>
frontend/src/features/orders/api/orders.ts
+3 -2
View File
@@ -374,9 +374,10 @@ export async function adminApproveRefund(id: number) {
return data.data
}
export async function adminRejectRefund(id: number) {
export async function adminRejectRefund(id: number, action: 'restore' | 'close') {
const { data } = await apiClient.post<ApiResponse<{ rejected: boolean }>>(
`/admin/orders/${id}/refund/reject`
`/admin/orders/${id}/refund/reject`,
{ action }
)
return data.data
}