refactor(order): 调整payment支付接口API,修复订单模块受影响的代码和测试 (#121)

internal/order/internal/integration/module_test.go

@@ -188,12 +188,12 @@ func (s *OrderModuleTestSuite) getPaymentMockService() *paymentmocks.MockService
 		return r, nil
 	}).AnyTimes()
 
-	paymentSvc.EXPECT().PayByOrderID(gomock.Any(), gomock.Any()).DoAndReturn(func(ctx context.Context, oid int64) (payment.Payment, error) {
-		if oid == 11212 {
+	paymentSvc.EXPECT().PayByID(gomock.Any(), gomock.Any()).DoAndReturn(func(ctx context.Context, pmtID int64) (payment.Payment, error) {
+		if pmtID == 212 {
 			return payment.Payment{
 				ID:          212,
 				SN:          "paymentSN-repay-212",
-				OrderID:     oid,
+				OrderID:     11212,
 				OrderSN:     fmt.Sprintf("orderSN-repay-11%d", 212),
 				TotalAmount: 9990,
 				Records: []payment.Record{
@@ -212,11 +212,11 @@ func (s *OrderModuleTestSuite) getPaymentMockService() *paymentmocks.MockService
 					},
 				},
 			}, nil
-		} else if oid == 11213 {
+		} else if pmtID == 213 {
 			return payment.Payment{
 				ID:          213,
 				SN:          "paymentSN-repay-213",
-				OrderID:     oid,
+				OrderID:     11213,
 				OrderSN:     fmt.Sprintf("orderSN-repay-11%d", 213),
 				TotalAmount: 9990,
 				Records: []payment.Record{
@@ -229,7 +229,7 @@ func (s *OrderModuleTestSuite) getPaymentMockService() *paymentmocks.MockService
 				},
 			}, nil
 		}
-		r, ok := tables[oid]
+		r, ok := tables[pmtID]
 		if !ok {
 			return payment.Payment{}, fmt.Errorf(fmt.Sprintf("未配置的支付id=%d", id))
 		}

internal/order/internal/web/handler.go

@@ -133,7 +133,7 @@ func (h *Handler) CreateOrder(ctx *ginx.Context, req CreateOrderReq, sess sessio
 		return systemErrorResult, err
 	}
 
-	wechatCodeURL, err := h.processPaymentForOrder(ctx.Request.Context(), order.ID)
+	wechatCodeURL, err := h.processPaymentForOrder(ctx.Request.Context(), p.ID)
 	if err != nil {
 		return systemErrorResult, err
 	}
@@ -253,10 +253,10 @@ func (h *Handler) createPayment(ctx context.Context, order domain.Order, payment
 	})
 }
 
-func (h *Handler) processPaymentForOrder(ctx context.Context, oid int64) (string, error) {
-	p, err := h.paymentSvc.PayByOrderID(ctx, oid)
+func (h *Handler) processPaymentForOrder(ctx context.Context, pmtID int64) (string, error) {
+	p, err := h.paymentSvc.PayByID(ctx, pmtID)
 	if err != nil {
-		return "", fmt.Errorf("执行支付失败: %w, oid: %d", err, oid)
+		return "", fmt.Errorf("执行支付失败: %w, pmtID: %d", err, pmtID)
 	}
 	// 微信支付需要返回二维码URL
 	var wechatCodeURL string
@@ -281,7 +281,7 @@ func (h *Handler) RepayOrder(ctx *ginx.Context, req OrderSNReq, sess session.Ses
 		return systemErrorResult, fmt.Errorf("订单状态非法: %w, uid: %d, sn: %s", err, uid, req.SN)
 	}
 
-	wechatCodeURL, err := h.processPaymentForOrder(ctx.Request.Context(), order.ID)
+	wechatCodeURL, err := h.processPaymentForOrder(ctx.Request.Context(), order.Payment.ID)
 	if err != nil {
 		return systemErrorResult, fmt.Errorf("执行支付失败: %w", err)
 	}

internal/payment/internal/service/service.go

@@ -32,7 +32,7 @@ type Service interface {
 	CreatePayment(ctx context.Context, payment domain.Payment) (domain.Payment, error)
 	GetPaymentChannels(ctx context.Context) []domain.PaymentChannel
 	FindPaymentByID(ctx context.Context, pmtID int64) (domain.Payment, error)
-	PayByOrderID(ctx context.Context, oid int64) (domain.Payment, error)
+	PayByID(ctx context.Context, pmtID int64) (domain.Payment, error)
 }
 
 func NewService(wechatSvc *wechat.NativePaymentService,
@@ -130,8 +130,8 @@ func (s *service) FindPaymentByID(ctx context.Context, pmtID int64) (domain.Paym
 	return s.repo.FindPaymentByID(ctx, pmtID)
 }
 
-// PayByOrderID 通过订单序ID支付,查找并执行支付计划
-func (s *service) PayByOrderID(ctx context.Context, oid int64) (domain.Payment, error) {
+// PayByID 通过支付主记录ID支付,查找并执行支付计划
+func (s *service) PayByID(ctx context.Context, pmtID int64) (domain.Payment, error) {
 	// 幂等
 	return domain.Payment{}, nil
 }