代理在线充值

internal/model/agent_wallet.go

@@ -89,6 +89,8 @@ type AgentRechargeRecord struct {
 	Remark               string           `gorm:"column:remark;type:text;comment:运营备注（创建时填写，不可修改）" json:"remark,omitempty"`
 	RejectionReason      *string          `gorm:"column:rejection_reason;type:varchar(500);comment:驳回原因，仅驳回时写入" json:"rejection_reason,omitempty"`
 	ApprovalInstanceID   *uint            `gorm:"column:approval_instance_id;comment:员工线下代充值关联的唯一通用审批实例ID" json:"approval_instance_id,omitempty"`
+	RequestID            *string          `gorm:"column:request_id;type:varchar(64);comment:提交账号提供的在线充值幂等请求标识" json:"request_id,omitempty"`
+	RequestFingerprint   *string          `gorm:"column:request_fingerprint;type:varchar(64);comment:在线充值请求业务字段指纹" json:"-"`
 	PaidAt               *time.Time       `gorm:"column:paid_at;comment:支付时间" json:"paid_at,omitempty"`
 	CompletedAt          *time.Time       `gorm:"column:completed_at;comment:完成时间" json:"completed_at,omitempty"`
 	ShopIDTag            uint             `gorm:"column:shop_id_tag;not null;index;comment:店铺ID标签(多租户过滤)" json:"shop_id_tag"`

internal/model/dto/agent_recharge_dto.go

@@ -2,13 +2,49 @@ package dto
 
 // CreateAgentRechargeRequest 创建代理充值请求
 type CreateAgentRechargeRequest struct {
-	ShopID            uint     `json:"shop_id" validate:"required" required:"true" description:"目标店铺ID，代理只能填自己店铺"`
+	ShopID            *uint    `json:"shop_id,omitempty" description:"目标店铺ID，仅平台线下代充可填；代理在线充值禁止传入"`
 	Amount            int64    `json:"amount" validate:"required,min=1,max=100000000" required:"true" minimum:"1" maximum:"100000000" description:"充值金额（分），范围1分~100万元"`
-	PaymentMethod     string   `json:"payment_method" validate:"required,oneof=wechat offline" required:"true" description:"支付方式 (wechat:微信在线支付, offline:线下转账仅平台可用)"`
+	PaymentMethod     string   `json:"payment_method" validate:"required,oneof=wechat alipay offline" required:"true" description:"支付方式 (wechat:微信在线支付, alipay:支付宝在线支付, offline:线下转账仅平台可用)"`
+	RequestID         string   `json:"request_id,omitempty" validate:"omitempty,max=64" maxLength:"64" description:"在线充值幂等请求标识，微信或支付宝支付时必填"`
 	PaymentVoucherKey []string `json:"payment_voucher_key" validate:"omitempty,max=5,dive,max=500" maxItems:"5" description:"支付凭证对象存储Key列表（payment_method=offline 时至少1个，最多5个，微信支付时忽略）"`
 	Remark            string   `json:"remark" validate:"omitempty,max=1000" maxLength:"1000" description:"运营备注（可选，创建后只读）"`
 }
 
+// AgentRechargeOnlineResponse 代理在线扫码充值创建响应。
+type AgentRechargeOnlineResponse struct {
+	RechargeID         uint   `json:"recharge_id" description:"充值记录ID"`
+	RechargeNo         string `json:"recharge_no" description:"充值单号（ARCH前缀）"`
+	PaymentNo          string `json:"payment_no" description:"支付单号（PAY前缀）"`
+	PaymentMethod      string `json:"payment_method" description:"支付方式 (wechat:微信, alipay:支付宝)"`
+	RechargeSource     string `json:"recharge_source" description:"充值来源 (agent_online:代理在线自充)"`
+	RechargeSourceName string `json:"recharge_source_name" description:"充值来源名称（中文）"`
+	Amount             int64  `json:"amount" description:"在线充值金额（分），范围10000分~100000000分"`
+	QRContent          string `json:"qr_content" description:"支付渠道原始扫码付款内容，由前端渲染二维码"`
+	Status             int    `json:"status" description:"状态 (1:待支付, 2:已支付, 3:已完成, 4:已关闭, 5:已退款, 6:已驳回)"`
+	StatusName         string `json:"status_name" description:"状态名称（中文）"`
+}
+
+// AgentRechargePaymentMethodsResponse 代理在线充值可用支付方式响应。
+type AgentRechargePaymentMethodsResponse struct {
+	Methods   []string `json:"methods" description:"可用支付方式，固定顺序 (wechat:微信, alipay:支付宝)"`
+	MinAmount int64    `json:"min_amount" description:"在线充值最小金额（分），固定为10000"`
+	MaxAmount int64    `json:"max_amount" description:"在线充值最大金额（分），固定为100000000"`
+}
+
+// AgentRechargePaymentStatusResponse 代理充值本地支付与到账状态响应。
+type AgentRechargePaymentStatusResponse struct {
+	RechargeID         uint    `json:"recharge_id" description:"充值记录ID"`
+	RechargeNo         string  `json:"recharge_no" description:"充值单号（ARCH前缀）"`
+	RechargeSource     string  `json:"recharge_source" description:"充值来源 (platform_offline:平台线下代充, agent_online:代理在线自充)"`
+	RechargeSourceName string  `json:"recharge_source_name" description:"充值来源名称（中文）"`
+	Status             int     `json:"status" description:"充值状态 (1:待支付, 2:已支付, 3:已完成, 4:已关闭, 5:已退款, 6:已驳回)"`
+	StatusName         string  `json:"status_name" description:"充值状态名称（中文）"`
+	PaymentStatus      int     `json:"payment_status" description:"支付状态 (0:待支付, 1:已支付, 2:已失败, 3:已退款)"`
+	PaymentStatusName  string  `json:"payment_status_name" description:"支付状态名称（中文）"`
+	PaidAt             *string `json:"paid_at" description:"第三方支付确认时间"`
+	CompletedAt        *string `json:"completed_at" description:"钱包入账完成时间"`
+}
+
 // AgentOfflinePayRequest 代理线下充值确认请求
 type AgentOfflinePayRequest struct {
 	OperationPassword string `json:"operation_password" validate:"required" required:"true" description:"操作密码"`
@@ -28,7 +64,9 @@ type AgentRechargeResponse struct {
 	ShopName             string   `json:"shop_name" description:"店铺名称"`
 	AgentWalletID        uint     `json:"agent_wallet_id" description:"代理钱包ID"`
 	Amount               int64    `json:"amount" description:"充值金额（分）"`
-	PaymentMethod        string   `json:"payment_method" description:"支付方式 (wechat:微信在线支付, offline:线下转账)"`
+	PaymentMethod        string   `json:"payment_method" description:"支付方式 (wechat:微信在线支付, alipay:支付宝在线支付, offline:线下转账)"`
+	RechargeSource       string   `json:"recharge_source" description:"充值来源 (platform_offline:平台线下代充, agent_online:代理在线自充)"`
+	RechargeSourceName   string   `json:"recharge_source_name" description:"充值来源名称（中文）"`
 	PaymentChannel       string   `json:"payment_channel" description:"实际支付通道 (wechat_direct:微信直连, fuyou:富友, offline:线下转账)"`
 	PaymentConfigID      *uint    `json:"payment_config_id" description:"关联支付配置ID，线下充值为null"`
 	PaymentTransactionID string   `json:"payment_transaction_id" description:"第三方支付流水号"`
@@ -62,12 +100,13 @@ type AgentRechargeRejectParams struct {
 
 // AgentRechargeListRequest 代理充值记录列表请求
 type AgentRechargeListRequest struct {
-	Page      int    `json:"page" query:"page" validate:"omitempty,min=1" minimum:"1" description:"页码，默认1"`
-	PageSize  int    `json:"page_size" query:"page_size" validate:"omitempty,min=1,max=100" minimum:"1" maximum:"100" description:"每页条数，默认20，最大100"`
-	ShopID    *uint  `json:"shop_id" query:"shop_id" description:"按店铺ID过滤"`
-	Status    *int   `json:"status" query:"status" description:"按状态过滤 (1:待支付, 2:已支付, 3:已完成, 4:已关闭, 5:已退款, 6:已驳回)"`
-	StartDate string `json:"start_date" query:"start_date" description:"创建时间起始日期(YYYY-MM-DD)"`
-	EndDate   string `json:"end_date" query:"end_date" description:"创建时间截止日期(YYYY-MM-DD)"`
+	Page           int    `json:"page" query:"page" validate:"omitempty,min=1" minimum:"1" description:"页码，默认1"`
+	PageSize       int    `json:"page_size" query:"page_size" validate:"omitempty,min=1,max=100" minimum:"1" maximum:"100" description:"每页条数，默认20，最大100"`
+	ShopID         *uint  `json:"shop_id" query:"shop_id" description:"按店铺ID过滤"`
+	Status         *int   `json:"status" query:"status" description:"按状态过滤 (1:待支付, 2:已支付, 3:已完成, 4:已关闭, 5:已退款, 6:已驳回)"`
+	RechargeSource string `json:"recharge_source" query:"recharge_source" validate:"omitempty,oneof=platform_offline agent_online" description:"按充值来源过滤 (platform_offline:平台线下代充, agent_online:代理在线自充)"`
+	StartDate      string `json:"start_date" query:"start_date" description:"创建时间起始日期(YYYY-MM-DD)"`
+	EndDate        string `json:"end_date" query:"end_date" description:"创建时间截止日期(YYYY-MM-DD)"`
 }
 
 // AgentRechargeListResponse 代理充值记录列表响应

internal/model/payment.go

@@ -3,6 +3,8 @@ package model
 import (
 	"gorm.io/gorm"
 	"time"
+
+	"github.com/break/junhong_cmp_fiber/pkg/constants"
 )
 
 type Payment struct {
@@ -11,11 +13,13 @@ type Payment struct {
 	OrderID           uint           `gorm:"column:order_id;not null" json:"order_id"`
 	OrderType         string         `gorm:"column:order_type;type:varchar(30);not null" json:"order_type"`
 	PaymentMethod     string         `gorm:"column:payment_method;type:varchar(20);not null" json:"payment_method"`
+	MerchantIdentity  string         `gorm:"column:merchant_identity;type:varchar(100)" json:"-"`
 	Amount            int64          `gorm:"column:amount;type:bigint;not null" json:"amount"`
 	Status            int            `gorm:"column:status;type:smallint;not null;default:0" json:"status"`
 	ThirdPartyTradeNo string         `gorm:"column:third_party_trade_no;type:varchar(100)" json:"third_party_trade_no,omitempty"`
 	PaymentConfigID   *uint          `gorm:"column:payment_config_id" json:"payment_config_id,omitempty"`
 	PaymentVoucherKey string         `gorm:"column:payment_voucher_key;type:varchar(500)" json:"payment_voucher_key,omitempty"`
+	QRContent         string         `gorm:"column:qr_content;type:text" json:"-"`
 	PaidAt            *time.Time     `gorm:"column:paid_at" json:"paid_at,omitempty"`
 	ExpireAt          *time.Time     `gorm:"column:expire_at" json:"expire_at,omitempty"`
 	CreatedAt         time.Time      `gorm:"column:created_at;not null;default:CURRENT_TIMESTAMP" json:"created_at"`
@@ -28,15 +32,16 @@ func (Payment) TableName() string {
 }
 
 const (
-	PaymentRecordStatusPending  = 0 // 待支付
-	PaymentRecordStatusPaid     = 1 // 已支付
-	PaymentRecordStatusFailed   = 2 // 已失败
-	PaymentRecordStatusRefunded = 3 // 已退款
+	PaymentRecordStatusPending  = constants.PaymentRecordStatusPending  // 待支付
+	PaymentRecordStatusPaid     = constants.PaymentRecordStatusPaid     // 已支付
+	PaymentRecordStatusFailed   = constants.PaymentRecordStatusFailed   // 已失败
+	PaymentRecordStatusRefunded = constants.PaymentRecordStatusRefunded // 已退款
 )
 
 const (
-	PaymentOrderTypePackage  = "package_order"
-	PaymentOrderTypeRecharge = "recharge_order"
+	PaymentOrderTypePackage       = "package_order"  // 套餐订单
+	PaymentOrderTypeRecharge      = "recharge_order" // 客户充值订单
+	PaymentOrderTypeAgentRecharge = "agent_recharge" // 代理充值订单
 )
 
 const (