驳回

internal/model/agent_wallet.go

@@ -84,6 +84,7 @@ type AgentRechargeRecord struct {
 	Status               int            `gorm:"column:status;type:int;not null;default:1;comment:充值状态(1-待支付 2-已支付 3-已完成 4-已关闭 5-已退款)" json:"status"`
 	PaymentVoucherKey    StringJSONBArray `gorm:"column:payment_voucher_key;type:jsonb;comment:支付凭证对象存储Key列表（线下支付时必填，最多5个，微信支付时为空）" json:"payment_voucher_key"`
 	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"`
 	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/admin_recharge_order_dto.go

@@ -1,64 +0,0 @@
-package dto
-
-// AdminRechargeOrderListRequest 后台充值订单列表请求
-type AdminRechargeOrderListRequest struct {
-	Page         int    `json:"page" query:"page" description:"页码"`
-	PageSize     int    `json:"page_size" query:"page_size" description:"每页数量"`
-	Status       *int   `json:"status" query:"status" description:"状态过滤 (0:待支付, 1:已支付, 2:已关闭, 3:已退款, 4:已驳回)"`
-	ResourceType string `json:"resource_type" query:"resource_type" description:"资产类型 (iot_card/device)"`
-	ResourceID   *uint  `json:"resource_id" query:"resource_id" description:"资产 ID"`
-	StartTime    string `json:"start_time" query:"start_time" description:"创建时间起始（RFC3339）"`
-	EndTime      string `json:"end_time" query:"end_time" description:"创建时间结束（RFC3339）"`
-}
-
-// AdminRechargeOrderListItem 后台充值订单列表项
-type AdminRechargeOrderListItem struct {
-	ID                 uint    `json:"id" description:"充值订单ID"`
-	RechargeOrderNo    string  `json:"recharge_order_no" description:"充值订单号"`
-	UserID             uint    `json:"user_id" description:"用户ID"`
-	ResourceType       string  `json:"resource_type" description:"资产类型 (iot_card/device)"`
-	ResourceID         uint    `json:"resource_id" description:"资产ID"`
-	Amount             int64   `json:"amount" description:"充值金额（分）"`
-	Status             int     `json:"status" description:"状态 (0:待支付, 1:已支付, 2:已关闭, 3:已退款, 4:已驳回)"`
-	StatusName         string  `json:"status_name" description:"状态名称（中文）"`
-	AutoPurchaseStatus string  `json:"auto_purchase_status" description:"自动购包状态 (pending/success/failed)"`
-	RejectionReason    *string `json:"rejection_reason,omitempty" description:"驳回原因（已驳回时有值）"`
-	CreatedAt          string  `json:"created_at" description:"创建时间"`
-}
-
-// AdminRechargeOrderDetail 后台充值订单详情
-type AdminRechargeOrderDetail struct {
-	ID                 uint                               `json:"id" description:"充值订单ID"`
-	RechargeOrderNo    string                             `json:"recharge_order_no" description:"充值订单号"`
-	UserID             uint                               `json:"user_id" description:"用户ID"`
-	AssetWalletID      uint                               `json:"asset_wallet_id" description:"资产钱包ID"`
-	ResourceType       string                             `json:"resource_type" description:"资产类型 (iot_card/device)"`
-	ResourceID         uint                               `json:"resource_id" description:"资产ID"`
-	Amount             int64                              `json:"amount" description:"充值金额（分）"`
-	Status             int                                `json:"status" description:"状态 (0:待支付, 1:已支付, 2:已关闭, 3:已退款, 4:已驳回)"`
-	StatusName         string                             `json:"status_name" description:"状态名称（中文）"`
-	AutoPurchaseStatus string                             `json:"auto_purchase_status" description:"自动购包状态"`
-	LinkedPackageIDs   interface{}                        `json:"linked_package_ids" description:"关联套餐ID列表"`
-	RejectionReason    *string                            `json:"rejection_reason,omitempty" description:"驳回原因（已驳回时有值）"`
-	CreatedAt          string                             `json:"created_at" description:"创建时间"`
-	PaidAt             string                             `json:"paid_at,omitempty" description:"支付时间"`
-	Payments           []AdminRechargeOrderPaymentDetail  `json:"payments,omitempty" description:"支付记录列表"`
-}
-
-// AdminRechargeOrderPaymentDetail 后台充值订单支付记录
-type AdminRechargeOrderPaymentDetail struct {
-	PaymentID         uint   `json:"payment_id" description:"支付记录ID"`
-	PaymentNo         string `json:"payment_no" description:"支付单号"`
-	PaymentMethod     string `json:"payment_method" description:"支付方式 (wechat/alipay/wallet)"`
-	Amount            int64  `json:"amount" description:"支付金额（分）"`
-	Status            int    `json:"status" description:"状态 (0:待支付, 1:已支付, 2:已失败, 3:已退款)"`
-	StatusName        string `json:"status_name" description:"状态名称（中文）"`
-	ThirdPartyTradeNo string `json:"third_party_trade_no,omitempty" description:"第三方交易号"`
-	PaidAt            string `json:"paid_at,omitempty" description:"支付时间"`
-	CreatedAt         string `json:"created_at" description:"创建时间"`
-}
-
-// AdminRechargeOrderRejectRequest 后台驳回充值订单请求
-type AdminRechargeOrderRejectRequest struct {
-	RejectionReason string `json:"rejection_reason" validate:"required,max=500" description:"驳回原因（必填，最多500字）"`
-}

internal/model/dto/agent_recharge_dto.go

@@ -22,24 +22,30 @@ type AgentOfflinePayParams struct {
 
 // AgentRechargeResponse 代理充值记录响应
 type AgentRechargeResponse struct {
-	ID                   uint    `json:"id" description:"充值记录ID"`
-	RechargeNo           string  `json:"recharge_no" description:"充值单号(ARCH前缀)"`
-	ShopID               uint    `json:"shop_id" description:"店铺ID"`
-	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:线下转账)"`
-	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:"第三方支付流水号"`
+	ID                   uint     `json:"id" description:"充值记录ID"`
+	RechargeNo           string   `json:"recharge_no" description:"充值单号(ARCH前缀)"`
+	ShopID               uint     `json:"shop_id" description:"店铺ID"`
+	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:线下转账)"`
+	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:"第三方支付流水号"`
 	PaymentVoucherKey    []string `json:"payment_voucher_key" description:"支付凭证对象存储Key列表（线下支付时存在，最多5个）"`
 	Remark               string   `json:"remark,omitempty" description:"运营备注"`
-	Status               int     `json:"status" description:"状态 (1:待支付, 2:已支付, 3:已完成, 4:已关闭, 5:已退款)"`
-	StatusName           string  `json:"status_name" description:"状态名称（中文）"`
-	PaidAt               *string `json:"paid_at" description:"支付时间"`
-	CompletedAt          *string `json:"completed_at" description:"完成时间"`
-	CreatedAt            string  `json:"created_at" description:"创建时间"`
-	UpdatedAt            string  `json:"updated_at" description:"更新时间"`
+	Status               int      `json:"status" description:"状态 (1:待支付, 2:已支付, 3:已完成, 4:已关闭, 5:已退款, 6:已驳回)"`
+	StatusName           string   `json:"status_name" description:"状态名称（中文）"`
+	RejectionReason      *string  `json:"rejection_reason,omitempty" description:"驳回原因，仅 status=6 时有值"`
+	PaidAt               *string  `json:"paid_at" description:"支付时间"`
+	CompletedAt          *string  `json:"completed_at" description:"完成时间"`
+	CreatedAt            string   `json:"created_at" description:"创建时间"`
+	UpdatedAt            string   `json:"updated_at" description:"更新时间"`
+}
+
+// AgentRechargeRejectRequest 驳回代理充值订单请求
+type AgentRechargeRejectRequest struct {
+	RejectionReason string `json:"rejection_reason" validate:"required,max=500" required:"true" description:"驳回原因（必填，最多500字）"`
 }
 
 // AgentRechargeListRequest 代理充值记录列表请求
@@ -47,7 +53,7 @@ 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:已退款)"`
+	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)"`
 }

