修复支付以及订单相关的问题

internal/handler/app/client_wallet.go

@@ -298,6 +298,7 @@ func (h *ClientWalletHandler) CreateRecharge(c *fiber.Ctx) error {
 	}
 
 	rechargeNo := generateClientRechargeNo()
+	paymentNo := generateClientPaymentNo()
 
 	// 先初始化微信支付实例并创建预支付订单，确认支付通道可用
 	// 避免先写入充值记录后支付初始化失败，导致产生孤儿记录
@@ -305,7 +306,7 @@ func (h *ClientWalletHandler) CreateRecharge(c *fiber.Ctx) error {
 		resolved.SkipPermissionCtx,
 		config,
 		appID,
-		rechargeNo,
+		paymentNo,
 		"资产钱包充值",
 		openID,
 		int(req.Amount),
@@ -334,7 +335,7 @@ func (h *ClientWalletHandler) CreateRecharge(c *fiber.Ctx) error {
 	}
 
 	payment := &model.Payment{
-		PaymentNo:       rechargeNo,
+		PaymentNo:       paymentNo,
 		OrderID:         rechargeOrder.ID,
 		OrderType:       model.PaymentOrderTypeRecharge,
 		PaymentMethod:   model.PaymentByWechat,
@@ -639,6 +640,10 @@ func generateClientRechargeNo() string {
 	return fmt.Sprintf("%s%s%06d", constants.AssetRechargeOrderPrefix, timestamp, randomNum)
 }
 
+func generateClientPaymentNo() string {
+	return fmt.Sprintf("PAY%d%06d", time.Now().UnixNano()/1e6, rand.Intn(1000000))
+}
+
 func buildClientRechargePayConfig(appID string, result *wechat.JSAPIPayResult) dto.ClientRechargePayConfig {
 	resp := dto.ClientRechargePayConfig{AppID: appID}
 	if result == nil || result.PayConfig == nil {

internal/handler/callback/payment.go

@@ -21,6 +21,7 @@ import (
 	"github.com/break/junhong_cmp_fiber/pkg/errors"
 	"github.com/break/junhong_cmp_fiber/pkg/fuiou"
 	"github.com/break/junhong_cmp_fiber/pkg/wechat"
+	"gorm.io/gorm"
 )
 
 // AgentRechargeServiceInterface 代理充值服务接口
@@ -128,8 +129,36 @@ func (h *PaymentHandler) WechatPayCallback(c *fiber.Ctx) error {
 	return h.wechatV2SuccessResponse(c)
 }
 
-// dispatchWechatCallback 按订单号前缀将支付结果分发到对应业务
+func (h *PaymentHandler) dispatchPaymentRecordCallback(ctx context.Context, paymentNo, paymentMethod, transactionID string, paidAmount int64) (bool, error) {
+	if h.paymentStore != nil {
+		payment, err := h.paymentStore.GetByPaymentNo(ctx, paymentNo)
+		if err == nil {
+			switch payment.OrderType {
+			case model.PaymentOrderTypePackage:
+				return true, h.orderService.HandlePaymentRecordCallback(ctx, paymentNo, paymentMethod, transactionID, paidAmount)
+			case model.PaymentOrderTypeRecharge:
+				if h.rechargeOrderService != nil {
+					return true, h.rechargeOrderService.HandlePaymentCallback(ctx, paymentNo, paymentMethod, transactionID)
+				}
+				return true, fmt.Errorf("充值订单服务未配置，无法处理支付单: %s", paymentNo)
+			default:
+				return true, fmt.Errorf("未知支付记录类型: %s", payment.OrderType)
+			}
+		}
+		if err != gorm.ErrRecordNotFound {
+			return true, errors.Wrap(errors.CodeDatabaseError, err, "查询支付记录失败")
+		}
+	}
+	return false, nil
+}
+
+// dispatchWechatCallback 优先按支付单分发，旧单号继续按前缀兼容处理。
 func (h *PaymentHandler) dispatchWechatCallback(ctx context.Context, outTradeNo, transactionID string, paidAmount int64) error {
+	handled, err := h.dispatchPaymentRecordCallback(ctx, outTradeNo, model.PaymentMethodWechat, transactionID, paidAmount)
+	if handled || err != nil {
+		return err
+	}
+
 	switch {
 	case strings.HasPrefix(outTradeNo, "ORD"):
 		return h.orderService.HandlePaymentCallback(ctx, outTradeNo, model.PaymentMethodWechat, paidAmount)
@@ -196,6 +225,14 @@ func (h *PaymentHandler) AlipayCallback(c *fiber.Ctx) error {
 	}
 	paidAmount := parseYuanToFen(rawAmount)
 
+	handled, err := h.dispatchPaymentRecordCallback(ctx, req.OrderNo, model.PaymentMethodAlipay, "", paidAmount)
+	if err != nil {
+		return err
+	}
+	if handled {
+		return c.SendString("success")
+	}
+
 	// 按订单号前缀分发
 	switch {
 	case strings.HasPrefix(req.OrderNo, "ORD"):
@@ -277,6 +314,12 @@ func (h *PaymentHandler) FuiouPayCallback(c *fiber.Ctx) error {
 	orderNo := notify.MchntOrderNo
 	// OrderAmt 为字符串格式的分，解析失败则降级为 0
 	orderAmt, _ := strconv.ParseInt(notify.OrderAmt, 10, 64)
+	if handled, err := h.dispatchPaymentRecordCallback(ctx, orderNo, "fuiou", notify.TransactionId, orderAmt); err != nil {
+		return c.Send(fuiou.BuildNotifyFailResponse(err.Error()))
+	} else if handled {
+		return c.Send(fuiou.BuildNotifySuccessResponse())
+	}
+
 	switch {
 	case strings.HasPrefix(orderNo, "ORD"):
 		if err := h.orderService.HandlePaymentCallback(ctx, orderNo, "fuiou", orderAmt); err != nil {