csxj2026/junhong_cmp_fiber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

七月迭代短暂完结,还有很多后端的关键东西没有弄,这是一版赶时间做的东西
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m26s
Details

Browse Source
This commit is contained in:
break
2026-07-25 17:06:58 +08:00
parent ad9f613dd6
commit 73f5125d3d
249 changed files with 17137 additions and 877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/model/dto/client_order_dto.go
View File

@@ -8,8 +8,8 @@ package dto
type ClientCreateOrderRequest struct {
Identifier string `json:"identifier" validate:"required,min=1,max=50" required:"true" minLength:"1" maxLength:"50" description:"资产标识符（SN/IMEI/虚拟号/ICCID/MSISDN）"`
PackageIDs []uint `json:"package_ids" validate:"required,min=1,dive,gt=0" required:"true" description:"套餐ID列表"`
// PaymentMethod 指定支付方式；强充场景必传。wechat 时 app_type 也必传，alipay 时不需要 app_type
PaymentMethod string `json:"payment_method" validate:"omitempty,oneof=wechat alipay" description:"支付方式（强充必传）(wechat:微信, alipay:支付宝)"`
// PaymentMethod 指定新订单固化的支付方式；wechat 时 app_type 也必传，alipay 时不需要 app_type。
PaymentMethod string `json:"payment_method" validate:"required,oneof=wallet wechat alipay" required:"true" description:"订单支付方式 (wallet:钱包, wechat:微信, alipay:支付宝)"`
// AppType 仅强充 + 微信支付场景必传；支付宝强充无需传
AppType string `json:"app_type" validate:"omitempty,oneof=official_account miniapp" description:"应用类型（微信强充必传）(official_account:公众号, miniapp:小程序)"`
}
@@ -30,6 +30,7 @@ type ClientOrderInfo struct {
OrderID uint `json:"order_id" description:"订单ID"`
OrderNo string `json:"order_no" description:"订单号"`
TotalAmount int64 `json:"total_amount" description:"订单总金额（分）"`
PaymentMethod string `json:"payment_method" description:"订单创建时选定的支付方式 (wallet:钱包, wechat:微信, alipay:支付宝)"`
PaymentStatus int `json:"payment_status" description:"支付状态 (1:待支付, 2:已支付, 3:已取消, 4:已退款)"`
PaymentStatusName string `json:"payment_status_name" description:"支付状态名称（中文）"`
CreatedAt string `json:"created_at" description:"创建时间"`
@@ -79,10 +80,15 @@ type ClientOrderListRequest struct {
type ClientOrderListItem struct {
OrderID uint `json:"order_id" description:"订单ID"`
OrderNo string `json:"order_no" description:"订单号"`
AssetType string `json:"asset_type" description:"资产类型 (card:卡, device:设备)"`
AssetID uint `json:"asset_id" description:"资产ID"`
AssetIdentifier string `json:"asset_identifier" description:"下单时资产标识符快照（卡为ICCID，设备优先VirtualNo、其次IMEI）"`
TotalAmount int64 `json:"total_amount" description:"订单总金额（分）"`
PaymentMethod string `json:"payment_method" description:"订单创建时选定的支付方式 (wallet:钱包, wechat:微信, alipay:支付宝)"`
PaymentStatus int `json:"payment_status" description:"支付状态 (1:待支付, 2:已支付, 3:已取消, 4:已退款)"`
PaymentStatusName string `json:"payment_status_name" description:"支付状态名称（中文）"`
CreatedAt string `json:"created_at" description:"创建时间"`
PackageIDs []uint `json:"package_ids" description:"套餐ID列表，可用于发起续费"`
PackageNames []string `json:"package_names" description:"套餐名称列表"`
}
@@ -102,6 +108,9 @@ type ClientOrderListResponse struct {
type ClientOrderDetailResponse struct {
OrderID uint `json:"order_id" description:"订单ID"`
OrderNo string `json:"order_no" description:"订单号"`
AssetType string `json:"asset_type" description:"资产类型 (card:卡, device:设备)"`
AssetID uint `json:"asset_id" description:"资产ID"`
AssetIdentifier string `json:"asset_identifier" description:"下单时资产标识符快照（卡为ICCID，设备优先VirtualNo、其次IMEI）"`
TotalAmount int64 `json:"total_amount" description:"订单总金额（分）"`
PaymentStatus int `json:"payment_status" description:"支付状态 (1:待支付, 2:已支付, 3:已取消, 4:已退款)"`
PaymentStatusName string `json:"payment_status_name" description:"支付状态名称（中文）"`
@@ -135,7 +144,7 @@ type ClientPaymentLink struct {
// ClientPayOrderRequest D4 订单支付请求
type ClientPayOrderRequest struct {
PaymentMethod string `json:"payment_method" validate:"required,oneof=wallet wechat alipay" required:"true" description:"支付方式 (wallet:钱包, wechat:微信, alipay:支付宝)"`
PaymentMethod string `json:"payment_method,omitempty" validate:"omitempty,oneof=wallet wechat alipay" description:"过渡兼容字段；为空时使用订单快照，非空时必须与订单快照一致"`
// AppType 仅 payment_method=wechat 时必填，alipay 无需传
AppType string `json:"app_type" validate:"omitempty,oneof=official_account miniapp" description:"应用类型（微信支付必传）(official_account:公众号, miniapp:小程序)"`
}