internal/model/dto/client_recharge_order_dto.go

@@ -4,19 +4,18 @@ package dto
 type ClientRechargeOrderListRequest struct {
 	Page     int `json:"page" query:"page" description:"页码"`
 	PageSize int `json:"page_size" query:"page_size" description:"每页数量"`
-	Status   int `json:"status" query:"status" description:"状态过滤 (0:待支付, 1:已支付, 2:已关闭, 3:已退款, 4:已驳回)"`
+	Status   int `json:"status" query:"status" description:"状态过滤 (0:待支付, 1:已支付, 2:已关闭, 3:已退款)"`
 }
 
 // ClientRechargeOrderListItem C6 充值订单列表项
 type ClientRechargeOrderListItem struct {
-	RechargeOrderID    uint    `json:"recharge_order_id" description:"充值订单ID"`
-	RechargeOrderNo    string  `json:"recharge_order_no" description:"充值订单号"`
-	Amount             int64   `json:"amount" description:"充值金额（分）"`
-	Status             int     `json:"status" description:"状态 (0:待支付, 1:已支付, 2:已关闭, 3:已退款, 4:已驳回)"`
-	StatusName         string  `json:"status_name" description:"状态名称（中文）"`
-	AutoPurchaseStatus string  `json:"auto_purchase_status" description:"自动购包状态 (pending/success/failed)"`
-	RejectionReason    *string `json:"rejection_reason,omitempty" description:"驳回原因（已驳回时有值）"`
-	CreatedAt          string  `json:"created_at" description:"创建时间"`
+	RechargeOrderID    uint   `json:"recharge_order_id" description:"充值订单ID"`
+	RechargeOrderNo    string `json:"recharge_order_no" description:"充值订单号"`
+	Amount             int64  `json:"amount" description:"充值金额（分）"`
+	Status             int    `json:"status" description:"状态 (0:待支付, 1:已支付, 2:已关闭, 3:已退款)"`
+	StatusName         string `json:"status_name" description:"状态名称（中文）"`
+	AutoPurchaseStatus string `json:"auto_purchase_status" description:"自动购包状态 (pending/success/failed)"`
+	CreatedAt          string `json:"created_at" description:"创建时间"`
 }
 
 // ClientRechargeOrderDetail C7 充值订单详情
