Merge branch 'emdash/wechat-official-account-payment-integration-30g'

# Conflicts:
#	README.md
#	cmd/api/main.go
#	internal/bootstrap/dependencies.go
#	pkg/config/config.go
#	pkg/config/defaults/config.yaml

pkg/errors/codes.go

@@ -39,10 +39,14 @@ const (
 	CodePermAlreadyAssigned  = 1027 // 权限已分配
 
 	// 认证相关错误 (1040-1049)
-	CodeInvalidCredentials = 1040 // 用户名或密码错误
-	CodeAccountLocked      = 1041 // 账号已锁定
-	CodePasswordExpired    = 1042 // 密码已过期
-	CodeInvalidOldPassword = 1043 // 旧密码错误
+	CodeInvalidCredentials    = 1040 // 用户名或密码错误
+	CodeAccountLocked         = 1041 // 账号已锁定
+	CodePasswordExpired       = 1042 // 密码已过期
+	CodeInvalidOldPassword    = 1043 // 旧密码错误
+	CodeWechatOAuthFailed     = 1044 // 微信 OAuth 授权失败
+	CodeWechatUserInfoFailed  = 1045 // 获取微信用户信息失败
+	CodeWechatPayFailed       = 1046 // 微信支付发起失败
+	CodeWechatCallbackInvalid = 1047 // 微信回调签名验证失败
 
 	// 组织相关错误 (1030-1049)
 	CodeShopNotFound         = 1030 // 店铺不存在
@@ -150,6 +154,10 @@ var allErrorCodes = []int{
 	CodeAccountLocked,
 	CodePasswordExpired,
 	CodeInvalidOldPassword,
+	CodeWechatOAuthFailed,
+	CodeWechatUserInfoFailed,
+	CodeWechatPayFailed,
+	CodeWechatCallbackInvalid,
 	CodeInvalidStatus,
 	CodeInsufficientBalance,
 	CodeWithdrawalNotFound,
@@ -279,6 +287,10 @@ var errorMessages = map[int]string{
 	CodeAccountLocked:                     "账号已锁定",
 	CodePasswordExpired:                   "密码已过期",
 	CodeInvalidOldPassword:                "旧密码错误",
+	CodeWechatOAuthFailed:                 "微信授权失败",
+	CodeWechatUserInfoFailed:              "获取微信用户信息失败",
+	CodeWechatPayFailed:                   "微信支付发起失败",
+	CodeWechatCallbackInvalid:             "微信回调验证失败",
 	CodeInternalError:                     "内部服务器错误",
 	CodeDatabaseError:                     "数据库错误",
 	CodeRedisError:                        "缓存服务错误",