测试修复15分钟bug

2026-06-07 20:05:56 +08:00
parent 9740ff8799
commit a5e55bc045
7 changed files with 178 additions and 45 deletions
@@ -703,47 +703,29 @@ func (r *Repository) preparePayment(userID uint64, orderID uint64, req StartPaym
 			Order("id DESC").
 			First(&existing).Error
 		if err == nil {
-			existing.PayWay = firstNonEmpty(req.PayWay, existing.PayWay, runtimeConfig.PayWay, "ZFBZF")
-			existing.JSPayFlag = firstNonEmpty(req.JSPayFlag, existing.JSPayFlag, runtimeConfig.JSPayFlag, "2")
-			existing.AmountCent = amountCent
-			existing.Provider = firstNonEmpty(existing.Provider, runtimeConfig.Provider)
-			existing.MerchantID = firstNonEmpty(existing.MerchantID, runtimeConfig.MerchantID)
-			if existing.Provider == "mock" && existing.ProviderOrderID == "" {
-				existing.ProviderOrderID = "MOCK" + existing.ThirdOrderID
+			if canReuseOrderPayment(existing, runtimeConfig) {
+				existing.PayWay = firstNonEmpty(req.PayWay, existing.PayWay, runtimeConfig.PayWay, "ZFBZF")
+				existing.JSPayFlag = firstNonEmpty(req.JSPayFlag, existing.JSPayFlag, runtimeConfig.JSPayFlag, "2")
+				existing.AmountCent = amountCent
+				existing.Provider = firstNonEmpty(existing.Provider, runtimeConfig.Provider)
+				existing.MerchantID = firstNonEmpty(existing.MerchantID, runtimeConfig.MerchantID)
+				if existing.Provider == "mock" && existing.ProviderOrderID == "" {
+					existing.ProviderOrderID = "MOCK" + existing.ThirdOrderID
+				}
+				if err := tx.Save(&existing).Error; err != nil {
+					return err
+				}
+				paymentID = existing.ID
+				orderRow = row
+				return nil
 			}
-			if err := tx.Save(&existing).Error; err != nil {
-				return err
-			}
-			paymentID = existing.ID
-			orderRow = row
-			return nil
-		}
-		if err != gorm.ErrRecordNotFound {
+		} else if err != gorm.ErrRecordNotFound {
 			return err
 		}
-		paymentNo, err := newPaymentNo()
+		payment, err := newOrderPayment(row, amountCent, req, runtimeConfig)
 		if err != nil {
 			return err
 		}
-		payment := model.PaymentOrder{
-			PaymentNo:       paymentNo,
-			OrderID:         row.ID,
-			OrderNo:         row.OrderNo,
-			UserID:          row.RenterID,
-			Provider:        runtimeConfig.Provider,
-			MerchantID:      runtimeConfig.MerchantID,
-			ThirdOrderID:    row.OrderNo,
-			ProviderOrderID: "",
-			PayWay:          firstNonEmpty(req.PayWay, runtimeConfig.PayWay, "ZFBZF"),
-			JSPayFlag:       firstNonEmpty(req.JSPayFlag, runtimeConfig.JSPayFlag, "2"),
-			AmountCent:      amountCent,
-			BizType:         "order_pay",
-			Status:          "created",
-		}
-		if runtimeConfig.isMockMode() {
-			payment.ProviderOrderID = "MOCK" + row.OrderNo
-			payment.TDCode = "mock://payment/pay/" + row.OrderNo
-		}
 		if err := tx.Create(&payment).Error; err != nil {
 			return err
 		}
@@ -761,6 +743,49 @@ func (r *Repository) preparePayment(userID uint64, orderID uint64, req StartPaym
 	return payment, &orderRow, nil
 }

+func canReuseOrderPayment(payment model.PaymentOrder, runtimeConfig runtimePaymentConfig) bool {
+	if payment.Status == "paid" {
+		return true
+	}
+	if payment.Status != "created" && payment.Status != "paying" {
+		return false
+	}
+	if payment.Provider != "" && runtimeConfig.Provider != "" && payment.Provider != runtimeConfig.Provider {
+		return false
+	}
+	if payment.MerchantID != "" && runtimeConfig.MerchantID != "" && payment.MerchantID != runtimeConfig.MerchantID {
+		return false
+	}
+	return true
+}
+
+func newOrderPayment(row model.RentalOrder, amountCent int64, req StartPaymentRequest, runtimeConfig runtimePaymentConfig) (model.PaymentOrder, error) {
+	paymentNo, err := newPaymentNo()
+	if err != nil {
+		return model.PaymentOrder{}, err
+	}
+	payment := model.PaymentOrder{
+		PaymentNo:       paymentNo,
+		OrderID:         row.ID,
+		OrderNo:         row.OrderNo,
+		UserID:          row.RenterID,
+		Provider:        runtimeConfig.Provider,
+		MerchantID:      runtimeConfig.MerchantID,
+		ThirdOrderID:    paymentNo,
+		ProviderOrderID: "",
+		PayWay:          firstNonEmpty(req.PayWay, runtimeConfig.PayWay, "ZFBZF"),
+		JSPayFlag:       firstNonEmpty(req.JSPayFlag, runtimeConfig.JSPayFlag, "2"),
+		AmountCent:      amountCent,
+		BizType:         "order_pay",
+		Status:          "created",
+	}
+	if runtimeConfig.isMockMode() {
+		payment.ProviderOrderID = "MOCK" + paymentNo
+		payment.TDCode = "mock://payment/pay/" + paymentNo
+	}
+	return payment, nil
+}
+
 func (r *Repository) createWalletRechargePayment(userID uint64, amountCent int64, req WalletRechargePaymentRequest, runtimeConfig runtimePaymentConfig) (*model.PaymentOrder, error) {
 	paymentNo, err := newPaymentNo()
 	if err != nil {