fix wx payment

app/user/cmd/api/internal/service/wechatpayService.go

@@ -18,6 +18,8 @@ import (
 	"strconv"
 	"time"
 	"tydata-server/app/user/cmd/api/internal/config"
+	"tydata-server/app/user/model"
+	"tydata-server/common/ctxdata"
 	"tydata-server/pkg/lzkit/lzUtils"
 )
 
@@ -35,25 +37,31 @@ type WechatPayService struct {
 	config        config.WxpayConfig
 	wechatClient  *core.Client
 	notifyHandler *notify.Handler
+	userAuthModel model.UserAuthModel
 }
 
 // NewWechatPayService 初始化微信支付服务
-func NewWechatPayService(c config.Config) *WechatPayService {
+func NewWechatPayService(c config.Config, userAuthModel model.UserAuthModel) *WechatPayService {
 	// 从配置中加载商户信息
 	mchID := c.Wxpay.MchID
 	mchCertificateSerialNumber := c.Wxpay.MchCertificateSerialNumber
 	mchAPIv3Key := c.Wxpay.MchApiv3Key
-
+	mchPublicKeyID := c.Wxpay.MchPublicKeyID
 	// 从文件中加载商户私钥
 	mchPrivateKey, err := utils.LoadPrivateKeyWithPath(c.Wxpay.MchPrivateKeyPath)
 	if err != nil {
 		logx.Errorf("加载商户私钥失败: %v", err)
 		panic(fmt.Sprintf("初始化失败，服务停止: %v", err)) // 记录错误并停止程序
 	}
-
+	// 从文件中加载公钥
+	mchPublicKey, err := utils.LoadPublicKeyWithPath(c.Wxpay.MchPublicKeyPath)
+	if err != nil {
+		logx.Errorf("加载商户私钥失败: %v", err)
+		panic(fmt.Sprintf("初始化失败，服务停止: %v", err)) // 记录错误并停止程序
+	}
 	// 使用商户私钥和其他参数初始化微信支付客户端
 	opts := []core.ClientOption{
-		option.WithWechatPayAutoAuthCipher(mchID, mchCertificateSerialNumber, mchPrivateKey, mchAPIv3Key),
+		option.WithWechatPayPublicKeyAuthCipher(mchID, mchCertificateSerialNumber, mchPrivateKey, mchPublicKeyID, mchPublicKey),
 	}
 	client, err := core.NewClient(context.Background(), opts...)
 	if err != nil {
@@ -71,6 +79,7 @@ func NewWechatPayService(c config.Config) *WechatPayService {
 		config:        c.Wxpay,
 		wechatClient:  client,
 		notifyHandler: notifyHandler,
+		userAuthModel: userAuthModel,
 	}
 }
 
@@ -104,7 +113,7 @@ func (w *WechatPayService) CreateWechatAppOrder(ctx context.Context, amount floa
 }
 
 // CreateWechatMiniProgramOrder 创建微信小程序支付订单
-func (w *WechatPayService) CreateWechatMiniProgramOrder(ctx context.Context, amount float64, description string, outTradeNo string, openid string) (string, error) {
+func (w *WechatPayService) CreateWechatMiniProgramOrder(ctx context.Context, amount float64, description string, outTradeNo string, openid string) (interface{}, error) {
 	totalAmount := lzUtils.ToWechatAmount(amount)
 
 	// 构建支付请求参数
@@ -131,24 +140,41 @@ func (w *WechatPayService) CreateWechatMiniProgramOrder(ctx context.Context, amo
 	}
 
 	// 返回预支付交易会话标识
-	return *resp.PrepayId, nil
+	return resp, nil
 }
 
 // CreateWechatOrder 创建微信支付订单（集成 APP、H5、小程序）
-func (w *WechatPayService) CreateWechatOrder(ctx context.Context, amount float64, description string, outTradeNo string) (string, error) {
+func (w *WechatPayService) CreateWechatOrder(ctx context.Context, amount float64, description string, outTradeNo string) (interface{}, error) {
 	// 根据 ctx 中的 platform 判断平台
 	platform := ctx.Value("platform").(string)
 
-	var prepayId string
+	var prepayData interface{}
 	var err error
 
 	switch platform {
 	case "mp-weixin":
-		// 如果是小程序平台，调用小程序支付订单创建
-		prepayId, err = w.CreateWechatMiniProgramOrder(ctx, amount, description, outTradeNo, "asdasd")
+		userID, getUidErr := ctxdata.GetUidFromCtx(ctx)
+		if getUidErr != nil {
+			return "", getUidErr
+		}
+		userAuthModel, findAuthModelErr := w.userAuthModel.FindOneByUserIdAuthType(ctx, userID, model.UserAuthTypeWxMini)
+		if findAuthModelErr != nil {
+			return "", findAuthModelErr
+		}
+		prepayData, err = w.CreateWechatMiniProgramOrder(ctx, amount, description, outTradeNo, userAuthModel.AuthKey)
+	case "h5-weixin":
+		userID, getUidErr := ctxdata.GetUidFromCtx(ctx)
+		if getUidErr != nil {
+			return "", getUidErr
+		}
+		userAuthModel, findAuthModelErr := w.userAuthModel.FindOneByUserIdAuthType(ctx, userID, model.UserAuthTypeWxh5)
+		if findAuthModelErr != nil {
+			return "", findAuthModelErr
+		}
+		prepayData, err = w.CreateWechatMiniProgramOrder(ctx, amount, description, outTradeNo, userAuthModel.AuthKey)
 	case "app":
 		// 如果是 APP 平台，调用 APP 支付订单创建
-		prepayId, err = w.CreateWechatAppOrder(ctx, amount, description, outTradeNo)
+		prepayData, err = w.CreateWechatAppOrder(ctx, amount, description, outTradeNo)
 	default:
 		return "", fmt.Errorf("不支持的支付平台: %s", platform)
 	}
@@ -159,7 +185,7 @@ func (w *WechatPayService) CreateWechatOrder(ctx context.Context, amount float64
 	}
 
 	// 返回预支付ID
-	return prepayId, nil
+	return prepayData, nil
 }
 
 // HandleWechatPayNotification 处理微信支付回调