dachui/hfb_sys
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(distribution): 货架加价打通前台、下单与卖方分成

Browse Source 
分站公开列表和详情展示当前货架加价；下单写入 base_price / shelf_markup / markup_site_id 快照并计入实付。
支付分账改用快照加价，不再误用 PlatformFeeCent；结账不退加价，事后改价不影响历史订单。
This commit is contained in:
yml2213
2026-09-08 17:07:17 +08:00
parent 8521bf4753
commit 96bc6a4db6
16 changed files with 417 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/modules/listing/handler_parse.go
+29 -29
View File
@@ -88,38 +88,38 @@ func parseAdminListQuery(c *gin.Context) (AdminListQuery, bool) {
func parsePublicListQuery(c *gin.Context) PublicListQuery {
query := PublicListQuery{
Page: parsePositiveInt(c.DefaultQuery("page", "1"), 1),
PageSize: parsePositiveInt(c.DefaultQuery("page_size", "20"), 20),
Keyword: strings.TrimSpace(c.Query("keyword")),
Sort: strings.TrimSpace(c.Query("sort")),
Zone: strings.TrimSpace(c.Query("zone")),
Server: parseCSVQuery(c.Query("server")),
Region: parseCSVQuery(c.Query("region")),
LoginMethod: parseCSVQuery(firstNonEmpty(c.Query("login_method"), c.Query("login"))),
Rank: parseCSVQuery(c.Query("rank")),
Insurance: parseCSVQuery(c.Query("insurance")),
Stamina: parseCSVQuery(c.Query("stamina")),
Load: parseCSVQuery(c.Query("load")),
SkinGroup: parseCSVQuery(c.Query("skin_group")),
SkinName: parseCSVQuery(firstNonEmpty(c.Query("skin_name"), c.Query("skin"))),
MinCoin: parseOptionalFloat(c.Query("min_coin")),
MaxCoin: parseOptionalFloat(c.Query("max_coin")),
MinRatio: parseOptionalFloat(c.Query("min_ratio")),
MaxRatio: parseOptionalFloat(c.Query("max_ratio")),
MinPrice: parseOptionalFloat(c.Query("min_price")),
MaxPrice: parseOptionalFloat(c.Query("max_price")),
MinDeposit: parseOptionalFloat(c.Query("min_deposit")),
MaxDeposit: parseOptionalFloat(c.Query("max_deposit")),
MinTotal: parseOptionalFloat(c.Query("min_total")),
MaxTotal: parseOptionalFloat(c.Query("max_total")),
MinFireLevel: parseOptionalFloat(c.Query("min_fire_level")),
MaxFireLevel: parseOptionalFloat(c.Query("max_fire_level")),
MinDailyLoss: parseOptionalFloat(c.Query("min_daily_loss")),
MaxDailyLoss: parseOptionalFloat(c.Query("max_daily_loss")),
Page: parsePositiveInt(c.DefaultQuery("page", "1"), 1),
PageSize: parsePositiveInt(c.DefaultQuery("page_size", "20"), 20),
Keyword: strings.TrimSpace(c.Query("keyword")),
Sort: strings.TrimSpace(c.Query("sort")),
Zone: strings.TrimSpace(c.Query("zone")),
Server: parseCSVQuery(c.Query("server")),
Region: parseCSVQuery(c.Query("region")),
LoginMethod: parseCSVQuery(firstNonEmpty(c.Query("login_method"), c.Query("login"))),
Rank: parseCSVQuery(c.Query("rank")),
Insurance: parseCSVQuery(c.Query("insurance")),
Stamina: parseCSVQuery(c.Query("stamina")),
Load: parseCSVQuery(c.Query("load")),
SkinGroup: parseCSVQuery(c.Query("skin_group")),
SkinName: parseCSVQuery(firstNonEmpty(c.Query("skin_name"), c.Query("skin"))),
MinCoin: parseOptionalFloat(c.Query("min_coin")),
MaxCoin: parseOptionalFloat(c.Query("max_coin")),
MinRatio: parseOptionalFloat(c.Query("min_ratio")),
MaxRatio: parseOptionalFloat(c.Query("max_ratio")),
MinPrice: parseOptionalFloat(c.Query("min_price")),
MaxPrice: parseOptionalFloat(c.Query("max_price")),
MinDeposit: parseOptionalFloat(c.Query("min_deposit")),
MaxDeposit: parseOptionalFloat(c.Query("max_deposit")),
MinTotal: parseOptionalFloat(c.Query("min_total")),
MaxTotal: parseOptionalFloat(c.Query("max_total")),
MinFireLevel: parseOptionalFloat(c.Query("min_fire_level")),
MaxFireLevel: parseOptionalFloat(c.Query("max_fire_level")),
MinDailyLoss: parseOptionalFloat(c.Query("min_daily_loss")),
MaxDailyLoss: parseOptionalFloat(c.Query("max_daily_loss")),
MinSecretKD: parseOptionalFloat(c.Query("min_secret_kd")),
MaxSecretKD: parseOptionalFloat(c.Query("max_secret_kd")),
ResourceRanges: parseResourceRanges(c),
DistributionSiteCode: strings.TrimSpace(firstNonEmpty(c.Query("distribution_site_code"), c.Query("site_code"))),
DistributionSiteCode: strings.TrimSpace(firstNonEmpty(c.GetHeader("X-Distribution-Site-Code"), c.Query("distribution_site_code"), c.Query("site_code"))),
}
if query.PageSize > 50 {
query.PageSize = 50