优化订单支付
This commit is contained in:
@@ -612,6 +612,9 @@ func normalizePaymentStatus(raw map[string]string) string {
|
|||||||
|
|
||||||
func normalizeRefundStatus(raw map[string]string) string {
|
func normalizeRefundStatus(raw map[string]string) string {
|
||||||
value := strings.ToUpper(firstNonEmpty(raw["refund_status"], raw["trade_state"], raw["trade_status"], raw["status"]))
|
value := strings.ToUpper(firstNonEmpty(raw["refund_status"], raw["trade_state"], raw["trade_status"], raw["status"]))
|
||||||
|
if value == "" && responseOK(raw) {
|
||||||
|
return "refunded"
|
||||||
|
}
|
||||||
switch value {
|
switch value {
|
||||||
case "SUCCESS", "REFUND_SUCCESS", "TRADE_SUCCESS", "REFUNDED", "S", "11":
|
case "SUCCESS", "REFUND_SUCCESS", "TRADE_SUCCESS", "REFUNDED", "S", "11":
|
||||||
return "refunded"
|
return "refunded"
|
||||||
|
|||||||
@@ -77,6 +77,16 @@ func TestParsePayloadNormalizesAliases(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestNormalizeRefundStatusTreatsSuccessCodeAsRefunded(t *testing.T) {
|
||||||
|
status := normalizeRefundStatus(map[string]string{
|
||||||
|
"code": "BBS00000",
|
||||||
|
"msg": "成功",
|
||||||
|
})
|
||||||
|
if status != "refunded" {
|
||||||
|
t.Fatalf("normalizeRefundStatus() = %q, want refunded", status)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestCreatePaymentOmitsCounterParamWhenPayModeBlank(t *testing.T) {
|
func TestCreatePaymentOmitsCounterParamWhenPayModeBlank(t *testing.T) {
|
||||||
body := captureCreatePaymentBody(t, "")
|
body := captureCreatePaymentBody(t, "")
|
||||||
reqData := body["req_data"].(map[string]any)
|
reqData := body["req_data"].(map[string]any)
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package dispute
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
|
"fmt"
|
||||||
"math"
|
"math"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -268,6 +269,16 @@ func (r *Repository) Arbitrate(adminID uint64, id uint64, req ArbitrateRequest,
|
|||||||
if err := tx.Save(&account).Error; err != nil {
|
if err := tx.Save(&account).Error; err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
handoffRecord := model.HandoffRecord{
|
||||||
|
OrderID: order.ID,
|
||||||
|
FromUserID: adminID,
|
||||||
|
ToUserID: order.RenterID,
|
||||||
|
Type: "admin_arbitration",
|
||||||
|
Content: buildArbitrationHandoffContent(req, settlement),
|
||||||
|
}
|
||||||
|
if err := tx.Create(&handoffRecord).Error; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
disputeID := row.ID
|
disputeID := row.ID
|
||||||
if err := appendAuditLog(tx, adminID, "dispute.arbitrate", "dispute", row.ID, meta, map[string]any{
|
if err := appendAuditLog(tx, adminID, "dispute.arbitrate", "dispute", row.ID, meta, map[string]any{
|
||||||
"dispute_id": row.ID,
|
"dispute_id": row.ID,
|
||||||
@@ -525,6 +536,44 @@ func arbitrateOrderStatus(result string) string {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func buildArbitrationHandoffContent(req ArbitrateRequest, settlement arbitrationSettlement) string {
|
||||||
|
content := fmt.Sprintf("客服仲裁结果:%s", arbitrationResultLabel(req.Result))
|
||||||
|
if req.Remark != "" {
|
||||||
|
content += "\n处理说明:" + req.Remark
|
||||||
|
}
|
||||||
|
if settlement.RenterRefundAmount > 0 {
|
||||||
|
content += fmt.Sprintf("\n退款给租客:¥%.2f", settlement.RenterRefundAmount)
|
||||||
|
}
|
||||||
|
if settlement.OwnerIncomeAmount > 0 {
|
||||||
|
content += fmt.Sprintf("\n结算给号主:¥%.2f", settlement.OwnerIncomeAmount)
|
||||||
|
}
|
||||||
|
if settlement.DepositDeductAmount > 0 {
|
||||||
|
content += fmt.Sprintf("\n押金扣除:¥%.2f", settlement.DepositDeductAmount)
|
||||||
|
}
|
||||||
|
return content
|
||||||
|
}
|
||||||
|
|
||||||
|
func arbitrationResultLabel(result string) string {
|
||||||
|
switch result {
|
||||||
|
case "full_refund":
|
||||||
|
return "全额退款"
|
||||||
|
case "partial_refund":
|
||||||
|
return "部分退款"
|
||||||
|
case "deduct_deposit":
|
||||||
|
return "扣押金"
|
||||||
|
case "release_deposit":
|
||||||
|
return "释放押金"
|
||||||
|
case "compensate_owner":
|
||||||
|
return "赔付号主"
|
||||||
|
case "order_close":
|
||||||
|
return "关闭订单"
|
||||||
|
case "mark_abnormal":
|
||||||
|
return "标记异常"
|
||||||
|
default:
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func disputeType(input string, isCheckoutDispute bool) string {
|
func disputeType(input string, isCheckoutDispute bool) string {
|
||||||
if isCheckoutDispute {
|
if isCheckoutDispute {
|
||||||
return "checkout_dispute"
|
return "checkout_dispute"
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package dispute
|
package dispute
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"hfb_sys/backend/internal/model"
|
"hfb_sys/backend/internal/model"
|
||||||
@@ -76,3 +77,25 @@ func TestBuildArbitrationSettlementLimitsFrozenReleaseToExistingBalance(t *testi
|
|||||||
t.Fatalf("release frozen entry count = %d, want 1", releaseEntryCount)
|
t.Fatalf("release frozen entry count = %d, want 1", releaseEntryCount)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestBuildArbitrationHandoffContent(t *testing.T) {
|
||||||
|
content := buildArbitrationHandoffContent(ArbitrateRequest{
|
||||||
|
Result: "partial_refund",
|
||||||
|
Remark: "账号异常,退还部分租金。",
|
||||||
|
}, arbitrationSettlement{
|
||||||
|
RenterRefundAmount: 80,
|
||||||
|
OwnerIncomeAmount: 120,
|
||||||
|
})
|
||||||
|
|
||||||
|
wantParts := []string{
|
||||||
|
"客服仲裁结果:部分退款",
|
||||||
|
"处理说明:账号异常,退还部分租金。",
|
||||||
|
"退款给租客:¥80.00",
|
||||||
|
"结算给号主:¥120.00",
|
||||||
|
}
|
||||||
|
for _, part := range wantParts {
|
||||||
|
if !strings.Contains(content, part) {
|
||||||
|
t.Fatalf("handoff content = %q, want include %q", content, part)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
package payment
|
package payment
|
||||||
|
|
||||||
import "time"
|
import (
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"gorm.io/datatypes"
|
||||||
|
)
|
||||||
|
|
||||||
type StartPaymentRequest struct {
|
type StartPaymentRequest struct {
|
||||||
PayWay string `json:"pay_way"`
|
PayWay string `json:"pay_way"`
|
||||||
@@ -52,3 +56,46 @@ type NotifyResult struct {
|
|||||||
OK bool
|
OK bool
|
||||||
Message string
|
Message string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type AdminPaymentQuery struct {
|
||||||
|
UserID uint64
|
||||||
|
OrderID uint64
|
||||||
|
OrderNo string
|
||||||
|
BizType string
|
||||||
|
Status string
|
||||||
|
Provider string
|
||||||
|
Page int
|
||||||
|
PageSize int
|
||||||
|
}
|
||||||
|
|
||||||
|
type PaginatedResult struct {
|
||||||
|
Items interface{} `json:"items"`
|
||||||
|
Total int64 `json:"total"`
|
||||||
|
Page int `json:"page"`
|
||||||
|
PageSize int `json:"page_size"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AdminPaymentDTO struct {
|
||||||
|
ID uint64 `json:"id"`
|
||||||
|
PaymentNo string `json:"payment_no"`
|
||||||
|
OrderID uint64 `json:"order_id"`
|
||||||
|
OrderNo string `json:"order_no"`
|
||||||
|
UserID uint64 `json:"user_id"`
|
||||||
|
UserPhone string `json:"user_phone"`
|
||||||
|
Provider string `json:"provider"`
|
||||||
|
MerchantID string `json:"merchant_id"`
|
||||||
|
ThirdOrderID string `json:"third_order_id"`
|
||||||
|
ProviderOrderID string `json:"provider_order_id"`
|
||||||
|
PayWay string `json:"pay_way"`
|
||||||
|
AmountCent int64 `json:"amount_cent"`
|
||||||
|
BizType string `json:"biz_type"`
|
||||||
|
Status string `json:"status"`
|
||||||
|
ErrorCode string `json:"error_code"`
|
||||||
|
ErrorMessage string `json:"error_message"`
|
||||||
|
RawRequest datatypes.JSON `json:"raw_request"`
|
||||||
|
RawResponse datatypes.JSON `json:"raw_response"`
|
||||||
|
PaidAt *time.Time `json:"paid_at,omitempty"`
|
||||||
|
NotifiedAt *time.Time `json:"notified_at,omitempty"`
|
||||||
|
CreatedAt time.Time `json:"created_at"`
|
||||||
|
UpdatedAt time.Time `json:"updated_at"`
|
||||||
|
}
|
||||||
|
|||||||
@@ -113,6 +113,19 @@ func (h *Handler) QueryRefundStatus(c *gin.Context) {
|
|||||||
response.OK(c, item)
|
response.OK(c, item)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (h *Handler) AdminList(c *gin.Context) {
|
||||||
|
query, ok := parseAdminPaymentQuery(c)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
result, err := h.service.AdminList(query)
|
||||||
|
if err != nil {
|
||||||
|
writePaymentError(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
response.OK(c, result)
|
||||||
|
}
|
||||||
|
|
||||||
func (h *Handler) LeshuaNotify(c *gin.Context) {
|
func (h *Handler) LeshuaNotify(c *gin.Context) {
|
||||||
body, err := io.ReadAll(io.LimitReader(c.Request.Body, 1<<20))
|
body, err := io.ReadAll(io.LimitReader(c.Request.Body, 1<<20))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -196,6 +209,35 @@ func parseID(c *gin.Context) (uint64, bool) {
|
|||||||
return id, true
|
return id, true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func parseAdminPaymentQuery(c *gin.Context) (AdminPaymentQuery, bool) {
|
||||||
|
var query AdminPaymentQuery
|
||||||
|
if raw := c.Query("user_id"); raw != "" {
|
||||||
|
value, err := strconv.ParseUint(raw, 10, 64)
|
||||||
|
if err != nil || value == 0 {
|
||||||
|
response.BadRequest(c, "用户ID不正确")
|
||||||
|
return query, false
|
||||||
|
}
|
||||||
|
query.UserID = value
|
||||||
|
}
|
||||||
|
if raw := c.Query("order_id"); raw != "" {
|
||||||
|
value, err := strconv.ParseUint(raw, 10, 64)
|
||||||
|
if err != nil || value == 0 {
|
||||||
|
response.BadRequest(c, "订单ID不正确")
|
||||||
|
return query, false
|
||||||
|
}
|
||||||
|
query.OrderID = value
|
||||||
|
}
|
||||||
|
query.OrderNo = c.Query("order_no")
|
||||||
|
query.BizType = c.Query("biz_type")
|
||||||
|
query.Status = c.Query("status")
|
||||||
|
query.Provider = c.Query("provider")
|
||||||
|
page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
|
||||||
|
pageSize, _ := strconv.Atoi(c.DefaultQuery("page_size", "20"))
|
||||||
|
query.Page = page
|
||||||
|
query.PageSize = pageSize
|
||||||
|
return query, true
|
||||||
|
}
|
||||||
|
|
||||||
func writePaymentError(c *gin.Context, err error) {
|
func writePaymentError(c *gin.Context, err error) {
|
||||||
switch {
|
switch {
|
||||||
case errors.Is(err, ErrDependencyUnavailable):
|
case errors.Is(err, ErrDependencyUnavailable):
|
||||||
|
|||||||
@@ -180,6 +180,8 @@ func (r *Repository) Start(userID uint64, orderID uint64, req StartPaymentReques
|
|||||||
return nil, ErrPaymentUnavailable
|
return nil, ErrPaymentUnavailable
|
||||||
}
|
}
|
||||||
|
|
||||||
|
log.Printf("[payment] payment start order_id=%d order_no=%s payment_id=%d provider=%s amount_cent=%d third_order_id=%s",
|
||||||
|
orderID, orderRow.OrderNo, payment.ID, runtimeConfig.Provider, payment.AmountCent, payment.ThirdOrderID)
|
||||||
resp, err := runtimeConfig.Channel.CreatePayment(context.Background(), channelCreatePaymentRequest{
|
resp, err := runtimeConfig.Channel.CreatePayment(context.Background(), channelCreatePaymentRequest{
|
||||||
ThirdOrderID: payment.ThirdOrderID,
|
ThirdOrderID: payment.ThirdOrderID,
|
||||||
AmountCent: payment.AmountCent,
|
AmountCent: payment.AmountCent,
|
||||||
@@ -193,10 +195,14 @@ func (r *Repository) Start(userID uint64, orderID uint64, req StartPaymentReques
|
|||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
_ = r.markPaymentFailed(payment.ID, nil, err.Error())
|
_ = r.markPaymentFailed(payment.ID, nil, err.Error())
|
||||||
|
log.Printf("[payment] payment request failed order_id=%d payment_id=%d provider=%s amount_cent=%d err=%v",
|
||||||
|
orderID, payment.ID, runtimeConfig.Provider, payment.AmountCent, err)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if !resp.OK {
|
if !resp.OK {
|
||||||
_ = r.markPaymentFailed(payment.ID, resp.Raw, resp.ErrorMessage)
|
_ = r.markPaymentFailed(payment.ID, resp.Raw, resp.ErrorMessage)
|
||||||
|
log.Printf("[payment] payment rejected order_id=%d payment_id=%d provider=%s amount_cent=%d code=%s message=%s",
|
||||||
|
orderID, payment.ID, runtimeConfig.Provider, payment.AmountCent, firstNonEmpty(resp.Raw["code"], resp.Raw["resp_code"], resp.Raw["result_code"]), resp.ErrorMessage)
|
||||||
return nil, ErrPaymentUnavailable
|
return nil, ErrPaymentUnavailable
|
||||||
}
|
}
|
||||||
if err := r.db.Model(&model.PaymentOrder{}).Where("id = ?", payment.ID).Updates(map[string]any{
|
if err := r.db.Model(&model.PaymentOrder{}).Where("id = ?", payment.ID).Updates(map[string]any{
|
||||||
@@ -216,6 +222,8 @@ func (r *Repository) Start(userID uint64, orderID uint64, req StartPaymentReques
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
r.recordConfigUsage(runtimeConfig, latest)
|
r.recordConfigUsage(runtimeConfig, latest)
|
||||||
|
log.Printf("[payment] payment result order_id=%d order_no=%s payment_id=%d provider=%s amount_cent=%d status=%s provider_order_id=%s",
|
||||||
|
orderID, orderRow.OrderNo, latest.ID, runtimeConfig.Provider, latest.AmountCent, latest.Status, latest.ProviderOrderID)
|
||||||
dto := toDTO(*latest)
|
dto := toDTO(*latest)
|
||||||
return &dto, nil
|
return &dto, nil
|
||||||
}
|
}
|
||||||
@@ -254,6 +262,8 @@ func (r *Repository) StartWalletRecharge(userID uint64, req WalletRechargePaymen
|
|||||||
_ = r.markPaymentFailed(payment.ID, nil, "payment channel unavailable")
|
_ = r.markPaymentFailed(payment.ID, nil, "payment channel unavailable")
|
||||||
return nil, ErrPaymentUnavailable
|
return nil, ErrPaymentUnavailable
|
||||||
}
|
}
|
||||||
|
log.Printf("[payment] wallet recharge start user_id=%d payment_id=%d provider=%s amount_cent=%d third_order_id=%s",
|
||||||
|
userID, payment.ID, runtimeConfig.Provider, payment.AmountCent, payment.ThirdOrderID)
|
||||||
resp, err := runtimeConfig.Channel.CreatePayment(context.Background(), channelCreatePaymentRequest{
|
resp, err := runtimeConfig.Channel.CreatePayment(context.Background(), channelCreatePaymentRequest{
|
||||||
ThirdOrderID: payment.ThirdOrderID,
|
ThirdOrderID: payment.ThirdOrderID,
|
||||||
AmountCent: payment.AmountCent,
|
AmountCent: payment.AmountCent,
|
||||||
@@ -267,10 +277,14 @@ func (r *Repository) StartWalletRecharge(userID uint64, req WalletRechargePaymen
|
|||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
_ = r.markPaymentFailed(payment.ID, nil, err.Error())
|
_ = r.markPaymentFailed(payment.ID, nil, err.Error())
|
||||||
|
log.Printf("[payment] wallet recharge request failed user_id=%d payment_id=%d provider=%s amount_cent=%d err=%v",
|
||||||
|
userID, payment.ID, runtimeConfig.Provider, payment.AmountCent, err)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if !resp.OK {
|
if !resp.OK {
|
||||||
_ = r.markPaymentFailed(payment.ID, resp.Raw, resp.ErrorMessage)
|
_ = r.markPaymentFailed(payment.ID, resp.Raw, resp.ErrorMessage)
|
||||||
|
log.Printf("[payment] wallet recharge rejected user_id=%d payment_id=%d provider=%s amount_cent=%d code=%s message=%s",
|
||||||
|
userID, payment.ID, runtimeConfig.Provider, payment.AmountCent, firstNonEmpty(resp.Raw["code"], resp.Raw["resp_code"], resp.Raw["result_code"]), resp.ErrorMessage)
|
||||||
return nil, ErrPaymentUnavailable
|
return nil, ErrPaymentUnavailable
|
||||||
}
|
}
|
||||||
if err := r.db.Model(&model.PaymentOrder{}).Where("id = ?", payment.ID).Updates(map[string]any{
|
if err := r.db.Model(&model.PaymentOrder{}).Where("id = ?", payment.ID).Updates(map[string]any{
|
||||||
@@ -290,6 +304,8 @@ func (r *Repository) StartWalletRecharge(userID uint64, req WalletRechargePaymen
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
r.recordConfigUsage(runtimeConfig, latest)
|
r.recordConfigUsage(runtimeConfig, latest)
|
||||||
|
log.Printf("[payment] wallet recharge result user_id=%d payment_id=%d provider=%s amount_cent=%d status=%s provider_order_id=%s",
|
||||||
|
userID, latest.ID, runtimeConfig.Provider, latest.AmountCent, latest.Status, latest.ProviderOrderID)
|
||||||
dto := toDTO(*latest)
|
dto := toDTO(*latest)
|
||||||
return &dto, nil
|
return &dto, nil
|
||||||
}
|
}
|
||||||
@@ -466,6 +482,8 @@ func (r *Repository) StartRefund(orderID uint64, refundAmountCent int64, bizType
|
|||||||
if err := r.db.Create(&refundOrder).Error; err != nil {
|
if err := r.db.Create(&refundOrder).Error; err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
log.Printf("[payment] refund start order_id=%d order_no=%s payment_id=%d biz_type=%s provider=%s amount_cent=%d merchant_refund_id=%s origin_third_order_id=%s origin_provider_order_id=%s",
|
||||||
|
orderID, originalPayment.OrderNo, refundOrder.ID, bizType, runtimeConfig.Provider, refundAmountCent, merchantRefundID, originalPayment.ThirdOrderID, refundOriginProviderOrderID(originalPayment))
|
||||||
r.recordConfigUsage(runtimeConfig, &refundOrder)
|
r.recordConfigUsage(runtimeConfig, &refundOrder)
|
||||||
if err := r.markOrderRefunding(orderID, refundAmountCent); err != nil {
|
if err := r.markOrderRefunding(orderID, refundAmountCent); err != nil {
|
||||||
log.Printf("[payment] mark order refunding failed order_id=%d err=%v", orderID, err)
|
log.Printf("[payment] mark order refunding failed order_id=%d err=%v", orderID, err)
|
||||||
@@ -477,7 +495,7 @@ func (r *Repository) StartRefund(orderID uint64, refundAmountCent int64, bizType
|
|||||||
}
|
}
|
||||||
resp, err := runtimeConfig.Channel.CreateRefund(context.Background(), channelCreateRefundRequest{
|
resp, err := runtimeConfig.Channel.CreateRefund(context.Background(), channelCreateRefundRequest{
|
||||||
ThirdOrderID: originalPayment.ThirdOrderID,
|
ThirdOrderID: originalPayment.ThirdOrderID,
|
||||||
ProviderOrderID: originalPayment.ProviderOrderID,
|
ProviderOrderID: refundOriginProviderOrderID(originalPayment),
|
||||||
MerchantRefundID: merchantRefundID,
|
MerchantRefundID: merchantRefundID,
|
||||||
RefundAmountCent: refundAmountCent,
|
RefundAmountCent: refundAmountCent,
|
||||||
NotifyURL: runtimeConfig.NotifyURL,
|
NotifyURL: runtimeConfig.NotifyURL,
|
||||||
@@ -486,10 +504,14 @@ func (r *Repository) StartRefund(orderID uint64, refundAmountCent int64, bizType
|
|||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
_ = r.markRefundFailed(refundOrder.ID, orderID, refundAmountCent, map[string]string{"error": err.Error()})
|
_ = r.markRefundFailed(refundOrder.ID, orderID, refundAmountCent, map[string]string{"error": err.Error()})
|
||||||
|
log.Printf("[payment] refund request failed order_id=%d payment_id=%d biz_type=%s provider=%s amount_cent=%d err=%v",
|
||||||
|
orderID, refundOrder.ID, bizType, runtimeConfig.Provider, refundAmountCent, err)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if !resp.OK {
|
if !resp.OK {
|
||||||
_ = r.markRefundFailed(refundOrder.ID, orderID, refundAmountCent, resp.Raw)
|
_ = r.markRefundFailed(refundOrder.ID, orderID, refundAmountCent, resp.Raw)
|
||||||
|
log.Printf("[payment] refund rejected order_id=%d payment_id=%d biz_type=%s provider=%s amount_cent=%d code=%s message=%s",
|
||||||
|
orderID, refundOrder.ID, bizType, runtimeConfig.Provider, refundAmountCent, firstNonEmpty(resp.Raw["code"], resp.Raw["resp_code"], resp.Raw["result_code"]), resp.ErrorMessage)
|
||||||
return nil, ErrPaymentUnavailable
|
return nil, ErrPaymentUnavailable
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -522,6 +544,8 @@ func (r *Repository) StartRefund(orderID uint64, refundAmountCent int64, bizType
|
|||||||
}
|
}
|
||||||
refundOrder.Status = refundStatus
|
refundOrder.Status = refundStatus
|
||||||
refundOrder.ProviderOrderID = resp.ProviderRefundID
|
refundOrder.ProviderOrderID = resp.ProviderRefundID
|
||||||
|
log.Printf("[payment] refund result order_id=%d payment_id=%d biz_type=%s provider=%s amount_cent=%d status=%s provider_refund_id=%s",
|
||||||
|
orderID, refundOrder.ID, bizType, runtimeConfig.Provider, refundAmountCent, refundStatus, resp.ProviderRefundID)
|
||||||
|
|
||||||
dto := toRefundDTO(refundOrder)
|
dto := toRefundDTO(refundOrder)
|
||||||
return &dto, nil
|
return &dto, nil
|
||||||
@@ -581,6 +605,51 @@ func (r *Repository) QueryRefundStatus(orderID uint64) (*RefundDTO, error) {
|
|||||||
return &dto, nil
|
return &dto, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *Repository) AdminList(query AdminPaymentQuery) (*PaginatedResult, error) {
|
||||||
|
db := r.db.Table("payment_orders AS p").
|
||||||
|
Select("p.*, COALESCE(u.phone, '') AS user_phone").
|
||||||
|
Joins("LEFT JOIN users AS u ON u.id = p.user_id")
|
||||||
|
countDB := r.db.Model(&model.PaymentOrder{})
|
||||||
|
if query.UserID > 0 {
|
||||||
|
db = db.Where("p.user_id = ?", query.UserID)
|
||||||
|
countDB = countDB.Where("user_id = ?", query.UserID)
|
||||||
|
}
|
||||||
|
if query.OrderID > 0 {
|
||||||
|
db = db.Where("p.order_id = ?", query.OrderID)
|
||||||
|
countDB = countDB.Where("order_id = ?", query.OrderID)
|
||||||
|
}
|
||||||
|
if query.OrderNo != "" {
|
||||||
|
db = db.Where("p.order_no = ?", query.OrderNo)
|
||||||
|
countDB = countDB.Where("order_no = ?", query.OrderNo)
|
||||||
|
}
|
||||||
|
if query.BizType != "" {
|
||||||
|
db = db.Where("p.biz_type = ?", query.BizType)
|
||||||
|
countDB = countDB.Where("biz_type = ?", query.BizType)
|
||||||
|
}
|
||||||
|
if query.Status != "" {
|
||||||
|
db = db.Where("p.status = ?", query.Status)
|
||||||
|
countDB = countDB.Where("status = ?", query.Status)
|
||||||
|
}
|
||||||
|
if query.Provider != "" {
|
||||||
|
db = db.Where("p.provider = ?", query.Provider)
|
||||||
|
countDB = countDB.Where("provider = ?", query.Provider)
|
||||||
|
}
|
||||||
|
var total int64
|
||||||
|
if err := countDB.Count(&total).Error; err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
offset := (query.Page - 1) * query.PageSize
|
||||||
|
var rows []adminPaymentRow
|
||||||
|
if err := db.Order("p.id DESC").Offset(offset).Limit(query.PageSize).Scan(&rows).Error; err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
items := make([]AdminPaymentDTO, 0, len(rows))
|
||||||
|
for _, row := range rows {
|
||||||
|
items = append(items, row.toDTO())
|
||||||
|
}
|
||||||
|
return &PaginatedResult{Items: items, Total: total, Page: query.Page, PageSize: query.PageSize}, nil
|
||||||
|
}
|
||||||
|
|
||||||
// HandleRefundNotify 处理渠道退款通知。
|
// HandleRefundNotify 处理渠道退款通知。
|
||||||
func (r *Repository) HandleRefundNotify(provider string, params map[string]string, rawPayload string, contentType string, authorization string) (*NotifyResult, error) {
|
func (r *Repository) HandleRefundNotify(provider string, params map[string]string, rawPayload string, contentType string, authorization string) (*NotifyResult, error) {
|
||||||
payment, err := r.findRefundPaymentForNotify(params)
|
payment, err := r.findRefundPaymentForNotify(params)
|
||||||
@@ -1004,6 +1073,55 @@ func toDTO(payment model.PaymentOrder) PaymentDTO {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type adminPaymentRow struct {
|
||||||
|
model.PaymentOrder
|
||||||
|
UserPhone string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (row adminPaymentRow) toDTO() AdminPaymentDTO {
|
||||||
|
errorCode, errorMessage := paymentErrorSummary(row.Status, row.RawResponse)
|
||||||
|
return AdminPaymentDTO{
|
||||||
|
ID: row.ID,
|
||||||
|
PaymentNo: row.PaymentNo,
|
||||||
|
OrderID: row.OrderID,
|
||||||
|
OrderNo: row.OrderNo,
|
||||||
|
UserID: row.UserID,
|
||||||
|
UserPhone: row.UserPhone,
|
||||||
|
Provider: row.Provider,
|
||||||
|
MerchantID: row.MerchantID,
|
||||||
|
ThirdOrderID: row.ThirdOrderID,
|
||||||
|
ProviderOrderID: row.ProviderOrderID,
|
||||||
|
PayWay: row.PayWay,
|
||||||
|
AmountCent: row.AmountCent,
|
||||||
|
BizType: row.BizType,
|
||||||
|
Status: row.Status,
|
||||||
|
ErrorCode: errorCode,
|
||||||
|
ErrorMessage: errorMessage,
|
||||||
|
RawRequest: row.RawRequest,
|
||||||
|
RawResponse: row.RawResponse,
|
||||||
|
PaidAt: row.PaidAt,
|
||||||
|
NotifiedAt: row.NotifiedAt,
|
||||||
|
CreatedAt: row.CreatedAt,
|
||||||
|
UpdatedAt: row.UpdatedAt,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func paymentErrorSummary(status string, raw datatypes.JSON) (string, string) {
|
||||||
|
if status != "failed" {
|
||||||
|
return "", ""
|
||||||
|
}
|
||||||
|
if len(raw) == 0 {
|
||||||
|
return "", ""
|
||||||
|
}
|
||||||
|
var payload map[string]any
|
||||||
|
if err := json.Unmarshal(raw, &payload); err != nil {
|
||||||
|
return "", ""
|
||||||
|
}
|
||||||
|
code := firstStringValue(payload, "code", "resp_code", "result_code", "error_code", "status")
|
||||||
|
message := firstStringValue(payload, "msg", "message", "error", "error_message", "result_msg", "result_desc")
|
||||||
|
return code, message
|
||||||
|
}
|
||||||
|
|
||||||
func moneyCent(value float64) int64 {
|
func moneyCent(value float64) int64 {
|
||||||
return int64(math.Round(value * 100))
|
return int64(math.Round(value * 100))
|
||||||
}
|
}
|
||||||
@@ -1014,6 +1132,69 @@ func parseCent(value string) int64 {
|
|||||||
return amount
|
return amount
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func refundOriginProviderOrderID(payment model.PaymentOrder) string {
|
||||||
|
if payment.Provider != "lakala" {
|
||||||
|
return payment.ProviderOrderID
|
||||||
|
}
|
||||||
|
if tradeID := lakalaOriginTradeID(payment.RawResponse); tradeID != "" {
|
||||||
|
return tradeID
|
||||||
|
}
|
||||||
|
return payment.ProviderOrderID
|
||||||
|
}
|
||||||
|
|
||||||
|
func lakalaOriginTradeID(raw datatypes.JSON) string {
|
||||||
|
if len(raw) == 0 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
var payload map[string]any
|
||||||
|
if err := json.Unmarshal(raw, &payload); err != nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if tradeID := firstStringValue(payload, "trade_no", "origin_trade_no"); tradeID != "" {
|
||||||
|
return tradeID
|
||||||
|
}
|
||||||
|
value, ok := payload["order_trade_info_list"]
|
||||||
|
if !ok {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
switch typed := value.(type) {
|
||||||
|
case string:
|
||||||
|
var items []map[string]any
|
||||||
|
if err := json.Unmarshal([]byte(typed), &items); err != nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
for _, item := range items {
|
||||||
|
if tradeID := firstStringValue(item, "trade_no", "origin_trade_no"); tradeID != "" {
|
||||||
|
return tradeID
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case []any:
|
||||||
|
for _, item := range typed {
|
||||||
|
itemMap, ok := item.(map[string]any)
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if tradeID := firstStringValue(itemMap, "trade_no", "origin_trade_no"); tradeID != "" {
|
||||||
|
return tradeID
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func firstStringValue(values map[string]any, keys ...string) string {
|
||||||
|
for _, key := range keys {
|
||||||
|
value, ok := values[key]
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if text, ok := value.(string); ok && text != "" {
|
||||||
|
return text
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
func parseChannelTime(value string) *time.Time {
|
func parseChannelTime(value string) *time.Time {
|
||||||
if value == "" {
|
if value == "" {
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
@@ -128,3 +128,32 @@ func TestParseChannelTimeUsesShanghaiWhenLocalIsUTC(t *testing.T) {
|
|||||||
t.Fatalf("parseChannelTime() = %s, want 20260607202700 in Asia/Shanghai", got)
|
t.Fatalf("parseChannelTime() = %s, want 20260607202700 in Asia/Shanghai", got)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestRefundOriginProviderOrderIDUsesLakalaTradeNo(t *testing.T) {
|
||||||
|
payment := model.PaymentOrder{
|
||||||
|
Provider: "lakala",
|
||||||
|
ProviderOrderID: "26060811012001101011735013210",
|
||||||
|
RawResponse: datatypes.JSON([]byte(`{
|
||||||
|
"pay_order_no": "26060811012001101011735013210",
|
||||||
|
"order_trade_info_list": "[{\"trade_no\":\"20260608110113230266224452004512\",\"pay_order_no\":\"26060811012001101011735013210\"}]"
|
||||||
|
}`)),
|
||||||
|
}
|
||||||
|
|
||||||
|
got := refundOriginProviderOrderID(payment)
|
||||||
|
if got != "20260608110113230266224452004512" {
|
||||||
|
t.Fatalf("refundOriginProviderOrderID() = %q, want trade_no", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRefundOriginProviderOrderIDFallsBackToProviderOrderID(t *testing.T) {
|
||||||
|
payment := model.PaymentOrder{
|
||||||
|
Provider: "lakala",
|
||||||
|
ProviderOrderID: "26060811012001101011735013210",
|
||||||
|
RawResponse: datatypes.JSON([]byte(`{"pay_order_no":"26060811012001101011735013210"}`)),
|
||||||
|
}
|
||||||
|
|
||||||
|
got := refundOriginProviderOrderID(payment)
|
||||||
|
if got != payment.ProviderOrderID {
|
||||||
|
t.Fatalf("refundOriginProviderOrderID() = %q, want fallback %q", got, payment.ProviderOrderID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -106,3 +106,19 @@ func (s *Service) QueryRefundStatus(orderID uint64) (*RefundDTO, error) {
|
|||||||
}
|
}
|
||||||
return s.repo.QueryRefundStatus(orderID)
|
return s.repo.QueryRefundStatus(orderID)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *Service) AdminList(query AdminPaymentQuery) (*PaginatedResult, error) {
|
||||||
|
if s.repo == nil {
|
||||||
|
return nil, ErrDependencyUnavailable
|
||||||
|
}
|
||||||
|
if query.Page < 1 {
|
||||||
|
query.Page = 1
|
||||||
|
}
|
||||||
|
if query.PageSize < 1 {
|
||||||
|
query.PageSize = 20
|
||||||
|
}
|
||||||
|
if query.PageSize > 100 {
|
||||||
|
query.PageSize = 100
|
||||||
|
}
|
||||||
|
return s.repo.AdminList(query)
|
||||||
|
}
|
||||||
|
|||||||
@@ -3,11 +3,11 @@ package wallet
|
|||||||
import (
|
import (
|
||||||
"crypto/rand"
|
"crypto/rand"
|
||||||
"fmt"
|
"fmt"
|
||||||
"math"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"hfb_sys/backend/internal/model"
|
"hfb_sys/backend/internal/model"
|
||||||
"hfb_sys/backend/internal/timeutil"
|
"hfb_sys/backend/internal/timeutil"
|
||||||
|
"hfb_sys/backend/pkg/money"
|
||||||
|
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
"gorm.io/gorm/clause"
|
"gorm.io/gorm/clause"
|
||||||
@@ -260,7 +260,7 @@ func applyEntry(account *model.WalletAccount, entry Entry) (float64, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func roundWalletMoney(value float64) float64 {
|
func roundWalletMoney(value float64) float64 {
|
||||||
return math.Round(value)
|
return money.Round(value)
|
||||||
}
|
}
|
||||||
|
|
||||||
func toAccountDTO(account model.WalletAccount) *AccountDTO {
|
func toAccountDTO(account model.WalletAccount) *AccountDTO {
|
||||||
|
|||||||
@@ -31,6 +31,34 @@ func TestApplyEntryRoundsMoneyBeforeComparing(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestApplyEntryKeepsWalletMoneyAtJiaoPrecision(t *testing.T) {
|
||||||
|
account := model.WalletAccount{
|
||||||
|
UserID: 8,
|
||||||
|
AvailableBalance: 0,
|
||||||
|
}
|
||||||
|
entry := Entry{
|
||||||
|
UserID: 8,
|
||||||
|
Direction: "in",
|
||||||
|
Amount: 2.30,
|
||||||
|
BalanceType: "available",
|
||||||
|
}
|
||||||
|
|
||||||
|
balanceAfter, err := applyEntry(&account, entry)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("applyEntry() error = %v", err)
|
||||||
|
}
|
||||||
|
if balanceAfter != 2.3 {
|
||||||
|
t.Fatalf("balanceAfter = %v, want 2.3", balanceAfter)
|
||||||
|
}
|
||||||
|
if account.AvailableBalance != 2.3 {
|
||||||
|
t.Fatalf("AvailableBalance = %v, want 2.3", account.AvailableBalance)
|
||||||
|
}
|
||||||
|
|
||||||
|
if rounded := roundWalletMoney(2.36); rounded != 2.4 {
|
||||||
|
t.Fatalf("roundWalletMoney(2.36) = %v, want 2.4", rounded)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestNewLedgerNoUsesReadableFormat(t *testing.T) {
|
func TestNewLedgerNoUsesReadableFormat(t *testing.T) {
|
||||||
ledgerNo, err := newLedgerNo()
|
ledgerNo, err := newLedgerNo()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -425,6 +425,7 @@ func New(cfg config.Config, deps Dependencies, logger *zap.Logger) *gin.Engine {
|
|||||||
adminRoutes.GET("/disputes", requirePerm("dispute:view"), disputeHandler.AdminList)
|
adminRoutes.GET("/disputes", requirePerm("dispute:view"), disputeHandler.AdminList)
|
||||||
adminRoutes.POST("/disputes/:id/arbitrate", requirePerm("dispute:arbitrate"), disputeHandler.AdminArbitrate)
|
adminRoutes.POST("/disputes/:id/arbitrate", requirePerm("dispute:arbitrate"), disputeHandler.AdminArbitrate)
|
||||||
adminRoutes.GET("/wallet/ledger", requirePerm("wallet:view"), walletHandler.AdminLedger)
|
adminRoutes.GET("/wallet/ledger", requirePerm("wallet:view"), walletHandler.AdminLedger)
|
||||||
|
adminRoutes.GET("/payments", requirePerm("wallet:view"), paymentHandler.AdminList)
|
||||||
|
|
||||||
// 提现管理
|
// 提现管理
|
||||||
adminRoutes.GET("/withdrawals", requirePerm("withdrawal:list"), withdrawalHandler.AdminList)
|
adminRoutes.GET("/withdrawals", requirePerm("withdrawal:list"), withdrawalHandler.AdminList)
|
||||||
|
|||||||
@@ -0,0 +1,56 @@
|
|||||||
|
import { apiClient } from '@/shared/api/client'
|
||||||
|
|
||||||
|
import type { ApiResponse, PaginatedResult } from '@/shared/types/types'
|
||||||
|
|
||||||
|
export interface AdminPayment {
|
||||||
|
id: number
|
||||||
|
payment_no: string
|
||||||
|
order_id: number
|
||||||
|
order_no: string
|
||||||
|
user_id: number
|
||||||
|
user_phone: string
|
||||||
|
provider: string
|
||||||
|
merchant_id: string
|
||||||
|
third_order_id: string
|
||||||
|
provider_order_id: string
|
||||||
|
pay_way: string
|
||||||
|
amount_cent: number
|
||||||
|
biz_type: string
|
||||||
|
status: string
|
||||||
|
error_code: string
|
||||||
|
error_message: string
|
||||||
|
raw_request?: Record<string, unknown>
|
||||||
|
raw_response?: Record<string, unknown>
|
||||||
|
paid_at?: string
|
||||||
|
notified_at?: string
|
||||||
|
created_at: string
|
||||||
|
updated_at: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AdminPaymentQuery {
|
||||||
|
user_id?: string
|
||||||
|
order_id?: string
|
||||||
|
order_no?: string
|
||||||
|
biz_type?: string
|
||||||
|
status?: string
|
||||||
|
provider?: string
|
||||||
|
page?: number
|
||||||
|
page_size?: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function fetchAdminPayments(query: AdminPaymentQuery = {}) {
|
||||||
|
const params = Object.fromEntries(
|
||||||
|
Object.entries(query).filter(([, value]) => value !== '' && value !== undefined)
|
||||||
|
)
|
||||||
|
const { data } = await apiClient.get<ApiResponse<PaginatedResult<AdminPayment>>>(
|
||||||
|
'/admin/payments',
|
||||||
|
{ params }
|
||||||
|
)
|
||||||
|
const result = data.data
|
||||||
|
return {
|
||||||
|
items: Array.isArray(result?.items) ? result.items : [],
|
||||||
|
total: Number(result?.total ?? 0),
|
||||||
|
page: Number(result?.page ?? query.page ?? 1),
|
||||||
|
page_size: Number(result?.page_size ?? query.page_size ?? 20),
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,6 +3,7 @@ export * from './api/adminDashboard'
|
|||||||
export * from './api/adminUsers'
|
export * from './api/adminUsers'
|
||||||
export * from './api/adminMgr'
|
export * from './api/adminMgr'
|
||||||
export * from './api/adminWallet'
|
export * from './api/adminWallet'
|
||||||
|
export * from './api/adminPayments'
|
||||||
export * from './api/adminAudit'
|
export * from './api/adminAudit'
|
||||||
export * from './api/systemConfigs'
|
export * from './api/systemConfigs'
|
||||||
export * from './composables/useAdminTable'
|
export * from './composables/useAdminTable'
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import {
|
|||||||
type Order,
|
type Order,
|
||||||
type RefundStatus,
|
type RefundStatus,
|
||||||
} from '@/features/orders'
|
} from '@/features/orders'
|
||||||
|
import { fetchAdminPayments, type AdminPayment } from '@/features/admin/api/adminPayments'
|
||||||
import { handoffStatusLabel, orderStatusLabel } from '@/utils/statusLabels'
|
import { handoffStatusLabel, orderStatusLabel } from '@/utils/statusLabels'
|
||||||
import { formatDateTime } from '@/utils/time'
|
import { formatDateTime } from '@/utils/time'
|
||||||
import { formatListingNo } from '@/utils/listingDisplay'
|
import { formatListingNo } from '@/utils/listingDisplay'
|
||||||
@@ -23,6 +24,7 @@ const loading = ref(false)
|
|||||||
const submitting = ref(false)
|
const submitting = ref(false)
|
||||||
const order = ref<Order | null>(null)
|
const order = ref<Order | null>(null)
|
||||||
const handoffRecords = ref<HandoffRecord[]>([])
|
const handoffRecords = ref<HandoffRecord[]>([])
|
||||||
|
const paymentRecords = ref<AdminPayment[]>([])
|
||||||
const actionType = ref<'close' | 'abnormal' | ''>('')
|
const actionType = ref<'close' | 'abnormal' | ''>('')
|
||||||
const reason = ref('')
|
const reason = ref('')
|
||||||
const refundStatus = ref<RefundStatus | null>(null)
|
const refundStatus = ref<RefundStatus | null>(null)
|
||||||
@@ -44,6 +46,7 @@ async function loadOrder() {
|
|||||||
try {
|
try {
|
||||||
order.value = await fetchAdminOrder(String(route.params.id))
|
order.value = await fetchAdminOrder(String(route.params.id))
|
||||||
handoffRecords.value = await fetchAdminHandoffRecords(String(route.params.id))
|
handoffRecords.value = await fetchAdminHandoffRecords(String(route.params.id))
|
||||||
|
paymentRecords.value = (await fetchAdminPayments({ order_id: String(route.params.id) })).items
|
||||||
await loadRefundStatus()
|
await loadRefundStatus()
|
||||||
} finally {
|
} finally {
|
||||||
loading.value = false
|
loading.value = false
|
||||||
@@ -124,12 +127,49 @@ async function handleRefund() {
|
|||||||
function refundStatusLabel(status: string) {
|
function refundStatusLabel(status: string) {
|
||||||
const map: Record<string, string> = {
|
const map: Record<string, string> = {
|
||||||
pending: '待退款',
|
pending: '待退款',
|
||||||
|
refunding: '退款中',
|
||||||
refunded: '已退款',
|
refunded: '已退款',
|
||||||
failed: '退款失败',
|
failed: '退款失败',
|
||||||
}
|
}
|
||||||
return map[status] || status || '未退款'
|
return map[status] || status || '未退款'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function paymentStatusLabel(status: string) {
|
||||||
|
const map: Record<string, string> = {
|
||||||
|
created: '已创建',
|
||||||
|
paying: '支付中',
|
||||||
|
paid: '已支付',
|
||||||
|
refunding: '退款中',
|
||||||
|
refunded: '已退款',
|
||||||
|
failed: '失败',
|
||||||
|
}
|
||||||
|
return map[status] || status
|
||||||
|
}
|
||||||
|
|
||||||
|
function paymentStatusType(status: string) {
|
||||||
|
if (['paid', 'refunded'].includes(status)) return 'success'
|
||||||
|
if (status === 'failed') return 'danger'
|
||||||
|
if (['paying', 'refunding'].includes(status)) return 'warning'
|
||||||
|
return 'info'
|
||||||
|
}
|
||||||
|
|
||||||
|
function paymentBizTypeLabel(type: string) {
|
||||||
|
const map: Record<string, string> = {
|
||||||
|
order_pay: '订单支付',
|
||||||
|
checkout_refund: '结账退款',
|
||||||
|
arbitration_refund: '仲裁退款',
|
||||||
|
admin_refund: '人工退款',
|
||||||
|
cancel_refund: '取消退款',
|
||||||
|
admin_close_refund: '客服关闭退款',
|
||||||
|
wallet_recharge: '钱包充值',
|
||||||
|
}
|
||||||
|
return map[type] || type
|
||||||
|
}
|
||||||
|
|
||||||
|
function moneyCent(value: number) {
|
||||||
|
return `¥${(Number(value || 0) / 100).toFixed(2)}`
|
||||||
|
}
|
||||||
|
|
||||||
function formatHandoffRecordType(type: string) {
|
function formatHandoffRecordType(type: string) {
|
||||||
const typeMap: Record<string, string> = {
|
const typeMap: Record<string, string> = {
|
||||||
owner_handoff: '卖家交接',
|
owner_handoff: '卖家交接',
|
||||||
@@ -137,6 +177,7 @@ function formatHandoffRecordType(type: string) {
|
|||||||
owner_counter_checkout: '卖家反驳结账',
|
owner_counter_checkout: '卖家反驳结账',
|
||||||
renter_confirm_checkout: '买家确认结账',
|
renter_confirm_checkout: '买家确认结账',
|
||||||
owner_accept_checkout: '卖家接受结账',
|
owner_accept_checkout: '卖家接受结账',
|
||||||
|
admin_arbitration: '客服仲裁',
|
||||||
}
|
}
|
||||||
return typeMap[type] || type
|
return typeMap[type] || type
|
||||||
}
|
}
|
||||||
@@ -214,6 +255,27 @@ function formatHandoffRecordType(type: string) {
|
|||||||
<p>预计截止:{{ formatDateTime(orderEstimatedEndAt(), '未设置') }}</p>
|
<p>预计截止:{{ formatDateTime(orderEstimatedEndAt(), '未设置') }}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="order-panel dashboard-panel">
|
||||||
|
<h2>支付与退款</h2>
|
||||||
|
<el-empty v-if="paymentRecords.length === 0" description="暂无支付流水" />
|
||||||
|
<div v-for="record in paymentRecords" :key="record.id" class="timeline-item">
|
||||||
|
<strong>
|
||||||
|
{{ paymentBizTypeLabel(record.biz_type) }} · {{ moneyCent(record.amount_cent) }}
|
||||||
|
</strong>
|
||||||
|
<p>
|
||||||
|
{{ record.provider || '-' }} · {{ record.third_order_id }}
|
||||||
|
<span v-if="record.provider_order_id"> / {{ record.provider_order_id }}</span>
|
||||||
|
</p>
|
||||||
|
<p v-if="record.error_message" class="danger-text">
|
||||||
|
{{ record.error_code }} {{ record.error_message }}
|
||||||
|
</p>
|
||||||
|
<el-tag :type="paymentStatusType(record.status)">
|
||||||
|
{{ paymentStatusLabel(record.status) }}
|
||||||
|
</el-tag>
|
||||||
|
<span>{{ formatDateTime(record.created_at) }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="order-panel dashboard-panel">
|
<div class="order-panel dashboard-panel">
|
||||||
<h2>交接记录</h2>
|
<h2>交接记录</h2>
|
||||||
<el-empty v-if="handoffRecords.length === 0" description="暂无交接记录" />
|
<el-empty v-if="handoffRecords.length === 0" description="暂无交接记录" />
|
||||||
|
|||||||
@@ -0,0 +1,311 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { Document, Search } from '@element-plus/icons-vue'
|
||||||
|
import { computed, onMounted, reactive, ref } from 'vue'
|
||||||
|
|
||||||
|
import { fetchAdminPayments, type AdminPayment } from '@/features/admin/api/adminPayments'
|
||||||
|
import { formatDateTime } from '@/utils/time'
|
||||||
|
import AdminTablePagination from '../components/AdminTablePagination.vue'
|
||||||
|
|
||||||
|
const loading = ref(false)
|
||||||
|
const payments = ref<AdminPayment[]>([])
|
||||||
|
const currentPage = ref(1)
|
||||||
|
const currentPageSize = ref(20)
|
||||||
|
const total = ref(0)
|
||||||
|
const detailVisible = ref(false)
|
||||||
|
const activePayment = ref<AdminPayment | null>(null)
|
||||||
|
const filters = reactive({
|
||||||
|
user_id: '',
|
||||||
|
order_id: '',
|
||||||
|
order_no: '',
|
||||||
|
biz_type: '',
|
||||||
|
status: '',
|
||||||
|
provider: '',
|
||||||
|
})
|
||||||
|
|
||||||
|
const payAmount = computed(() =>
|
||||||
|
payments.value
|
||||||
|
.filter(item => item.biz_type === 'order_pay' || item.biz_type === 'wallet_recharge')
|
||||||
|
.reduce((sum, item) => sum + Number(item.amount_cent || 0), 0)
|
||||||
|
)
|
||||||
|
const refundAmount = computed(() =>
|
||||||
|
payments.value
|
||||||
|
.filter(item => item.biz_type.includes('refund'))
|
||||||
|
.reduce((sum, item) => sum + Number(item.amount_cent || 0), 0)
|
||||||
|
)
|
||||||
|
|
||||||
|
onMounted(loadPayments)
|
||||||
|
|
||||||
|
async function loadPayments() {
|
||||||
|
loading.value = true
|
||||||
|
try {
|
||||||
|
const result = await fetchAdminPayments({
|
||||||
|
...filters,
|
||||||
|
page: currentPage.value,
|
||||||
|
page_size: currentPageSize.value,
|
||||||
|
})
|
||||||
|
payments.value = result.items
|
||||||
|
total.value = result.total
|
||||||
|
} catch {
|
||||||
|
payments.value = []
|
||||||
|
total.value = 0
|
||||||
|
} finally {
|
||||||
|
loading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function resetFilters() {
|
||||||
|
filters.user_id = ''
|
||||||
|
filters.order_id = ''
|
||||||
|
filters.order_no = ''
|
||||||
|
filters.biz_type = ''
|
||||||
|
filters.status = ''
|
||||||
|
filters.provider = ''
|
||||||
|
currentPage.value = 1
|
||||||
|
void loadPayments()
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handlePageChange() {
|
||||||
|
await loadPayments()
|
||||||
|
}
|
||||||
|
|
||||||
|
function moneyCent(value: number) {
|
||||||
|
return `¥${(Number(value || 0) / 100).toFixed(2)}`
|
||||||
|
}
|
||||||
|
|
||||||
|
function paymentStatusType(status: string) {
|
||||||
|
if (['paid', 'refunded'].includes(status)) return 'success'
|
||||||
|
if (status === 'failed') return 'danger'
|
||||||
|
if (['paying', 'refunding'].includes(status)) return 'warning'
|
||||||
|
return 'info'
|
||||||
|
}
|
||||||
|
|
||||||
|
function paymentStatusLabel(status: string) {
|
||||||
|
const map: Record<string, string> = {
|
||||||
|
created: '已创建',
|
||||||
|
paying: '支付中',
|
||||||
|
paid: '已支付',
|
||||||
|
refunding: '退款中',
|
||||||
|
refunded: '已退款',
|
||||||
|
failed: '失败',
|
||||||
|
closed: '已关闭',
|
||||||
|
}
|
||||||
|
return map[status] || status
|
||||||
|
}
|
||||||
|
|
||||||
|
function bizTypeLabel(type: string) {
|
||||||
|
const map: Record<string, string> = {
|
||||||
|
order_pay: '订单支付',
|
||||||
|
wallet_recharge: '钱包充值',
|
||||||
|
cancel_refund: '取消退款',
|
||||||
|
admin_close_refund: '客服关闭退款',
|
||||||
|
admin_refund: '人工退款',
|
||||||
|
checkout_refund: '结账退款',
|
||||||
|
deposit_refund: '押金退款',
|
||||||
|
rent_refund: '租金退款',
|
||||||
|
arbitration_refund: '仲裁退款',
|
||||||
|
}
|
||||||
|
return map[type] || type
|
||||||
|
}
|
||||||
|
|
||||||
|
function openDetail(row: AdminPayment) {
|
||||||
|
activePayment.value = row
|
||||||
|
detailVisible.value = true
|
||||||
|
}
|
||||||
|
|
||||||
|
function jsonText(value: unknown) {
|
||||||
|
if (!value) return '{}'
|
||||||
|
try {
|
||||||
|
return JSON.stringify(value, null, 2)
|
||||||
|
} catch {
|
||||||
|
return String(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<section class="page">
|
||||||
|
<div class="page-header-row">
|
||||||
|
<div class="page-header">
|
||||||
|
<p class="eyebrow">Payment Ledger</p>
|
||||||
|
<h1>支付流水</h1>
|
||||||
|
<p>查看第三方支付、退款请求、渠道单号、状态和失败原因。</p>
|
||||||
|
</div>
|
||||||
|
<div class="toolbar-actions">
|
||||||
|
<el-button @click="resetFilters">重置</el-button>
|
||||||
|
<el-button type="primary" :icon="Search" :loading="loading" @click="loadPayments"
|
||||||
|
>查询</el-button
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="metric-grid">
|
||||||
|
<div class="metric-card">
|
||||||
|
<span>总条数</span>
|
||||||
|
<strong>{{ total }} 笔</strong>
|
||||||
|
</div>
|
||||||
|
<div class="metric-card">
|
||||||
|
<span>本页支付额</span>
|
||||||
|
<strong>{{ moneyCent(payAmount) }}</strong>
|
||||||
|
</div>
|
||||||
|
<div class="metric-card">
|
||||||
|
<span>本页退款额</span>
|
||||||
|
<strong>{{ moneyCent(refundAmount) }}</strong>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<el-form class="filter-panel" label-position="top">
|
||||||
|
<el-form-item label="用户 ID">
|
||||||
|
<el-input v-model="filters.user_id" clearable placeholder="按用户筛选" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="订单 ID">
|
||||||
|
<el-input v-model="filters.order_id" clearable placeholder="按订单筛选" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="订单号">
|
||||||
|
<el-input v-model="filters.order_no" clearable placeholder="按订单号筛选" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="业务类型">
|
||||||
|
<el-select v-model="filters.biz_type" clearable placeholder="全部业务" class="full-control">
|
||||||
|
<el-option label="订单支付" value="order_pay" />
|
||||||
|
<el-option label="结账退款" value="checkout_refund" />
|
||||||
|
<el-option label="仲裁退款" value="arbitration_refund" />
|
||||||
|
<el-option label="人工退款" value="admin_refund" />
|
||||||
|
<el-option label="取消退款" value="cancel_refund" />
|
||||||
|
<el-option label="钱包充值" value="wallet_recharge" />
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="状态">
|
||||||
|
<el-select v-model="filters.status" clearable placeholder="全部状态" class="full-control">
|
||||||
|
<el-option label="已支付" value="paid" />
|
||||||
|
<el-option label="支付中" value="paying" />
|
||||||
|
<el-option label="退款中" value="refunding" />
|
||||||
|
<el-option label="已退款" value="refunded" />
|
||||||
|
<el-option label="失败" value="failed" />
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="渠道">
|
||||||
|
<el-select v-model="filters.provider" clearable placeholder="全部渠道" class="full-control">
|
||||||
|
<el-option label="拉卡拉" value="lakala" />
|
||||||
|
<el-option label="乐刷" value="leshua" />
|
||||||
|
<el-option label="Mock" value="mock" />
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
|
||||||
|
<el-table v-loading="loading" class="table-panel" :data="payments">
|
||||||
|
<el-table-column prop="payment_no" label="支付单号" min-width="220" />
|
||||||
|
<el-table-column label="订单" min-width="180">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<RouterLink v-if="row.order_id" :to="`/admin/orders/${row.order_id}`">{{
|
||||||
|
row.order_no || row.order_id
|
||||||
|
}}</RouterLink>
|
||||||
|
<span v-else>-</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="用户" min-width="130">
|
||||||
|
<template #default="{ row }">{{ row.user_phone || `用户 ${row.user_id}` }}</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="业务" width="120">
|
||||||
|
<template #default="{ row }">{{ bizTypeLabel(row.biz_type) }}</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="渠道" width="90">
|
||||||
|
<template #default="{ row }">{{ row.provider || '-' }}</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="金额" width="110">
|
||||||
|
<template #default="{ row }">{{ moneyCent(row.amount_cent) }}</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="状态" width="110">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<el-tag :type="paymentStatusType(row.status)">{{
|
||||||
|
paymentStatusLabel(row.status)
|
||||||
|
}}</el-tag>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="失败原因" min-width="180">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<span v-if="row.status === 'failed' && row.error_message"
|
||||||
|
>{{ row.error_code }} {{ row.error_message }}</span
|
||||||
|
>
|
||||||
|
<span v-else>-</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column prop="third_order_id" label="平台单号" min-width="230" />
|
||||||
|
<el-table-column prop="provider_order_id" label="渠道单号" min-width="220" />
|
||||||
|
<el-table-column label="创建时间" min-width="180">
|
||||||
|
<template #default="{ row }">{{ formatDateTime(row.created_at) }}</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="操作" width="90" fixed="right">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<el-button size="small" :icon="Document" @click="openDetail(row)">详情</el-button>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
|
||||||
|
<AdminTablePagination
|
||||||
|
v-if="total > 0"
|
||||||
|
v-model:current-page="currentPage"
|
||||||
|
v-model:page-size="currentPageSize"
|
||||||
|
:total="total"
|
||||||
|
:loading="loading"
|
||||||
|
@page-change="handlePageChange"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<el-dialog v-model="detailVisible" title="支付流水详情" width="820px">
|
||||||
|
<div v-if="activePayment" class="payment-detail">
|
||||||
|
<div class="detail-grid">
|
||||||
|
<p><span>业务类型</span><strong>{{ bizTypeLabel(activePayment.biz_type) }}</strong></p>
|
||||||
|
<p><span>状态</span><strong>{{ paymentStatusLabel(activePayment.status) }}</strong></p>
|
||||||
|
<p><span>金额</span><strong>{{ moneyCent(activePayment.amount_cent) }}</strong></p>
|
||||||
|
<p><span>渠道</span><strong>{{ activePayment.provider || '-' }}</strong></p>
|
||||||
|
</div>
|
||||||
|
<h3>请求参数</h3>
|
||||||
|
<pre>{{ jsonText(activePayment.raw_request) }}</pre>
|
||||||
|
<h3>响应结果</h3>
|
||||||
|
<pre>{{ jsonText(activePayment.raw_response) }}</pre>
|
||||||
|
</div>
|
||||||
|
</el-dialog>
|
||||||
|
</section>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.payment-detail h3 {
|
||||||
|
margin: 18px 0 8px;
|
||||||
|
font-size: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.detail-grid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.detail-grid p {
|
||||||
|
margin: 0;
|
||||||
|
padding: 10px 12px;
|
||||||
|
background: #f8fafc;
|
||||||
|
border: 1px solid #e5e7eb;
|
||||||
|
border-radius: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.detail-grid span {
|
||||||
|
display: block;
|
||||||
|
color: #64748b;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.detail-grid strong {
|
||||||
|
display: block;
|
||||||
|
margin-top: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
pre {
|
||||||
|
max-height: 260px;
|
||||||
|
overflow: auto;
|
||||||
|
margin: 0;
|
||||||
|
padding: 12px;
|
||||||
|
background: #0f172a;
|
||||||
|
color: #e2e8f0;
|
||||||
|
border-radius: 8px;
|
||||||
|
white-space: pre-wrap;
|
||||||
|
word-break: break-word;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -540,6 +540,18 @@ function money(value: unknown) {
|
|||||||
return `${roundMoney(readNumber(value))}`
|
return `${roundMoney(readNumber(value))}`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function formatHandoffRecordType(type: string) {
|
||||||
|
const typeMap: Record<string, string> = {
|
||||||
|
owner_handoff: '卖家交接',
|
||||||
|
renter_checkout: '买家结账',
|
||||||
|
owner_counter_checkout: '卖家反驳结账',
|
||||||
|
renter_confirm_checkout: '买家确认结账',
|
||||||
|
owner_accept_checkout: '卖家接受结账',
|
||||||
|
admin_arbitration: '客服仲裁',
|
||||||
|
}
|
||||||
|
return typeMap[type] || type
|
||||||
|
}
|
||||||
|
|
||||||
function orderRentAmount(item: Order) {
|
function orderRentAmount(item: Order) {
|
||||||
if (item.owner_id === session.userId)
|
if (item.owner_id === session.userId)
|
||||||
return Number(item.owner_rent_amount ?? item.display_amount ?? 0)
|
return Number(item.owner_rent_amount ?? item.display_amount ?? 0)
|
||||||
@@ -792,7 +804,7 @@ async function copyListingCode() {
|
|||||||
<div v-for="record in handoffRecords" :key="record.id" class="log-item">
|
<div v-for="record in handoffRecords" :key="record.id" class="log-item">
|
||||||
<div class="log-dot"></div>
|
<div class="log-dot"></div>
|
||||||
<div class="log-content-wrap">
|
<div class="log-content-wrap">
|
||||||
<strong class="log-type">{{ record.type }}</strong>
|
<strong class="log-type">{{ formatHandoffRecordType(record.type) }}</strong>
|
||||||
<p class="log-desc">{{ record.content }}</p>
|
<p class="log-desc">{{ record.content }}</p>
|
||||||
<span class="log-time">{{ formatDateTime(record.created_at) }}</span>
|
<span class="log-time">{{ formatDateTime(record.created_at) }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -677,6 +677,7 @@ function formatHandoffRecordType(type: string) {
|
|||||||
owner_counter_checkout: '卖家反驳结账',
|
owner_counter_checkout: '卖家反驳结账',
|
||||||
renter_confirm_checkout: '买家确认结账',
|
renter_confirm_checkout: '买家确认结账',
|
||||||
owner_accept_checkout: '卖家接受结账',
|
owner_accept_checkout: '卖家接受结账',
|
||||||
|
admin_arbitration: '客服仲裁',
|
||||||
}
|
}
|
||||||
return typeMap[type] || type
|
return typeMap[type] || type
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -98,6 +98,7 @@ const allNavGroups: NavGroup[] = [
|
|||||||
icon: Coin,
|
icon: Coin,
|
||||||
children: [
|
children: [
|
||||||
{ label: '资金流水', to: '/admin/wallet-ledger', icon: Wallet, permission: 'wallet:view' },
|
{ label: '资金流水', to: '/admin/wallet-ledger', icon: Wallet, permission: 'wallet:view' },
|
||||||
|
{ label: '支付流水', to: '/admin/payments', icon: CreditCard, permission: 'wallet:view' },
|
||||||
{ label: '提现审核', to: '/admin/withdrawals', icon: Money, permission: 'withdrawal:list' },
|
{ label: '提现审核', to: '/admin/withdrawals', icon: Money, permission: 'withdrawal:list' },
|
||||||
{
|
{
|
||||||
label: '支付配置',
|
label: '支付配置',
|
||||||
|
|||||||
@@ -70,6 +70,12 @@ export const adminRoutes: RouteRecordRaw[] = [
|
|||||||
component: () => import('@/features/admin/views/AdminWalletLedgerView.vue'),
|
component: () => import('@/features/admin/views/AdminWalletLedgerView.vue'),
|
||||||
meta: adminMeta,
|
meta: adminMeta,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: '/admin/payments',
|
||||||
|
name: 'admin-payments',
|
||||||
|
component: () => import('@/features/admin/views/AdminPaymentsView.vue'),
|
||||||
|
meta: adminMeta,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: '/admin/withdrawals',
|
path: '/admin/withdrawals',
|
||||||
name: 'admin-withdrawals',
|
name: 'admin-withdrawals',
|
||||||
|
|||||||
Reference in New Issue
Block a user