Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 shanshanzhong147
|
ea586e3ba2 |
@@ -1,48 +0,0 @@
|
||||
syntax = "v1"
|
||||
|
||||
info (
|
||||
title: "invite admin API"
|
||||
desc: "API for ppanel"
|
||||
author: "Tension"
|
||||
email: "tension@ppanel.com"
|
||||
version: "0.0.1"
|
||||
)
|
||||
|
||||
type (
|
||||
GetInviteManageListRequest {
|
||||
Page int `form:"page"`
|
||||
Size int `form:"size"`
|
||||
Search string `form:"search"`
|
||||
InviterId int64 `form:"inviter_id"`
|
||||
InviteeId int64 `form:"invitee_id"`
|
||||
}
|
||||
InviteManageRecord {
|
||||
InviterId int64 `json:"inviter_id"`
|
||||
InviterIdentifier string `json:"inviter_identifier"`
|
||||
InviteeId int64 `json:"invitee_id"`
|
||||
InviteeIdentifier string `json:"invitee_identifier"`
|
||||
InviteeAvatar string `json:"invitee_avatar"`
|
||||
InviteeEnable bool `json:"invitee_enable"`
|
||||
InvitedAt int64 `json:"invited_at"`
|
||||
OrderCount int64 `json:"order_count"`
|
||||
HasPurchased bool `json:"has_purchased"`
|
||||
InviterCommission int64 `json:"inviter_commission"`
|
||||
InviterGiftDays int64 `json:"inviter_gift_days"`
|
||||
InviteeGiftDays int64 `json:"invitee_gift_days"`
|
||||
}
|
||||
GetInviteManageListResponse {
|
||||
Total int64 `json:"total"`
|
||||
List []InviteManageRecord `json:"list"`
|
||||
}
|
||||
)
|
||||
|
||||
@server (
|
||||
prefix: v1/admin/invite
|
||||
group: admin/invite
|
||||
middleware: AuthMiddleware
|
||||
)
|
||||
service ppanel {
|
||||
@doc "Get invite manage list"
|
||||
@handler GetInviteManageList
|
||||
get /list (GetInviteManageListRequest) returns (GetInviteManageListResponse)
|
||||
}
|
||||
+79
-45
@@ -1,7 +1,7 @@
|
||||
syntax = "v1"
|
||||
|
||||
info (
|
||||
title: "promo admin API"
|
||||
title: "Promo API"
|
||||
desc: "API for ppanel"
|
||||
author: "Tension"
|
||||
email: "tension@ppanel.com"
|
||||
@@ -11,62 +11,96 @@ info (
|
||||
import "../types.api"
|
||||
|
||||
type (
|
||||
PromoRule {
|
||||
Id int64 `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Type string `json:"type"`
|
||||
Params interface{} `json:"params"`
|
||||
Priority int64 `json:"priority"`
|
||||
Enabled bool `json:"enabled"`
|
||||
StartTime int64 `json:"start_time"`
|
||||
EndTime int64 `json:"end_time"`
|
||||
CreatedAt int64 `json:"created_at"`
|
||||
UpdatedAt int64 `json:"updated_at"`
|
||||
}
|
||||
CreatePromoRuleRequest {
|
||||
Name string `json:"name" validate:"required,max=100"`
|
||||
Type string `json:"type" validate:"required,oneof=new_user inactive_user campaign"`
|
||||
Params map[string]interface{} `json:"params"`
|
||||
Priority int64 `json:"priority" validate:"gte=0"`
|
||||
Enabled *bool `json:"enabled"`
|
||||
StartTime *int64 `json:"start_time"`
|
||||
EndTime *int64 `json:"end_time"`
|
||||
Name string `json:"name" validate:"required,max=100"`
|
||||
Type string `json:"type" validate:"required,oneof=new_user inactive_user campaign"`
|
||||
Params interface{} `json:"params" validate:"required"`
|
||||
Priority int64 `json:"priority" validate:"gte=0"`
|
||||
Enabled *bool `json:"enabled" validate:"required"`
|
||||
StartTime int64 `json:"start_time" validate:"required"`
|
||||
EndTime int64 `json:"end_time" validate:"required"`
|
||||
}
|
||||
UpdatePromoRuleRequest {
|
||||
Id int64 `uri:"id" validate:"required,gt=0"`
|
||||
Name string `json:"name" validate:"required,max=100"`
|
||||
Type string `json:"type" validate:"required,oneof=new_user inactive_user campaign"`
|
||||
Params map[string]interface{} `json:"params"`
|
||||
Priority int64 `json:"priority" validate:"gte=0"`
|
||||
Enabled *bool `json:"enabled"`
|
||||
StartTime *int64 `json:"start_time"`
|
||||
EndTime *int64 `json:"end_time"`
|
||||
}
|
||||
GetPromoRuleDetailRequest {
|
||||
Id int64 `uri:"id" validate:"required,gt=0"`
|
||||
Id int64 `json:"id" validate:"required"`
|
||||
Name string `json:"name" validate:"required,max=100"`
|
||||
Type string `json:"type" validate:"required,oneof=new_user inactive_user campaign"`
|
||||
Params interface{} `json:"params" validate:"required"`
|
||||
Priority int64 `json:"priority" validate:"gte=0"`
|
||||
Enabled *bool `json:"enabled" validate:"required"`
|
||||
StartTime int64 `json:"start_time" validate:"required"`
|
||||
EndTime int64 `json:"end_time" validate:"required"`
|
||||
}
|
||||
DeletePromoRuleRequest {
|
||||
Id int64 `uri:"id" validate:"required,gt=0"`
|
||||
Id int64 `path:"id" validate:"required"`
|
||||
}
|
||||
GetPromoRuleDetailRequest {
|
||||
Id int64 `path:"id" validate:"required"`
|
||||
}
|
||||
GetPromoRuleListRequest {
|
||||
Page int64 `form:"page" validate:"required,gt=0"`
|
||||
Size int64 `form:"size" validate:"required,gt=0,lte=200"`
|
||||
Type string `form:"type" validate:"omitempty,oneof=new_user inactive_user campaign"`
|
||||
Enabled *bool `form:"enabled"`
|
||||
Page int64 `form:"page" validate:"required"`
|
||||
Size int64 `form:"size" validate:"required"`
|
||||
Type string `form:"type,omitempty" validate:"omitempty,oneof=new_user inactive_user campaign"`
|
||||
Enabled *bool `form:"enabled,omitempty"`
|
||||
Search string `form:"search,omitempty"`
|
||||
}
|
||||
GetPromoRuleListResponse {
|
||||
Total int64 `json:"total"`
|
||||
List []PromoRule `json:"list"`
|
||||
}
|
||||
SetPromoPriceRequest {
|
||||
PromoRuleId int64 `json:"promo_rule_id" validate:"required,gt=0"`
|
||||
Items []PromoPriceItem `json:"items" validate:"required,min=1,dive"`
|
||||
PromoPriceInput {
|
||||
SubscribeId int64 `json:"subscribe_id" validate:"required"`
|
||||
PromoPrice int64 `json:"promo_price" validate:"required,gt=0"`
|
||||
}
|
||||
PromoPrice {
|
||||
Id int64 `json:"id"`
|
||||
SubscribeId int64 `json:"subscribe_id"`
|
||||
PromoRuleId int64 `json:"promo_rule_id"`
|
||||
PromoPrice int64 `json:"promo_price"`
|
||||
UnitPrice int64 `json:"unit_price"`
|
||||
CreatedAt int64 `json:"created_at"`
|
||||
UpdatedAt int64 `json:"updated_at"`
|
||||
}
|
||||
CreatePromoPriceRequest {
|
||||
PromoRuleId int64 `json:"promo_rule_id" validate:"required"`
|
||||
Items []PromoPriceInput `json:"items" validate:"required,dive"`
|
||||
}
|
||||
GetPromoPriceListRequest {
|
||||
PromoRuleId int64 `form:"promo_rule_id" validate:"required,gt=0"`
|
||||
Page int64 `form:"page" validate:"required,gt=0"`
|
||||
Size int64 `form:"size" validate:"required,gt=0,lte=200"`
|
||||
Page int64 `form:"page" validate:"required"`
|
||||
Size int64 `form:"size" validate:"required"`
|
||||
PromoRuleId int64 `form:"promo_rule_id" validate:"required"`
|
||||
}
|
||||
GetPromoPriceListResponse {
|
||||
Total int64 `json:"total"`
|
||||
List []PromoPrice `json:"list"`
|
||||
}
|
||||
DeletePromoPriceRequest {
|
||||
Id int64 `uri:"id" validate:"required,gt=0"`
|
||||
Id int64 `path:"id" validate:"required"`
|
||||
}
|
||||
PromoUsage {
|
||||
Id int64 `json:"id"`
|
||||
UserId int64 `json:"user_id"`
|
||||
PromoRuleId int64 `json:"promo_rule_id"`
|
||||
SubscribeId int64 `json:"subscribe_id"`
|
||||
OrderNo string `json:"order_no"`
|
||||
PromoPrice int64 `json:"promo_price"`
|
||||
CreatedAt int64 `json:"created_at"`
|
||||
}
|
||||
GetPromoUsageListRequest {
|
||||
Page int64 `form:"page" validate:"required,gt=0"`
|
||||
Size int64 `form:"size" validate:"required,gt=0,lte=200"`
|
||||
RuleId int64 `form:"rule_id,omitempty"`
|
||||
Page int64 `form:"page" validate:"required"`
|
||||
Size int64 `form:"size" validate:"required"`
|
||||
PromoRuleId int64 `form:"rule_id,omitempty"`
|
||||
UserId int64 `form:"user_id,omitempty"`
|
||||
SubscribeId int64 `form:"subscribe_id,omitempty"`
|
||||
OrderNo string `form:"order_no,omitempty"`
|
||||
@@ -84,38 +118,38 @@ type (
|
||||
)
|
||||
service ppanel {
|
||||
@doc "Create promo rule"
|
||||
@handler CreateRule
|
||||
@handler CreatePromoRule
|
||||
post /rule (CreatePromoRuleRequest) returns (PromoRule)
|
||||
|
||||
@doc "Get promo rule list"
|
||||
@handler GetRuleList
|
||||
@handler GetPromoRuleList
|
||||
get /rule/list (GetPromoRuleListRequest) returns (GetPromoRuleListResponse)
|
||||
|
||||
@doc "Get promo rule detail"
|
||||
@handler GetRuleDetail
|
||||
@handler GetPromoRuleDetail
|
||||
get /rule/:id (GetPromoRuleDetailRequest) returns (PromoRule)
|
||||
|
||||
@doc "Update promo rule"
|
||||
@handler UpdateRule
|
||||
@handler UpdatePromoRule
|
||||
put /rule/:id (UpdatePromoRuleRequest) returns (PromoRule)
|
||||
|
||||
@doc "Delete promo rule"
|
||||
@handler DeleteRule
|
||||
@handler DeletePromoRule
|
||||
delete /rule/:id (DeletePromoRuleRequest)
|
||||
|
||||
@doc "Set promo prices"
|
||||
@handler SetPrice
|
||||
post /price (SetPromoPriceRequest)
|
||||
@doc "Batch set promo price"
|
||||
@handler CreatePromoPrice
|
||||
post /price (CreatePromoPriceRequest)
|
||||
|
||||
@doc "Get promo price list"
|
||||
@handler GetPriceList
|
||||
@handler GetPromoPriceList
|
||||
get /price/list (GetPromoPriceListRequest) returns (GetPromoPriceListResponse)
|
||||
|
||||
@doc "Delete promo price"
|
||||
@handler DeletePrice
|
||||
@handler DeletePromoPrice
|
||||
delete /price/:id (DeletePromoPriceRequest)
|
||||
|
||||
@doc "Get promo usage list"
|
||||
@handler GetUsageList
|
||||
@handler GetPromoUsageList
|
||||
get /usage/list (GetPromoUsageListRequest) returns (GetPromoUsageListResponse)
|
||||
}
|
||||
|
||||
@@ -46,7 +46,6 @@ type (
|
||||
SpeedLimit int64 `json:"speed_limit"`
|
||||
DeviceLimit int64 `json:"device_limit"`
|
||||
Quota int64 `json:"quota"`
|
||||
NewUserOnly *bool `json:"new_user_only"`
|
||||
Nodes []int64 `json:"nodes"`
|
||||
NodeTags []string `json:"node_tags"`
|
||||
NodeGroupIds []int64 `json:"node_group_ids,omitempty"`
|
||||
@@ -75,7 +74,6 @@ type (
|
||||
SpeedLimit int64 `json:"speed_limit"`
|
||||
DeviceLimit int64 `json:"device_limit"`
|
||||
Quota int64 `json:"quota"`
|
||||
NewUserOnly *bool `json:"new_user_only"`
|
||||
Nodes []int64 `json:"nodes"`
|
||||
NodeTags []string `json:"node_tags"`
|
||||
NodeGroupIds []int64 `json:"node_group_ids,omitempty"`
|
||||
@@ -177,3 +175,4 @@ service ppanel {
|
||||
@handler ResetAllSubscribeToken
|
||||
post /reset_all_token returns (ResetAllSubscribeTokenResponse)
|
||||
}
|
||||
|
||||
|
||||
+1
-45
@@ -23,12 +23,10 @@ type (
|
||||
SubscribeId *int64 `form:"subscribe_id,omitempty"`
|
||||
UserSubscribeId *int64 `form:"user_subscribe_id,omitempty"`
|
||||
ShortCode string `form:"short_code,omitempty"`
|
||||
DeviceId *int64 `form:"device_id,omitempty"`
|
||||
FamilyJoined *bool `form:"family_joined,omitempty"`
|
||||
FamilyStatus string `form:"family_status,omitempty"`
|
||||
FamilyOwnerUserId *int64 `form:"family_owner_user_id,omitempty"`
|
||||
FamilyId *int64 `form:"family_id,omitempty"`
|
||||
SortOrder string `form:"sort_order,omitempty"`
|
||||
}
|
||||
// GetUserListResponse
|
||||
GetUserListResponse {
|
||||
@@ -136,40 +134,6 @@ type (
|
||||
List []UserDevice `json:"list"`
|
||||
Total int64 `json:"total"`
|
||||
}
|
||||
GetAdminUserInviteStatsRequest {
|
||||
UserId int64 `form:"user_id" validate:"required"`
|
||||
}
|
||||
GetAdminUserInviteStatsResponse {
|
||||
InviteCount int64 `json:"invite_count"`
|
||||
TotalCommission int64 `json:"total_commission"`
|
||||
CurrentCommission int64 `json:"current_commission"`
|
||||
ReferralPercentage uint8 `json:"referral_percentage"`
|
||||
OnlyFirstPurchase bool `json:"only_first_purchase"`
|
||||
}
|
||||
GetAdminUserInviteListRequest {
|
||||
Page int `form:"page"`
|
||||
Size int `form:"size"`
|
||||
UserId int64 `form:"user_id" validate:"required"`
|
||||
Search string `form:"search,omitempty"`
|
||||
Enable *bool `form:"enable,omitempty"`
|
||||
UserIdSearch int64 `form:"user_id_search,omitempty"`
|
||||
}
|
||||
AdminInvitedUser {
|
||||
Id int64 `json:"id"`
|
||||
Avatar string `json:"avatar"`
|
||||
Identifier string `json:"identifier"`
|
||||
Enable bool `json:"enable"`
|
||||
CreatedAt int64 `json:"created_at"`
|
||||
OrderCount int64 `json:"order_count"`
|
||||
HasPurchased bool `json:"has_purchased"`
|
||||
InviterCommission int64 `json:"inviter_commission"`
|
||||
InviterGiftDays int64 `json:"inviter_gift_days"`
|
||||
InviteeGiftDays int64 `json:"invitee_gift_days"`
|
||||
}
|
||||
GetAdminUserInviteListResponse {
|
||||
Total int64 `json:"total"`
|
||||
List []AdminInvitedUser `json:"list"`
|
||||
}
|
||||
CreateUserSubscribeRequest {
|
||||
UserId int64 `json:"user_id"`
|
||||
ExpiredAt int64 `json:"expired_at"`
|
||||
@@ -185,7 +149,7 @@ type (
|
||||
ExpiredAt int64 `json:"expired_at"`
|
||||
Upload int64 `json:"upload"`
|
||||
Download int64 `json:"download"`
|
||||
SpeedLimit *int64 `json:"speed_limit,omitempty" validate:"omitempty,gte=0"`
|
||||
SpeedLimit *int64 `json:"speed_limit,omitempty"`
|
||||
TrafficLimit *string `json:"traffic_limit,omitempty"`
|
||||
}
|
||||
GetUserLoginLogsRequest {
|
||||
@@ -354,14 +318,6 @@ service ppanel {
|
||||
@handler GetUserSubscribeTrafficLogs
|
||||
get /subscribe/traffic_logs (GetUserSubscribeTrafficLogsRequest) returns (GetUserSubscribeTrafficLogsResponse)
|
||||
|
||||
@doc "Get admin user invite stats"
|
||||
@handler GetAdminUserInviteStats
|
||||
get /invite/stats (GetAdminUserInviteStatsRequest) returns (GetAdminUserInviteStatsResponse)
|
||||
|
||||
@doc "Get admin user invite list"
|
||||
@handler GetAdminUserInviteList
|
||||
get /invite/list (GetAdminUserInviteListRequest) returns (GetAdminUserInviteListResponse)
|
||||
|
||||
@doc "Get user subcribe devices"
|
||||
@handler GetUserSubscribeDevices
|
||||
get /subscribe/device (GetUserSubscribeDevicesRequest) returns (GetUserSubscribeDevicesResponse)
|
||||
|
||||
+3
-2
@@ -111,7 +111,7 @@ type (
|
||||
|
||||
@server (
|
||||
prefix: v1/server
|
||||
group: node/server
|
||||
group: server
|
||||
middleware: ServerMiddleware
|
||||
)
|
||||
service ppanel {
|
||||
@@ -138,10 +138,11 @@ service ppanel {
|
||||
|
||||
@server (
|
||||
prefix: v2/server
|
||||
group: node/server
|
||||
group: server
|
||||
)
|
||||
service ppanel {
|
||||
@doc "Get Server Protocol Config"
|
||||
@handler QueryServerProtocolConfig
|
||||
get /:server_id (QueryServerConfigRequest) returns (QueryServerConfigResponse)
|
||||
}
|
||||
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
syntax = "v1"
|
||||
|
||||
info (
|
||||
title: "ppanel API"
|
||||
desc: "API for ppanel"
|
||||
author: "Tension"
|
||||
email: "tension@ppanel.com"
|
||||
version: "0.0.1"
|
||||
)
|
||||
|
||||
import (
|
||||
"common.api"
|
||||
"node/node.api"
|
||||
"auth/auth.api"
|
||||
"admin/system.api"
|
||||
"admin/user.api"
|
||||
"admin/auth.api"
|
||||
"admin/server.api"
|
||||
"admin/subscribe.api"
|
||||
"admin/payment.api"
|
||||
"admin/coupon.api"
|
||||
"admin/redemption.api"
|
||||
"admin/order.api"
|
||||
"admin/ticket.api"
|
||||
"admin/announcement.api"
|
||||
"admin/document.api"
|
||||
"admin/tool.api"
|
||||
"admin/console.api"
|
||||
"admin/log.api"
|
||||
"admin/ads.api"
|
||||
"admin/marketing.api"
|
||||
"admin/application.api"
|
||||
"admin/promo.api"
|
||||
"admin/invite.api"
|
||||
"admin/group.api"
|
||||
"public/user.api"
|
||||
"public/subscribe.api"
|
||||
"public/redemption.api"
|
||||
"public/recovery.api"
|
||||
"public/order.api"
|
||||
"public/announcement.api"
|
||||
"public/ticket.api"
|
||||
"public/payment.api"
|
||||
"public/document.api"
|
||||
"public/file.api"
|
||||
"public/portal.api"
|
||||
"public/iap.api"
|
||||
)
|
||||
+13
-2
@@ -16,7 +16,13 @@ type (
|
||||
}
|
||||
|
||||
FileUploadResponse {
|
||||
Url string `json:"url"`
|
||||
FileId string `json:"file_id"`
|
||||
FileName string `json:"file_name"`
|
||||
ObjectKey string `json:"object_key"`
|
||||
Size int64 `json:"size"`
|
||||
ContentType string `json:"content_type"`
|
||||
Etag string `json:"etag"`
|
||||
Status string `json:"status"`
|
||||
}
|
||||
|
||||
FileUploadInitRequest {
|
||||
@@ -41,7 +47,12 @@ type (
|
||||
}
|
||||
|
||||
FileUploadCompleteResponse {
|
||||
Url string `json:"url"`
|
||||
FileId string `json:"file_id"`
|
||||
ObjectKey string `json:"object_key"`
|
||||
Size int64 `json:"size"`
|
||||
ContentType string `json:"content_type"`
|
||||
Etag string `json:"etag"`
|
||||
Status string `json:"status"`
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
+13
-13
@@ -201,22 +201,21 @@ type (
|
||||
GrowthRate string `json:"growth_rate"`
|
||||
PaidGrowthRate string `json:"paid_growth_rate"`
|
||||
}
|
||||
GetInviteRecordsRequest {
|
||||
GetInviteSalesRequest {
|
||||
Page int `form:"page"`
|
||||
Size int `form:"size"`
|
||||
StartTime int64 `form:"start_time"`
|
||||
EndTime int64 `form:"end_time"`
|
||||
}
|
||||
InviteRecord {
|
||||
Role string `json:"role"`
|
||||
PeerHash string `json:"peer_hash"`
|
||||
GiftDays int64 `json:"gift_days"`
|
||||
OrderNo string `json:"order_no"`
|
||||
CreatedAt int64 `json:"created_at"`
|
||||
InvitedUserSale {
|
||||
Amount float64 `json:"amount"`
|
||||
UpdatedAt int64 `json:"updated_at"`
|
||||
UserHash string `json:"user_hash"`
|
||||
ProductName string `json:"product_name"`
|
||||
}
|
||||
GetInviteRecordsResponse {
|
||||
Total int64 `json:"total"`
|
||||
List []InviteRecord `json:"list"`
|
||||
GetInviteSalesResponse {
|
||||
Total int64 `json:"total"`
|
||||
List []InvitedUserSale `json:"list"`
|
||||
}
|
||||
GetSubscribeStatusRequest {
|
||||
Email string `form:"email" json:"email" validate:"omitempty,email"`
|
||||
@@ -398,9 +397,9 @@ service ppanel {
|
||||
@handler GetAgentRealtime
|
||||
get /agent_realtime (GetAgentRealtimeRequest) returns (GetAgentRealtimeResponse)
|
||||
|
||||
@doc "Get Invite Records"
|
||||
@handler GetInviteRecords
|
||||
get /invite_records (GetInviteRecordsRequest) returns (GetInviteRecordsResponse)
|
||||
@doc "Get Invite Sales"
|
||||
@handler GetInviteSales
|
||||
get /invite_sales (GetInviteSalesRequest) returns (GetInviteSalesResponse)
|
||||
|
||||
@doc "Get Subscribe Status"
|
||||
@handler GetSubscribeStatus
|
||||
@@ -425,3 +424,4 @@ service ppanel {
|
||||
@handler DeviceWsConnect
|
||||
get /device_ws_connect
|
||||
}
|
||||
|
||||
|
||||
@@ -26,5 +26,6 @@ import (
|
||||
"./admin/ads.api"
|
||||
"./admin/marketing.api"
|
||||
"./admin/application.api"
|
||||
"./admin/group.api"
|
||||
"./admin/promo.api"
|
||||
)
|
||||
|
||||
|
||||
+15
-62
@@ -160,17 +160,15 @@ type (
|
||||
OnlyRealDevice bool `json:"only_real_device"`
|
||||
}
|
||||
RegisterConfig {
|
||||
StopRegister bool `json:"stop_register"`
|
||||
EnableTrial bool `json:"enable_trial"`
|
||||
EnableTrialEmailWhitelist bool `json:"enable_trial_email_whitelist"`
|
||||
TrialSubscribe int64 `json:"trial_subscribe"`
|
||||
TrialTime int64 `json:"trial_time"`
|
||||
TrialTimeUnit string `json:"trial_time_unit"`
|
||||
TrialEmailDomainWhitelist string `json:"trial_email_domain_whitelist"`
|
||||
EnableIpRegisterLimit bool `json:"enable_ip_register_limit"`
|
||||
IpRegisterLimit int64 `json:"ip_register_limit"`
|
||||
IpRegisterLimitDuration int64 `json:"ip_register_limit_duration"`
|
||||
DeviceLimit int64 `json:"device_limit"`
|
||||
StopRegister bool `json:"stop_register"`
|
||||
EnableTrial bool `json:"enable_trial"`
|
||||
TrialSubscribe int64 `json:"trial_subscribe"`
|
||||
TrialTime int64 `json:"trial_time"`
|
||||
TrialTimeUnit string `json:"trial_time_unit"`
|
||||
EnableIpRegisterLimit bool `json:"enable_ip_register_limit"`
|
||||
IpRegisterLimit int64 `json:"ip_register_limit"`
|
||||
IpRegisterLimitDuration int64 `json:"ip_register_limit_duration"`
|
||||
DeviceLimit int64 `json:"device_limit"`
|
||||
}
|
||||
VerifyConfig {
|
||||
CaptchaType string `json:"captcha_type"` // local or turnstile
|
||||
@@ -228,46 +226,9 @@ type (
|
||||
CurrencySymbol string `json:"currency_symbol"`
|
||||
}
|
||||
SubscribeDiscount {
|
||||
Quantity int64 `json:"quantity"`
|
||||
Discount float64 `json:"discount"`
|
||||
NewUserOnly bool `json:"new_user_only"`
|
||||
MapApple string `json:"map_apple"`
|
||||
Promo *SubscribePromo `json:"promo"`
|
||||
}
|
||||
PromoPrice {
|
||||
Id int64 `json:"id"`
|
||||
SubscribeId int64 `json:"subscribe_id"`
|
||||
PromoRuleId int64 `json:"promo_rule_id"`
|
||||
Quantity int64 `json:"quantity"`
|
||||
PromoPrice int64 `json:"promo_price"`
|
||||
CreatedAt int64 `json:"created_at"`
|
||||
UpdatedAt int64 `json:"updated_at"`
|
||||
}
|
||||
PromoPriceItem {
|
||||
SubscribeId int64 `json:"subscribe_id" validate:"required,gt=0"`
|
||||
Quantity int64 `json:"quantity" validate:"required,gt=0,lte=1000"`
|
||||
PromoPrice int64 `json:"promo_price" validate:"required,gt=0"`
|
||||
}
|
||||
PromoRule {
|
||||
Id int64 `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Type string `json:"type"`
|
||||
Params map[string]interface{} `json:"params"`
|
||||
Priority int64 `json:"priority"`
|
||||
Enabled bool `json:"enabled"`
|
||||
StartTime *int64 `json:"start_time"`
|
||||
EndTime *int64 `json:"end_time"`
|
||||
CreatedAt int64 `json:"created_at"`
|
||||
UpdatedAt int64 `json:"updated_at"`
|
||||
}
|
||||
PromoUsage {
|
||||
Id int64 `json:"id"`
|
||||
UserId int64 `json:"user_id"`
|
||||
PromoRuleId int64 `json:"promo_rule_id"`
|
||||
SubscribeId int64 `json:"subscribe_id"`
|
||||
OrderNo string `json:"order_no"`
|
||||
PromoPrice int64 `json:"promo_price"`
|
||||
CreatedAt int64 `json:"created_at"`
|
||||
Quantity int64 `json:"quantity"`
|
||||
Discount float64 `json:"discount"`
|
||||
MapApple string `json:"map_apple"`
|
||||
}
|
||||
SubscribePromo {
|
||||
RuleName string `json:"rule_name"`
|
||||
@@ -289,6 +250,7 @@ type (
|
||||
UnitPrice int64 `json:"unit_price"`
|
||||
UnitTime string `json:"unit_time"`
|
||||
Discount []SubscribeDiscount `json:"discount"`
|
||||
Promo *SubscribePromo `json:"promo"`
|
||||
NodeCount int64 `json:"node_count"`
|
||||
Replacement int64 `json:"replacement"`
|
||||
Inventory int64 `json:"inventory"`
|
||||
@@ -296,7 +258,6 @@ type (
|
||||
SpeedLimit int64 `json:"speed_limit"`
|
||||
DeviceLimit int64 `json:"device_limit"`
|
||||
Quota int64 `json:"quota"`
|
||||
NewUserOnly bool `json:"new_user_only"`
|
||||
Nodes []int64 `json:"nodes"`
|
||||
NodeTags []string `json:"node_tags"`
|
||||
NodeGroupIds []int64 `json:"node_group_ids,omitempty"`
|
||||
@@ -466,8 +427,6 @@ type (
|
||||
Amount int64 `json:"amount"`
|
||||
GiftAmount int64 `json:"gift_amount"`
|
||||
Discount int64 `json:"discount"`
|
||||
PromoRuleId int64 `json:"promo_rule_id"`
|
||||
PromoDiscount int64 `json:"promo_discount"`
|
||||
Coupon string `json:"coupon"`
|
||||
CouponDiscount int64 `json:"coupon_discount"`
|
||||
Commission int64 `json:"commission,omitempty"`
|
||||
@@ -490,8 +449,6 @@ type (
|
||||
Amount int64 `json:"amount"`
|
||||
GiftAmount int64 `json:"gift_amount"`
|
||||
Discount int64 `json:"discount"`
|
||||
PromoRuleId int64 `json:"promo_rule_id"`
|
||||
PromoDiscount int64 `json:"promo_discount"`
|
||||
Coupon string `json:"coupon"`
|
||||
CouponDiscount int64 `json:"coupon_discount"`
|
||||
Commission int64 `json:"commission,omitempty"`
|
||||
@@ -565,13 +522,10 @@ type (
|
||||
}
|
||||
UserSubscribe {
|
||||
Id int64 `json:"id"`
|
||||
IdStr string `json:"id_str"`
|
||||
UserId int64 `json:"user_id"`
|
||||
OrderId int64 `json:"order_id"`
|
||||
SubscribeId int64 `json:"subscribe_id"`
|
||||
Subscribe Subscribe `json:"subscribe"`
|
||||
NodeGroupId int64 `json:"node_group_id"`
|
||||
NodeGroupName string `json:"node_group_name"`
|
||||
StartTime int64 `json:"start_time"`
|
||||
ExpireTime int64 `json:"expire_time"`
|
||||
FinishedAt int64 `json:"finished_at"`
|
||||
@@ -917,9 +871,8 @@ type (
|
||||
Sandbox *bool `json:"sandbox,omitempty"`
|
||||
}
|
||||
AttachAppleTransactionResponse {
|
||||
ExpiresAt int64 `json:"expires_at"`
|
||||
Tier string `json:"tier"`
|
||||
ExistingOrderNo string `json:"existing_order_no,omitempty"`
|
||||
ExpiresAt int64 `json:"expires_at"`
|
||||
Tier string `json:"tier"`
|
||||
}
|
||||
RestoreAppleTransactionsRequest {
|
||||
Transactions []string `json:"transactions" validate:"required"`
|
||||
|
||||
@@ -4316,9 +4316,6 @@
|
||||
"discount": {
|
||||
"type": "number",
|
||||
"format": "double"
|
||||
},
|
||||
"promo": {
|
||||
"$ref": "#/definitions/SubscribePromo"
|
||||
}
|
||||
},
|
||||
"title": "SubscribeDiscount",
|
||||
|
||||
@@ -1,560 +0,0 @@
|
||||
# 提现 & 文件上传 & 日志上报 — 用户端 API 接口文档
|
||||
|
||||
> 基于 ppanel-server 源码整理，所有时间戳均为**秒级 Unix**。
|
||||
|
||||
---
|
||||
|
||||
## 目录
|
||||
|
||||
- [一、提现接口](#一提现接口)
|
||||
- [1.1 申请提现](#11-申请提现)
|
||||
- [1.2 取消提现](#12-取消提现)
|
||||
- [1.3 查询提现记录](#13-查询提现记录)
|
||||
- [二、枚举值与状态流转](#二枚举值与状态流转)
|
||||
- [三、文件上传接口](#三文件上传接口)
|
||||
- [3.1 直传文件（小文件）](#31-直传文件小文件)
|
||||
- [3.2 初始化上传（大文件 — 预签名）](#32-初始化上传大文件--预签名)
|
||||
- [3.3 确认上传完成](#33-确认上传完成)
|
||||
- [四、日志查询接口 (Admin)](#四日志查询接口-admin)
|
||||
- [4.1 错误日志列表](#41-错误日志列表)
|
||||
- [4.2 错误日志详情](#42-错误日志详情)
|
||||
- [4.3 日志消息原始详情](#43-日志消息原始详情)
|
||||
|
||||
---
|
||||
|
||||
## 一、提现接口
|
||||
|
||||
> 认证方式: JWT（用户登录态）
|
||||
>
|
||||
> 路由前缀: `/v1/public/user`
|
||||
|
||||
### 1.1 申请提现
|
||||
|
||||
提交佣金提现申请，创建一条待审核的提现记录。
|
||||
|
||||
```
|
||||
POST /v1/public/user/commission_withdraw
|
||||
```
|
||||
|
||||
**Request Body**
|
||||
|
||||
| 字段 | 类型 | 必填 | 校验 | 说明 |
|
||||
|------|------|------|------|------|
|
||||
| `amount` | int64 | 是 | — | 提现金额（分） |
|
||||
| `method` | uint8 | 是 | `oneof=0 1 2 3` | 收款方式（见枚举表） |
|
||||
| `content` | string | 否 | — | 提现备注 |
|
||||
| `account` | string | 条件必填 | — | 收款账号 |
|
||||
| `qr_code_url` | string | 条件必填 | — | 收款码图片 URL |
|
||||
|
||||
**各收款方式的必填字段**
|
||||
|
||||
| method | 收款方式 | 必填字段 |
|
||||
|--------|---------|---------|
|
||||
| `1` 支付宝 | `qr_code_url` | 收款码图片 |
|
||||
| `2` 微信 | `qr_code_url` | 收款码图片 |
|
||||
| `3` 银行卡 | `account` | 收款账号 |
|
||||
| `0` 其他 | `account` 必填 |
|
||||
|
||||
**Request 示例**
|
||||
|
||||
```json
|
||||
{
|
||||
"amount": 5000,
|
||||
"content": "提现到支付宝",
|
||||
"method": 1,
|
||||
"account": "user@example.com",
|
||||
"qr_code_url": "https://cdn.example.com/qrcode/alipay.png"
|
||||
}
|
||||
```
|
||||
|
||||
**Response**: [`WithdrawalLog`](#withdrawallog-对象)
|
||||
|
||||
---
|
||||
|
||||
### 1.2 取消提现
|
||||
|
||||
用户取消自己的待审核提现申请，佣金退回账户。
|
||||
|
||||
```
|
||||
POST /v1/public/user/withdrawal_cancel
|
||||
```
|
||||
|
||||
**Request Body**
|
||||
|
||||
| 字段 | 类型 | 必填 | 校验 | 说明 |
|
||||
|------|------|------|------|------|
|
||||
| `withdrawal_id` | int64 | 是 | `required,gt=0` | 提现记录 ID |
|
||||
|
||||
**Request 示例**
|
||||
|
||||
```json
|
||||
{
|
||||
"withdrawal_id": 123
|
||||
}
|
||||
```
|
||||
|
||||
**Response**: [`WithdrawalLog`](#withdrawallog-对象)（状态已变为 `3=已取消`）
|
||||
|
||||
---
|
||||
|
||||
### 1.3 查询提现记录
|
||||
|
||||
分页查询当前用户的提现记录（自动按 JWT 中的 userId 过滤）。
|
||||
|
||||
```
|
||||
GET /v1/public/user/withdrawal_log
|
||||
```
|
||||
|
||||
**Query 参数**
|
||||
|
||||
| 参数 | 类型 | 必填 | 说明 |
|
||||
|------|------|------|------|
|
||||
| `page` | int | 否 | 页码，默认 1 |
|
||||
| `size` | int | 否 | 每页条数，默认 10 |
|
||||
|
||||
**Request 示例**
|
||||
|
||||
```
|
||||
GET /v1/public/user/withdrawal_log?page=1&size=10
|
||||
```
|
||||
|
||||
**Response**
|
||||
|
||||
```json
|
||||
{
|
||||
"list": [WithdrawalLog, ...],
|
||||
"total": 25
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 二、枚举值与状态流转
|
||||
|
||||
### 提现状态 (`status`)
|
||||
|
||||
| 值 | 说明 |
|
||||
|----|------|
|
||||
| 0 | 待审核 |
|
||||
| 1 | 已通过 |
|
||||
| 2 | 已拒绝 |
|
||||
| 3 | 已取消 |
|
||||
|
||||
### 收款方式 (`method`)
|
||||
|
||||
| 值 | 说明 |
|
||||
|----|------|
|
||||
| 0 | 其他 |
|
||||
| 1 | 支付宝 |
|
||||
| 2 | 微信 |
|
||||
| 3 | 银行卡 |
|
||||
|
||||
### 状态流转
|
||||
|
||||
```
|
||||
┌── 管理员通过 ──▶ 已通过 (1)
|
||||
│
|
||||
待审核 (0) ──────┼── 管理员拒绝 ──▶ 已拒绝 (2)
|
||||
│
|
||||
└── 用户取消 ───▶ 已取消 (3)
|
||||
```
|
||||
|
||||
### WithdrawalLog 对象
|
||||
|
||||
所有提现接口共用的响应结构：
|
||||
|
||||
```json
|
||||
{
|
||||
"id": 1,
|
||||
"user_id": 100,
|
||||
"amount": 5000,
|
||||
"content": "提现备注",
|
||||
"status": 0,
|
||||
"reason": "",
|
||||
"method": 1,
|
||||
"account": "user@example.com",
|
||||
"qr_code_url": "https://cdn.example.com/qrcode/alipay.png",
|
||||
"created_at": 1716700000,
|
||||
"updated_at": 1716700000
|
||||
}
|
||||
```
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| `id` | int64 | 提现记录 ID |
|
||||
| `user_id` | int64 | 用户 ID |
|
||||
| `amount` | int64 | 提现金额（分） |
|
||||
| `content` | string | 提现备注 |
|
||||
| `status` | uint8 | 状态（见枚举表） |
|
||||
| `reason` | string | 拒绝原因（仅 status=2 时有值，其余 omitempty） |
|
||||
| `method` | uint8 | 收款方式（见枚举表） |
|
||||
| `account` | string | 收款账号 |
|
||||
| `qr_code_url` | string | 收款码图片 URL |
|
||||
| `created_at` | int64 | 创建时间（秒级 Unix） |
|
||||
| `updated_at` | int64 | 更新时间（秒级 Unix） |
|
||||
|
||||
---
|
||||
|
||||
## 三、文件上传接口
|
||||
|
||||
> 认证方式: JWT + DeviceMiddleware（用户登录态 + 设备认证）
|
||||
>
|
||||
> 路由前缀: `/v1/public/file`
|
||||
>
|
||||
> 存储后端: S3 兼容（RustFS）
|
||||
|
||||
提供两种上传方式：
|
||||
|
||||
| 方式 | 适用场景 | 流程 |
|
||||
|------|---------|------|
|
||||
| **直传** | 小文件（收款码等） | 1 次请求，`multipart/form-data` 直接上传 |
|
||||
| **预签名** | 大文件 / 客户端直传 S3 | init → 客户端 PUT 到预签名 URL → complete 确认 |
|
||||
|
||||
---
|
||||
|
||||
### 3.1 直传文件（小文件）
|
||||
|
||||
通过 `multipart/form-data` 直接上传文件到服务端，服务端转存至 S3。
|
||||
|
||||
```
|
||||
POST /v1/public/file/upload
|
||||
Content-Type: multipart/form-data
|
||||
```
|
||||
|
||||
**Form 参数**
|
||||
|
||||
| 字段 | 类型 | 必填 | 说明 |
|
||||
|------|------|------|------|
|
||||
| `biz_type` | string | 是 | 业务类型（如 `withdrawal_qrcode`、`avatar` 等） |
|
||||
| `file` | file | 是 | 上传的文件（multipart） |
|
||||
|
||||
**cURL 示例**
|
||||
|
||||
```bash
|
||||
curl -X POST /v1/public/file/upload \
|
||||
-H "Authorization: Bearer <token>" \
|
||||
-F "biz_type=withdrawal_qrcode" \
|
||||
-F "file=@/path/to/alipay_qr.png"
|
||||
```
|
||||
|
||||
**Response**
|
||||
|
||||
```json
|
||||
{
|
||||
"file_id": "a1b2c3d4e5f678901234",
|
||||
"file_name": "alipay_qr.png",
|
||||
"object_key": "app-upload/2026/05/27/100/alipay_qr.png__a1b2c3d4e5f678901234",
|
||||
"size": 52480,
|
||||
"content_type": "image/png",
|
||||
"etag": "\"d41d8cd98f00b204e9800998ecf8427e\"",
|
||||
"status": "completed"
|
||||
}
|
||||
```
|
||||
|
||||
**FileUploadResponse 字段说明**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| `file_id` | string | 文件唯一 ID（24 字符 hex） |
|
||||
| `file_name` | string | 原始文件名 |
|
||||
| `object_key` | string | S3 对象路径 |
|
||||
| `size` | int64 | 文件大小（字节） |
|
||||
| `content_type` | string | MIME 类型 |
|
||||
| `etag` | string | S3 ETag |
|
||||
| `status` | string | 状态，直传成功即 `completed` |
|
||||
|
||||
---
|
||||
|
||||
### 3.2 初始化上传（大文件 — 预签名）
|
||||
|
||||
获取 S3 预签名 URL，客户端直接 PUT 到 S3，避免文件经过服务端。
|
||||
|
||||
```
|
||||
POST /v1/public/file/upload/init
|
||||
```
|
||||
|
||||
**Request Body**
|
||||
|
||||
| 字段 | 类型 | 必填 | 校验 | 说明 |
|
||||
|------|------|------|------|------|
|
||||
| `biz_type` | string | 是 | `required` | 业务类型 |
|
||||
| `file_name` | string | 是 | `required` | 文件名 |
|
||||
| `content_type` | string | 是 | `required` | MIME 类型（如 `image/png`） |
|
||||
| `size` | int64 | 是 | `required` | 文件大小（字节） |
|
||||
| `sha256` | string | 否 | — | 文件 SHA256（可选校验） |
|
||||
|
||||
**Request 示例**
|
||||
|
||||
```json
|
||||
{
|
||||
"biz_type": "withdrawal_qrcode",
|
||||
"file_name": "wechat_qr.png",
|
||||
"content_type": "image/png",
|
||||
"size": 102400,
|
||||
"sha256": "e3b0c44298fc1c149afbf4c8996fb924..."
|
||||
}
|
||||
```
|
||||
|
||||
**Response**
|
||||
|
||||
```json
|
||||
{
|
||||
"file_id": "b2c3d4e5f6789012345a",
|
||||
"object_key": "app-upload/2026/05/27/100/wechat_qr.png__b2c3d4e5f6789012345a",
|
||||
"upload_url": "https://s3.example.com/bucket/app-upload/...?X-Amz-Signature=...",
|
||||
"method": "PUT",
|
||||
"headers": {
|
||||
"Content-Type": "image/png"
|
||||
},
|
||||
"expired_at": 1716700300
|
||||
}
|
||||
```
|
||||
|
||||
**FileUploadInitResponse 字段说明**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| `file_id` | string | 文件唯一 ID |
|
||||
| `object_key` | string | S3 对象路径 |
|
||||
| `upload_url` | string | 预签名上传 URL |
|
||||
| `method` | string | HTTP 方法（`PUT`） |
|
||||
| `headers` | map | 上传时需携带的请求头 |
|
||||
| `expired_at` | int64 | 预签名过期时间（秒级 Unix，默认 300 秒） |
|
||||
|
||||
**客户端上传流程**
|
||||
|
||||
```
|
||||
1. 调用 /upload/init 获取 upload_url
|
||||
2. 用返回的 method + headers 直接上传文件到 upload_url
|
||||
3. 上传成功后调用 /upload/complete 确认
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 3.3 确认上传完成
|
||||
|
||||
客户端通过预签名 URL 上传完成后，调用此接口确认文件状态。
|
||||
|
||||
```
|
||||
POST /v1/public/file/upload/complete
|
||||
```
|
||||
|
||||
**Request Body**
|
||||
|
||||
| 字段 | 类型 | 必填 | 校验 | 说明 |
|
||||
|------|------|------|------|------|
|
||||
| `file_id` | string | 是 | `required` | init 返回的 file_id |
|
||||
|
||||
**Request 示例**
|
||||
|
||||
```json
|
||||
{
|
||||
"file_id": "b2c3d4e5f6789012345a"
|
||||
}
|
||||
```
|
||||
|
||||
**Response**
|
||||
|
||||
```json
|
||||
{
|
||||
"file_id": "b2c3d4e5f6789012345a",
|
||||
"object_key": "app-upload/2026/05/27/100/wechat_qr.png__b2c3d4e5f6789012345a",
|
||||
"size": 102400,
|
||||
"content_type": "image/png",
|
||||
"etag": "\"d41d8cd98f00b204e9800998ecf8427e\"",
|
||||
"status": "completed"
|
||||
}
|
||||
```
|
||||
|
||||
**FileUploadCompleteResponse 字段说明**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| `file_id` | string | 文件唯一 ID |
|
||||
| `object_key` | string | S3 对象路径 |
|
||||
| `size` | int64 | 实际文件大小（S3 HeadObject 获取） |
|
||||
| `content_type` | string | MIME 类型 |
|
||||
| `etag` | string | S3 ETag |
|
||||
| `status` | string | `completed` |
|
||||
|
||||
**校验规则**
|
||||
|
||||
- 文件大小不能超过配置的 `S3.MaxUploadSize`
|
||||
- Content-Type 必须在配置的 `S3.AllowedContentTypes` 白名单内（若配置了）
|
||||
- complete 时会校验 S3 上的实际文件大小是否与 init 声明的一致
|
||||
- 只能确认自己发起的上传（userId 校验）
|
||||
|
||||
---
|
||||
|
||||
## 四、日志查询接口 (Admin)
|
||||
|
||||
> 认证方式: AuthMiddleware（管理员权限）
|
||||
>
|
||||
> 路由前缀: `/v1/admin/log`
|
||||
>
|
||||
> 数据来源: `log_message` 表（客户端上报的错误/崩溃日志）
|
||||
|
||||
---
|
||||
|
||||
### 4.1 错误日志列表
|
||||
|
||||
分页查询客户端上报的错误日志，支持多维度筛选。
|
||||
|
||||
```
|
||||
GET /v1/admin/log/error_message/list
|
||||
```
|
||||
|
||||
**Query 参数**
|
||||
|
||||
| 参数 | 类型 | 必填 | 说明 |
|
||||
|------|------|------|------|
|
||||
| `page` | int | 是 | 页码 |
|
||||
| `size` | int | 是 | 每页条数 |
|
||||
| `platform` | string | 否 | 平台筛选（ios / android / windows / mac / harmony） |
|
||||
| `level` | uint8 | 否 | 日志级别 |
|
||||
| `user_id` | int64 | 否 | 用户 ID |
|
||||
| `device_id` | string | 否 | 设备 ID |
|
||||
| `error_code` | string | 否 | 错误码 |
|
||||
| `keyword` | string | 否 | 关键字搜索（匹配 message） |
|
||||
| `start` | int64 | 否 | 开始时间（秒级 Unix） |
|
||||
| `end` | int64 | 否 | 结束时间（秒级 Unix） |
|
||||
|
||||
**Request 示例**
|
||||
|
||||
```
|
||||
GET /v1/admin/log/error_message/list?page=1&size=20&platform=ios&start=1716600000&end=1716700000
|
||||
```
|
||||
|
||||
**Response**
|
||||
|
||||
```json
|
||||
{
|
||||
"total": 50,
|
||||
"list": [
|
||||
{
|
||||
"id": 1,
|
||||
"platform": "ios",
|
||||
"app_version": "2.1.0",
|
||||
"os_name": "iOS",
|
||||
"os_version": "17.5",
|
||||
"device_id": "A1B2C3D4",
|
||||
"user_id": 100,
|
||||
"session_id": "sess_xxx",
|
||||
"level": 3,
|
||||
"error_code": "VPN_CONNECT_FAIL",
|
||||
"message": "Failed to establish VPN tunnel",
|
||||
"created_at": 1716700000
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
**ErrorLogMessage 字段说明**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| `id` | int64 | 日志 ID |
|
||||
| `platform` | string | 平台 |
|
||||
| `app_version` | string | 客户端版本 |
|
||||
| `os_name` | string | 操作系统名称 |
|
||||
| `os_version` | string | 操作系统版本 |
|
||||
| `device_id` | string | 设备 ID |
|
||||
| `user_id` | int64 | 用户 ID |
|
||||
| `session_id` | string | 会话 ID |
|
||||
| `level` | uint8 | 日志级别 |
|
||||
| `error_code` | string | 错误码 |
|
||||
| `message` | string | 错误消息 |
|
||||
| `created_at` | int64 | 创建时间（秒级 Unix） |
|
||||
|
||||
---
|
||||
|
||||
### 4.2 错误日志详情
|
||||
|
||||
获取单条错误日志的完整详情（列表字段 + 堆栈/IP/UA 等扩展信息）。
|
||||
|
||||
```
|
||||
GET /v1/admin/log/error_message/detail
|
||||
```
|
||||
|
||||
**Response**
|
||||
|
||||
```json
|
||||
{
|
||||
"id": 1,
|
||||
"platform": "ios",
|
||||
"app_version": "2.1.0",
|
||||
"os_name": "iOS",
|
||||
"os_version": "17.5",
|
||||
"device_id": "A1B2C3D4",
|
||||
"user_id": 100,
|
||||
"session_id": "sess_xxx",
|
||||
"level": 3,
|
||||
"error_code": "VPN_CONNECT_FAIL",
|
||||
"message": "Failed to establish VPN tunnel",
|
||||
"stack": "at VPNManager.connect() line 42\nat ...",
|
||||
"client_ip": "1.2.3.4",
|
||||
"user_agent": "PPanel/2.1.0 iOS/17.5",
|
||||
"locale": "zh-CN",
|
||||
"occurred_at": 1716700000,
|
||||
"created_at": 1716700000
|
||||
}
|
||||
```
|
||||
|
||||
**相比列表额外返回的字段**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| `stack` | string | 堆栈信息 |
|
||||
| `client_ip` | string | 客户端 IP |
|
||||
| `user_agent` | string | User-Agent |
|
||||
| `locale` | string | 客户端语言/地区 |
|
||||
| `occurred_at` | int64 | 错误发生时间（秒级 Unix） |
|
||||
|
||||
---
|
||||
|
||||
### 4.3 日志消息原始详情
|
||||
|
||||
获取单条 `log_message` 的完整原始数据（含 context、digest 等全量字段）。
|
||||
|
||||
```
|
||||
GET /v1/admin/log/message/detail
|
||||
```
|
||||
|
||||
**Query 参数**
|
||||
|
||||
| 参数 | 类型 | 必填 | 说明 |
|
||||
|------|------|------|------|
|
||||
| `id` | int64 | 是 | 日志消息 ID |
|
||||
|
||||
**Response**
|
||||
|
||||
```json
|
||||
{
|
||||
"id": 1,
|
||||
"platform": "ios",
|
||||
"app_version": "2.1.0",
|
||||
"os_name": "iOS",
|
||||
"os_version": "17.5",
|
||||
"device_id": "A1B2C3D4",
|
||||
"user_id": 100,
|
||||
"session_id": "sess_xxx",
|
||||
"level": 3,
|
||||
"error_code": "VPN_CONNECT_FAIL",
|
||||
"message": "Failed to establish VPN tunnel",
|
||||
"stack": "at VPNManager.connect() line 42\nat ...",
|
||||
"context": { "server_id": 5, "protocol": "vmess" },
|
||||
"client_ip": "1.2.3.4",
|
||||
"user_agent": "PPanel/2.1.0 iOS/17.5",
|
||||
"locale": "zh-CN",
|
||||
"digest": "sha256_abc123...",
|
||||
"occurred_at": 1716700000,
|
||||
"created_at": 1716700000
|
||||
}
|
||||
```
|
||||
|
||||
**相比详情额外返回的字段**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| `context` | any | 附加上下文（原始 JSON） |
|
||||
| `digest` | string | 内容摘要（用于去重） |
|
||||
@@ -128,10 +128,6 @@ curl -X PUT 'https://bucket.s3.ap-east-1.amazonaws.com/...' \
|
||||
说明：
|
||||
|
||||
- `Content-Type` 需和 `init` 返回的 `headers.Content-Type` 一致
|
||||
- 允许的 `Content-Type` 由服务端 `S3.AllowedContentTypes` 配置控制，默认包含：
|
||||
- 压缩包：`application/zip`、`application/x-zip-compressed`、`application/gzip`、`application/x-gzip`
|
||||
- 通用文件：`application/octet-stream`、`text/plain`、`application/json`
|
||||
- 图片：`image/jpeg`、`image/jpg`、`image/png`、`image/webp`、`image/gif`、`image/heic`、`image/heif`、`image/bmp`
|
||||
- `upload_url` 有过期时间，通常 300 秒
|
||||
- 成功时 S3 常见返回 `200` 或 `204`
|
||||
|
||||
@@ -168,13 +164,11 @@ curl -X POST 'https://tapi.hifast.biz/v1/public/file/upload/complete' \
|
||||
- 如果请求带了 `X-App-Id`，就按现有逻辑验签
|
||||
- 如果没有 `X-App-Id`，仍按旧逻辑放行
|
||||
- 如果要给该接口加签，签名时必须对原始 multipart body 计算 `BODY_SHA256`
|
||||
- 允许的 `Content-Type` 与预签名三段式一致；multipart 文件字段未显式携带 `Content-Type` 时，服务端会基于文件内容嗅探常见类型。
|
||||
|
||||
## 常见错误码
|
||||
|
||||
- `200`: 成功
|
||||
- `400`: 参数错误
|
||||
- `400 content_type is not allowed`: 文件 `Content-Type` 不在 `S3.AllowedContentTypes` 白名单内
|
||||
- `40008`: 缺少签名头
|
||||
- `40009`: 签名已过期
|
||||
- `40010`: 签名无效
|
||||
|
||||
+1
-1
@@ -74,7 +74,7 @@ S3:
|
||||
UsePathStyle: false
|
||||
PresignExpireSeconds: 300
|
||||
MaxUploadSize: 104857600
|
||||
AllowedContentTypes: "application/zip,application/x-zip-compressed,application/gzip,application/x-gzip,application/octet-stream,text/plain,application/json,image/jpeg,image/jpg,image/png,image/webp,image/gif,image/heic,image/heif,image/bmp"
|
||||
AllowedContentTypes: "application/zip,application/x-zip-compressed,application/gzip,application/x-gzip,application/octet-stream,text/plain,application/json"
|
||||
|
||||
device:
|
||||
enable: true # 开启设备加密通信
|
||||
|
||||
@@ -2,8 +2,6 @@ module github.com/perfect-panel/server
|
||||
|
||||
go 1.24
|
||||
|
||||
replace github.com/zeromicro/go-zero => ./internal/gozero
|
||||
|
||||
require (
|
||||
github.com/GUAIK-ORG/go-snowflake v0.0.0-20200116064823-220c4260e85f
|
||||
github.com/alibabacloud-go/darabonba-openapi v0.1.18
|
||||
@@ -35,7 +33,6 @@ require (
|
||||
github.com/spf13/cobra v1.8.1
|
||||
github.com/stripe/stripe-go/v81 v81.1.0
|
||||
github.com/twilio/twilio-go v1.23.11
|
||||
github.com/zeromicro/go-zero v0.0.0
|
||||
go.opentelemetry.io/otel v1.29.0
|
||||
go.opentelemetry.io/otel/exporters/jaeger v1.17.0
|
||||
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0
|
||||
@@ -56,7 +53,6 @@ require (
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/DATA-DOG/go-sqlmock v1.5.2
|
||||
github.com/Masterminds/sprig/v3 v3.3.0
|
||||
github.com/aws/aws-sdk-go-v2 v1.41.7
|
||||
github.com/aws/aws-sdk-go-v2/config v1.32.17
|
||||
|
||||
@@ -8,8 +8,6 @@ filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4
|
||||
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
|
||||
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
|
||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
||||
github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
|
||||
github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
|
||||
github.com/GUAIK-ORG/go-snowflake v0.0.0-20200116064823-220c4260e85f h1:RDkg3pyE1qGbBpRWmvSN9RNZC5nUrOaEPiEpEb8y2f0=
|
||||
github.com/GUAIK-ORG/go-snowflake v0.0.0-20200116064823-220c4260e85f/go.mod h1:zA7AF9RTfpluCfz0omI4t5KCMaWHUMicsZoMccnaT44=
|
||||
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
|
||||
@@ -266,7 +264,6 @@ github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/
|
||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
|
||||
github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE=
|
||||
github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
|
||||
github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
|
||||
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
|
||||
|
||||
@@ -1,10 +1,4 @@
|
||||
SELECT COUNT(*) INTO @col_exists FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'withdrawals' AND COLUMN_NAME = 'method';
|
||||
|
||||
SET @ddl = IF(@col_exists = 0,
|
||||
'ALTER TABLE `withdrawals` ADD COLUMN `method` TINYINT(1) NOT NULL DEFAULT 0 AFTER `content`, ADD COLUMN `account` VARCHAR(255) NOT NULL DEFAULT '''' AFTER `method`, ADD COLUMN `qr_code_url` VARCHAR(500) NOT NULL DEFAULT '''' AFTER `account`',
|
||||
'SELECT 1');
|
||||
|
||||
PREPARE stmt FROM @ddl;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
ALTER TABLE `withdrawals`
|
||||
ADD COLUMN `method` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '收款方式 0:其他 1:支付宝 2:微信 3:银行卡' AFTER `content`,
|
||||
ADD COLUMN `account` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '收款账号' AFTER `method`,
|
||||
ADD COLUMN `qr_code_url` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '收款码图片URL' AFTER `account`;
|
||||
|
||||
@@ -1,35 +1,5 @@
|
||||
SET @traffic_limit_exists = (
|
||||
SELECT COUNT(*)
|
||||
FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_SCHEMA = DATABASE()
|
||||
AND TABLE_NAME = 'user_subscribe'
|
||||
AND COLUMN_NAME = 'traffic_limit'
|
||||
);
|
||||
-- Purpose: Rollback user-level speed limit overrides from user_subscribe
|
||||
|
||||
SET @traffic_limit_sql = IF(
|
||||
@traffic_limit_exists = 1,
|
||||
'ALTER TABLE `user_subscribe` DROP COLUMN `traffic_limit`',
|
||||
'SELECT 1'
|
||||
);
|
||||
|
||||
PREPARE traffic_limit_stmt FROM @traffic_limit_sql;
|
||||
EXECUTE traffic_limit_stmt;
|
||||
DEALLOCATE PREPARE traffic_limit_stmt;
|
||||
|
||||
SET @speed_limit_exists = (
|
||||
SELECT COUNT(*)
|
||||
FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_SCHEMA = DATABASE()
|
||||
AND TABLE_NAME = 'user_subscribe'
|
||||
AND COLUMN_NAME = 'speed_limit'
|
||||
);
|
||||
|
||||
SET @speed_limit_sql = IF(
|
||||
@speed_limit_exists = 1,
|
||||
'ALTER TABLE `user_subscribe` DROP COLUMN `speed_limit`',
|
||||
'SELECT 1'
|
||||
);
|
||||
|
||||
PREPARE speed_limit_stmt FROM @speed_limit_sql;
|
||||
EXECUTE speed_limit_stmt;
|
||||
DEALLOCATE PREPARE speed_limit_stmt;
|
||||
ALTER TABLE `user_subscribe`
|
||||
DROP COLUMN IF EXISTS `traffic_limit`,
|
||||
DROP COLUMN IF EXISTS `speed_limit`;
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
SET @speed_limit_exists = (
|
||||
-- Purpose: Add user-level speed limit overrides to user_subscribe
|
||||
|
||||
SET @column_exists = (
|
||||
SELECT COUNT(*)
|
||||
FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_SCHEMA = DATABASE()
|
||||
@@ -6,17 +8,17 @@ SET @speed_limit_exists = (
|
||||
AND COLUMN_NAME = 'speed_limit'
|
||||
);
|
||||
|
||||
SET @speed_limit_sql = IF(
|
||||
@speed_limit_exists = 0,
|
||||
'ALTER TABLE `user_subscribe` ADD COLUMN `speed_limit` BIGINT NOT NULL DEFAULT 0 COMMENT ''User-level speed limit override (Mbps), 0 uses plan-level'' AFTER `upload`',
|
||||
'SELECT 1'
|
||||
SET @sql = IF(
|
||||
@column_exists = 0,
|
||||
'ALTER TABLE `user_subscribe` ADD COLUMN `speed_limit` int NOT NULL DEFAULT 0 COMMENT ''User-level speed limit override (Mbps, 0=use plan default)'' AFTER `upload`',
|
||||
'SELECT ''Column speed_limit already exists in user_subscribe table'''
|
||||
);
|
||||
|
||||
PREPARE speed_limit_stmt FROM @speed_limit_sql;
|
||||
EXECUTE speed_limit_stmt;
|
||||
DEALLOCATE PREPARE speed_limit_stmt;
|
||||
PREPARE stmt FROM @sql;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
SET @traffic_limit_exists = (
|
||||
SET @column_exists = (
|
||||
SELECT COUNT(*)
|
||||
FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_SCHEMA = DATABASE()
|
||||
@@ -24,12 +26,12 @@ SET @traffic_limit_exists = (
|
||||
AND COLUMN_NAME = 'traffic_limit'
|
||||
);
|
||||
|
||||
SET @traffic_limit_sql = IF(
|
||||
@traffic_limit_exists = 0,
|
||||
'ALTER TABLE `user_subscribe` ADD COLUMN `traffic_limit` TEXT DEFAULT NULL COMMENT ''User-level traffic limit override (JSON), NULL uses plan-level'' AFTER `speed_limit`',
|
||||
'SELECT 1'
|
||||
SET @sql = IF(
|
||||
@column_exists = 0,
|
||||
'ALTER TABLE `user_subscribe` ADD COLUMN `traffic_limit` text DEFAULT NULL COMMENT ''User-level traffic limit rules override (JSON, NULL=use plan default)'' AFTER `speed_limit`',
|
||||
'SELECT ''Column traffic_limit already exists in user_subscribe table'''
|
||||
);
|
||||
|
||||
PREPARE traffic_limit_stmt FROM @traffic_limit_sql;
|
||||
EXECUTE traffic_limit_stmt;
|
||||
DEALLOCATE PREPARE traffic_limit_stmt;
|
||||
PREPARE stmt FROM @sql;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
@@ -11,158 +11,22 @@ CREATE TABLE IF NOT EXISTS `promo_rule` (
|
||||
`updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||
`deleted_at` DATETIME DEFAULT NULL COMMENT '软删除时间',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_enabled_priority_deleted` (`enabled`, `deleted_at`, `priority` DESC)
|
||||
KEY `idx_enabled_priority` (`enabled`, `priority` DESC),
|
||||
KEY `idx_deleted_at` (`deleted_at`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='促销规则表';
|
||||
|
||||
SET @index_exists = (
|
||||
SELECT COUNT(*)
|
||||
FROM INFORMATION_SCHEMA.STATISTICS
|
||||
WHERE TABLE_SCHEMA = DATABASE()
|
||||
AND TABLE_NAME = 'promo_rule'
|
||||
AND INDEX_NAME = 'idx_enabled_priority'
|
||||
);
|
||||
|
||||
SET @sql = IF(
|
||||
@index_exists = 1,
|
||||
'ALTER TABLE `promo_rule` DROP INDEX `idx_enabled_priority`',
|
||||
'SELECT ''Index idx_enabled_priority does not exist on promo_rule table'''
|
||||
);
|
||||
|
||||
PREPARE stmt FROM @sql;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
SET @index_exists = (
|
||||
SELECT COUNT(*)
|
||||
FROM INFORMATION_SCHEMA.STATISTICS
|
||||
WHERE TABLE_SCHEMA = DATABASE()
|
||||
AND TABLE_NAME = 'promo_rule'
|
||||
AND INDEX_NAME = 'idx_deleted_at'
|
||||
);
|
||||
|
||||
SET @sql = IF(
|
||||
@index_exists = 1,
|
||||
'ALTER TABLE `promo_rule` DROP INDEX `idx_deleted_at`',
|
||||
'SELECT ''Index idx_deleted_at does not exist on promo_rule table'''
|
||||
);
|
||||
|
||||
PREPARE stmt FROM @sql;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
SET @index_exists = (
|
||||
SELECT COUNT(*)
|
||||
FROM INFORMATION_SCHEMA.STATISTICS
|
||||
WHERE TABLE_SCHEMA = DATABASE()
|
||||
AND TABLE_NAME = 'promo_rule'
|
||||
AND INDEX_NAME = 'idx_enabled_priority_deleted'
|
||||
);
|
||||
|
||||
SET @sql = IF(
|
||||
@index_exists = 0,
|
||||
'ALTER TABLE `promo_rule` ADD KEY `idx_enabled_priority_deleted` (`enabled`, `deleted_at`, `priority` DESC)',
|
||||
'SELECT ''Index idx_enabled_priority_deleted already exists on promo_rule table'''
|
||||
);
|
||||
|
||||
PREPARE stmt FROM @sql;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `subscribe_promo` (
|
||||
`id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||
`subscribe_id` BIGINT UNSIGNED NOT NULL COMMENT '套餐规格 ID',
|
||||
`quantity` BIGINT NOT NULL DEFAULT 1 COMMENT '购买数量',
|
||||
`promo_rule_id` BIGINT UNSIGNED NOT NULL COMMENT '促销规则 ID',
|
||||
`promo_price` BIGINT NOT NULL DEFAULT 0 COMMENT '该规格在此规则下的优惠价（分）',
|
||||
`created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
`updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `uk_subscribe_quantity_rule` (`subscribe_id`, `quantity`, `promo_rule_id`),
|
||||
UNIQUE KEY `uk_subscribe_rule` (`subscribe_id`, `promo_rule_id`),
|
||||
KEY `idx_promo_rule_id` (`promo_rule_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='规格促销价表';
|
||||
|
||||
SET @column_exists = (
|
||||
SELECT COUNT(*)
|
||||
FROM INFORMATION_SCHEMA.COLUMNS
|
||||
WHERE TABLE_SCHEMA = DATABASE()
|
||||
AND TABLE_NAME = 'subscribe_promo'
|
||||
AND COLUMN_NAME = 'quantity'
|
||||
);
|
||||
|
||||
SET @sql = IF(
|
||||
@column_exists = 0,
|
||||
'ALTER TABLE `subscribe_promo` ADD COLUMN `quantity` BIGINT NOT NULL DEFAULT 1 COMMENT ''购买数量'' AFTER `subscribe_id`',
|
||||
'SELECT ''Column quantity already exists in subscribe_promo table'''
|
||||
);
|
||||
|
||||
PREPARE stmt FROM @sql;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
SET @sql = IF(
|
||||
@column_exists = 1,
|
||||
'ALTER TABLE `subscribe_promo` MODIFY COLUMN `quantity` BIGINT NOT NULL DEFAULT 1 COMMENT ''购买数量''',
|
||||
'SELECT ''Column quantity does not exist in subscribe_promo table'''
|
||||
);
|
||||
|
||||
PREPARE stmt FROM @sql;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
SET @index_exists = (
|
||||
SELECT COUNT(*)
|
||||
FROM INFORMATION_SCHEMA.STATISTICS
|
||||
WHERE TABLE_SCHEMA = DATABASE()
|
||||
AND TABLE_NAME = 'subscribe_promo'
|
||||
AND INDEX_NAME = 'uk_subscribe_rule'
|
||||
);
|
||||
|
||||
SET @sql = IF(
|
||||
@index_exists = 1,
|
||||
'ALTER TABLE `subscribe_promo` DROP INDEX `uk_subscribe_rule`',
|
||||
'SELECT ''Index uk_subscribe_rule does not exist on subscribe_promo table'''
|
||||
);
|
||||
|
||||
PREPARE stmt FROM @sql;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
SET @index_exists = (
|
||||
SELECT COUNT(*)
|
||||
FROM INFORMATION_SCHEMA.STATISTICS
|
||||
WHERE TABLE_SCHEMA = DATABASE()
|
||||
AND TABLE_NAME = 'subscribe_promo'
|
||||
AND INDEX_NAME = 'uk_subscribe_qty_rule'
|
||||
);
|
||||
|
||||
SET @sql = IF(
|
||||
@index_exists = 1,
|
||||
'ALTER TABLE `subscribe_promo` DROP INDEX `uk_subscribe_qty_rule`',
|
||||
'SELECT ''Index uk_subscribe_qty_rule does not exist on subscribe_promo table'''
|
||||
);
|
||||
|
||||
PREPARE stmt FROM @sql;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
SET @index_exists = (
|
||||
SELECT COUNT(*)
|
||||
FROM INFORMATION_SCHEMA.STATISTICS
|
||||
WHERE TABLE_SCHEMA = DATABASE()
|
||||
AND TABLE_NAME = 'subscribe_promo'
|
||||
AND INDEX_NAME = 'uk_subscribe_quantity_rule'
|
||||
);
|
||||
|
||||
SET @sql = IF(
|
||||
@index_exists = 0,
|
||||
'ALTER TABLE `subscribe_promo` ADD UNIQUE KEY `uk_subscribe_quantity_rule` (`subscribe_id`, `quantity`, `promo_rule_id`)',
|
||||
'SELECT ''Index uk_subscribe_quantity_rule already exists on subscribe_promo table'''
|
||||
);
|
||||
|
||||
PREPARE stmt FROM @sql;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `promo_usage` (
|
||||
`id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||
`user_id` BIGINT UNSIGNED NOT NULL COMMENT '用户 ID',
|
||||
|
||||
@@ -58,7 +58,7 @@ type S3Config struct {
|
||||
UsePathStyle bool `yaml:"UsePathStyle" default:"false"`
|
||||
PresignExpireSeconds int64 `yaml:"PresignExpireSeconds" default:"300"`
|
||||
MaxUploadSize int64 `yaml:"MaxUploadSize" default:"104857600"`
|
||||
AllowedContentTypes string `yaml:"AllowedContentTypes" default:"application/zip,application/x-zip-compressed,application/gzip,application/x-gzip,application/octet-stream,text/plain,application/json,image/jpeg,image/jpg,image/png,image/webp,image/gif,image/heic,image/heif,image/bmp"`
|
||||
AllowedContentTypes string `yaml:"AllowedContentTypes" default:"application/zip,application/x-zip-compressed,application/gzip,application/x-gzip,application/octet-stream,text/plain,application/json"`
|
||||
}
|
||||
|
||||
type RedisConfig struct {
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
package logx
|
||||
|
||||
import (
|
||||
"context"
|
||||
"log"
|
||||
)
|
||||
|
||||
type Logger interface {
|
||||
Error(...any)
|
||||
Errorf(string, ...any)
|
||||
Info(...any)
|
||||
Infof(string, ...any)
|
||||
}
|
||||
|
||||
type logger struct{}
|
||||
|
||||
func WithContext(context.Context) Logger {
|
||||
return logger{}
|
||||
}
|
||||
|
||||
func (logger) Error(v ...any) {
|
||||
log.Print(v...)
|
||||
}
|
||||
|
||||
func (logger) Errorf(format string, v ...any) {
|
||||
log.Printf(format, v...)
|
||||
}
|
||||
|
||||
func (logger) Info(v ...any) {
|
||||
log.Print(v...)
|
||||
}
|
||||
|
||||
func (logger) Infof(format string, v ...any) {
|
||||
log.Printf(format, v...)
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
module github.com/zeromicro/go-zero
|
||||
|
||||
go 1.24
|
||||
|
||||
require github.com/gin-gonic/gin v1.10.0
|
||||
@@ -1,27 +0,0 @@
|
||||
package httpx
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
func Parse(r *http.Request, v any) error {
|
||||
if r.Body == nil {
|
||||
return nil
|
||||
}
|
||||
decoder := json.NewDecoder(r.Body)
|
||||
if err := decoder.Decode(v); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func ErrorCtx(_ context.Context, w http.ResponseWriter, err error) {
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
}
|
||||
|
||||
func OkJsonCtx(_ context.Context, w http.ResponseWriter, v any) {
|
||||
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
||||
_ = json.NewEncoder(w).Encode(v)
|
||||
}
|
||||
@@ -1,72 +0,0 @@
|
||||
package rest
|
||||
|
||||
import "github.com/gin-gonic/gin"
|
||||
|
||||
type Middleware = gin.HandlerFunc
|
||||
|
||||
type Route struct {
|
||||
Method string
|
||||
Path string
|
||||
Handler gin.HandlerFunc
|
||||
Middlewares []Middleware
|
||||
}
|
||||
|
||||
type RouteOption func(*routeOptions)
|
||||
|
||||
type routeOptions struct {
|
||||
prefix string
|
||||
}
|
||||
|
||||
type Server struct {
|
||||
router *gin.Engine
|
||||
optionalAuth Middleware
|
||||
}
|
||||
|
||||
type ServerOption func(*Server)
|
||||
|
||||
func NewServer(router *gin.Engine, opts ...ServerOption) *Server {
|
||||
server := &Server{router: router}
|
||||
for _, opt := range opts {
|
||||
opt(server)
|
||||
}
|
||||
return server
|
||||
}
|
||||
|
||||
func WithOptionalAuth(middleware Middleware) ServerOption {
|
||||
return func(server *Server) {
|
||||
server.optionalAuth = middleware
|
||||
}
|
||||
}
|
||||
|
||||
func WithMiddlewares(middlewares []Middleware, routes ...Route) []Route {
|
||||
for i := range routes {
|
||||
routes[i].Middlewares = append(routes[i].Middlewares, middlewares...)
|
||||
}
|
||||
return routes
|
||||
}
|
||||
|
||||
func WithPrefix(prefix string) RouteOption {
|
||||
return func(opts *routeOptions) {
|
||||
opts.prefix = prefix
|
||||
}
|
||||
}
|
||||
|
||||
func WithJwt(_ string) RouteOption {
|
||||
return func(_ *routeOptions) {}
|
||||
}
|
||||
|
||||
func (server *Server) AddRoutes(routes []Route, opts ...RouteOption) {
|
||||
options := routeOptions{}
|
||||
for _, opt := range opts {
|
||||
opt(&options)
|
||||
}
|
||||
|
||||
for _, route := range routes {
|
||||
handlers := append([]gin.HandlerFunc{}, route.Middlewares...)
|
||||
if server.optionalAuth != nil && options.prefix == "/v1/public/subscribe" && route.Path == "/list" && len(handlers) > 0 {
|
||||
handlers[0] = server.optionalAuth
|
||||
}
|
||||
handlers = append(handlers, route.Handler)
|
||||
server.router.Handle(route.Method, options.prefix+route.Path, handlers...)
|
||||
}
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
package invite
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/perfect-panel/server/internal/logic/admin/invite"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/result"
|
||||
)
|
||||
|
||||
// Get invite manage list
|
||||
func GetInviteManageListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
return func(c *gin.Context) {
|
||||
var req types.GetInviteManageListRequest
|
||||
_ = c.ShouldBind(&req)
|
||||
if err := svcCtx.Validate(&req); err != nil {
|
||||
result.ParamErrorResult(c, err)
|
||||
return
|
||||
}
|
||||
|
||||
l := invite.NewGetInviteManageListLogic(c.Request.Context(), svcCtx)
|
||||
resp, err := l.GetInviteManageList(&req)
|
||||
result.HttpResult(c, resp, err)
|
||||
}
|
||||
}
|
||||
+6
-4
@@ -8,16 +8,18 @@ import (
|
||||
"github.com/perfect-panel/server/pkg/result"
|
||||
)
|
||||
|
||||
func SetPriceHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
// Batch set promo price
|
||||
func CreatePromoPriceHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
return func(c *gin.Context) {
|
||||
var req types.SetPromoPriceRequest
|
||||
var req types.CreatePromoPriceRequest
|
||||
_ = c.ShouldBind(&req)
|
||||
if err := svcCtx.Validate(&req); err != nil {
|
||||
result.ParamErrorResult(c, err)
|
||||
return
|
||||
}
|
||||
l := promo.NewSetPriceLogic(c.Request.Context(), svcCtx)
|
||||
err := l.SetPrice(&req)
|
||||
|
||||
l := promo.NewCreatePromoPriceLogic(c.Request.Context(), svcCtx)
|
||||
err := l.CreatePromoPrice(&req)
|
||||
result.HttpResult(c, nil, err)
|
||||
}
|
||||
}
|
||||
+5
-3
@@ -8,7 +8,8 @@ import (
|
||||
"github.com/perfect-panel/server/pkg/result"
|
||||
)
|
||||
|
||||
func CreateRuleHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
// Create promo rule
|
||||
func CreatePromoRuleHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
return func(c *gin.Context) {
|
||||
var req types.CreatePromoRuleRequest
|
||||
_ = c.ShouldBind(&req)
|
||||
@@ -16,8 +17,9 @@ func CreateRuleHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
result.ParamErrorResult(c, err)
|
||||
return
|
||||
}
|
||||
l := promo.NewCreateRuleLogic(c.Request.Context(), svcCtx)
|
||||
resp, err := l.CreateRule(&req)
|
||||
|
||||
l := promo.NewCreatePromoRuleLogic(c.Request.Context(), svcCtx)
|
||||
resp, err := l.CreatePromoRule(&req)
|
||||
result.HttpResult(c, resp, err)
|
||||
}
|
||||
}
|
||||
+14
-5
@@ -1,6 +1,9 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/perfect-panel/server/internal/logic/admin/promo"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
@@ -8,19 +11,25 @@ import (
|
||||
"github.com/perfect-panel/server/pkg/result"
|
||||
)
|
||||
|
||||
func DeletePriceHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
// Delete promo price
|
||||
func DeletePromoPriceHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
return func(c *gin.Context) {
|
||||
var req types.DeletePromoPriceRequest
|
||||
if err := c.ShouldBindUri(&req); err != nil {
|
||||
result.ParamErrorResult(c, err)
|
||||
id, err := strconv.ParseInt(c.Param("id"), 10, 64)
|
||||
if err != nil {
|
||||
c.String(http.StatusBadRequest, "Invalid Params")
|
||||
c.Abort()
|
||||
return
|
||||
}
|
||||
req.Id = id
|
||||
_ = c.ShouldBind(&req)
|
||||
if err := svcCtx.Validate(&req); err != nil {
|
||||
result.ParamErrorResult(c, err)
|
||||
return
|
||||
}
|
||||
l := promo.NewDeletePriceLogic(c.Request.Context(), svcCtx)
|
||||
err := l.DeletePrice(&req)
|
||||
|
||||
l := promo.NewDeletePromoPriceLogic(c.Request.Context(), svcCtx)
|
||||
err = l.DeletePromoPrice(&req)
|
||||
result.HttpResult(c, nil, err)
|
||||
}
|
||||
}
|
||||
+14
-5
@@ -1,6 +1,9 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/perfect-panel/server/internal/logic/admin/promo"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
@@ -8,19 +11,25 @@ import (
|
||||
"github.com/perfect-panel/server/pkg/result"
|
||||
)
|
||||
|
||||
func DeleteRuleHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
// Delete promo rule
|
||||
func DeletePromoRuleHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
return func(c *gin.Context) {
|
||||
var req types.DeletePromoRuleRequest
|
||||
if err := c.ShouldBindUri(&req); err != nil {
|
||||
result.ParamErrorResult(c, err)
|
||||
id, err := strconv.ParseInt(c.Param("id"), 10, 64)
|
||||
if err != nil {
|
||||
c.String(http.StatusBadRequest, "Invalid Params")
|
||||
c.Abort()
|
||||
return
|
||||
}
|
||||
req.Id = id
|
||||
_ = c.ShouldBind(&req)
|
||||
if err := svcCtx.Validate(&req); err != nil {
|
||||
result.ParamErrorResult(c, err)
|
||||
return
|
||||
}
|
||||
l := promo.NewDeleteRuleLogic(c.Request.Context(), svcCtx)
|
||||
err := l.DeleteRule(&req)
|
||||
|
||||
l := promo.NewDeletePromoRuleLogic(c.Request.Context(), svcCtx)
|
||||
err = l.DeletePromoRule(&req)
|
||||
result.HttpResult(c, nil, err)
|
||||
}
|
||||
}
|
||||
+5
-3
@@ -8,7 +8,8 @@ import (
|
||||
"github.com/perfect-panel/server/pkg/result"
|
||||
)
|
||||
|
||||
func GetPriceListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
// Get promo price list
|
||||
func GetPromoPriceListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
return func(c *gin.Context) {
|
||||
var req types.GetPromoPriceListRequest
|
||||
_ = c.ShouldBind(&req)
|
||||
@@ -16,8 +17,9 @@ func GetPriceListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
result.ParamErrorResult(c, err)
|
||||
return
|
||||
}
|
||||
l := promo.NewGetPriceListLogic(c.Request.Context(), svcCtx)
|
||||
resp, err := l.GetPriceList(&req)
|
||||
|
||||
l := promo.NewGetPromoPriceListLogic(c.Request.Context(), svcCtx)
|
||||
resp, err := l.GetPromoPriceList(&req)
|
||||
result.HttpResult(c, resp, err)
|
||||
}
|
||||
}
|
||||
+14
-5
@@ -1,6 +1,9 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/perfect-panel/server/internal/logic/admin/promo"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
@@ -8,19 +11,25 @@ import (
|
||||
"github.com/perfect-panel/server/pkg/result"
|
||||
)
|
||||
|
||||
func GetRuleDetailHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
// Get promo rule detail
|
||||
func GetPromoRuleDetailHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
return func(c *gin.Context) {
|
||||
var req types.GetPromoRuleDetailRequest
|
||||
if err := c.ShouldBindUri(&req); err != nil {
|
||||
result.ParamErrorResult(c, err)
|
||||
id, err := strconv.ParseInt(c.Param("id"), 10, 64)
|
||||
if err != nil {
|
||||
c.String(http.StatusBadRequest, "Invalid Params")
|
||||
c.Abort()
|
||||
return
|
||||
}
|
||||
req.Id = id
|
||||
_ = c.ShouldBind(&req)
|
||||
if err := svcCtx.Validate(&req); err != nil {
|
||||
result.ParamErrorResult(c, err)
|
||||
return
|
||||
}
|
||||
l := promo.NewGetRuleDetailLogic(c.Request.Context(), svcCtx)
|
||||
resp, err := l.GetRuleDetail(&req)
|
||||
|
||||
l := promo.NewGetPromoRuleDetailLogic(c.Request.Context(), svcCtx)
|
||||
resp, err := l.GetPromoRuleDetail(&req)
|
||||
result.HttpResult(c, resp, err)
|
||||
}
|
||||
}
|
||||
+5
-3
@@ -8,7 +8,8 @@ import (
|
||||
"github.com/perfect-panel/server/pkg/result"
|
||||
)
|
||||
|
||||
func GetRuleListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
// Get promo rule list
|
||||
func GetPromoRuleListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
return func(c *gin.Context) {
|
||||
var req types.GetPromoRuleListRequest
|
||||
_ = c.ShouldBind(&req)
|
||||
@@ -16,8 +17,9 @@ func GetRuleListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
result.ParamErrorResult(c, err)
|
||||
return
|
||||
}
|
||||
l := promo.NewGetRuleListLogic(c.Request.Context(), svcCtx)
|
||||
resp, err := l.GetRuleList(&req)
|
||||
|
||||
l := promo.NewGetPromoRuleListLogic(c.Request.Context(), svcCtx)
|
||||
resp, err := l.GetPromoRuleList(&req)
|
||||
result.HttpResult(c, resp, err)
|
||||
}
|
||||
}
|
||||
+5
-3
@@ -8,7 +8,8 @@ import (
|
||||
"github.com/perfect-panel/server/pkg/result"
|
||||
)
|
||||
|
||||
func GetUsageListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
// Get promo usage list
|
||||
func GetPromoUsageListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
return func(c *gin.Context) {
|
||||
var req types.GetPromoUsageListRequest
|
||||
_ = c.ShouldBind(&req)
|
||||
@@ -16,8 +17,9 @@ func GetUsageListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
result.ParamErrorResult(c, err)
|
||||
return
|
||||
}
|
||||
l := promo.NewGetUsageListLogic(c.Request.Context(), svcCtx)
|
||||
resp, err := l.GetUsageList(&req)
|
||||
|
||||
l := promo.NewGetPromoUsageListLogic(c.Request.Context(), svcCtx)
|
||||
resp, err := l.GetPromoUsageList(&req)
|
||||
result.HttpResult(c, resp, err)
|
||||
}
|
||||
}
|
||||
+13
-5
@@ -1,6 +1,9 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/perfect-panel/server/internal/logic/admin/promo"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
@@ -8,20 +11,25 @@ import (
|
||||
"github.com/perfect-panel/server/pkg/result"
|
||||
)
|
||||
|
||||
func UpdateRuleHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
// Update promo rule
|
||||
func UpdatePromoRuleHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
return func(c *gin.Context) {
|
||||
var req types.UpdatePromoRuleRequest
|
||||
if err := c.ShouldBindUri(&req); err != nil {
|
||||
result.ParamErrorResult(c, err)
|
||||
id, err := strconv.ParseInt(c.Param("id"), 10, 64)
|
||||
if err != nil {
|
||||
c.String(http.StatusBadRequest, "Invalid Params")
|
||||
c.Abort()
|
||||
return
|
||||
}
|
||||
_ = c.ShouldBind(&req)
|
||||
req.Id = id
|
||||
if err := svcCtx.Validate(&req); err != nil {
|
||||
result.ParamErrorResult(c, err)
|
||||
return
|
||||
}
|
||||
l := promo.NewUpdateRuleLogic(c.Request.Context(), svcCtx)
|
||||
resp, err := l.UpdateRule(&req)
|
||||
|
||||
l := promo.NewUpdatePromoRuleLogic(c.Request.Context(), svcCtx)
|
||||
resp, err := l.UpdatePromoRule(&req)
|
||||
result.HttpResult(c, resp, err)
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,6 @@
|
||||
package user
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/perfect-panel/server/internal/logic/admin/user"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
@@ -21,25 +18,9 @@ func UpdateUserSubscribeHandler(svcCtx *svc.ServiceContext) func(c *gin.Context)
|
||||
result.ParamErrorResult(c, validateErr)
|
||||
return
|
||||
}
|
||||
if err := validateUpdateUserSubscribeTrafficLimit(&req); err != nil {
|
||||
result.ParamErrorResult(c, err)
|
||||
return
|
||||
}
|
||||
|
||||
l := user.NewUpdateUserSubscribeLogic(c.Request.Context(), svcCtx)
|
||||
err := l.UpdateUserSubscribe(&req)
|
||||
result.HttpResult(c, nil, err)
|
||||
}
|
||||
}
|
||||
|
||||
func validateUpdateUserSubscribeTrafficLimit(req *types.UpdateUserSubscribeRequest) error {
|
||||
if req.TrafficLimit == nil || *req.TrafficLimit == "" {
|
||||
return nil
|
||||
}
|
||||
|
||||
var rules []types.TrafficLimit
|
||||
if err := json.Unmarshal([]byte(*req.TrafficLimit), &rules); err != nil {
|
||||
return errors.New("traffic_limit must be a valid JSON array")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -1,59 +0,0 @@
|
||||
package user
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
)
|
||||
|
||||
func TestUpdateUserSubscribeHandlerRejectsInvalidLimits(t *testing.T) {
|
||||
gin.SetMode(gin.TestMode)
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
body string
|
||||
}{
|
||||
{
|
||||
name: "negative speed limit",
|
||||
body: `{"user_subscribe_id":1,"subscribe_id":1,"traffic":0,"expired_at":4102444800000,"upload":0,"download":0,"speed_limit":-1}`,
|
||||
},
|
||||
{
|
||||
name: "invalid traffic limit json",
|
||||
body: `{"user_subscribe_id":1,"subscribe_id":1,"traffic":0,"expired_at":4102444800000,"upload":0,"download":0,"traffic_limit":"not-json"}`,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
router := gin.New()
|
||||
router.PUT("/v1/admin/user/subscribe", UpdateUserSubscribeHandler(&svc.ServiceContext{}))
|
||||
|
||||
req := httptest.NewRequest(http.MethodPut, "/v1/admin/user/subscribe", bytes.NewBufferString(tt.body))
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
rec := httptest.NewRecorder()
|
||||
|
||||
router.ServeHTTP(rec, req)
|
||||
|
||||
if rec.Code != http.StatusOK {
|
||||
t.Fatalf("expected HTTP 200, got %d", rec.Code)
|
||||
}
|
||||
|
||||
var resp struct {
|
||||
Code uint32 `json:"code"`
|
||||
Msg string `json:"msg"`
|
||||
}
|
||||
if err := json.Unmarshal(rec.Body.Bytes(), &resp); err != nil {
|
||||
t.Fatalf("unmarshal response: %v", err)
|
||||
}
|
||||
if resp.Code != xerr.InvalidParams {
|
||||
t.Fatalf("expected code %d, got %d (%s)", xerr.InvalidParams, resp.Code, resp.Msg)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package common
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
authHandler "github.com/perfect-panel/server/internal/handler/auth"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
)
|
||||
|
||||
func CheckCodeLegacyHandler(svcCtx *svc.ServiceContext) gin.HandlerFunc {
|
||||
return authHandler.CheckCodeLegacyV1Handler(svcCtx)
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package common
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
authHandler "github.com/perfect-panel/server/internal/handler/auth"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
)
|
||||
|
||||
func CheckCodeLegacyV2Handler(svcCtx *svc.ServiceContext) gin.HandlerFunc {
|
||||
return authHandler.CheckCodeLegacyV2Handler(svcCtx)
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
package common
|
||||
@@ -1 +0,0 @@
|
||||
package common
|
||||
@@ -1,11 +0,0 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
serverhandler "github.com/perfect-panel/server/internal/handler/server"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
)
|
||||
|
||||
func GetServerConfigHandler(svcCtx *svc.ServiceContext) gin.HandlerFunc {
|
||||
return serverhandler.GetServerConfigHandler(svcCtx)
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
serverhandler "github.com/perfect-panel/server/internal/handler/server"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
)
|
||||
|
||||
func GetServerUserListHandler(svcCtx *svc.ServiceContext) gin.HandlerFunc {
|
||||
return serverhandler.GetServerUserListHandler(svcCtx)
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
serverhandler "github.com/perfect-panel/server/internal/handler/server"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
)
|
||||
|
||||
func PushOnlineUsersHandler(svcCtx *svc.ServiceContext) gin.HandlerFunc {
|
||||
return serverhandler.PushOnlineUsersHandler(svcCtx)
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
serverhandler "github.com/perfect-panel/server/internal/handler/server"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
)
|
||||
|
||||
func QueryServerProtocolConfigHandler(svcCtx *svc.ServiceContext) gin.HandlerFunc {
|
||||
return serverhandler.QueryServerProtocolConfigHandler(svcCtx)
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
serverhandler "github.com/perfect-panel/server/internal/handler/server"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
)
|
||||
|
||||
func ServerPushStatusHandler(svcCtx *svc.ServiceContext) gin.HandlerFunc {
|
||||
return serverhandler.ServerPushStatusHandler(svcCtx)
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
serverhandler "github.com/perfect-panel/server/internal/handler/server"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
)
|
||||
|
||||
func ServerPushUserTrafficHandler(svcCtx *svc.ServiceContext) gin.HandlerFunc {
|
||||
return serverhandler.ServerPushUserTrafficHandler(svcCtx)
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
package apple
|
||||
@@ -1 +0,0 @@
|
||||
package apple
|
||||
@@ -1 +0,0 @@
|
||||
package apple
|
||||
@@ -1 +0,0 @@
|
||||
package apple
|
||||
+5
-5
@@ -8,10 +8,10 @@ import (
|
||||
"github.com/perfect-panel/server/pkg/result"
|
||||
)
|
||||
|
||||
// Get invite gift records
|
||||
func GetInviteRecordsHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
// Get invite sales data
|
||||
func GetInviteSalesHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
return func(c *gin.Context) {
|
||||
var req types.GetInviteRecordsRequest
|
||||
var req types.GetInviteSalesRequest
|
||||
if err := c.ShouldBind(&req); err != nil {
|
||||
result.ParamErrorResult(c, err)
|
||||
return
|
||||
@@ -23,8 +23,8 @@ func GetInviteRecordsHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
l := user.NewGetInviteRecordsLogic(c.Request.Context(), svcCtx)
|
||||
resp, err := l.GetInviteRecords(&req)
|
||||
l := user.NewGetInviteSalesLogic(c.Request.Context(), svcCtx)
|
||||
resp, err := l.GetInviteSales(&req)
|
||||
result.HttpResult(c, resp, err)
|
||||
}
|
||||
}
|
||||
+1159
-2292
File diff suppressed because it is too large
Load Diff
@@ -1,203 +0,0 @@
|
||||
package invite
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
modellog "github.com/perfect-panel/server/internal/model/log"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type Benefits struct {
|
||||
OrderCount int64
|
||||
HasPurchased bool
|
||||
InviterCommission int64
|
||||
InviterGiftDays int64
|
||||
InviteeGiftDays int64
|
||||
}
|
||||
|
||||
type InviteRelation struct {
|
||||
InviteeId int64
|
||||
InviterId int64
|
||||
}
|
||||
|
||||
type paidOrderRow struct {
|
||||
UserId int64 `gorm:"column:user_id"`
|
||||
OrderNo string `gorm:"column:order_no"`
|
||||
}
|
||||
|
||||
type systemLogRow struct {
|
||||
ObjectID int64 `gorm:"column:object_id"`
|
||||
Content string `gorm:"column:content"`
|
||||
}
|
||||
|
||||
func NormalizePage(page, size int) (int, int) {
|
||||
if page < 1 {
|
||||
page = 1
|
||||
}
|
||||
if size < 1 {
|
||||
size = 10
|
||||
}
|
||||
if size > 100 {
|
||||
size = 100
|
||||
}
|
||||
return page, size
|
||||
}
|
||||
|
||||
func QueryBenefits(ctx context.Context, db *gorm.DB, relations []InviteRelation) (map[int64]Benefits, error) {
|
||||
result := make(map[int64]Benefits, len(relations))
|
||||
if len(relations) == 0 {
|
||||
return result, nil
|
||||
}
|
||||
|
||||
inviteeIds := make([]int64, 0, len(relations))
|
||||
inviteeToInviter := make(map[int64]int64, len(relations))
|
||||
for _, relation := range relations {
|
||||
inviteeIds = append(inviteeIds, relation.InviteeId)
|
||||
inviteeToInviter[relation.InviteeId] = relation.InviterId
|
||||
result[relation.InviteeId] = Benefits{}
|
||||
}
|
||||
|
||||
var orderCounts []struct {
|
||||
UserId int64 `gorm:"column:user_id"`
|
||||
Cnt int64 `gorm:"column:cnt"`
|
||||
}
|
||||
if err := db.WithContext(ctx).
|
||||
Table("`order`").
|
||||
Select("user_id, COUNT(*) as cnt").
|
||||
Where("user_id IN ? AND status IN ?", inviteeIds, []int{2, 5}).
|
||||
Group("user_id").
|
||||
Scan(&orderCounts).Error; err != nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "count invitee paid orders failed: %v", err)
|
||||
}
|
||||
for _, row := range orderCounts {
|
||||
benefit := result[row.UserId]
|
||||
benefit.OrderCount = row.Cnt
|
||||
benefit.HasPurchased = row.Cnt > 0
|
||||
result[row.UserId] = benefit
|
||||
}
|
||||
|
||||
var paidOrders []paidOrderRow
|
||||
if err := db.WithContext(ctx).
|
||||
Table("`order`").
|
||||
Select("user_id, order_no").
|
||||
Where("user_id IN ? AND status IN ?", inviteeIds, []int{2, 5}).
|
||||
Scan(&paidOrders).Error; err != nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query invitee paid orders failed: %v", err)
|
||||
}
|
||||
if len(paidOrders) == 0 {
|
||||
return result, nil
|
||||
}
|
||||
|
||||
orderNos := make([]string, 0, len(paidOrders))
|
||||
orderToInvitee := make(map[string]int64, len(paidOrders))
|
||||
inviterIds := make([]int64, 0, len(relations))
|
||||
inviteeAndInviterSet := make(map[int64]struct{}, len(relations)*2)
|
||||
for _, order := range paidOrders {
|
||||
orderNos = append(orderNos, order.OrderNo)
|
||||
orderToInvitee[order.OrderNo] = order.UserId
|
||||
}
|
||||
for _, relation := range relations {
|
||||
inviterIds = append(inviterIds, relation.InviterId)
|
||||
inviteeAndInviterSet[relation.InviteeId] = struct{}{}
|
||||
inviteeAndInviterSet[relation.InviterId] = struct{}{}
|
||||
}
|
||||
inviteeAndInviterIds := make([]int64, 0, len(inviteeAndInviterSet))
|
||||
for userId := range inviteeAndInviterSet {
|
||||
inviteeAndInviterIds = append(inviteeAndInviterIds, userId)
|
||||
}
|
||||
|
||||
if err := fillCommissionBenefits(ctx, db, result, orderToInvitee, inviteeToInviter, orderNos, inviterIds); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := fillGiftBenefits(ctx, db, result, orderToInvitee, inviteeToInviter, orderNos, inviteeAndInviterIds); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func fillCommissionBenefits(ctx context.Context, db *gorm.DB, benefits map[int64]Benefits, orderToInvitee map[string]int64, inviteeToInviter map[int64]int64, orderNos []string, inviterIds []int64) error {
|
||||
var rows []systemLogRow
|
||||
if err := db.WithContext(ctx).
|
||||
Table("system_logs").
|
||||
Select("object_id, content").
|
||||
Where("type = ? AND object_id IN ? AND JSON_UNQUOTE(JSON_EXTRACT(content, '$.order_no')) IN ? AND JSON_EXTRACT(content, '$.type') IN ?", modellog.TypeCommission.Uint8(), inviterIds, orderNos, []int{int(modellog.CommissionTypePurchase), int(modellog.CommissionTypeRenewal)}).
|
||||
Scan(&rows).Error; err != nil {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query invite commission logs failed: %v", err)
|
||||
}
|
||||
for _, row := range rows {
|
||||
content := modellog.Commission{}
|
||||
if err := content.Unmarshal([]byte(row.Content)); err != nil {
|
||||
continue
|
||||
}
|
||||
inviteeId, ok := orderToInvitee[content.OrderNo]
|
||||
if !ok || inviteeToInviter[inviteeId] != row.ObjectID {
|
||||
continue
|
||||
}
|
||||
benefit := benefits[inviteeId]
|
||||
benefit.InviterCommission += content.Amount
|
||||
benefits[inviteeId] = benefit
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func fillGiftBenefits(ctx context.Context, db *gorm.DB, benefits map[int64]Benefits, orderToInvitee map[string]int64, inviteeToInviter map[int64]int64, orderNos []string, userIds []int64) error {
|
||||
var rows []systemLogRow
|
||||
if err := db.WithContext(ctx).
|
||||
Table("system_logs").
|
||||
Select("object_id, content").
|
||||
Where("type = ? AND object_id IN ? AND JSON_UNQUOTE(JSON_EXTRACT(content, '$.order_no')) IN ?", modellog.TypeGift.Uint8(), userIds, orderNos).
|
||||
Scan(&rows).Error; err != nil {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query invite gift logs failed: %v", err)
|
||||
}
|
||||
for _, row := range rows {
|
||||
content := modellog.Gift{}
|
||||
if err := content.Unmarshal([]byte(row.Content)); err != nil {
|
||||
continue
|
||||
}
|
||||
if content.Type != modellog.GiftTypeIncrease {
|
||||
continue
|
||||
}
|
||||
inviteeId, ok := orderToInvitee[content.OrderNo]
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
benefit := benefits[inviteeId]
|
||||
switch row.ObjectID {
|
||||
case inviteeToInviter[inviteeId]:
|
||||
benefit.InviterGiftDays += content.Amount
|
||||
case inviteeId:
|
||||
benefit.InviteeGiftDays += content.Amount
|
||||
default:
|
||||
continue
|
||||
}
|
||||
benefits[inviteeId] = benefit
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func QueryIdentifiers(ctx context.Context, db *gorm.DB, userIds []int64) (map[int64]string, error) {
|
||||
identifiers := make(map[int64]string, len(userIds))
|
||||
if len(userIds) == 0 {
|
||||
return identifiers, nil
|
||||
}
|
||||
|
||||
type identifierRow struct {
|
||||
UserId int64 `gorm:"column:user_id"`
|
||||
Identifier string `gorm:"column:identifier"`
|
||||
}
|
||||
var rows []identifierRow
|
||||
if err := db.WithContext(ctx).
|
||||
Table("user_auth_methods uam").
|
||||
Select("uam.user_id, uam.auth_identifier as identifier").
|
||||
Joins("JOIN (SELECT user_id, MIN(id) AS id FROM user_auth_methods WHERE user_id IN ? GROUP BY user_id) first_uam ON first_uam.id = uam.id", userIds).
|
||||
Scan(&rows).Error; err != nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query user identifiers failed: %v", err)
|
||||
}
|
||||
for _, row := range rows {
|
||||
identifiers[row.UserId] = row.Identifier
|
||||
}
|
||||
return identifiers, nil
|
||||
}
|
||||
@@ -1,117 +0,0 @@
|
||||
package invite
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type GetInviteManageListLogic struct {
|
||||
logger.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewGetInviteManageListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetInviteManageListLogic {
|
||||
return &GetInviteManageListLogic{
|
||||
Logger: logger.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *GetInviteManageListLogic) GetInviteManageList(req *types.GetInviteManageListRequest) (resp *types.GetInviteManageListResponse, err error) {
|
||||
req.Page, req.Size = NormalizePage(req.Page, req.Size)
|
||||
|
||||
type inviteRow struct {
|
||||
InviteeId int64 `gorm:"column:invitee_id"`
|
||||
InviteeAvatar string `gorm:"column:invitee_avatar"`
|
||||
InviteeEnable bool `gorm:"column:invitee_enable"`
|
||||
InvitedAt int64 `gorm:"column:invited_at"`
|
||||
InviterId int64 `gorm:"column:inviter_id"`
|
||||
}
|
||||
|
||||
baseQuery := applyInviteManageFilters(l.svcCtx.DB.WithContext(l.ctx).
|
||||
Table("user invitee").
|
||||
Where("invitee.referer_id > 0 AND invitee.deleted_at IS NULL"), req)
|
||||
|
||||
var total int64
|
||||
if err = baseQuery.Count(&total).Error; err != nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "count invite manage records failed: %v", err)
|
||||
}
|
||||
|
||||
var rows []inviteRow
|
||||
if err = applyInviteManageFilters(l.svcCtx.DB.WithContext(l.ctx).
|
||||
Table("user invitee").
|
||||
Select("invitee.id as invitee_id, invitee.avatar as invitee_avatar, invitee.enable as invitee_enable, UNIX_TIMESTAMP(invitee.created_at) as invited_at, invitee.referer_id as inviter_id").
|
||||
Where("invitee.referer_id > 0 AND invitee.deleted_at IS NULL"), req).
|
||||
Order("invitee.created_at DESC").
|
||||
Limit(req.Size).
|
||||
Offset((req.Page - 1) * req.Size).
|
||||
Scan(&rows).Error; err != nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query invite manage records failed: %v", err)
|
||||
}
|
||||
|
||||
relations := make([]InviteRelation, 0, len(rows))
|
||||
userIds := make([]int64, 0, len(rows)*2)
|
||||
for _, row := range rows {
|
||||
relations = append(relations, InviteRelation{InviteeId: row.InviteeId, InviterId: row.InviterId})
|
||||
userIds = append(userIds, row.InviteeId, row.InviterId)
|
||||
}
|
||||
|
||||
benefits, err := QueryBenefits(l.ctx, l.svcCtx.DB, relations)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
identifiers, err := QueryIdentifiers(l.ctx, l.svcCtx.DB, userIds)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
list := make([]types.InviteManageRecord, 0, len(rows))
|
||||
for _, row := range rows {
|
||||
benefit := benefits[row.InviteeId]
|
||||
list = append(list, types.InviteManageRecord{
|
||||
InviterId: row.InviterId,
|
||||
InviterIdentifier: identifiers[row.InviterId],
|
||||
InviteeId: row.InviteeId,
|
||||
InviteeIdentifier: identifiers[row.InviteeId],
|
||||
InviteeAvatar: row.InviteeAvatar,
|
||||
InviteeEnable: row.InviteeEnable,
|
||||
InvitedAt: row.InvitedAt,
|
||||
OrderCount: benefit.OrderCount,
|
||||
HasPurchased: benefit.HasPurchased,
|
||||
InviterCommission: benefit.InviterCommission,
|
||||
InviterGiftDays: benefit.InviterGiftDays,
|
||||
InviteeGiftDays: benefit.InviteeGiftDays,
|
||||
})
|
||||
}
|
||||
|
||||
return &types.GetInviteManageListResponse{
|
||||
Total: total,
|
||||
List: list,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func applyInviteManageFilters(db *gorm.DB, req *types.GetInviteManageListRequest) *gorm.DB {
|
||||
if req.InviterId > 0 {
|
||||
db = db.Where("invitee.referer_id = ?", req.InviterId)
|
||||
}
|
||||
if req.InviteeId > 0 {
|
||||
db = db.Where("invitee.id = ?", req.InviteeId)
|
||||
}
|
||||
if req.Search != "" {
|
||||
search := "%" + req.Search + "%"
|
||||
db = db.Where(
|
||||
"(EXISTS (SELECT 1 FROM user_auth_methods inviter_auth WHERE inviter_auth.user_id = invitee.referer_id AND inviter_auth.auth_identifier LIKE ?) OR EXISTS (SELECT 1 FROM user_auth_methods invitee_auth WHERE invitee_auth.user_id = invitee.id AND invitee_auth.auth_identifier LIKE ?))",
|
||||
search,
|
||||
search,
|
||||
)
|
||||
}
|
||||
return db
|
||||
}
|
||||
@@ -0,0 +1,128 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
promoModel "github.com/perfect-panel/server/internal/model/promo"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
const (
|
||||
enabledRulesCacheKey = "promo:rules:enabled"
|
||||
subscribePromoKeyFmt = "promo:subscribe:%d"
|
||||
)
|
||||
|
||||
type ruleParams struct {
|
||||
WindowHours int `json:"window_hours"`
|
||||
InactiveMonths int `json:"inactive_months"`
|
||||
}
|
||||
|
||||
func validateRulePayload(ruleType string, params json.RawMessage, priority, startTime, endTime int64) error {
|
||||
if priority < 0 {
|
||||
return xerr.NewErrCodeMsg(xerr.InvalidParams, "priority must be greater than or equal to 0")
|
||||
}
|
||||
if startTime >= endTime {
|
||||
return xerr.NewErrCodeMsg(xerr.InvalidParams, "start_time must be less than end_time")
|
||||
}
|
||||
|
||||
var p ruleParams
|
||||
if len(params) == 0 || !json.Valid(params) {
|
||||
return xerr.NewErrCodeMsg(xerr.InvalidParams, "params must be valid json")
|
||||
}
|
||||
if err := json.Unmarshal(params, &p); err != nil {
|
||||
return xerr.NewErrCodeMsg(xerr.InvalidParams, "params must be valid json object")
|
||||
}
|
||||
|
||||
switch ruleType {
|
||||
case promoModel.RuleTypeNewUser:
|
||||
if p.WindowHours <= 0 {
|
||||
return xerr.NewErrCodeMsg(xerr.InvalidParams, "params.window_hours must be greater than 0")
|
||||
}
|
||||
case promoModel.RuleTypeInactiveUser:
|
||||
if p.InactiveMonths <= 0 {
|
||||
return xerr.NewErrCodeMsg(xerr.InvalidParams, "params.inactive_months must be greater than 0")
|
||||
}
|
||||
case promoModel.RuleTypeCampaign:
|
||||
return nil
|
||||
default:
|
||||
return xerr.NewErrCodeMsg(xerr.InvalidParams, "type must be new_user, inactive_user or campaign")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func toRuleResponse(data *promoModel.Rule) types.PromoRule {
|
||||
resp := types.PromoRule{
|
||||
Id: data.Id,
|
||||
Name: data.Name,
|
||||
Type: data.Type,
|
||||
Params: json.RawMessage(data.Params),
|
||||
Priority: data.Priority,
|
||||
Enabled: data.Enabled,
|
||||
CreatedAt: data.CreatedAt.UnixMilli(),
|
||||
UpdatedAt: data.UpdatedAt.UnixMilli(),
|
||||
}
|
||||
if data.StartTime != nil {
|
||||
resp.StartTime = data.StartTime.UnixMilli()
|
||||
}
|
||||
if data.EndTime != nil {
|
||||
resp.EndTime = data.EndTime.UnixMilli()
|
||||
}
|
||||
return resp
|
||||
}
|
||||
|
||||
func toPriceResponse(data *promoModel.SubscribePromo, unitPrice int64) types.PromoPrice {
|
||||
return types.PromoPrice{
|
||||
Id: data.Id,
|
||||
SubscribeId: data.SubscribeId,
|
||||
PromoRuleId: data.PromoRuleId,
|
||||
PromoPrice: data.PromoPrice,
|
||||
UnitPrice: unitPrice,
|
||||
CreatedAt: data.CreatedAt.UnixMilli(),
|
||||
UpdatedAt: data.UpdatedAt.UnixMilli(),
|
||||
}
|
||||
}
|
||||
|
||||
func toUsageResponse(data *promoModel.Usage) types.PromoUsage {
|
||||
return types.PromoUsage{
|
||||
Id: data.Id,
|
||||
UserId: data.UserId,
|
||||
PromoRuleId: data.PromoRuleId,
|
||||
SubscribeId: data.SubscribeId,
|
||||
OrderNo: data.OrderNo,
|
||||
PromoPrice: data.PromoPrice,
|
||||
CreatedAt: data.CreatedAt.UnixMilli(),
|
||||
}
|
||||
}
|
||||
|
||||
func ruleTimes(startTime, endTime int64) (*time.Time, *time.Time) {
|
||||
start := time.UnixMilli(startTime)
|
||||
end := time.UnixMilli(endTime)
|
||||
return &start, &end
|
||||
}
|
||||
|
||||
func clearRuleCache(ctx context.Context, svcCtx *svc.ServiceContext) {
|
||||
if svcCtx != nil && svcCtx.Redis != nil {
|
||||
_ = svcCtx.Redis.Del(ctx, enabledRulesCacheKey).Err()
|
||||
}
|
||||
}
|
||||
|
||||
func clearSubscribePromoCache(ctx context.Context, svcCtx *svc.ServiceContext, ids ...int64) {
|
||||
if svcCtx == nil || svcCtx.Redis == nil || len(ids) == 0 {
|
||||
return
|
||||
}
|
||||
keys := make([]string, 0, len(ids))
|
||||
for _, id := range ids {
|
||||
keys = append(keys, fmt.Sprintf(subscribePromoKeyFmt, id))
|
||||
}
|
||||
_ = svcCtx.Redis.Del(ctx, keys...).Err()
|
||||
}
|
||||
|
||||
func wrapQueryError(msg string, err error) error {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "%s: %v", msg, err.Error())
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
promoModel "github.com/perfect-panel/server/internal/model/promo"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
type CreatePromoPriceLogic struct {
|
||||
logger.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
// Batch set promo price
|
||||
func NewCreatePromoPriceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CreatePromoPriceLogic {
|
||||
return &CreatePromoPriceLogic{
|
||||
Logger: logger.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *CreatePromoPriceLogic) CreatePromoPrice(req *types.CreatePromoPriceRequest) error {
|
||||
if _, err := l.svcCtx.PromoModel.FindRule(l.ctx, req.PromoRuleId); err != nil {
|
||||
if promoModel.IsNotFound(err) {
|
||||
return xerr.NewErrCodeMsg(xerr.InvalidParams, "promo rule not found")
|
||||
}
|
||||
l.Errorw("[CreatePromoPrice] Query Rule Error", logger.Field("error", err.Error()))
|
||||
return wrapQueryError("get promo rule failed", err)
|
||||
}
|
||||
|
||||
data := make([]*promoModel.SubscribePromo, 0, len(req.Items))
|
||||
subscribeIds := make([]int64, 0, len(req.Items))
|
||||
for _, item := range req.Items {
|
||||
sub, err := l.svcCtx.SubscribeModel.FindOne(l.ctx, item.SubscribeId)
|
||||
if err != nil {
|
||||
return xerr.NewErrCodeMsg(xerr.InvalidParams, "subscribe not found")
|
||||
}
|
||||
if item.PromoPrice >= sub.UnitPrice {
|
||||
return xerr.NewErrCodeMsg(xerr.InvalidParams, "promo_price must be less than unit_price")
|
||||
}
|
||||
data = append(data, &promoModel.SubscribePromo{
|
||||
SubscribeId: item.SubscribeId,
|
||||
PromoRuleId: req.PromoRuleId,
|
||||
PromoPrice: item.PromoPrice,
|
||||
})
|
||||
subscribeIds = append(subscribeIds, item.SubscribeId)
|
||||
}
|
||||
|
||||
if err := l.svcCtx.PromoModel.UpsertSubscribePromos(l.ctx, data); err != nil {
|
||||
l.Errorw("[CreatePromoPrice] Database Error", logger.Field("error", err.Error()))
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "set promo price failed: %v", err.Error())
|
||||
}
|
||||
clearSubscribePromoCache(l.ctx, l.svcCtx, subscribeIds...)
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
promoModel "github.com/perfect-panel/server/internal/model/promo"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
type CreatePromoRuleLogic struct {
|
||||
logger.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
// Create promo rule
|
||||
func NewCreatePromoRuleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CreatePromoRuleLogic {
|
||||
return &CreatePromoRuleLogic{
|
||||
Logger: logger.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *CreatePromoRuleLogic) CreatePromoRule(req *types.CreatePromoRuleRequest) (*types.PromoRule, error) {
|
||||
if err := validateRulePayload(req.Type, req.Params, req.Priority, req.StartTime, req.EndTime); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
start, end := ruleTimes(req.StartTime, req.EndTime)
|
||||
data := &promoModel.Rule{
|
||||
Name: req.Name,
|
||||
Type: req.Type,
|
||||
Params: string(req.Params),
|
||||
Priority: req.Priority,
|
||||
Enabled: *req.Enabled,
|
||||
StartTime: start,
|
||||
EndTime: end,
|
||||
}
|
||||
if err := l.svcCtx.PromoModel.InsertRule(l.ctx, data); err != nil {
|
||||
l.Errorw("[CreatePromoRule] Database Error", logger.Field("error", err.Error()))
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "create promo rule failed: %v", err.Error())
|
||||
}
|
||||
clearRuleCache(l.ctx, l.svcCtx)
|
||||
resp := toRuleResponse(data)
|
||||
return &resp, nil
|
||||
}
|
||||
@@ -1,58 +0,0 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
promomodel "github.com/perfect-panel/server/internal/model/promo"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
type CreateRuleLogic struct {
|
||||
logger.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewCreateRuleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CreateRuleLogic {
|
||||
return &CreateRuleLogic{
|
||||
Logger: logger.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *CreateRuleLogic) CreateRule(req *types.CreatePromoRuleRequest) (*types.PromoRule, error) {
|
||||
if err := validateRuleInput(req.Type, req.Params, req.Priority, req.StartTime, req.EndTime); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
params, err := paramsToString(req.Params)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
enabled := true
|
||||
if req.Enabled != nil {
|
||||
enabled = *req.Enabled
|
||||
}
|
||||
rule := &promomodel.Rule{
|
||||
Name: req.Name,
|
||||
Type: req.Type,
|
||||
Params: params,
|
||||
Priority: req.Priority,
|
||||
Enabled: enabled,
|
||||
StartTime: unixPtrToTimePtr(req.StartTime),
|
||||
EndTime: unixPtrToTimePtr(req.EndTime),
|
||||
}
|
||||
if err := l.svcCtx.PromoModel.InsertRule(l.ctx, rule); err != nil {
|
||||
l.Errorw("[CreatePromoRule] Database Error", logger.Field("error", err.Error()))
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "create promo rule error: %v", err.Error())
|
||||
}
|
||||
if err := l.svcCtx.Redis.Del(l.ctx, ruleCacheKey).Err(); err != nil {
|
||||
l.Errorw("[CreatePromoRule] Delete Cache Error", logger.Field("error", err.Error()))
|
||||
}
|
||||
resp := convertRule(rule)
|
||||
return &resp, nil
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"context"
|
||||
stderrors "errors"
|
||||
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type DeletePriceLogic struct {
|
||||
logger.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewDeletePriceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DeletePriceLogic {
|
||||
return &DeletePriceLogic{
|
||||
Logger: logger.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *DeletePriceLogic) DeletePrice(req *types.DeletePromoPriceRequest) error {
|
||||
price, err := l.svcCtx.PromoModel.FindPrice(l.ctx, req.Id)
|
||||
if err != nil {
|
||||
if stderrors.Is(err, gorm.ErrRecordNotFound) {
|
||||
l.Errorw("[DeletePromoPrice] Price Not Found", logger.Field("id", req.Id))
|
||||
return errors.Wrapf(xerr.NewErrCodeMsg(404, "promo price not found"), "promo price not found: %d", req.Id)
|
||||
}
|
||||
l.Errorw("[DeletePromoPrice] Find Price Error", logger.Field("error", err.Error()))
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find promo price error: %v", err.Error())
|
||||
}
|
||||
if err := l.svcCtx.PromoModel.DeletePrice(l.ctx, req.Id); err != nil {
|
||||
l.Errorw("[DeletePromoPrice] Database Error", logger.Field("error", err.Error()))
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), "delete promo price error: %v", err.Error())
|
||||
}
|
||||
if err := l.svcCtx.Redis.Del(l.ctx, subscribePromoCacheKey(price.SubscribeId)).Err(); err != nil {
|
||||
l.Errorw("[DeletePromoPrice] Delete Cache Error", logger.Field("error", err.Error()))
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
promoModel "github.com/perfect-panel/server/internal/model/promo"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
type DeletePromoPriceLogic struct {
|
||||
logger.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
// Delete promo price
|
||||
func NewDeletePromoPriceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DeletePromoPriceLogic {
|
||||
return &DeletePromoPriceLogic{
|
||||
Logger: logger.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *DeletePromoPriceLogic) DeletePromoPrice(req *types.DeletePromoPriceRequest) error {
|
||||
data, err := l.svcCtx.PromoModel.FindSubscribePromo(l.ctx, req.Id)
|
||||
if err != nil {
|
||||
if promoModel.IsNotFound(err) {
|
||||
return xerr.NewErrCodeMsg(xerr.InvalidParams, "promo price not found")
|
||||
}
|
||||
l.Errorw("[DeletePromoPrice] Database Query Error", logger.Field("error", err.Error()))
|
||||
return wrapQueryError("get promo price failed", err)
|
||||
}
|
||||
|
||||
if err = l.svcCtx.PromoModel.DeleteSubscribePromo(l.ctx, req.Id); err != nil {
|
||||
l.Errorw("[DeletePromoPrice] Database Delete Error", logger.Field("error", err.Error()))
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), "delete promo price failed: %v", err.Error())
|
||||
}
|
||||
clearSubscribePromoCache(l.ctx, l.svcCtx, data.SubscribeId)
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
promoModel "github.com/perfect-panel/server/internal/model/promo"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
type DeletePromoRuleLogic struct {
|
||||
logger.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
// Delete promo rule
|
||||
func NewDeletePromoRuleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DeletePromoRuleLogic {
|
||||
return &DeletePromoRuleLogic{
|
||||
Logger: logger.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *DeletePromoRuleLogic) DeletePromoRule(req *types.DeletePromoRuleRequest) error {
|
||||
if err := l.svcCtx.PromoModel.DeleteRule(l.ctx, req.Id); err != nil {
|
||||
if promoModel.IsNotFound(err) {
|
||||
return xerr.NewErrCodeMsg(xerr.InvalidParams, "promo rule not found")
|
||||
}
|
||||
l.Errorw("[DeletePromoRule] Database Delete Error", logger.Field("error", err.Error()))
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), "delete promo rule failed: %v", err.Error())
|
||||
}
|
||||
clearRuleCache(l.ctx, l.svcCtx)
|
||||
return nil
|
||||
}
|
||||
@@ -1,46 +0,0 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"context"
|
||||
stderrors "errors"
|
||||
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type DeleteRuleLogic struct {
|
||||
logger.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewDeleteRuleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DeleteRuleLogic {
|
||||
return &DeleteRuleLogic{
|
||||
Logger: logger.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *DeleteRuleLogic) DeleteRule(req *types.DeletePromoRuleRequest) error {
|
||||
if _, err := l.svcCtx.PromoModel.FindRule(l.ctx, req.Id); err != nil {
|
||||
if stderrors.Is(err, gorm.ErrRecordNotFound) {
|
||||
l.Errorw("[DeletePromoRule] Rule Not Found", logger.Field("id", req.Id))
|
||||
return errors.Wrapf(xerr.NewErrCodeMsg(404, "promo rule not found"), "promo rule not found: %d", req.Id)
|
||||
}
|
||||
l.Errorw("[DeletePromoRule] Find Rule Error", logger.Field("error", err.Error()))
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find promo rule error: %v", err.Error())
|
||||
}
|
||||
if err := l.svcCtx.PromoModel.DeleteRule(l.ctx, req.Id); err != nil {
|
||||
l.Errorw("[DeletePromoRule] Database Error", logger.Field("error", err.Error()))
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), "delete promo rule error: %v", err.Error())
|
||||
}
|
||||
if err := l.svcCtx.Redis.Del(l.ctx, ruleCacheKey).Err(); err != nil {
|
||||
l.Errorw("[DeletePromoRule] Delete Cache Error", logger.Field("error", err.Error()))
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -1,93 +0,0 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"context"
|
||||
"testing"
|
||||
|
||||
promomodel "github.com/perfect-panel/server/internal/model/promo"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
pkgerrors "github.com/pkg/errors"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type fakePromoModel struct{}
|
||||
|
||||
func (fakePromoModel) QueryEligibleRules(context.Context, int64, int64) ([]*promomodel.RuleWithPrice, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (fakePromoModel) InsertUsage(context.Context, *promomodel.Usage, ...*gorm.DB) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (fakePromoModel) InsertRule(context.Context, *promomodel.Rule) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (fakePromoModel) FindRule(context.Context, int64) (*promomodel.Rule, error) {
|
||||
return nil, gorm.ErrRecordNotFound
|
||||
}
|
||||
|
||||
func (fakePromoModel) UpdateRule(context.Context, *promomodel.Rule) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (fakePromoModel) DeleteRule(context.Context, int64) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (fakePromoModel) QueryRuleList(context.Context, int, int, string, *bool, string) (int64, []*promomodel.Rule, error) {
|
||||
return 0, nil, nil
|
||||
}
|
||||
|
||||
func (fakePromoModel) UpsertPrices(context.Context, int64, []*promomodel.SubscribePromo) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (fakePromoModel) FindPrice(context.Context, int64) (*promomodel.SubscribePromo, error) {
|
||||
return nil, gorm.ErrRecordNotFound
|
||||
}
|
||||
|
||||
func (fakePromoModel) DeletePrice(context.Context, int64) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (fakePromoModel) QueryPriceList(context.Context, int64, int, int) (int64, []*promomodel.SubscribePromo, error) {
|
||||
return 0, nil, nil
|
||||
}
|
||||
|
||||
func (fakePromoModel) QueryUsageList(context.Context, promomodel.UsageFilter) (int64, []*promomodel.Usage, error) {
|
||||
return 0, nil, nil
|
||||
}
|
||||
|
||||
func (fakePromoModel) Transaction(context.Context, func(*gorm.DB) error) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func TestDeleteRuleNotFoundReturns404(t *testing.T) {
|
||||
svcCtx := &svc.ServiceContext{PromoModel: fakePromoModel{}}
|
||||
err := NewDeleteRuleLogic(context.Background(), svcCtx).DeleteRule(&types.DeletePromoRuleRequest{Id: 1})
|
||||
assertCodeError(t, err, 404)
|
||||
}
|
||||
|
||||
func TestDeletePriceNotFoundReturns404(t *testing.T) {
|
||||
svcCtx := &svc.ServiceContext{PromoModel: fakePromoModel{}}
|
||||
err := NewDeletePriceLogic(context.Background(), svcCtx).DeletePrice(&types.DeletePromoPriceRequest{Id: 1})
|
||||
assertCodeError(t, err, 404)
|
||||
}
|
||||
|
||||
func assertCodeError(t *testing.T, err error, want uint32) {
|
||||
t.Helper()
|
||||
if err == nil {
|
||||
t.Fatal("expected error")
|
||||
}
|
||||
codeErr, ok := pkgerrors.Cause(err).(*xerr.CodeError)
|
||||
if !ok {
|
||||
t.Fatalf("expected CodeError, got %T", pkgerrors.Cause(err))
|
||||
}
|
||||
if got := codeErr.GetErrCode(); got != want {
|
||||
t.Fatalf("unexpected error code: got %d want %d", got, want)
|
||||
}
|
||||
}
|
||||
@@ -1,41 +0,0 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
type GetPriceListLogic struct {
|
||||
logger.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewGetPriceListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetPriceListLogic {
|
||||
return &GetPriceListLogic{
|
||||
Logger: logger.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *GetPriceListLogic) GetPriceList(req *types.GetPromoPriceListRequest) (*types.GetPromoPriceListResponse, error) {
|
||||
total, list, err := l.svcCtx.PromoModel.QueryPriceList(l.ctx, req.PromoRuleId, int(req.Page), int(req.Size))
|
||||
if err != nil {
|
||||
l.Errorw("[GetPromoPriceList] Database Error", logger.Field("error", err.Error()))
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "get promo price list error: %v", err.Error())
|
||||
}
|
||||
resp := &types.GetPromoPriceListResponse{
|
||||
Total: total,
|
||||
List: make([]types.PromoPrice, 0, len(list)),
|
||||
}
|
||||
for _, item := range list {
|
||||
resp.List = append(resp.List, convertPrice(item))
|
||||
}
|
||||
return resp, nil
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
promoModel "github.com/perfect-panel/server/internal/model/promo"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
)
|
||||
|
||||
type GetPromoPriceListLogic struct {
|
||||
logger.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
// Get promo price list
|
||||
func NewGetPromoPriceListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetPromoPriceListLogic {
|
||||
return &GetPromoPriceListLogic{
|
||||
Logger: logger.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *GetPromoPriceListLogic) GetPromoPriceList(req *types.GetPromoPriceListRequest) (*types.GetPromoPriceListResponse, error) {
|
||||
total, list, err := l.svcCtx.PromoModel.QuerySubscribePromoList(l.ctx, promoModel.SubscribePromoFilter{
|
||||
Page: int(req.Page),
|
||||
Size: int(req.Size),
|
||||
PromoRuleId: req.PromoRuleId,
|
||||
})
|
||||
if err != nil {
|
||||
l.Errorw("[GetPromoPriceList] Database Error", logger.Field("error", err.Error()))
|
||||
return nil, wrapQueryError("get promo price list failed", err)
|
||||
}
|
||||
resp := &types.GetPromoPriceListResponse{
|
||||
Total: total,
|
||||
List: make([]types.PromoPrice, 0, len(list)),
|
||||
}
|
||||
for _, item := range list {
|
||||
var unitPrice int64
|
||||
sub, subErr := l.svcCtx.SubscribeModel.FindOne(l.ctx, item.SubscribeId)
|
||||
if subErr == nil {
|
||||
unitPrice = sub.UnitPrice
|
||||
}
|
||||
resp.List = append(resp.List, toPriceResponse(item, unitPrice))
|
||||
}
|
||||
return resp, nil
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
promoModel "github.com/perfect-panel/server/internal/model/promo"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
)
|
||||
|
||||
type GetPromoRuleDetailLogic struct {
|
||||
logger.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
// Get promo rule detail
|
||||
func NewGetPromoRuleDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetPromoRuleDetailLogic {
|
||||
return &GetPromoRuleDetailLogic{
|
||||
Logger: logger.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *GetPromoRuleDetailLogic) GetPromoRuleDetail(req *types.GetPromoRuleDetailRequest) (*types.PromoRule, error) {
|
||||
data, err := l.svcCtx.PromoModel.FindRule(l.ctx, req.Id)
|
||||
if err != nil {
|
||||
if promoModel.IsNotFound(err) {
|
||||
return nil, xerr.NewErrCodeMsg(xerr.InvalidParams, "promo rule not found")
|
||||
}
|
||||
l.Errorw("[GetPromoRuleDetail] Database Error", logger.Field("error", err.Error()))
|
||||
return nil, wrapQueryError("get promo rule detail failed", err)
|
||||
}
|
||||
resp := toRuleResponse(data)
|
||||
return &resp, nil
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
promoModel "github.com/perfect-panel/server/internal/model/promo"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
)
|
||||
|
||||
type GetPromoRuleListLogic struct {
|
||||
logger.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
// Get promo rule list
|
||||
func NewGetPromoRuleListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetPromoRuleListLogic {
|
||||
return &GetPromoRuleListLogic{
|
||||
Logger: logger.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *GetPromoRuleListLogic) GetPromoRuleList(req *types.GetPromoRuleListRequest) (*types.GetPromoRuleListResponse, error) {
|
||||
total, list, err := l.svcCtx.PromoModel.QueryRuleList(l.ctx, promoModel.RuleFilter{
|
||||
Page: int(req.Page),
|
||||
Size: int(req.Size),
|
||||
Type: req.Type,
|
||||
Enabled: req.Enabled,
|
||||
Search: req.Search,
|
||||
})
|
||||
if err != nil {
|
||||
l.Errorw("[GetPromoRuleList] Database Error", logger.Field("error", err.Error()))
|
||||
return nil, wrapQueryError("get promo rule list failed", err)
|
||||
}
|
||||
resp := &types.GetPromoRuleListResponse{
|
||||
Total: total,
|
||||
List: make([]types.PromoRule, 0, len(list)),
|
||||
}
|
||||
for _, item := range list {
|
||||
resp.List = append(resp.List, toRuleResponse(item))
|
||||
}
|
||||
return resp, nil
|
||||
}
|
||||
+10
-11
@@ -3,47 +3,46 @@ package promo
|
||||
import (
|
||||
"context"
|
||||
|
||||
promomodel "github.com/perfect-panel/server/internal/model/promo"
|
||||
promoModel "github.com/perfect-panel/server/internal/model/promo"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
type GetUsageListLogic struct {
|
||||
type GetPromoUsageListLogic struct {
|
||||
logger.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewGetUsageListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetUsageListLogic {
|
||||
return &GetUsageListLogic{
|
||||
// Get promo usage list
|
||||
func NewGetPromoUsageListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetPromoUsageListLogic {
|
||||
return &GetPromoUsageListLogic{
|
||||
Logger: logger.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *GetUsageListLogic) GetUsageList(req *types.GetPromoUsageListRequest) (*types.GetPromoUsageListResponse, error) {
|
||||
total, list, err := l.svcCtx.PromoModel.QueryUsageList(l.ctx, promomodel.UsageFilter{
|
||||
func (l *GetPromoUsageListLogic) GetPromoUsageList(req *types.GetPromoUsageListRequest) (*types.GetPromoUsageListResponse, error) {
|
||||
total, list, err := l.svcCtx.PromoModel.QueryUsageList(l.ctx, promoModel.UsageFilter{
|
||||
Page: int(req.Page),
|
||||
Size: int(req.Size),
|
||||
RuleId: req.RuleId,
|
||||
PromoRuleId: req.PromoRuleId,
|
||||
UserId: req.UserId,
|
||||
SubscribeId: req.SubscribeId,
|
||||
OrderNo: req.OrderNo,
|
||||
})
|
||||
if err != nil {
|
||||
l.Errorw("[GetPromoUsageList] Database Error", logger.Field("error", err.Error()))
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "get promo usage list error: %v", err.Error())
|
||||
return nil, wrapQueryError("get promo usage list failed", err)
|
||||
}
|
||||
resp := &types.GetPromoUsageListResponse{
|
||||
Total: total,
|
||||
List: make([]types.PromoUsage, 0, len(list)),
|
||||
}
|
||||
for _, item := range list {
|
||||
resp.List = append(resp.List, convertUsage(item))
|
||||
resp.List = append(resp.List, toUsageResponse(item))
|
||||
}
|
||||
return resp, nil
|
||||
}
|
||||
@@ -1,35 +0,0 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
type GetRuleDetailLogic struct {
|
||||
logger.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewGetRuleDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetRuleDetailLogic {
|
||||
return &GetRuleDetailLogic{
|
||||
Logger: logger.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *GetRuleDetailLogic) GetRuleDetail(req *types.GetPromoRuleDetailRequest) (*types.PromoRule, error) {
|
||||
rule, err := l.svcCtx.PromoModel.FindRule(l.ctx, req.Id)
|
||||
if err != nil {
|
||||
l.Errorw("[GetPromoRuleDetail] Database Error", logger.Field("error", err.Error()))
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "get promo rule detail error: %v", err.Error())
|
||||
}
|
||||
resp := convertRule(rule)
|
||||
return &resp, nil
|
||||
}
|
||||
@@ -1,41 +0,0 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
type GetRuleListLogic struct {
|
||||
logger.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewGetRuleListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetRuleListLogic {
|
||||
return &GetRuleListLogic{
|
||||
Logger: logger.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *GetRuleListLogic) GetRuleList(req *types.GetPromoRuleListRequest) (*types.GetPromoRuleListResponse, error) {
|
||||
total, list, err := l.svcCtx.PromoModel.QueryRuleList(l.ctx, int(req.Page), int(req.Size), req.Type, req.Enabled, req.Search)
|
||||
if err != nil {
|
||||
l.Errorw("[GetPromoRuleList] Database Error", logger.Field("error", err.Error()))
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "get promo rule list error: %v", err.Error())
|
||||
}
|
||||
resp := &types.GetPromoRuleListResponse{
|
||||
Total: total,
|
||||
List: make([]types.PromoRule, 0, len(list)),
|
||||
}
|
||||
for _, item := range list {
|
||||
resp.List = append(resp.List, convertRule(item))
|
||||
}
|
||||
return resp, nil
|
||||
}
|
||||
@@ -1,81 +0,0 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
promomodel "github.com/perfect-panel/server/internal/model/promo"
|
||||
subscribeModel "github.com/perfect-panel/server/internal/model/subscribe"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
type SetPriceLogic struct {
|
||||
logger.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewSetPriceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SetPriceLogic {
|
||||
return &SetPriceLogic{
|
||||
Logger: logger.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *SetPriceLogic) SetPrice(req *types.SetPromoPriceRequest) error {
|
||||
if _, err := l.svcCtx.PromoModel.FindRule(l.ctx, req.PromoRuleId); err != nil {
|
||||
l.Errorw("[SetPromoPrice] Find Rule Error", logger.Field("error", err.Error()))
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find promo rule error: %v", err.Error())
|
||||
}
|
||||
subscribeIds := make([]int64, 0, len(req.Items))
|
||||
seenSubscribeIds := make(map[int64]struct{}, len(req.Items))
|
||||
for _, item := range req.Items {
|
||||
if _, ok := seenSubscribeIds[item.SubscribeId]; ok {
|
||||
continue
|
||||
}
|
||||
seenSubscribeIds[item.SubscribeId] = struct{}{}
|
||||
subscribeIds = append(subscribeIds, item.SubscribeId)
|
||||
}
|
||||
var subscribes []*subscribeModel.Subscribe
|
||||
if err := l.svcCtx.DB.WithContext(l.ctx).Model(&subscribeModel.Subscribe{}).Where("id IN ?", subscribeIds).Find(&subscribes).Error; err != nil {
|
||||
l.Errorw("[SetPromoPrice] Find Subscribe Error", logger.Field("error", err.Error()))
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find subscribe error: %v", err.Error())
|
||||
}
|
||||
subscribeById := make(map[int64]*subscribeModel.Subscribe, len(subscribes))
|
||||
for _, sub := range subscribes {
|
||||
subscribeById[sub.Id] = sub
|
||||
}
|
||||
items := make([]*promomodel.SubscribePromo, 0, len(req.Items))
|
||||
cacheKeys := make([]string, 0, len(req.Items))
|
||||
for _, item := range req.Items {
|
||||
sub, ok := subscribeById[item.SubscribeId]
|
||||
if !ok {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "subscribe plan not found")
|
||||
}
|
||||
originPrice := sub.UnitPrice * item.Quantity
|
||||
if item.PromoPrice >= originPrice {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "promo_price must be less than unit_price * quantity")
|
||||
}
|
||||
items = append(items, &promomodel.SubscribePromo{
|
||||
SubscribeId: item.SubscribeId,
|
||||
PromoRuleId: req.PromoRuleId,
|
||||
Quantity: item.Quantity,
|
||||
PromoPrice: item.PromoPrice,
|
||||
})
|
||||
cacheKeys = append(cacheKeys, subscribePromoCacheKey(item.SubscribeId))
|
||||
}
|
||||
if err := l.svcCtx.PromoModel.UpsertPrices(l.ctx, req.PromoRuleId, items); err != nil {
|
||||
l.Errorw("[SetPromoPrice] Database Error", logger.Field("error", err.Error()))
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "set promo price error: %v", err.Error())
|
||||
}
|
||||
if len(cacheKeys) > 0 {
|
||||
if err := l.svcCtx.Redis.Del(l.ctx, cacheKeys...).Err(); err != nil {
|
||||
l.Errorw("[SetPromoPrice] Delete Cache Error", logger.Field("error", err.Error()))
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -1,162 +0,0 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"math"
|
||||
"time"
|
||||
|
||||
promomodel "github.com/perfect-panel/server/internal/model/promo"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
const (
|
||||
ruleCacheKey = "promo:rules:enabled"
|
||||
subscribeCachePref = "promo:subscribe:"
|
||||
)
|
||||
|
||||
func validateRuleInput(ruleType string, params map[string]interface{}, priority int64, startTime, endTime *int64) error {
|
||||
if priority < 0 {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "priority must be greater than or equal to 0")
|
||||
}
|
||||
if startTime != nil && endTime != nil && *startTime >= *endTime {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "start_time must be less than end_time")
|
||||
}
|
||||
switch ruleType {
|
||||
case "new_user":
|
||||
windowHours, ok := numberParam(params, "window_hours")
|
||||
if !ok || windowHours <= 0 {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "params.window_hours must be greater than 0")
|
||||
}
|
||||
case "inactive_user":
|
||||
inactiveMonths, ok := numberParam(params, "inactive_months")
|
||||
if !ok || inactiveMonths <= 0 {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "params.inactive_months must be greater than 0")
|
||||
}
|
||||
case "campaign":
|
||||
if params == nil {
|
||||
return nil
|
||||
}
|
||||
default:
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "unsupported promo rule type")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func numberParam(params map[string]interface{}, key string) (int64, bool) {
|
||||
if params == nil {
|
||||
return 0, false
|
||||
}
|
||||
value, ok := params[key]
|
||||
if !ok {
|
||||
return 0, false
|
||||
}
|
||||
switch v := value.(type) {
|
||||
case float64:
|
||||
if math.Trunc(v) != v {
|
||||
return 0, false
|
||||
}
|
||||
return int64(v), true
|
||||
case int64:
|
||||
return v, true
|
||||
case int:
|
||||
return int64(v), true
|
||||
case json.Number:
|
||||
n, err := v.Int64()
|
||||
return n, err == nil
|
||||
default:
|
||||
return 0, false
|
||||
}
|
||||
}
|
||||
|
||||
func paramsToString(params map[string]interface{}) (string, error) {
|
||||
if params == nil {
|
||||
params = map[string]interface{}{}
|
||||
}
|
||||
b, err := json.Marshal(params)
|
||||
if err != nil {
|
||||
return "", errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "invalid params")
|
||||
}
|
||||
return string(b), nil
|
||||
}
|
||||
|
||||
func parseParams(data string) map[string]interface{} {
|
||||
if data == "" {
|
||||
return map[string]interface{}{}
|
||||
}
|
||||
var params map[string]interface{}
|
||||
if err := json.Unmarshal([]byte(data), ¶ms); err != nil {
|
||||
return map[string]interface{}{}
|
||||
}
|
||||
return params
|
||||
}
|
||||
|
||||
func unixPtrToTimePtr(ts *int64) *time.Time {
|
||||
if ts == nil || *ts == 0 {
|
||||
return nil
|
||||
}
|
||||
t := time.Unix(*ts, 0)
|
||||
return &t
|
||||
}
|
||||
|
||||
func timePtrToUnixPtr(t *time.Time) *int64 {
|
||||
if t == nil {
|
||||
return nil
|
||||
}
|
||||
ts := t.Unix()
|
||||
return &ts
|
||||
}
|
||||
|
||||
func convertRule(item *promomodel.Rule) types.PromoRule {
|
||||
if item == nil {
|
||||
return types.PromoRule{}
|
||||
}
|
||||
return types.PromoRule{
|
||||
Id: item.Id,
|
||||
Name: item.Name,
|
||||
Type: item.Type,
|
||||
Params: parseParams(item.Params),
|
||||
Priority: item.Priority,
|
||||
Enabled: item.Enabled,
|
||||
StartTime: timePtrToUnixPtr(item.StartTime),
|
||||
EndTime: timePtrToUnixPtr(item.EndTime),
|
||||
CreatedAt: item.CreatedAt.Unix(),
|
||||
UpdatedAt: item.UpdatedAt.Unix(),
|
||||
}
|
||||
}
|
||||
|
||||
func convertPrice(item *promomodel.SubscribePromo) types.PromoPrice {
|
||||
if item == nil {
|
||||
return types.PromoPrice{}
|
||||
}
|
||||
return types.PromoPrice{
|
||||
Id: item.Id,
|
||||
SubscribeId: item.SubscribeId,
|
||||
PromoRuleId: item.PromoRuleId,
|
||||
Quantity: item.Quantity,
|
||||
PromoPrice: item.PromoPrice,
|
||||
CreatedAt: item.CreatedAt.Unix(),
|
||||
UpdatedAt: item.UpdatedAt.Unix(),
|
||||
}
|
||||
}
|
||||
|
||||
func convertUsage(item *promomodel.Usage) types.PromoUsage {
|
||||
if item == nil {
|
||||
return types.PromoUsage{}
|
||||
}
|
||||
return types.PromoUsage{
|
||||
Id: item.Id,
|
||||
UserId: item.UserId,
|
||||
PromoRuleId: item.PromoRuleId,
|
||||
SubscribeId: item.SubscribeId,
|
||||
OrderNo: item.OrderNo,
|
||||
PromoPrice: item.PromoPrice,
|
||||
CreatedAt: item.CreatedAt.Unix(),
|
||||
}
|
||||
}
|
||||
|
||||
func subscribePromoCacheKey(subscribeId int64) string {
|
||||
return fmt.Sprintf("%s%d", subscribeCachePref, subscribeId)
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
promoModel "github.com/perfect-panel/server/internal/model/promo"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
type UpdatePromoRuleLogic struct {
|
||||
logger.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
// Update promo rule
|
||||
func NewUpdatePromoRuleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdatePromoRuleLogic {
|
||||
return &UpdatePromoRuleLogic{
|
||||
Logger: logger.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *UpdatePromoRuleLogic) UpdatePromoRule(req *types.UpdatePromoRuleRequest) (*types.PromoRule, error) {
|
||||
if err := validateRulePayload(req.Type, req.Params, req.Priority, req.StartTime, req.EndTime); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
data, err := l.svcCtx.PromoModel.FindRule(l.ctx, req.Id)
|
||||
if err != nil {
|
||||
if promoModel.IsNotFound(err) {
|
||||
return nil, xerr.NewErrCodeMsg(xerr.InvalidParams, "promo rule not found")
|
||||
}
|
||||
l.Errorw("[UpdatePromoRule] Database Query Error", logger.Field("error", err.Error()))
|
||||
return nil, wrapQueryError("get promo rule failed", err)
|
||||
}
|
||||
|
||||
start, end := ruleTimes(req.StartTime, req.EndTime)
|
||||
data.Name = req.Name
|
||||
data.Type = req.Type
|
||||
data.Params = string(req.Params)
|
||||
data.Priority = req.Priority
|
||||
data.Enabled = *req.Enabled
|
||||
data.StartTime = start
|
||||
data.EndTime = end
|
||||
|
||||
if err = l.svcCtx.PromoModel.UpdateRule(l.ctx, data); err != nil {
|
||||
l.Errorw("[UpdatePromoRule] Database Update Error", logger.Field("error", err.Error()))
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "update promo rule failed: %v", err.Error())
|
||||
}
|
||||
clearRuleCache(l.ctx, l.svcCtx)
|
||||
resp := toRuleResponse(data)
|
||||
return &resp, nil
|
||||
}
|
||||
@@ -1,60 +0,0 @@
|
||||
package promo
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
type UpdateRuleLogic struct {
|
||||
logger.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewUpdateRuleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdateRuleLogic {
|
||||
return &UpdateRuleLogic{
|
||||
Logger: logger.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *UpdateRuleLogic) UpdateRule(req *types.UpdatePromoRuleRequest) (*types.PromoRule, error) {
|
||||
if err := validateRuleInput(req.Type, req.Params, req.Priority, req.StartTime, req.EndTime); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
rule, err := l.svcCtx.PromoModel.FindRule(l.ctx, req.Id)
|
||||
if err != nil {
|
||||
l.Errorw("[UpdatePromoRule] Find Rule Error", logger.Field("error", err.Error()))
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find promo rule error: %v", err.Error())
|
||||
}
|
||||
params, err := paramsToString(req.Params)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
enabled := rule.Enabled
|
||||
if req.Enabled != nil {
|
||||
enabled = *req.Enabled
|
||||
}
|
||||
rule.Name = req.Name
|
||||
rule.Type = req.Type
|
||||
rule.Params = params
|
||||
rule.Priority = req.Priority
|
||||
rule.Enabled = enabled
|
||||
rule.StartTime = unixPtrToTimePtr(req.StartTime)
|
||||
rule.EndTime = unixPtrToTimePtr(req.EndTime)
|
||||
if err := l.svcCtx.PromoModel.UpdateRule(l.ctx, rule); err != nil {
|
||||
l.Errorw("[UpdatePromoRule] Database Error", logger.Field("error", err.Error()))
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "update promo rule error: %v", err.Error())
|
||||
}
|
||||
if err := l.svcCtx.Redis.Del(l.ctx, ruleCacheKey).Err(); err != nil {
|
||||
l.Errorw("[UpdatePromoRule] Delete Cache Error", logger.Field("error", err.Error()))
|
||||
}
|
||||
resp := convertRule(rule)
|
||||
return &resp, nil
|
||||
}
|
||||
@@ -3,13 +3,11 @@ package user
|
||||
import (
|
||||
"context"
|
||||
|
||||
adminInvite "github.com/perfect-panel/server/internal/logic/admin/invite"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type GetAdminUserInviteListLogic struct {
|
||||
@@ -27,7 +25,15 @@ func NewGetAdminUserInviteListLogic(ctx context.Context, svcCtx *svc.ServiceCont
|
||||
}
|
||||
|
||||
func (l *GetAdminUserInviteListLogic) GetAdminUserInviteList(req *types.GetAdminUserInviteListRequest) (resp *types.GetAdminUserInviteListResponse, err error) {
|
||||
req.Page, req.Size = adminInvite.NormalizePage(req.Page, req.Size)
|
||||
if req.Page < 1 {
|
||||
req.Page = 1
|
||||
}
|
||||
if req.Size < 1 {
|
||||
req.Size = 10
|
||||
}
|
||||
if req.Size > 100 {
|
||||
req.Size = 100
|
||||
}
|
||||
|
||||
type InvitedUser struct {
|
||||
Id int64 `gorm:"column:id"`
|
||||
@@ -38,19 +44,19 @@ func (l *GetAdminUserInviteListLogic) GetAdminUserInviteList(req *types.GetAdmin
|
||||
}
|
||||
|
||||
var total int64
|
||||
baseQuery := applyAdminUserInviteFilters(l.svcCtx.DB.WithContext(l.ctx).
|
||||
baseQuery := l.svcCtx.DB.WithContext(l.ctx).
|
||||
Table("user u").
|
||||
Where("u.referer_id = ? AND u.deleted_at IS NULL", req.UserId), req)
|
||||
Where("u.referer_id = ? AND u.deleted_at IS NULL", req.UserId)
|
||||
|
||||
if err = baseQuery.Count(&total).Error; err != nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "count invited users failed: %v", err)
|
||||
}
|
||||
|
||||
var rows []InvitedUser
|
||||
err = applyAdminUserInviteFilters(l.svcCtx.DB.WithContext(l.ctx).
|
||||
err = l.svcCtx.DB.WithContext(l.ctx).
|
||||
Table("user u").
|
||||
Select("u.id, u.avatar, u.enable, UNIX_TIMESTAMP(u.created_at) as created_at, COALESCE((SELECT uam.auth_identifier FROM user_auth_methods uam WHERE uam.user_id = u.id ORDER BY uam.id ASC LIMIT 1), '') as identifier").
|
||||
Where("u.referer_id = ? AND u.deleted_at IS NULL", req.UserId), req).
|
||||
Where("u.referer_id = ? AND u.deleted_at IS NULL", req.UserId).
|
||||
Order("u.created_at DESC").
|
||||
Limit(req.Size).
|
||||
Offset((req.Page - 1) * req.Size).
|
||||
@@ -59,29 +65,14 @@ func (l *GetAdminUserInviteListLogic) GetAdminUserInviteList(req *types.GetAdmin
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query invited users failed: %v", err)
|
||||
}
|
||||
|
||||
relations := make([]adminInvite.InviteRelation, 0, len(rows))
|
||||
for _, r := range rows {
|
||||
relations = append(relations, adminInvite.InviteRelation{InviteeId: r.Id, InviterId: req.UserId})
|
||||
}
|
||||
benefits, err := adminInvite.QueryBenefits(l.ctx, l.svcCtx.DB, relations)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
list := make([]types.AdminInvitedUser, 0, len(rows))
|
||||
for _, r := range rows {
|
||||
benefit := benefits[r.Id]
|
||||
list = append(list, types.AdminInvitedUser{
|
||||
Id: r.Id,
|
||||
Avatar: r.Avatar,
|
||||
Identifier: r.Identifier,
|
||||
Enable: r.Enable,
|
||||
CreatedAt: r.CreatedAt,
|
||||
OrderCount: benefit.OrderCount,
|
||||
HasPurchased: benefit.HasPurchased,
|
||||
InviterCommission: benefit.InviterCommission,
|
||||
InviterGiftDays: benefit.InviterGiftDays,
|
||||
InviteeGiftDays: benefit.InviteeGiftDays,
|
||||
Id: r.Id,
|
||||
Avatar: r.Avatar,
|
||||
Identifier: r.Identifier,
|
||||
Enable: r.Enable,
|
||||
CreatedAt: r.CreatedAt,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -90,16 +81,3 @@ func (l *GetAdminUserInviteListLogic) GetAdminUserInviteList(req *types.GetAdmin
|
||||
List: list,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func applyAdminUserInviteFilters(db *gorm.DB, req *types.GetAdminUserInviteListRequest) *gorm.DB {
|
||||
if req.Search != "" {
|
||||
db = db.Where("EXISTS (SELECT 1 FROM user_auth_methods uam WHERE uam.user_id = u.id AND uam.auth_identifier LIKE ?)", "%"+req.Search+"%")
|
||||
}
|
||||
if req.Enable != nil {
|
||||
db = db.Where("u.enable = ?", *req.Enable)
|
||||
}
|
||||
if req.UserIdSearch > 0 {
|
||||
db = db.Where("u.id = ?", req.UserIdSearch)
|
||||
}
|
||||
return db
|
||||
}
|
||||
|
||||
@@ -2,7 +2,6 @@ package user
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
|
||||
"github.com/perfect-panel/server/internal/model/group"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
@@ -37,13 +36,6 @@ func (l *GetUserSubscribeByIdLogic) GetUserSubscribeById(req *types.GetUserSubsc
|
||||
}
|
||||
var subscribeDetails types.UserSubscribeDetail
|
||||
tool.DeepCopy(&subscribeDetails, sub)
|
||||
subscribeDetails.SpeedLimit = sub.SpeedLimit
|
||||
if sub.TrafficLimit != nil && *sub.TrafficLimit != "" {
|
||||
_ = json.Unmarshal([]byte(*sub.TrafficLimit), &subscribeDetails.TrafficLimit)
|
||||
}
|
||||
if sub.Subscribe != nil {
|
||||
subscribeDetails.PlanSpeedLimit = sub.Subscribe.SpeedLimit
|
||||
}
|
||||
|
||||
// 填充分组名
|
||||
if sub.NodeGroupId > 0 {
|
||||
@@ -55,17 +47,7 @@ func (l *GetUserSubscribeByIdLogic) GetUserSubscribeById(req *types.GetUserSubsc
|
||||
|
||||
// Calculate speed limit status
|
||||
if sub.Subscribe != nil && sub.Status == 1 {
|
||||
baseSpeed := sub.Subscribe.SpeedLimit
|
||||
if sub.SpeedLimit > 0 {
|
||||
baseSpeed = sub.SpeedLimit
|
||||
}
|
||||
|
||||
trafficLimit := sub.Subscribe.TrafficLimit
|
||||
if sub.TrafficLimit != nil && *sub.TrafficLimit != "" {
|
||||
trafficLimit = *sub.TrafficLimit
|
||||
}
|
||||
|
||||
result := speedlimit.Calculate(l.ctx, l.svcCtx.DB, sub.UserId, sub.Id, baseSpeed, trafficLimit)
|
||||
result := speedlimit.Calculate(l.ctx, l.svcCtx.DB, sub.UserId, sub.Id, sub.Subscribe.SpeedLimit, sub.Subscribe.TrafficLimit)
|
||||
subscribeDetails.EffectiveSpeed = result.EffectiveSpeed
|
||||
subscribeDetails.IsThrottled = result.IsThrottled
|
||||
subscribeDetails.ThrottleRule = result.ThrottleRule
|
||||
|
||||
@@ -39,32 +39,22 @@ func (l *UpdateUserSubscribeLogic) UpdateUserSubscribe(req *types.UpdateUserSubs
|
||||
} else {
|
||||
userSub.Status = 1
|
||||
}
|
||||
speedLimit := userSub.SpeedLimit
|
||||
if req.SpeedLimit != nil {
|
||||
speedLimit = *req.SpeedLimit
|
||||
}
|
||||
trafficLimit := userSub.TrafficLimit
|
||||
if req.TrafficLimit != nil {
|
||||
trafficLimit = req.TrafficLimit
|
||||
}
|
||||
|
||||
err = l.svcCtx.UserModel.UpdateSubscribe(l.ctx, &user.Subscribe{
|
||||
Id: userSub.Id,
|
||||
UserId: userSub.UserId,
|
||||
OrderId: userSub.OrderId,
|
||||
SubscribeId: req.SubscribeId,
|
||||
StartTime: userSub.StartTime,
|
||||
ExpireTime: time.UnixMilli(req.ExpiredAt),
|
||||
Traffic: req.Traffic,
|
||||
Download: req.Download,
|
||||
Upload: req.Upload,
|
||||
SpeedLimit: speedLimit,
|
||||
TrafficLimit: trafficLimit,
|
||||
Token: userSub.Token,
|
||||
UUID: userSub.UUID,
|
||||
Status: userSub.Status,
|
||||
NodeGroupId: userSub.NodeGroupId,
|
||||
GroupLocked: userSub.GroupLocked,
|
||||
Id: userSub.Id,
|
||||
UserId: userSub.UserId,
|
||||
OrderId: userSub.OrderId,
|
||||
SubscribeId: req.SubscribeId,
|
||||
StartTime: userSub.StartTime,
|
||||
ExpireTime: time.UnixMilli(req.ExpiredAt),
|
||||
Traffic: req.Traffic,
|
||||
Download: req.Download,
|
||||
Upload: req.Upload,
|
||||
Token: userSub.Token,
|
||||
UUID: userSub.UUID,
|
||||
Status: userSub.Status,
|
||||
NodeGroupId: userSub.NodeGroupId,
|
||||
GroupLocked: userSub.GroupLocked,
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
package common
|
||||
@@ -1 +0,0 @@
|
||||
package common
|
||||
@@ -11,7 +11,6 @@ import (
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/clause"
|
||||
)
|
||||
|
||||
type PromoResult struct {
|
||||
@@ -28,13 +27,13 @@ type promoRuleParams struct {
|
||||
InactiveMonths int `json:"inactive_months"`
|
||||
}
|
||||
|
||||
func EvaluatePromo(ctx context.Context, svcCtx *svc.ServiceContext, userID int64, subscribeID int64, quantity int64) (*PromoResult, error) {
|
||||
func EvaluatePromo(ctx context.Context, svcCtx *svc.ServiceContext, userID int64, subscribeID int64) (*PromoResult, error) {
|
||||
result := &PromoResult{}
|
||||
if svcCtx == nil || svcCtx.PromoModel == nil || svcCtx.DB == nil || userID <= 0 || subscribeID <= 0 || quantity <= 0 {
|
||||
if svcCtx == nil || svcCtx.PromoModel == nil || svcCtx.DB == nil || userID <= 0 || subscribeID <= 0 {
|
||||
return result, nil
|
||||
}
|
||||
|
||||
rules, err := svcCtx.PromoModel.QueryEligibleRules(ctx, subscribeID, quantity)
|
||||
rules, err := svcCtx.PromoModel.QueryEligibleRules(ctx, subscribeID)
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query promo rules failed: %v", err.Error())
|
||||
}
|
||||
@@ -149,12 +148,7 @@ func evaluateInactiveUserPromo(
|
||||
err := db.WithContext(ctx).
|
||||
Model(&user.Subscribe{}).
|
||||
Where("user_id = ?", userID).
|
||||
Order(clause.OrderBy{
|
||||
Expression: clause.Expr{
|
||||
SQL: "CASE WHEN expire_time = ? THEN 0 ELSE 1 END, expire_time DESC",
|
||||
Vars: []interface{}{time.UnixMilli(0)},
|
||||
},
|
||||
}).
|
||||
Order("expire_time DESC").
|
||||
Limit(1).
|
||||
Take(&lastSub).Error
|
||||
if err != nil {
|
||||
@@ -164,16 +158,8 @@ func evaluateInactiveUserPromo(
|
||||
return false, time.Time{}, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query promo inactive user subscription failed")
|
||||
}
|
||||
|
||||
return evaluateInactiveUserExpire(lastSub.ExpireTime, params, now), ruleExpiresAt, nil
|
||||
}
|
||||
|
||||
func evaluateInactiveUserExpire(lastExpire time.Time, params promoRuleParams, now time.Time) bool {
|
||||
if lastExpire.Equal(time.UnixMilli(0)) {
|
||||
return false
|
||||
}
|
||||
|
||||
threshold := now.AddDate(0, -params.InactiveMonths, 0)
|
||||
return lastExpire.Before(threshold) || lastExpire.Equal(threshold)
|
||||
return lastSub.ExpireTime.Before(threshold) || lastSub.ExpireTime.Equal(threshold), ruleExpiresAt, nil
|
||||
}
|
||||
|
||||
func promoRuleExpiresAt(rule *promo.RuleWithPrice) time.Time {
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
package common
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestEvaluateInactiveUserExpire(t *testing.T) {
|
||||
now := time.Date(2026, 5, 27, 8, 0, 0, 0, time.UTC)
|
||||
params := promoRuleParams{InactiveMonths: 3}
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
lastExpire time.Time
|
||||
want bool
|
||||
}{
|
||||
{
|
||||
name: "permanent subscription is not inactive",
|
||||
lastExpire: time.UnixMilli(0),
|
||||
want: false,
|
||||
},
|
||||
{
|
||||
name: "active subscription is not inactive",
|
||||
lastExpire: now.Add(time.Hour),
|
||||
want: false,
|
||||
},
|
||||
{
|
||||
name: "expire at threshold is inactive",
|
||||
lastExpire: now.AddDate(0, -3, 0),
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "expire before threshold is inactive",
|
||||
lastExpire: now.AddDate(0, -3, -1),
|
||||
want: true,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
if got := evaluateInactiveUserExpire(tt.lastExpire, params, now); got != tt.want {
|
||||
t.Fatalf("evaluateInactiveUserExpire() = %v, want %v", got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
package common
|
||||
@@ -1 +0,0 @@
|
||||
package common
|
||||
@@ -1 +0,0 @@
|
||||
package server
|
||||
@@ -1 +0,0 @@
|
||||
package server
|
||||
@@ -1 +0,0 @@
|
||||
package server
|
||||
@@ -1 +0,0 @@
|
||||
package server
|
||||
@@ -1 +0,0 @@
|
||||
package server
|
||||
@@ -1 +0,0 @@
|
||||
package server
|
||||
@@ -80,7 +80,7 @@ func validateInitRequest(svcCtx *svc.ServiceContext, bizType, fileName, contentT
|
||||
allowed := allowedContentTypeSet(svcCtx.Config.S3.AllowedContentTypes)
|
||||
if len(allowed) > 0 {
|
||||
if _, ok := allowed[strings.ToLower(strings.TrimSpace(contentType))]; !ok {
|
||||
return errors.Wrapf(xerr.NewErrCodeMsg(xerr.InvalidParams, "content_type is not allowed"), "content_type is not allowed")
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "content_type is not allowed")
|
||||
}
|
||||
}
|
||||
return nil
|
||||
|
||||
@@ -1,91 +0,0 @@
|
||||
package file
|
||||
|
||||
import (
|
||||
"mime/multipart"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/perfect-panel/server/internal/config"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/pkg/storage"
|
||||
)
|
||||
|
||||
const testAllowedContentTypes = "application/zip,application/x-zip-compressed,application/gzip,application/x-gzip,application/octet-stream,text/plain,application/json,image/jpeg,image/jpg,image/png,image/webp,image/gif,image/heic,image/heif,image/bmp"
|
||||
|
||||
type testMultipartFile struct {
|
||||
*strings.Reader
|
||||
}
|
||||
|
||||
func (testMultipartFile) Close() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func TestValidateInitRequestAllowedContentTypes(t *testing.T) {
|
||||
svcCtx := &svc.ServiceContext{
|
||||
Config: config.Config{
|
||||
S3: config.S3Config{
|
||||
Enable: true,
|
||||
MaxUploadSize: 1024,
|
||||
AllowedContentTypes: testAllowedContentTypes,
|
||||
},
|
||||
},
|
||||
S3Store: &storage.S3Store{},
|
||||
}
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
contentType string
|
||||
wantErr bool
|
||||
}{
|
||||
{name: "allow jpeg", contentType: "image/jpeg"},
|
||||
{name: "allow png", contentType: "image/png"},
|
||||
{name: "allow webp", contentType: "image/webp"},
|
||||
{name: "reject unknown", contentType: "application/x-sh", wantErr: true},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
err := validateInitRequest(svcCtx, "app-package", "demo.bin", tt.contentType, 10)
|
||||
if tt.wantErr {
|
||||
if err == nil {
|
||||
t.Fatal("expected error, got nil")
|
||||
}
|
||||
if !strings.Contains(err.Error(), "content_type is not allowed") {
|
||||
t.Fatalf("expected content type error, got %v", err)
|
||||
}
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
t.Fatalf("expected nil error, got %v", err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestSniffContentTypeDetectsCommonImages(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
data string
|
||||
want string
|
||||
}{
|
||||
{name: "jpeg", data: "\xff\xd8\xff\xe0\x00\x10JFIF\x00\x01\x01", want: "image/jpeg"},
|
||||
{name: "png", data: "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR", want: "image/png"},
|
||||
{name: "webp", data: "RIFF\x1a\x00\x00\x00WEBPVP8 \x0e\x00\x00\x00", want: "image/webp"},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
file := testMultipartFile{Reader: strings.NewReader(tt.data)}
|
||||
got, err := sniffContentType(&multipart.FileHeader{}, file)
|
||||
if err != nil {
|
||||
t.Fatalf("expected nil error, got %v", err)
|
||||
}
|
||||
if got != tt.want {
|
||||
t.Fatalf("expected %q, got %q", tt.want, got)
|
||||
}
|
||||
if pos, err := file.Seek(0, 1); err != nil || pos != 0 {
|
||||
t.Fatalf("expected reader reset to start, pos=%d err=%v", pos, err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -61,6 +61,11 @@ func (l *FileUploadCompleteLogic) FileUploadComplete(req *types.FileUploadComple
|
||||
}
|
||||
|
||||
return &types.FileUploadCompleteResponse{
|
||||
Url: l.svcCtx.S3Store.BuildObjectURL(meta.ObjectKey),
|
||||
FileId: meta.FileID,
|
||||
ObjectKey: meta.ObjectKey,
|
||||
Size: head.ContentLength,
|
||||
ContentType: head.ContentType,
|
||||
Etag: head.ETag,
|
||||
Status: meta.Status,
|
||||
}, nil
|
||||
}
|
||||
|
||||
@@ -52,13 +52,20 @@ func (l *FileUploadLogic) FileUpload(req *types.FileUploadRequest, fileHeader *m
|
||||
fileID := buildFileID(u.Id, req.BizType, fileHeader.Filename)
|
||||
objectKey := buildObjectKey(l.svcCtx.Config.S3.Prefix, u.Id, req.BizType, fileID, fileHeader.Filename, now)
|
||||
|
||||
if _, err := l.svcCtx.S3Store.PutObject(l.ctx, objectKey, file, fileHeader.Size, contentType); err != nil {
|
||||
putResult, err := l.svcCtx.S3Store.PutObject(l.ctx, objectKey, file, fileHeader.Size, contentType)
|
||||
if err != nil {
|
||||
l.Errorw("put object failed", logger.Field("error", err.Error()), logger.Field("user_id", u.Id), logger.Field("file_id", fileID))
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &types.FileUploadResponse{
|
||||
Url: l.svcCtx.S3Store.BuildObjectURL(objectKey),
|
||||
FileId: fileID,
|
||||
FileName: fileHeader.Filename,
|
||||
ObjectKey: objectKey,
|
||||
Size: fileHeader.Size,
|
||||
ContentType: contentType,
|
||||
Etag: putResult.ETag,
|
||||
Status: fileUploadCompleteStatus,
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
package apple
|
||||
@@ -1 +0,0 @@
|
||||
package apple
|
||||
@@ -1 +0,0 @@
|
||||
package apple
|
||||
@@ -1 +0,0 @@
|
||||
package apple
|
||||
@@ -47,18 +47,13 @@ func (l *PreCreateOrderLogic) PreCreateOrder(req *types.PurchaseOrderRequest) (r
|
||||
l.Debugf("[PreCreateOrder] Quantity is less than or equal to 0, setting to 1")
|
||||
req.Quantity = 1
|
||||
}
|
||||
entitlement, entErr := commonLogic.ResolveEntitlementUser(l.ctx, l.svcCtx.DB, u.Id)
|
||||
if entErr != nil {
|
||||
return nil, entErr
|
||||
}
|
||||
|
||||
targetSubscribeID := req.SubscribeId
|
||||
orderType := uint8(1)
|
||||
isSingleModeRenewal := false
|
||||
decision, routeErr := commonLogic.ResolvePurchaseRoute(
|
||||
l.ctx,
|
||||
l.svcCtx.Config.Subscribe.SingleModel,
|
||||
entitlement.EffectiveUserID,
|
||||
u.Id,
|
||||
req.SubscribeId,
|
||||
l.svcCtx.UserModel.FindSingleModeAnchorSubscribe,
|
||||
)
|
||||
@@ -73,44 +68,15 @@ func (l *PreCreateOrderLogic) PreCreateOrder(req *types.PurchaseOrderRequest) (r
|
||||
targetSubscribeID = decision.ResolvedSubscribeID
|
||||
isSingleModeRenewal = decision.Route == commonLogic.PurchaseRoutePurchaseToRenewal
|
||||
if isSingleModeRenewal && decision.Anchor != nil {
|
||||
orderType = 2
|
||||
l.Infow("[PreCreateOrder] single mode purchase routed to renewal preview",
|
||||
logger.Field("mode", "single"),
|
||||
logger.Field("route", "purchase_to_renewal"),
|
||||
logger.Field("anchor_user_subscribe_id", decision.Anchor.Id),
|
||||
logger.Field("user_id", u.Id),
|
||||
logger.Field("effective_user_id", entitlement.EffectiveUserID),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// Keep promo eligibility preview aligned with Purchase: an existing paid subscription
|
||||
// routes the request to renewal semantics, where first-purchase promos are disabled.
|
||||
if !l.svcCtx.Config.Subscribe.SingleModel && orderType == 1 {
|
||||
var existSub user.Subscribe
|
||||
if e := l.svcCtx.DB.WithContext(l.ctx).
|
||||
Model(&user.Subscribe{}).
|
||||
Where("user_id = ? AND token != '' AND (order_id > 0 OR token LIKE 'iap:%')", entitlement.EffectiveUserID).
|
||||
Order("expire_time DESC").
|
||||
Order("updated_at DESC").
|
||||
Order("id DESC").
|
||||
First(&existSub).Error; e == nil && existSub.Id > 0 && existSub.Token != "" {
|
||||
orderType = 2
|
||||
l.Infow("[PreCreateOrder] purchase preview routed to renewal because an existing subscription was found",
|
||||
logger.Field("route_mode", "global_single_subscription"),
|
||||
logger.Field("route", "purchase_to_existing_subscription"),
|
||||
logger.Field("existing_subscribe_id", existSub.Id),
|
||||
logger.Field("existing_status", existSub.Status),
|
||||
logger.Field("user_id", u.Id),
|
||||
logger.Field("effective_user_id", entitlement.EffectiveUserID),
|
||||
logger.Field("resolved_subscribe_id", targetSubscribeID),
|
||||
)
|
||||
} else if e != nil && !errors.Is(e, gorm.ErrRecordNotFound) {
|
||||
l.Errorw("[PreCreateOrder] Database query error", logger.Field("error", e.Error()), logger.Field("user_id", u.Id))
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find existing subscription error: %v", e.Error())
|
||||
}
|
||||
}
|
||||
|
||||
// find subscribe plan
|
||||
sub, err := l.svcCtx.SubscribeModel.FindOne(l.ctx, targetSubscribeID)
|
||||
if err != nil {
|
||||
@@ -120,7 +86,7 @@ func (l *PreCreateOrderLogic) PreCreateOrder(req *types.PurchaseOrderRequest) (r
|
||||
|
||||
// check subscribe plan quota limit for new purchase flow only
|
||||
if !isSingleModeRenewal && sub.Quota > 0 {
|
||||
userSub, err := l.svcCtx.UserModel.QueryUserSubscribe(l.ctx, entitlement.EffectiveUserID)
|
||||
userSub, err := l.svcCtx.UserModel.QueryUserSubscribe(l.ctx, u.Id)
|
||||
if err != nil {
|
||||
l.Errorw("[PreCreateOrder] Database query error", logger.Field("error", err.Error()), logger.Field("user_id", u.Id))
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find user subscription error: %v", err.Error())
|
||||
@@ -136,7 +102,7 @@ func (l *PreCreateOrderLogic) PreCreateOrder(req *types.PurchaseOrderRequest) (r
|
||||
}
|
||||
}
|
||||
|
||||
newUserDiscount, err := resolveNewUserDiscountEligibility(l.ctx, l.svcCtx.DB, entitlement.EffectiveUserID, targetSubscribeID, req.Quantity, sub.Discount)
|
||||
newUserDiscount, err := resolveNewUserDiscountEligibility(l.ctx, l.svcCtx.DB, u.Id, targetSubscribeID, req.Quantity, sub.Discount)
|
||||
if err != nil {
|
||||
l.Errorw("[PreCreateOrder] Database query error resolving new user eligibility",
|
||||
logger.Field("error", err.Error()),
|
||||
@@ -151,13 +117,13 @@ func (l *PreCreateOrderLogic) PreCreateOrder(req *types.PurchaseOrderRequest) (r
|
||||
priceResult, err := calculatePurchasePrice(
|
||||
l.ctx,
|
||||
l.svcCtx,
|
||||
entitlement.EffectiveUserID,
|
||||
u.Id,
|
||||
targetSubscribeID,
|
||||
sub.UnitPrice,
|
||||
req.Quantity,
|
||||
newUserDiscount.Discounts,
|
||||
newUserDiscount.EligibleForDiscount,
|
||||
orderType == 1,
|
||||
!isSingleModeRenewal,
|
||||
)
|
||||
if err != nil {
|
||||
l.Errorw("[PreCreateOrder] Promo price calculation error",
|
||||
|
||||
@@ -36,12 +36,12 @@ func calculatePurchasePrice(
|
||||
}
|
||||
|
||||
if allowPromo {
|
||||
promoResult, err := commonLogic.EvaluatePromo(ctx, svcCtx, userID, subscribeID, quantity)
|
||||
promoResult, err := commonLogic.EvaluatePromo(ctx, svcCtx, userID, subscribeID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if promoResult != nil && promoResult.Eligible && promoResult.PromoPrice < originalPrice {
|
||||
result.PayableBase = promoResult.PromoPrice
|
||||
if promoResult != nil && promoResult.Eligible && promoResult.PromoPrice < unitPrice {
|
||||
result.PayableBase = promoResult.PromoPrice * quantity
|
||||
result.PromoRuleId = promoResult.RuleID
|
||||
result.PromoDiscount = originalPrice - result.PayableBase
|
||||
result.PromoPrice = promoResult.PromoPrice
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user