优化退款审核逻辑:驳回分恢复订单/关闭订单两种,优化状态标签,清理无用脚本
- 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:
@@ -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
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user