优化结构

internal/service/payment.go

@@ -21,7 +21,7 @@ func (s *PaymentService) Configs(ctx context.Context) ([]*dto.PaymentConfigRespo
 		if config == nil {
 			continue
 		}
-		result = append(result, &dto.PaymentConfigResponse{Provider: config.Provider, Enabled: config.Enabled, Values: config.Values})
+		result = append(result, &dto.PaymentConfigResponse{Provider: config.Provider, Enabled: config.Enabled, Config: config.Values})
 	}
 	return result, nil
 }
@@ -37,6 +37,7 @@ func (s *PaymentService) Order(ctx context.Context, provider, tradeNo string) (*
 		return nil, err
 	}
 	return &dto.PaymentOrderResponse{
+		ID:       order.ID,
 		Provider: order.Provider, TradeNo: order.TradeNo, ProviderTradeNo: order.ProviderTradeNo,
 		BusinessType: order.BusinessType, BusinessID: order.BusinessID, Subject: order.Subject,
 		PaymentMode: order.PaymentMode, OriginalAmount: order.OriginalAmount,
@@ -45,12 +46,60 @@ func (s *PaymentService) Order(ctx context.Context, provider, tradeNo string) (*
 		DiscountAmount: order.DiscountAmount, ProviderDiscountAmount: order.ProviderDiscountAmount,
 		MerchantDiscountAmount: order.MerchantDiscountAmount, SettlementAmount: order.SettlementAmount,
 		Currency: order.Currency, PayerCurrency: order.PayerCurrency, AmountBreakdownKnown: order.AmountBreakdownKnown,
-		PaymentStatus: order.PaymentStatus, FulfillmentStatus: order.FulfillmentStatus,
-		RefundStatus: order.RefundStatus, RefundedAmount: order.RefundedAmount, RefundNo: order.RefundNo,
+		PaymentStatus: order.PaymentStatus, ProviderStatus: order.ProviderStatus, FulfillmentStatus: order.FulfillmentStatus,
+		RefundStatus: order.RefundStatus, RefundedAmount: order.RefundedAmount, RefundRequestedAmount: order.RefundRequestedAmount, RefundNo: order.RefundNo, LastError: order.LastError,
 		CreatedAt: order.CreatedAt, UpdatedAt: order.UpdatedAt, PaidAt: order.PaidAt,
 		FulfilledAt: order.FulfilledAt, RefundedAt: order.RefundedAt,
 	}, nil
 }
+
+func (s *PaymentService) Orders(ctx context.Context, req *dto.PaymentOrderListRequest) ([]*dto.PaymentOrderResponse, int64, int, int, error) {
+	if req == nil {
+		return nil, 0, 1, 10, errors.New("支付订单列表请求为空")
+	}
+	page, pageSize := req.Page, req.PageSize
+	if page <= 0 {
+		page = 1
+	}
+	if pageSize <= 0 {
+		pageSize = 10
+	}
+	items, total, err := s.uc.Orders(ctx, page, pageSize, biz.PaymentOrderFilter{
+		Provider: req.Provider, TradeNo: req.TradeNo, BusinessType: req.BusinessType,
+		BusinessID: req.BusinessID, PaymentStatus: req.PaymentStatus, RefundStatus: req.RefundStatus,
+	})
+	if err != nil {
+		return nil, 0, page, pageSize, err
+	}
+	result := make([]*dto.PaymentOrderResponse, 0, len(items))
+	for _, item := range items {
+		converted, convertErr := paymentOrderResponse(item)
+		if convertErr != nil {
+			return nil, 0, page, pageSize, convertErr
+		}
+		result = append(result, converted)
+	}
+	return result, total, page, pageSize, nil
+}
+
+func paymentOrderResponse(order *biz.PaymentOrder) (*dto.PaymentOrderResponse, error) {
+	if order == nil {
+		return nil, errors.New("支付订单为空")
+	}
+	return &dto.PaymentOrderResponse{
+		ID: order.ID, Provider: order.Provider, TradeNo: order.TradeNo, ProviderTradeNo: order.ProviderTradeNo,
+		BusinessType: order.BusinessType, BusinessID: order.BusinessID, Subject: order.Subject,
+		PaymentMode: order.PaymentMode, OriginalAmount: order.OriginalAmount, Amount: order.Amount, PaidAmount: order.PaidAmount,
+		PayerPaidAmount: order.PayerPaidAmount, CashPaidAmount: order.CashPaidAmount, PointPaidAmount: order.PointPaidAmount,
+		DiscountAmount: order.DiscountAmount, ProviderDiscountAmount: order.ProviderDiscountAmount,
+		MerchantDiscountAmount: order.MerchantDiscountAmount, SettlementAmount: order.SettlementAmount,
+		Currency: order.Currency, PayerCurrency: order.PayerCurrency, AmountBreakdownKnown: order.AmountBreakdownKnown,
+		PaymentStatus: order.PaymentStatus, ProviderStatus: order.ProviderStatus, FulfillmentStatus: order.FulfillmentStatus,
+		RefundStatus: order.RefundStatus, RefundedAmount: order.RefundedAmount, RefundRequestedAmount: order.RefundRequestedAmount,
+		RefundNo: order.RefundNo, LastError: order.LastError, CreatedAt: order.CreatedAt, UpdatedAt: order.UpdatedAt,
+		PaidAt: order.PaidAt, FulfilledAt: order.FulfilledAt, RefundedAt: order.RefundedAt,
+	}, nil
+}
 func (s *PaymentService) Create(ctx context.Context, req *dto.PaymentRequest) (*dto.PaymentResultResponse, error) {
 	if req == nil {
 		return nil, errors.New("支付请求为空")