From 0d25783e483315545e7f5752791e7337969eadff Mon Sep 17 00:00:00 2001 From: Mrx <18278715334@163.com> Date: Wed, 11 Feb 2026 17:53:50 +0800 Subject: [PATCH] fadd --- app/main/api/desc/front/pay.api | 2 +- app/main/api/etc/main.dev.yaml | 14 ++++---- app/main/api/etc/main.yaml | 14 ++++---- .../apiclient_key.pem | 28 +++++++++++++++ .../1687993434_20260210_cert/pub_key.pem | 9 +++++ .../api/internal/logic/pay/paymentlogic.go | 5 ++- .../api/internal/service/wechatpayService.go | 34 ++++++++++++++++--- app/main/api/internal/types/types.go | 2 +- deploy/sql/agent_withdrawal_fix_columns.sql | 24 +++++++++++++ 9 files changed, 111 insertions(+), 21 deletions(-) create mode 100644 app/main/api/etc/merchant/wxpay/1687993434_20260210_cert/apiclient_key.pem create mode 100644 app/main/api/etc/merchant/wxpay/1687993434_20260210_cert/pub_key.pem create mode 100644 deploy/sql/agent_withdrawal_fix_columns.sql diff --git a/app/main/api/desc/front/pay.api b/app/main/api/desc/front/pay.api index b322c46..154e8b0 100644 --- a/app/main/api/desc/front/pay.api +++ b/app/main/api/desc/front/pay.api @@ -47,7 +47,7 @@ type ( PaymentReq { Id string `json:"id"` PayMethod string `json:"pay_method"` - PayType string `json:"pay_type" validate:"required,oneof=query agent_vip"` + PayType string `json:"pay_type" validate:"required,oneof=query agent_vip agent_upgrade"` } PaymentResp { PrepayData interface{} `json:"prepay_data"` diff --git a/app/main/api/etc/main.dev.yaml b/app/main/api/etc/main.dev.yaml index 30994a3..c511e74 100644 --- a/app/main/api/etc/main.dev.yaml +++ b/app/main/api/etc/main.dev.yaml @@ -41,13 +41,13 @@ Alipay: Wxpay: AppID: "wxa581992dc74d860e" - MchID: "1682635136" - MchCertificateSerialNumber: "5369B8AEEBDCF7AF274510252E6A8C0659C30F61" - MchApiv3Key: "e3ea4cf0765f1e71b01bb387dfcdbc9f" - MchPrivateKeyPath: "etc/merchant/apiclient_key.pem" - MchPublicKeyID: "PUB_KEY_ID_0116826351362025060900382267001601" - MchPublicKeyPath: "etc/merchant/pub_key.pem" - MchPlatformRAS: "1FFEC3F62E31885FAB4C91ADCB8D7557E9488781" + MchID: "1687993434" + MchCertificateSerialNumber: "241E4BCF5B69AAAC48451DB2C7ED794EF8B3A3D3" + MchApiv3Key: "aB3cD5eF7gH9iJ1kL2mN4oP6qR8sT0uV" + MchPrivateKeyPath: "etc/merchant/wxpay/1687993434_20260210_cert/apiclient_key.pem" + MchPublicKeyID: "PUB_KEY_ID_0116879934342025120200181745004208" + MchPublicKeyPath: "etc/merchant/wxpay/1687993434_20260210_cert/pub_key.pem" + MchPlatformRAS: "5630D013C88EA348BF66E642B6C39AA0180D4B15" NotifyUrl: "https://6m4685017o.goho.co/api/v1/pay/wechat/callback" RefundNotifyUrl: "https://6m4685017o.goho.co/api/v1/wechat/refund_callback" Applepay: diff --git a/app/main/api/etc/main.yaml b/app/main/api/etc/main.yaml index 084ccf0..556c033 100644 --- a/app/main/api/etc/main.yaml +++ b/app/main/api/etc/main.yaml @@ -42,13 +42,13 @@ Alipay: ReturnURL: "https://www.tianyuandb.com/payment/result" Wxpay: AppID: "wxa581992dc74d860e" - MchID: "1682635136" - MchCertificateSerialNumber: "5369B8AEEBDCF7AF274510252E6A8C0659C30F61" - MchApiv3Key: "e3ea4cf0765f1e71b01bb387dfcdbc9f" - MchPrivateKeyPath: "etc/merchant/apiclient_key.pem" - MchPublicKeyID: "PUB_KEY_ID_0116826351362025060900382267001601" - MchPublicKeyPath: "etc/merchant/pub_key.pem" - MchPlatformRAS: "1FFEC3F62E31885FAB4C91ADCB8D7557E9488781" + MchID: "1687993434" + MchCertificateSerialNumber: "241E4BCF5B69AAAC48451DB2C7ED794EF8B3A3D3" + MchApiv3Key: "aB3cD5eF7gH9iJ1kL2mN4oP6qR8sT0uV" + MchPrivateKeyPath: "etc/merchant/wxpay/1687993434_20260210_cert/apiclient_key.pem" + MchPublicKeyID: "PUB_KEY_ID_0116879934342025120200181745004208" + MchPublicKeyPath: "etc/merchant/wxpay/1687993434_20260210_cert/pub_key.pem" + MchPlatformRAS: "5630D013C88EA348BF66E642B6C39AA0180D4B15" NotifyUrl: "https://www.tianyuandb.com/api/v1/pay/wechat/callback" RefundNotifyUrl: "https://www.tianyuandb.com/api/v1/wechat/refund_callback" Applepay: diff --git a/app/main/api/etc/merchant/wxpay/1687993434_20260210_cert/apiclient_key.pem b/app/main/api/etc/merchant/wxpay/1687993434_20260210_cert/apiclient_key.pem new file mode 100644 index 0000000..0e3575b --- /dev/null +++ b/app/main/api/etc/merchant/wxpay/1687993434_20260210_cert/apiclient_key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDAh8YNl16EkVKW +IHDiPyx5Zz93osD4n2E7oJXPEOSGpumhsAMjXsRd32JulYDtD/B/phA/mxQiEf84 +Um4VKC16pNAEtpEyrO7ZZRhrPk2AMck6Jm81nXLoppttuS0B3VkOE/1UuvAbIz1y +VliRLDTiIbuSM8p1rMfpsJGo4CoLaerJgzXL6MHZA0+Fhn4PQLkLIt57jC0Jh2Dg +ayH7Ru/wgwgq6upXb7rXj0ZzMer5kkA446mLis9P6Nz1GiTUMyUy+tnORK1EpWLg +tUifsfXsKBLlUcOrNyG1+TyeMOuY2p592Au8J2eZbwyXKRDvK2oJzsDQW04pGyJc +oW1vObmLAgMBAAECggEAPc0XgRNezrULSo99TNK0hv/iepeu09/tSUOh8wbcJHD9 +u94RE9B+vhdPtGmfKfmc3IzE2HYCP3GBeGXVWks8VgsDjw+/igHC5duyu/IS1Jym +mFjwB8jTsuSQLedsEBYqWP+HqSQcoMluFv6qjWcgTpo/aI3hZmahAV2hVBEozeKR +Va+EssjI46k894Kr6s9rb9nk8hCORuLuqDXfWJdxT+UixMeYftrgmHXk6CCUb2Ct +EjMuxi66KyfVu9w5wS0DuE583mDIgTKmD+deJWxcVyJJMJDCULY4fotWhQb2ro9L +qndaCgBC+sOAB/PrO31E40hZhjgdToSq5SvUWgjUCQKBgQD6/zSzEGJYzjS3544l +PWF92WT3aFJxT3+Mgd/BrTWaY2LykbDoioM/Kp+5D1bB446k534xO6uwr3LuDCOE +jZGy/6+HQeDHSLfDZ+LgWQdEbakbniR57HXG293x3Mp5jTlZOXc8ryGURXaCP8Sy +xwIiZPUgpo4xA0Myt/CnjW9OhwKBgQDEXjkc4tyVTsgcVevxBjT4o3g2ihYouCdt +ClDr6iZ8Mi5A0vCcuy1A3uI5BZnax11AIwqapgjOdWgWEtyjQJ84bhesyI7km/Ya +AeaelsgSf+mAfFgTarWb+KpD5l0jxJAlX/1PAQU6vXuUPdA4PtBbKyUKHLY0kMXr +wE4vbPpZ3QKBgQDGvwpFt/WICFAqR0qBJmdqNZgDaDHP03lWEwjQ3YySYZxaIw8I +M5XVkLTE3uZ9xOiQn1WHOo6q62KAKFB/h3IVYOzmlz2bz3LjYgF+UEC26HZ9je2o +NZrVCghmmcQiF7ePdTd7b9mRBKfgXwor3fVMstB/OCNjoAe3w3rl0dKPRQKBgQC2 +oIbvdZH/DqkPqV1o6QPk5muMFbrsHfEU+U4vSrKGOUlJIqWCrpY0ydWNgMcJcPcq +Ciz3jUmNciXeuaYX8qbiHYnJOTGkLeShZXktrz/d7Lamt35WeJz0tTztL1caR9pj +2DVG/8T0T3uacC6x0MGIuMSW9gMDOk3Ipy5P70OaxQKBgQDFzgdJxU9Ra6AzbyBL +hcaKb+moNEo+peKCImwY1n3FeRM6XZ59qQaGV1lYu5KPUj9T/SVaJm6DCYFKqM0r +T1prq2LeR69nB7Dpsr2TKp57L86DoCqbxOBnWxZ/6Em65hoRYe7CAtn3yFQGKm9T ++EdUfn1gf7AWjQAgo3bis3TaMQ== +-----END PRIVATE KEY----- diff --git a/app/main/api/etc/merchant/wxpay/1687993434_20260210_cert/pub_key.pem b/app/main/api/etc/merchant/wxpay/1687993434_20260210_cert/pub_key.pem new file mode 100644 index 0000000..0adf8e3 --- /dev/null +++ b/app/main/api/etc/merchant/wxpay/1687993434_20260210_cert/pub_key.pem @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4el5skKyhhV+lFP/lx2x +MIQ14WFzoywBmy7Jd/UnKp5i8g85rwsFKvkMD9QqdQgoUPdnKKpvKiJeQqwUeXUC +ogVZxedg+wCj4FuOmctHTJVwWaqZ07uom78nvDJhgRCsgWR7UBRq8v9MymbPC4p7 +IkGuq+lLkYPyJFMGpk33fAua4NkKxBseyLHbB9t3vSlUFh8x2JlIYxC531362qbS ++L2m0B2stMyQEdYxpYCtS3nsEG+ib2Du3GiT+5pAmXxZ6DGyr4jAlAWDnljwJZEf +xJPECXSlcAsHdI6ugkC+9DwPjLs1mrEQ/BevmTT2o0wPigCRNi9xZf178L1sptYy +DwIDAQAB +-----END PUBLIC KEY----- diff --git a/app/main/api/internal/logic/pay/paymentlogic.go b/app/main/api/internal/logic/pay/paymentlogic.go index dae487f..dae583d 100644 --- a/app/main/api/internal/logic/pay/paymentlogic.go +++ b/app/main/api/internal/logic/pay/paymentlogic.go @@ -48,7 +48,7 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp, l.svcCtx.OrderModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error { switch req.PayType { - case "agent_vip": + case "agent_vip", "agent_upgrade": paymentTypeResp, err = l.AgentVipOrderPayment(req, session) if err != nil { return err @@ -59,6 +59,9 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp, if err != nil { return err } + default: + err = errors.Wrapf(xerr.NewErrCode(xerr.REUQEST_PARAM_ERROR), "不支持的支付类型: %s", req.PayType) + return err } // 开发环境测试支付模式：仅当 pay_method=test 时跳过实际支付，直接返回 test_payment_success diff --git a/app/main/api/internal/service/wechatpayService.go b/app/main/api/internal/service/wechatpayService.go index c312172..20c9dc8 100644 --- a/app/main/api/internal/service/wechatpayService.go +++ b/app/main/api/internal/service/wechatpayService.go @@ -206,8 +206,35 @@ func (w *WechatPayService) CreateWechatMiniProgramOrder(ctx context.Context, amo if err != nil { return "", fmt.Errorf("微信支付订单创建失败: %v, 状态码: %d", err, result.Response.StatusCode) } - // 返回预支付交易会话标识 - return resp, nil + // 显式转为 map，确保小程序 uni.requestPayment 能正确解析（避免指针序列化问题） + return jsapiRespToMap(resp), nil +} + +// jsapiRespToMap 将 PrepayWithRequestPaymentResponse 转为 map，供小程序/JSAPI 调起支付 +func jsapiRespToMap(resp *jsapi.PrepayWithRequestPaymentResponse) map[string]string { + m := make(map[string]string) + if resp == nil { + return m + } + if resp.Appid != nil { + m["appId"] = *resp.Appid + } + if resp.TimeStamp != nil { + m["timeStamp"] = *resp.TimeStamp + } + if resp.NonceStr != nil { + m["nonceStr"] = *resp.NonceStr + } + if resp.Package != nil { + m["package"] = *resp.Package + } + if resp.SignType != nil { + m["signType"] = *resp.SignType + } + if resp.PaySign != nil { + m["paySign"] = *resp.PaySign + } + return m } // CreateWechatH5Order 创建微信H5支付订单 @@ -237,8 +264,7 @@ func (w *WechatPayService) CreateWechatH5Order(ctx context.Context, amount float if err != nil { return "", fmt.Errorf("微信支付订单创建失败: %v, 状态码: %d", err, result.Response.StatusCode) } - // 返回预支付交易会话标识 - return resp, nil + return jsapiRespToMap(resp), nil } // CreateWechatOrder 创建微信支付订单（集成 APP、H5、小程序） diff --git a/app/main/api/internal/types/types.go b/app/main/api/internal/types/types.go index 327ad16..f234218 100644 --- a/app/main/api/internal/types/types.go +++ b/app/main/api/internal/types/types.go @@ -1841,7 +1841,7 @@ type PaymentCheckResp struct { type PaymentReq struct { Id string `json:"id"` PayMethod string `json:"pay_method"` - PayType string `json:"pay_type" validate:"required,oneof=query agent_vip"` + PayType string `json:"pay_type" validate:"required,oneof=query agent_vip agent_upgrade"` } type PaymentResp struct { diff --git a/deploy/sql/agent_withdrawal_fix_columns.sql b/deploy/sql/agent_withdrawal_fix_columns.sql new file mode 100644 index 0000000..771b8a4 --- /dev/null +++ b/deploy/sql/agent_withdrawal_fix_columns.sql @@ -0,0 +1,24 @@ +-- ============================================================ +-- agent_withdrawal 表缺失字段修复脚本 +-- 解决 Error 1054: Unknown column 'withdraw_type'/'bank_card_no'/'bank_name'/'payee_name' in 'field list' +-- 执行方式：在 MySQL 客户端或 Navicat 等工具中逐条执行 +-- 若某字段已存在会报 Duplicate column name，跳过该条继续执行下一条即可 +-- ============================================================ + +-- 1. 添加提现类型 +ALTER TABLE `agent_withdrawal` ADD COLUMN `withdraw_type` TINYINT NOT NULL DEFAULT 1 COMMENT '提现类型:1-支付宝,2-银行卡' AFTER `agent_id`; + +-- 2. 添加银行卡号 +ALTER TABLE `agent_withdrawal` ADD COLUMN `bank_card_no` VARCHAR(50) DEFAULT NULL COMMENT '银行卡号' AFTER `payeeAccount`; + +-- 3. 添加开户支行 +ALTER TABLE `agent_withdrawal` ADD COLUMN `bank_name` VARCHAR(100) DEFAULT NULL COMMENT '开户支行' AFTER `bank_card_no`; + +-- 4. 添加收款人姓名 +ALTER TABLE `agent_withdrawal` ADD COLUMN `payee_name` VARCHAR(50) DEFAULT NULL COMMENT '收款人姓名' AFTER `bank_name`; + +-- 5. 添加索引（若已存在可跳过） +ALTER TABLE `agent_withdrawal` ADD INDEX `idx_withdraw_type` (`withdraw_type`); + +-- 6. 更新现有记录 +UPDATE `agent_withdrawal` SET `withdraw_type` = 1 WHERE `withdraw_type` IS NULL OR `withdraw_type` = 0;