XingQue/Django
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
557 Commits 3 Branches 1 Tag
07ae350d55797fe1de29719f5945b18ab14e1632
Commit Graph

232 Commits

Author SHA1 Message Date
XingQue
07ae350d55 fix: 总会员按子会员迁出；我的会员去掉展开重复展示 
EOF

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 04:37:08 +08:00
XingQue
2f684a0203 fix: 二次迁移可迁账上仍有效的充值单合成会员 
EOF

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 04:30:31 +08:00
XingQue
2ab97b0579 fix: 会员按公共ID原样过户，禁止静默skip，残留资产可补迁 
EOF

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 04:25:23 +08:00
XingQue
5f3a5f9e08 fix: 二次迁移名额有剩余次数即展示入口，不依赖强制拦截 
EOF

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 04:19:25 +08:00
XingQue
b84bdc5a76 fix: 二次迁移名额可列表展示，保存后跳转用户页 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 04:12:10 +08:00
XingQue
e8de4b2cf9 fix: 会员迁移不盲信club_id，目标必落库并撤销源Czjilu权益 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 04:06:47 +08:00
XingQue
47f69dc8ab fix: 迁移会员过户统一 naive/aware 时间比较，避免 confirm 500 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 03:58:08 +08:00
XingQue
b324e3ee0f fix: 迁移码返回完整URL；确认须在目标店；兼容扫码接收 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 03:53:08 +08:00
XingQue
bd1284825c fix: 迁移预览兼容naive时间；无资产不强制进迁移页 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 03:47:53 +08:00
XingQue
7dc1dd6f04 fix: 迁移积分/分红次数/冻结入账，并修正无计划误导文案 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 03:44:53 +08:00
XingQue
2b6d91fc4a feat: 迁移预览展示会员名称与到期日，总会员按子会员加时长 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 03:30:08 +08:00
XingQue
9346123e8c fix: fund_freeze 从 business_models 导入 User，修复提现驳回 500 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 01:14:52 +08:00
XingQue
36e1bf902a feat: 提现驳回可选返还手续费与入账冻结（单笔/批量） 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 00:57:12 +08:00
XingQue
8e7481e25d fix: 管事/组长分红入账接入资金冻结网关（会员/商家单/押金） 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 00:50:13 +08:00
XingQue
0ebe5b4872 feat: 跨俱乐部资产迁移（计划/令牌/流水 + 用户与后台 API） 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 00:15:27 +08:00
XingQue
e91bf6c982 fix: 强制结单组队分账+按打手俱乐部冻结 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 15:03:54 +08:00
XingQue
5ded53bca8 fix: 平台微信退款改用俱乐部收款配置（付呗/直连分路，不动支付宝） 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 14:17:24 +08:00
XingQue
1c67f98866 feat: 罚款分红费率按俱乐部可读可配，接入提现设置 
个人利率优先，其次 club_fadan_fenhong_lilv，再回退全局表；组队均摊仍按每张罚单金额×费率。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 19:54:58 +08:00
XingQue
75fb69e6da fix: 自动结算写入对齐 USE_TZ；lxs 打手注册同步开通管事 
order_deal 不再 make_aware 入库以免 MySQL 报错；龙先生打手注册成功时创建管事且邀请人与打手相同。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 19:15:16 +08:00
XingQue
955b76cbea fix: 俱乐部超管可审本店提现与订单，禁跨店改单 
放宽身份校验与权限推断，列表带回俱乐部信息，写操作按本店范围拦截。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 18:39:46 +08:00
XingQue
b5506f5361 fix: 体验会员期判断统一 datetime 时区，避免提现审核报错 
naive/aware 混比导致 can't compare offset-naive and offset-aware datetimes。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 08:57:10 +08:00
XingQue
3c02b9477d fix: 成交指标 ensure 遇唯一键冲突时复用已有行 
回填并发插入 merchant_deal_stat/dashou_deal_stat 时不再因 Duplicate entry 中断。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 08:48:45 +08:00
XingQue
e3f9654002 fix: 成交指标始终记账并回填；抢单建聊移出事务并重试 
抢单池刷新触发历史回填，旧单也能出成交率/罚款率/均时；建聊失败重试并订阅组队成员，避免消息列表空白。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 08:46:22 +08:00
XingQue
5e38a3d49a feat: 自动结算返回到期时间戳供前端秒级倒计时 
详情/列表用 auto_expire_at_ts 做 HH:MM:SS 时钟；展示不依赖 Celery，真正自动结单才需要 beat。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 08:24:13 +08:00
XingQue
3fe24cbcce fix: 抢单/组队卡片成交指标有字段即返回，均时含0样本 
商家指标俱乐部兜底；组队大厅附带商家成交率/罚款率/均时。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 08:21:33 +08:00
XingQue
96f1a80395 feat: 俱乐部超级管理可加本店余额，不再强制集团高管 
持有000001且处于当前俱乐部视图时可加余额/押金/可提现；强制目标用户同俱乐部，并在修改记录中写入俱乐部ID。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 07:53:33 +08:00
XingQue
454f5abe90 fix: 组队强制本俱乐部隔离，修复组队分账冻结幂等键 
组队接口一律校验 X-Club-Id=订单=帖；不走跨店互通。分账 biz_id 按队员区分。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 03:25:52 +08:00
XingQue
193a82930e chore: Beat仅保留冻结解冻+可控自动结算，并加固关开关立即停结 
自动结算结单前再校验俱乐部开关与 SettlementTime>=开启时间；关开关仍清 eligible。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 03:17:01 +08:00
XingQue
7002da6093 feat: 组队招募（/zudui）+ 结单/自动结算/罚款挂钩 
新增 Team 表与接口；进8强制锁、组队分账优先且失败不回退全额队长。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 03:12:04 +08:00
XingQue
1b733d21cc feat: 订单列表/详情返回自动结算倒计时字段，并加小程序结算率接口 
仅 eligible 结算中订单下发预计时间；支持 auto_settle_pending 筛选；新增 /dingdan/wo-de-deal-stat。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 02:08:32 +08:00
XingQue
9ac0a3a5ad feat: 投诉仅限本人邀请人+人工客服配置+抢单池商家成交指标 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 01:41:29 +08:00
XingQue
0e102fbcba feat: 成交指标新表+可控自动结算（默认关，仅新进结算中eligible） 
按设计文档：SettlementTime起表；关开关清eligible；定时任务只结到期eligible单；打款走统一结单；指标从stats_since起幂等记账。不打开旧全局ORDER_AUTO_SETTLEMENT。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 01:28:44 +08:00
XingQue
fa6e679cbe feat: 角色协议(勾选+阅读秒数+卡点)与冻结说明按身份返回 
新增协议表/签署留痕、后台与小程序 API；去掉手写依赖；支持抢单/注册/提现等卡点配置。冻结问号文案按角色字典下发。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-26 20:22:12 +08:00
XingQue
6c96eb3bcb fix: 冻结条件可评估+分期规范化，定时扫描更及时 
后台条件真正按罚款率/单量等评估；选项式配置所需字段规范化；Celery 改为每5分钟；小程序说明文案接口补齐。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-26 19:36:10 +08:00
XingQue
3194a47f52 feat: 资金冻结 P2 客服后台 API（配置/明细/风险/手动解冻） 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-26 18:55:26 +08:00
XingQue
6a1895e566 feat: 资金冻结 P1 打手结单收口网关 + 到期解冻定时任务骨架 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-26 18:49:44 +08:00
XingQue
d40a27a5ca feat: 资金冻结 P0（表结构+默认关闭入账网关+权限菜单种子） 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-26 18:43:01 +08:00
XingQue
79c86ec373 fix: 全支付接口入口拦截小汐支付宝，微信支付路径不动 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-26 16:29:50 +08:00
XingQue
49e07c2673 fix: 仅小汐(xx)禁止发起支付宝支付，其它俱乐部与回调不受影响 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-26 16:08:03 +08:00
XingQue
231e5162b0 feat: 俱乐部订单单向互通抢单（集团配置 + 接单池/抢单校验） 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-26 03:08:10 +08:00
XingQue
1234cff035 fix: 会员/图标换图生成新路径并删除旧OSS，避免CDN缓存导致不更新 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-26 02:52:52 +08:00
XingQue
7cb41bf4d7 fix: 后台用户菜单对俱乐部超级管理000001可见（page_id兜底） 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-26 02:21:18 +08:00
XingQue
6443336bd9 fix: 俱乐部超级管理000001可添加/管理本店后台用户，无需集团权限 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-26 02:14:33 +08:00
XingQue
c870e7e6e9 fix: 单俱乐部视图下角色/用户/会员严格隔离，禁止泄露其他俱乐部 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-26 01:48:51 +08:00
XingQue
280d8742c9 feat: 提现审核按俱乐部隔离并加固打款商户号，新增小溪审核目录复制脚本 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-26 01:20:42 +08:00
XingQue
332c42c85d feat: 新增打手「我的」VIP条可配置背景与图标 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-25 22:49:11 +08:00
XingQue
ccd0149897 fix: 接单池/充值背景按俱乐部下发更稳健，并返回 club_id 便于排查 
配置型大图在已上传或路径非默认时均下发；payload 带 club_id，避免后台与小程序俱乐部不一致导致空白。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-25 21:08:05 +08:00
XingQue
fb5a1707db feat: 接单池三类订单卡背景支持图标管理配置 
新增平台/优质商家/普通商家卡背景 icon key，未上传不下发，按俱乐部独立配置。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-25 20:41:24 +08:00
XingQue
4b5130c824 feat: 会员/履约金页文案按俱乐部可配置 
新增 club_recharge_page_copy 表与小程序/后台读写接口，kefu 菜单挂「充值页文案」。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-24 00:04:23 +08:00
XingQue
dcb191ac3a fix: 邀请码俱乐部不符时提示两侧 club_id；新增 diagnose_lsx_invite 对齐种子 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-23 22:30:23 +08:00