优化每日推送和积分转化逻辑

2026-07-24 11:12:29 +08:00
parent b2b4fd4fbc
commit 4bad91b8a3
29 changed files with 661 additions and 102 deletions
--- a/web/src/lang/backend/en/mall/dailyPush.ts
+++ b/web/src/lang/backend/en/mall/dailyPush.ts
@@ -4,9 +4,11 @@ export default {
    date: 'Business date',
    username: 'Username',
    yesterday_win_loss_net: 'Yesterday net win/loss',
+    converted_points: 'Converted points',
    yesterday_total_deposit: 'Yesterday total deposit',
    lifetime_total_deposit: 'Lifetime total deposit',
    lifetime_total_withdraw: 'Lifetime total withdraw',
+    lifetime_win_loss_net: 'Lifetime net win/loss',
    create_time: 'Created at',
    'quick Search Fields': 'ID',
    export_excel: 'Export Excel',
--- a/web/src/lang/backend/en/mall/playxConfig.ts
+++ b/web/src/lang/backend/en/mall/playxConfig.ts
@@ -1,8 +1,24 @@
 export default {
-    return_ratio: 'Return ratio (return_ratio)',
-    return_ratio_tip: 'In daily push, when yesterday net win/loss is negative: locked increment = |net| × this ratio.',
+    section_daily_source: 'Source 1: yesterday net win/loss',
+    daily_points_enabled: 'Enable daily loss to points',
+    daily_points_enabled_tip: 'Convert yesterday net win/loss from daily push to locked points; only losses (negative net) count.',
+    return_ratio: 'Yesterday loss conversion ratio',
+    return_ratio_tip: 'On daily push: converted points = floor(|yesterday net|) × ratio (losses only, non-negative integer). Requires mall open date and enabled source.',
+    section_lifetime_source: 'Source 2: lifetime net win/loss',
+    lifetime_points_enabled: 'Enable lifetime loss to points',
+    lifetime_points_enabled_tip: 'Uses the latest daily push row per member; only losses. Skips when lifetime field is missing.',
+    lifetime_points_ratio: 'Lifetime loss conversion ratio',
+    lifetime_points_ratio_tip: 'One-click job: locked points from |lifetime net| × ratio. Re-run reverses prior lifetime conversion then applies the new ratio.',
+    calculate_lifetime_btn: 'Calculate lifetime loss points',
+    calculate_lifetime_tip: 'Batch update from latest daily push lifetime field and ratio above.',
+    calculate_lifetime_confirm: 'Recalculate all members with the current lifetime ratio (reverses previous lifetime conversion first). Continue?',
+    section_mall_open: 'Mall open date',
+    mall_open_date: 'Mall open date',
+    mall_open_date_tip: 'Takes effect the next calendar day. E.g. set Aug 1: from Aug 2, daily push rows with business date on/after Aug 1 convert yesterday loss to points.',
+    active_mall_open_date: 'Active open date',
+    section_other: 'Other settings',
    unlock_ratio: 'Unlock ratio (unlock_ratio)',
-    unlock_ratio_tip: 'In daily push: daily claim cap = yesterday total deposit × this ratio.',
+    unlock_ratio_tip: 'Daily push: daily claim cap = yesterday total deposit × this ratio.',
    points_to_cash_ratio: 'Points to cash ratio',
    points_to_cash_ratio_tip: 'For withdrawable cash display: cash ≈ available points × this ratio.',
 }
--- a/web/src/lang/backend/en/mall/playxDailyPush.ts
+++ b/web/src/lang/backend/en/mall/playxDailyPush.ts
@@ -4,9 +4,11 @@ export default {
    date: 'date',
    username: 'username',
    yesterday_win_loss_net: 'yesterday_win_loss_net',
+    converted_points: 'converted_points',
    yesterday_total_deposit: 'yesterday_total_deposit',
    lifetime_total_deposit: 'lifetime_total_deposit',
    lifetime_total_withdraw: 'lifetime_total_withdraw',
+    lifetime_win_loss_net: 'lifetime_win_loss_net',
    create_time: 'create_time',
    'quick Search Fields': 'id',
 }
--- a/web/src/lang/backend/en/mall/userAsset.ts
+++ b/web/src/lang/backend/en/mall/userAsset.ts
@@ -9,6 +9,8 @@ export default {
    today_limit: 'today_limit',
    today_claimed: 'today_claimed',
    today_limit_date: 'today_limit_date',
+    points_claim_cap: 'Points claim cap',
+    total_points_claimed: 'Total points claimed',
    create_time: 'create_time',
    update_time: 'update_time',
    'quick Search Fields': 'id, playX_user_id, username, phone',
--- a/web/src/lang/backend/zh-cn/mall/dailyPush.ts
+++ b/web/src/lang/backend/zh-cn/mall/dailyPush.ts
@@ -4,9 +4,11 @@ export default {
    date: '业务日期',
    username: '用户名',
    yesterday_win_loss_net: '昨日净输赢',
+    converted_points: '转换积分',
    yesterday_total_deposit: '昨日总充值',
-    lifetime_total_deposit: '历史总充值',
-    lifetime_total_withdraw: '历史总提现',
+    lifetime_total_deposit: '终身总充值',
+    lifetime_total_withdraw: '终身总提现',
+    lifetime_win_loss_net: '终身总输赢',
    create_time: '创建时间',
    'quick Search Fields': 'ID',
    export_excel: 'Excel导出',
--- a/web/src/lang/backend/zh-cn/mall/playxConfig.ts
+++ b/web/src/lang/backend/zh-cn/mall/playxConfig.ts
@@ -1,6 +1,22 @@
 export default {
-    return_ratio: '返还比例（return_ratio）',
-    return_ratio_tip: '每日推送中，仅当昨日净输赢为负时：待领取增量 = |净输赢| × 本比例。',
+    section_daily_source: '积分来源一：昨日净输赢',
+    daily_points_enabled: '启用昨日净输赢转积分',
+    daily_points_enabled_tip: '根据每日推送中的「昨日净输赢」折算待领取积分；仅统计会员输的钱（净输赢为负），赢的不计。',
+    return_ratio: '昨日净输赢兑换比例',
+    return_ratio_tip: '每日推送入库时：转换积分 = floor(|昨日净输赢|) × 本比例（仅负值，结果为非负整数）。需满足商城开放日规则且本来源已启用。',
+    section_lifetime_source: '积分来源二：终身总输赢',
+    lifetime_points_enabled: '启用终身总输赢转积分',
+    lifetime_points_enabled_tip: '使用每日推送中每位会员最新一条记录的「终身总输赢」字段；仅统计输的钱。第三方未传该字段时跳过。',
+    lifetime_points_ratio: '终身总输赢兑换比例',
+    lifetime_points_ratio_tip: '一键计算时：待领取增量按 |终身总输赢| × 本比例折算。重复执行会先按已记入的终身折算额扣回，再按新比例增加。',
+    calculate_lifetime_btn: '一键计算终身总输赢',
+    calculate_lifetime_tip: '按各会员最新每日推送中的终身总输赢与上方比例，批量更新待领取积分与领取上限。无终身总输赢数据的会员将跳过。',
+    calculate_lifetime_confirm: '将按当前终身总输赢兑换比例重新折算全部会员积分，已折算部分会先扣回再按新比例增加。是否继续？',
+    section_mall_open: '商城开放日',
+    mall_open_date: '商城开放日',
+    mall_open_date_tip: '设置后隔日生效。例如设为 8 月 1 日，则从 8 月 2 日起对业务日期为 8 月 1 日及之后的每日推送执行「昨日净输赢」转积分（T+1：开放日前一日产生的输赢在开放日次日开始折算）。',
+    active_mall_open_date: '当前生效的开放日',
+    section_other: '其他参数',
    unlock_ratio: '解锁比例（unlock_ratio）',
    unlock_ratio_tip: '每日推送中：今日可领取上限 = 昨日总充值 × 本比例。',
    points_to_cash_ratio: '积分折算现金比例',
--- a/web/src/lang/backend/zh-cn/mall/playxDailyPush.ts
+++ b/web/src/lang/backend/zh-cn/mall/playxDailyPush.ts
@@ -4,9 +4,11 @@ export default {
    date: '业务日期',
    username: '用户名',
    yesterday_win_loss_net: '昨日净输赢',
+    converted_points: '转换积分',
    yesterday_total_deposit: '昨日总充值',
-    lifetime_total_deposit: '历史总充值',
-    lifetime_total_withdraw: '历史总提现',
+    lifetime_total_deposit: '终身总充值',
+    lifetime_total_withdraw: '终身总提现',
+    lifetime_win_loss_net: '终身总输赢',
    create_time: '创建时间',
    'quick Search Fields': 'ID',
 }
--- a/web/src/lang/backend/zh-cn/mall/userAsset.ts
+++ b/web/src/lang/backend/zh-cn/mall/userAsset.ts
@@ -9,6 +9,8 @@ export default {
    today_limit: '今日可领取上限',
    today_claimed: '今日已领取',
    today_limit_date: '今日上限日期',
+    points_claim_cap: '领取积分上限',
+    total_points_claimed: '累计已领取积分',
    create_time: '创建时间',
    update_time: '修改时间',
    'quick Search Fields': 'ID、playX用户ID、用户名、手机号',