Compare commits
2 Commits
cae488d88e
...
5e02a56e87
| Author | SHA1 | Date | |
|---|---|---|---|
| 5e02a56e87 | |||
| e1fd1439d5 |
@@ -47,6 +47,7 @@ type (
|
||||
Id string `json:"id"`
|
||||
PayMethod string `json:"pay_method"` // 支付方式: wechat, alipay, appleiap, test(仅开发环境), test_empty(仅开发环境-空报告模式)
|
||||
PayType string `json:"pay_type" validate:"required,oneof=query agent_vip agent_upgrade"`
|
||||
Code string `json:"code,optional"` // 微信小程序/H5授权码，用于自动绑定微信账号（当用户未绑定微信时）
|
||||
}
|
||||
PaymentResp {
|
||||
PrepayData interface{} `json:"prepay_data"`
|
||||
|
||||
@@ -33,9 +33,9 @@ Alipay:
|
||||
AppID: "2021004165608254"
|
||||
PrivateKey: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCPsXuwFJeHAL8CwI0QdD9GP7xQ8eejIoQKg6J3/peu26su68JCtGSRhlDm/7vbLHJcFR6h7at+INoz2juc7SqlmNO7i9wKc3+Ua0487y1G2fCsneRNxTTqbceBZwqjj9/AAN0u5/4nSl0bcqTeMddofdpTGOvwGvIJh6CZgCglnhMZnH4D6H6yiIyZf7Q6k2d/qBpVGK8kluYEtSnf/vEQCHhxRx+/DgTL7V1LjbA3BYoPTELZ15JAj0uIzuxextAtxOm4+Huli0RJFAN3q/to2L1Zs8yYY1gKJyTaPWKsJWBx8zI+gZcC/e45k6CZnGgh1Fn3+Xqkf7eGxJGGHs1fAgMBAAECggEAM2rkApbrvdBDiV2TXK7sMVv/K8vUAmkIbKa7zUpZxqUuNSUBp1LbpcM1UeNyujPGXDLmejUMp55j1igiKr4nA4iTQ0oBm+/GWDqpjV5cijzURUBegIGvtK9Bs4lGok6KVy839l/nbvHKLVcxrZySIv7dz9xcGNfbghN5IVRdiU/kOokNbtwQNC837piG5q4PHL6bzwIUGbrLED/RDmw/IwVMMmZovcQQ2JAuWJBo9CS9LB0Nc3I4MOPNx/0Rl+5URSSfmJAriL5ihlWckocQCUHwhRpSGQ6Q4xAXFYvb8OsApAQG3WU9SciBfs2wg/QfGNFzwQgGFofPcTQg3DTeuQKBgQDUHBTsgoe3WXnGo6qZKw1zA4OtF67IJJoltHo5JtkBRKCNVU3BJ+q+6i/fn0MBwScKQ1mhPjWe3h+qTRT207RRxGaxb6ljATOiU+BxmpHvu6jP+DVYtP5F3M7MCAGqpDAEoXgoAWttxmijqk+5YuLOLe0j/btCmpzuH7zwxSnqlQKBgQCtbTvaS/g+Jeu4Ml6iv7xi5//JCjeTn2wUJpXnNmN0jn+riRwEO81z4GWuOI8WukZHHAnufI6qWk2sLH0gcdLQ/STsMnl2L3NbeUyO8o5w2JSAlnZDYfaFfasGqFkGJrBLqG6bh/Bk1DP3/Bl6iMEwDbmu7Ptoy8ihokng9dEPIwKBgBHdi6WgGO5IiwlAH85m4eseEKkzpXUWICWs3d6SdxS0QxGkbbgnNI6ACyg6sdoj+rXSlmoOY1XOP7yIYYuoqTd542xui0XbhA3YIr9u1XvrwnxB27xtAj3AK2rkAb/ttF2ve/9inznPzGB8p9plidTz6VVuuacSfsVPxwpAkRdBAoGAR7c9Ifd6b1DFGkWSBuEc6RWhG6Si+OPbELYoFRXTqNZoiynGsSV9v2ZTBemTmkVrXGqG3N0bLezr47/9+lW3ZP7ZrubsfWf/3xrZAt/g8V9OgaI2w4SWKfuepsElFzsWeiLroltjmH58Axd3/cjhgpqaZ3DOQjbK/7QZsvJUAlsCgYEAqTQVhKLizM7BvXu1N6Z2K8trfJbiN+f90XhZIRPkIIcom0PnOfXhRtT76MCxz9n+lwf+alOKOfbQFy0pZtWG/eaFSYroQlXL+EfmqlFPXZR6D0NQLeygWAKH8161IQUh2VF3Qkhle6g6ZkyJA3Ev4RmqH2BYGv8hcZTTHsZ3Ic4="
|
||||
AlipayPublicKey: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2CqoCp95w/JV3RT/gzF4/8QmVT1HQNaeW7yUp+mA7x9AbjvlTW/+eRn6oGAL/XhZLjvHD0XjKLVKX0MJVS1aUQHEHEbOJN4Eu8II45OavD4iZISa7Kp9V6AM+i4qTyaeV2wNDnGxHQBaLVUGCfMR+56EK2YpORdE1H9uy72SSQseVb3bmpsV9EW/IJNmcVL/ut3uA1JWAoRmzlQ7ekxg7p8AYXzYPEHQr1tl7W+M4zv9wO9GKZCxIqMA8U3RP5npPfRaCfIRGzXzCqFEEUvWuidOB7frsvN4jiPD07qpL2Bi9LM1X/ee2kC/oM8Uhd7ERZhG8MbZfijZKxgrsDKBcwIDAQAB"
|
||||
AppCertPath: "etc/merchant/appCertPublicKey_2021004165608254.crt"
|
||||
AlipayCertPath: "etc/merchant/alipayCertPublicKey_RSA2.crt"
|
||||
AlipayRootCertPath: "etc/merchant/alipayRootCert.crt"
|
||||
AppCertPath: "app/main/api/etc/merchant/appCertPublicKey_2021004165608254.crt"
|
||||
AlipayCertPath: "app/main/api/etc/merchant/alipayCertPublicKey_RSA2.crt"
|
||||
AlipayRootCertPath: "app/main/api/etc/merchant/alipayRootCert.crt"
|
||||
IsProduction: true
|
||||
NotifyUrl: "https://6m4685017o.goho.co/api/v1/pay/alipay/callback"
|
||||
ReturnURL: "http://localhost:5678/inquire"
|
||||
@@ -45,9 +45,9 @@ Wxpay:
|
||||
MchID: "1687993434"
|
||||
MchCertificateSerialNumber: "241E4BCF5B69AAAC48451DB2C7ED794EF8B3A3D3"
|
||||
MchApiv3Key: "aB3cD5eF7gH9iJ1kL2mN4oP6qR8sT0uV"
|
||||
MchPrivateKeyPath: "etc/merchant/apiclient_key.pem"
|
||||
MchPrivateKeyPath: "app/main/api/etc/merchant/apiclient_key.pem"
|
||||
MchPublicKeyID: "PUB_KEY_ID_0116879934342025120200181745004208"
|
||||
MchPublicKeyPath: "etc/merchant/pub_key.pem"
|
||||
MchPublicKeyPath: "app/main/api/etc/merchant/pub_key.pem"
|
||||
MchPlatformRAS: "5630D013C88EA348BF66E642B6C39AA0180D4B15"
|
||||
NotifyUrl: "https://6m4685017o.goho.co/api/v1/pay/wechat/callback"
|
||||
RefundNotifyUrl: "https://6m4685017o.goho.co/api/v1/paywechat/refund_callback"
|
||||
@@ -58,7 +58,7 @@ Applepay:
|
||||
BundleID: "com.allinone.check"
|
||||
IssuerID: "bf828d85-5269-4914-9660-c066e09cd6ef"
|
||||
KeyID: "LAY65829DQ"
|
||||
LoadPrivateKeyPath: "etc/merchant/AuthKey_LAY65829DQ.p8"
|
||||
LoadPrivateKeyPath: "app/main/api/etc/merchant/AuthKey_LAY65829DQ.p8"
|
||||
Ali:
|
||||
Code: "d55b58829efb41c8aa8e86769cba4844"
|
||||
SystemConfig:
|
||||
@@ -67,10 +67,8 @@ WechatH5:
|
||||
AppID: "wx442ee1ac1ee75917"
|
||||
AppSecret: "c80474909db42f63913b7a307b3bee17"
|
||||
WechatMini:
|
||||
AppID: "wx781abb66b3368963" # 小程序的AppID
|
||||
AppSecret: "c7d02cdb0fc23c35c93187af9243b00d" # 小程序的AppSecret
|
||||
TycAppID: "wxe74617f3dd56c196"
|
||||
TycAppSecret: "c8207e54aef5689b2a7c1f91ed7ae8a0"
|
||||
AppID: "wx5bacc94add2da981" # 小程序的AppID
|
||||
AppSecret: "48a2c1e8ff1b7d4c0ff82fbefa64d2d0" # 小程序的AppSecret
|
||||
Query:
|
||||
ShareLinkExpire: 604800 # 7天 = 7 * 24 * 60 * 60 = 604800秒
|
||||
AdminConfig:
|
||||
|
||||
@@ -4,15 +4,15 @@ import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
"qnc-server/app/main/model"
|
||||
"qnc-server/common/ctxdata"
|
||||
"qnc-server/common/globalkey"
|
||||
"qnc-server/common/tool"
|
||||
"qnc-server/common/xerr"
|
||||
"qnc-server/pkg/lzkit/crypto"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
|
||||
@@ -124,7 +124,18 @@ func (l *GetInviteLinkLogic) createInviteShortLink(inviteCodeId string, inviteCo
|
||||
// 先查询是否已存在短链
|
||||
existingShortLink, err := l.svcCtx.AgentShortLinkModel.FindOneByInviteCodeIdTypeDelState(l.ctx, sql.NullString{String: inviteCodeId, Valid: inviteCodeId != ""}, 2, globalkey.DelStateNo)
|
||||
if err == nil && existingShortLink != nil {
|
||||
// 已存在短链，直接返回
|
||||
// 已存在短链，检查 target_path 是否需要更新
|
||||
if existingShortLink.TargetPath != targetPath {
|
||||
// target_path 已变化，更新短链记录
|
||||
oldTargetPath := existingShortLink.TargetPath
|
||||
existingShortLink.TargetPath = targetPath
|
||||
if updateErr := l.svcCtx.AgentShortLinkModel.UpdateWithVersion(l.ctx, nil, existingShortLink); updateErr != nil {
|
||||
l.Errorf("更新短链 target_path 失败: %v", updateErr)
|
||||
// 即使更新失败，也返回旧短链，避免影响用户体验
|
||||
} else {
|
||||
l.Infof("短链 target_path 已更新: shortCode=%s, old=%s, new=%s", existingShortLink.ShortCode, oldTargetPath, targetPath)
|
||||
}
|
||||
}
|
||||
return fmt.Sprintf("%s/s/%s", promotionConfig.PromotionDomain, existingShortLink.ShortCode), nil
|
||||
}
|
||||
|
||||
@@ -136,6 +147,18 @@ func (l *GetInviteLinkLogic) createInviteShortLink(inviteCodeId string, inviteCo
|
||||
if inviteCodeId == "" && inviteCode != "" {
|
||||
existingByCode, err2 := l.svcCtx.AgentShortLinkModel.FindOneByInviteCodeTypeDelState(l.ctx, sql.NullString{String: inviteCode, Valid: true}, 2, globalkey.DelStateNo)
|
||||
if err2 == nil && existingByCode != nil {
|
||||
// 已存在短链，检查 target_path 是否需要更新
|
||||
if existingByCode.TargetPath != targetPath {
|
||||
// target_path 已变化，更新短链记录
|
||||
oldTargetPath := existingByCode.TargetPath
|
||||
existingByCode.TargetPath = targetPath
|
||||
if updateErr := l.svcCtx.AgentShortLinkModel.UpdateWithVersion(l.ctx, nil, existingByCode); updateErr != nil {
|
||||
l.Errorf("更新短链 target_path 失败: %v", updateErr)
|
||||
// 即使更新失败，也返回旧短链，避免影响用户体验
|
||||
} else {
|
||||
l.Infof("短链 target_path 已更新: shortCode=%s, old=%s, new=%s", existingByCode.ShortCode, oldTargetPath, targetPath)
|
||||
}
|
||||
}
|
||||
return fmt.Sprintf("%s/s/%s", promotionConfig.PromotionDomain, existingByCode.ShortCode), nil
|
||||
}
|
||||
if err2 != nil && !errors.Is(err2, model.ErrNotFound) {
|
||||
|
||||
@@ -5,13 +5,13 @@ import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"os"
|
||||
"strconv"
|
||||
"time"
|
||||
"qnc-server/app/main/model"
|
||||
"qnc-server/common/ctxdata"
|
||||
"qnc-server/common/globalkey"
|
||||
"qnc-server/common/xerr"
|
||||
"qnc-server/pkg/lzkit/crypto"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
@@ -6,15 +6,15 @@ import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
"qnc-server/app/main/api/internal/svc"
|
||||
"qnc-server/app/main/api/internal/types"
|
||||
"qnc-server/app/main/model"
|
||||
"qnc-server/common/ctxdata"
|
||||
"qnc-server/common/xerr"
|
||||
"qnc-server/pkg/lzkit/lzUtils"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"github.com/pkg/errors"
|
||||
@@ -35,6 +35,9 @@ type PaymentTypeResp struct {
|
||||
orderID string // 订单ID，用于开发环境测试支付模式
|
||||
}
|
||||
|
||||
// enableDevTestPayment 测试支付功能开关，设置为 true 以启用测试支付功能
|
||||
const enableDevTestPayment = false
|
||||
|
||||
func NewPaymentLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PaymentLogic {
|
||||
return &PaymentLogic{
|
||||
Logger: logx.WithContext(ctx),
|
||||
@@ -50,8 +53,8 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp,
|
||||
|
||||
// 检查是否为开发环境的测试支付模式
|
||||
env := os.Getenv("ENV")
|
||||
isDevTestPayment := env == "development" && (req.PayMethod == "test" || req.PayMethod == "test_empty")
|
||||
isEmptyReportMode := env == "development" && req.PayMethod == "test_empty"
|
||||
isDevTestPayment := enableDevTestPayment && env == "development" && (req.PayMethod == "test" || req.PayMethod == "test_empty")
|
||||
isEmptyReportMode := enableDevTestPayment && env == "development" && req.PayMethod == "test_empty"
|
||||
|
||||
l.svcCtx.OrderModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error {
|
||||
switch req.PayType {
|
||||
@@ -95,7 +98,7 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp,
|
||||
// 正常支付流程
|
||||
var createOrderErr error
|
||||
if req.PayMethod == "wechat" {
|
||||
prepayData, createOrderErr = l.svcCtx.WechatPayService.CreateWechatOrder(l.ctx, paymentTypeResp.amount, paymentTypeResp.description, paymentTypeResp.outTradeNo)
|
||||
prepayData, createOrderErr = l.svcCtx.WechatPayService.CreateWechatOrder(l.ctx, paymentTypeResp.amount, paymentTypeResp.description, paymentTypeResp.outTradeNo, req.Code)
|
||||
} else if req.PayMethod == "alipay" {
|
||||
prepayData, createOrderErr = l.svcCtx.AlipayService.CreateAlipayOrder(l.ctx, paymentTypeResp.amount, paymentTypeResp.description, paymentTypeResp.outTradeNo)
|
||||
} else if req.PayMethod == "appleiap" {
|
||||
|
||||
@@ -118,7 +118,37 @@ func (l *WxMiniAuthLogic) GetSessionKey(code string) (*SessionKeyResp, error) {
|
||||
|
||||
// 检查微信返回的错误码
|
||||
if sessionKeyResp.ErrCode != 0 {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR),
|
||||
// 针对不同的微信错误码返回更明确的错误信息
|
||||
var errMsg string
|
||||
switch sessionKeyResp.ErrCode {
|
||||
case 40029:
|
||||
// code 无效（已使用、已过期或格式错误）
|
||||
errMsg = "微信授权码无效或已过期，请重新打开小程序"
|
||||
l.Errorf("微信code无效: errcode=%d, errmsg=%s, code前6位=%s",
|
||||
sessionKeyResp.ErrCode, sessionKeyResp.ErrMsg,
|
||||
func() string {
|
||||
if len(code) > 6 {
|
||||
return code[:6] + "..."
|
||||
}
|
||||
return code
|
||||
}())
|
||||
case 40013:
|
||||
// 无效的 AppID
|
||||
errMsg = "小程序配置错误，请联系管理员"
|
||||
l.Errorf("微信AppID无效: errcode=%d, errmsg=%s", sessionKeyResp.ErrCode, sessionKeyResp.ErrMsg)
|
||||
case 40125:
|
||||
// 无效的 AppSecret
|
||||
errMsg = "小程序配置错误，请联系管理员"
|
||||
l.Errorf("微信AppSecret无效: errcode=%d, errmsg=%s", sessionKeyResp.ErrCode, sessionKeyResp.ErrMsg)
|
||||
case 45011:
|
||||
// 频率限制
|
||||
errMsg = "请求过于频繁，请稍后再试"
|
||||
l.Errorf("微信API频率限制: errcode=%d, errmsg=%s", sessionKeyResp.ErrCode, sessionKeyResp.ErrMsg)
|
||||
default:
|
||||
errMsg = fmt.Sprintf("微信授权失败: %s", sessionKeyResp.ErrMsg)
|
||||
l.Errorf("微信接口返回错误: errcode=%d, errmsg=%s", sessionKeyResp.ErrCode, sessionKeyResp.ErrMsg)
|
||||
}
|
||||
return nil, errors.Wrapf(xerr.NewErrMsg(errMsg),
|
||||
"微信接口返回错误: errcode=%d, errmsg=%s",
|
||||
sessionKeyResp.ErrCode, sessionKeyResp.ErrMsg)
|
||||
}
|
||||
|
||||
@@ -2,15 +2,19 @@ package service
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"time"
|
||||
"qnc-server/app/main/api/internal/config"
|
||||
"qnc-server/app/main/model"
|
||||
"qnc-server/common/ctxdata"
|
||||
"qnc-server/pkg/lzkit/lzUtils"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"github.com/wechatpay-apiv3/wechatpay-go/core"
|
||||
"github.com/wechatpay-apiv3/wechatpay-go/core/auth/verifiers"
|
||||
"github.com/wechatpay-apiv3/wechatpay-go/core/downloader"
|
||||
@@ -251,9 +255,16 @@ func (w *WechatPayService) CreateWechatH5Order(ctx context.Context, amount float
|
||||
}
|
||||
|
||||
// CreateWechatOrder 创建微信支付订单（集成 APP、H5、小程序）
|
||||
func (w *WechatPayService) CreateWechatOrder(ctx context.Context, amount float64, description string, outTradeNo string) (interface{}, error) {
|
||||
// 根据 ctx 中的 platform 判断平台
|
||||
platform := ctx.Value("platform").(string)
|
||||
func (w *WechatPayService) CreateWechatOrder(ctx context.Context, amount float64, description string, outTradeNo string, code string) (interface{}, error) {
|
||||
// 根据 ctx 中的 platform 判断平台（请求头 X-Platform: wxmini / wxh5 / app）
|
||||
platformValue := ctx.Value("platform")
|
||||
if platformValue == nil {
|
||||
return "", fmt.Errorf("平台信息不存在，请检查请求头 X-Platform")
|
||||
}
|
||||
platform, ok := platformValue.(string)
|
||||
if !ok {
|
||||
return "", fmt.Errorf("平台信息格式错误")
|
||||
}
|
||||
|
||||
var prepayData interface{}
|
||||
var err error
|
||||
@@ -266,7 +277,30 @@ func (w *WechatPayService) CreateWechatOrder(ctx context.Context, amount float64
|
||||
}
|
||||
userAuthModel, findAuthModelErr := w.userAuthModel.FindOneByUserIdAuthType(ctx, userID, model.UserAuthTypeWxMiniOpenID)
|
||||
if findAuthModelErr != nil {
|
||||
return "", findAuthModelErr
|
||||
if errors.Is(findAuthModelErr, model.ErrNotFound) {
|
||||
// 用户未绑定微信，尝试通过 code 自动绑定
|
||||
if code == "" {
|
||||
return "", fmt.Errorf("用户未绑定微信小程序账号，请先完成微信登录或提供授权码")
|
||||
}
|
||||
// 通过 code 获取 OpenID
|
||||
openid, getOpenidErr := w.getWechatMiniOpenID(ctx, code)
|
||||
if getOpenidErr != nil {
|
||||
return "", fmt.Errorf("获取微信小程序OpenID失败: %v", getOpenidErr)
|
||||
}
|
||||
// 自动绑定微信账号
|
||||
bindErr := w.bindWechatAuth(ctx, userID, model.UserAuthTypeWxMiniOpenID, openid)
|
||||
if bindErr != nil {
|
||||
return "", fmt.Errorf("绑定微信小程序账号失败: %v", bindErr)
|
||||
}
|
||||
// 重新查询绑定后的认证信息
|
||||
userAuthModel, findAuthModelErr = w.userAuthModel.FindOneByUserIdAuthType(ctx, userID, model.UserAuthTypeWxMiniOpenID)
|
||||
if findAuthModelErr != nil {
|
||||
return "", fmt.Errorf("查询绑定后的微信认证信息失败: %v", findAuthModelErr)
|
||||
}
|
||||
logx.Infof("用户 %s 已自动绑定微信小程序账号，OpenID: %s", userID, openid)
|
||||
} else {
|
||||
return "", fmt.Errorf("查询用户微信认证信息失败: %v", findAuthModelErr)
|
||||
}
|
||||
}
|
||||
prepayData, err = w.CreateWechatMiniProgramOrder(ctx, amount, description, outTradeNo, userAuthModel.AuthKey)
|
||||
if err != nil {
|
||||
@@ -279,7 +313,30 @@ func (w *WechatPayService) CreateWechatOrder(ctx context.Context, amount float64
|
||||
}
|
||||
userAuthModel, findAuthModelErr := w.userAuthModel.FindOneByUserIdAuthType(ctx, userID, model.UserAuthTypeWxh5OpenID)
|
||||
if findAuthModelErr != nil {
|
||||
return "", findAuthModelErr
|
||||
if errors.Is(findAuthModelErr, model.ErrNotFound) {
|
||||
// 用户未绑定微信，尝试通过 code 自动绑定
|
||||
if code == "" {
|
||||
return "", fmt.Errorf("用户未绑定微信H5账号，请先完成微信登录或提供授权码")
|
||||
}
|
||||
// 通过 code 获取 OpenID
|
||||
openid, getOpenidErr := w.getWechatH5OpenID(ctx, code)
|
||||
if getOpenidErr != nil {
|
||||
return "", fmt.Errorf("获取微信H5 OpenID失败: %v", getOpenidErr)
|
||||
}
|
||||
// 自动绑定微信账号
|
||||
bindErr := w.bindWechatAuth(ctx, userID, model.UserAuthTypeWxh5OpenID, openid)
|
||||
if bindErr != nil {
|
||||
return "", fmt.Errorf("绑定微信H5账号失败: %v", bindErr)
|
||||
}
|
||||
// 重新查询绑定后的认证信息
|
||||
userAuthModel, findAuthModelErr = w.userAuthModel.FindOneByUserIdAuthType(ctx, userID, model.UserAuthTypeWxh5OpenID)
|
||||
if findAuthModelErr != nil {
|
||||
return "", fmt.Errorf("查询绑定后的微信认证信息失败: %v", findAuthModelErr)
|
||||
}
|
||||
logx.Infof("用户 %s 已自动绑定微信H5账号，OpenID: %s", userID, openid)
|
||||
} else {
|
||||
return "", fmt.Errorf("查询用户微信认证信息失败: %v", findAuthModelErr)
|
||||
}
|
||||
}
|
||||
prepayData, err = w.CreateWechatH5Order(ctx, amount, description, outTradeNo, userAuthModel.AuthKey)
|
||||
if err != nil {
|
||||
@@ -384,3 +441,112 @@ func (w *WechatPayService) GenerateOutTradeNo() string {
|
||||
|
||||
return combined
|
||||
}
|
||||
|
||||
// getWechatMiniOpenID 通过 code 获取微信小程序 OpenID
|
||||
func (w *WechatPayService) getWechatMiniOpenID(ctx context.Context, code string) (string, error) {
|
||||
appID := w.config.WechatMini.AppID
|
||||
appSecret := w.config.WechatMini.AppSecret
|
||||
url := fmt.Sprintf("https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code", appID, appSecret, code)
|
||||
|
||||
resp, err := http.Get(url)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("请求微信API失败: %v", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
body, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("读取响应失败: %v", err)
|
||||
}
|
||||
|
||||
var data struct {
|
||||
Openid string `json:"openid"`
|
||||
ErrCode int `json:"errcode,omitempty"`
|
||||
ErrMsg string `json:"errmsg,omitempty"`
|
||||
}
|
||||
|
||||
if err := json.Unmarshal(body, &data); err != nil {
|
||||
return "", fmt.Errorf("解析响应失败: %v", err)
|
||||
}
|
||||
|
||||
if data.ErrCode != 0 {
|
||||
return "", fmt.Errorf("微信API返回错误: errcode=%d, errmsg=%s", data.ErrCode, data.ErrMsg)
|
||||
}
|
||||
|
||||
if data.Openid == "" {
|
||||
return "", fmt.Errorf("openid为空")
|
||||
}
|
||||
|
||||
return data.Openid, nil
|
||||
}
|
||||
|
||||
// getWechatH5OpenID 通过 code 获取微信H5 OpenID
|
||||
func (w *WechatPayService) getWechatH5OpenID(ctx context.Context, code string) (string, error) {
|
||||
appID := w.config.WechatH5.AppID
|
||||
appSecret := w.config.WechatH5.AppSecret
|
||||
url := fmt.Sprintf("https://api.weixin.qq.com/sns/oauth2/access_token?appid=%s&secret=%s&code=%s&grant_type=authorization_code", appID, appSecret, code)
|
||||
|
||||
resp, err := http.Get(url)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("请求微信API失败: %v", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
body, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("读取响应失败: %v", err)
|
||||
}
|
||||
|
||||
var data struct {
|
||||
Openid string `json:"openid"`
|
||||
ErrCode int `json:"errcode,omitempty"`
|
||||
ErrMsg string `json:"errmsg,omitempty"`
|
||||
}
|
||||
|
||||
if err := json.Unmarshal(body, &data); err != nil {
|
||||
return "", fmt.Errorf("解析响应失败: %v", err)
|
||||
}
|
||||
|
||||
if data.ErrCode != 0 {
|
||||
return "", fmt.Errorf("微信API返回错误: errcode=%d, errmsg=%s", data.ErrCode, data.ErrMsg)
|
||||
}
|
||||
|
||||
if data.Openid == "" {
|
||||
return "", fmt.Errorf("openid为空")
|
||||
}
|
||||
|
||||
return data.Openid, nil
|
||||
}
|
||||
|
||||
// bindWechatAuth 绑定微信认证信息到用户账号
|
||||
func (w *WechatPayService) bindWechatAuth(ctx context.Context, userID string, authType string, openid string) error {
|
||||
// 检查该 OpenID 是否已被其他用户绑定
|
||||
existingAuth, err := w.userAuthModel.FindOneByAuthTypeAuthKey(ctx, authType, openid)
|
||||
if err != nil && !errors.Is(err, model.ErrNotFound) {
|
||||
return fmt.Errorf("查询认证信息失败: %v", err)
|
||||
}
|
||||
|
||||
if existingAuth != nil {
|
||||
// 如果 OpenID 已被其他用户绑定，检查是否是当前用户
|
||||
if existingAuth.UserId != userID {
|
||||
return fmt.Errorf("该微信账号已被其他用户绑定")
|
||||
}
|
||||
// 如果已经是当前用户绑定的，直接返回成功
|
||||
return nil
|
||||
}
|
||||
|
||||
// 创建新的认证记录
|
||||
userAuth := &model.UserAuth{
|
||||
Id: uuid.NewString(),
|
||||
UserId: userID,
|
||||
AuthType: authType,
|
||||
AuthKey: openid,
|
||||
}
|
||||
|
||||
_, err = w.userAuthModel.Insert(ctx, nil, userAuth)
|
||||
if err != nil {
|
||||
return fmt.Errorf("创建认证记录失败: %v", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -104,7 +104,6 @@ func validDate(fl validator.FieldLevel) bool {
|
||||
return matched
|
||||
}
|
||||
|
||||
|
||||
// 自定义身份证校验（增强版）
|
||||
// 校验规则：
|
||||
// 1. 格式：18位，前6位地区码（首位不为0），7-14位出生日期，15-17位顺序码，18位校验码
|
||||
@@ -216,8 +215,12 @@ func validatePayMethod(fl validator.FieldLevel) bool {
|
||||
}
|
||||
|
||||
validTypes := map[string]bool{
|
||||
"alipay": true, // 中国电信
|
||||
"wechatpay": true, // 中国移动
|
||||
"alipay": true,
|
||||
"wechat": true,
|
||||
"wechatpay": true,
|
||||
"appleiap": true,
|
||||
"test": true,
|
||||
"test_empty": true,
|
||||
}
|
||||
|
||||
return validTypes[payMethod]
|
||||
|
||||
Reference in New Issue
Block a user