@@ -24,11 +23,10 @@ type ClientRechargeOrderDetail struct {
 	RechargeOrderID    uint                               `json:"recharge_order_id" description:"充值订单ID"`
 	RechargeOrderNo    string                             `json:"recharge_order_no" description:"充值订单号"`
 	Amount             int64                              `json:"amount" description:"充值金额（分）"`
-	Status             int                                `json:"status" description:"状态 (0:待支付, 1:已支付, 2:已关闭, 3:已退款, 4:已驳回)"`
+	Status             int                                `json:"status" description:"状态 (0:待支付, 1:已支付, 2:已关闭, 3:已退款)"`
 	StatusName         string                             `json:"status_name" description:"状态名称（中文）"`
 	AutoPurchaseStatus string                             `json:"auto_purchase_status" description:"自动购包状态"`
 	LinkedPackageIDs   interface{}                        `json:"linked_package_ids" description:"关联套餐ID列表"`
-	RejectionReason    *string                            `json:"rejection_reason,omitempty" description:"驳回原因（已驳回时有值）"`
 	CreatedAt          string                             `json:"created_at" description:"创建时间"`
 	PaidAt             string                             `json:"paid_at,omitempty" description:"支付时间"`
 	Payments           []ClientRechargeOrderPaymentDetail `json:"payments,omitempty" description:"支付记录列表"`

internal/model/recharge_order.go

@@ -31,7 +31,6 @@ type RechargeOrder struct {
 	AutoPurchaseStatus        string         `gorm:"column:auto_purchase_status;type:varchar(20)" json:"auto_purchase_status,omitempty"`
 	AccumulatedRechargeSeries int64          `gorm:"column:accumulated_recharge_series;not null;default:0" json:"accumulated_recharge_series"`
 	PaymentConfigID           *uint          `gorm:"column:payment_config_id;index" json:"payment_config_id,omitempty"`
-	RejectionReason           *string        `gorm:"column:rejection_reason;type:varchar(500)" json:"rejection_reason,omitempty"`
 	CreatedAt                 time.Time      `gorm:"column:created_at;not null;default:CURRENT_TIMESTAMP" json:"created_at"`
 	UpdatedAt                 time.Time      `gorm:"column:updated_at;not null;default:CURRENT_TIMESTAMP" json:"updated_at"`
 	DeletedAt                 gorm.DeletedAt `gorm:"column:deleted_at;index" json:"deleted_at,omitempty"`
@@ -47,7 +46,6 @@ const (
 	RechargeOrderStatusPaid     = 1 // 已支付
 	RechargeOrderStatusClosed   = 2 // 已关闭
 	RechargeOrderStatusRefunded = 3 // 已退款
-	RechargeOrderStatusRejected = 4 // 已驳回
 )
 
 const (