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

534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
17b38d07a9 feat: 抢单池/组队角标计数多接口附加字段（兼容旧客户端） 2026-07-27 17:19:41 +08:00
XingQue
9b9203587c fix: 组队复用抢单配对群，不再另建 group_订单 2026-07-27 09:21:15 +08:00
XingQue
8e71cd4243 feat: 仅特约商家可更换打手，后台可开关 2026-07-27 09:16:27 +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
871144b53b fix: 组队结单后罚款仍按队员均摊 
商家常在结单后申请罚款，招募已是结束态；现含已结束组队，并从结算流水兜底还原队员。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 08:18:06 +08:00
XingQue
7d366e8075 fix: 组队仅队长提交修改，组员可见交付；罚单聚合改撤联动 
详情返回 can_submit/can_modify；交付图按订单聚合；组队均摊罚单展示总额并联动修改/撤销；罚单 ClubID 归属订单店。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 08:05:34 +08:00
XingQue
c5ceacf3d3 fix: 进入组队订单群时一并订阅在队打手 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 08:00:27 +08:00
XingQue
caef4bf56c fix: 组队群统一 group_订单ID，入队发消息并拉商家/老板 
开组/入队订阅派单方；发送「已组队」；进聊与代理发消息在有组队时走订单群；队友可进群。

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

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 07:53:33 +08:00
XingQue
69e1ca0e1a feat: 组队大厅返回队长结算率/被罚款率 
与订单列表同口径，按招募与订单俱乐部兜底查询打手成交统计。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 07:43:26 +08:00
XingQue
fcb2f5364e feat: 组队大厅返回商家UID/头像与队长头像 
serialize_recruit_public 对齐抢单池补 shangjia_id、sj_avatar、leader_avatar。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 07:22:19 +08:00
XingQue
69b16848c4 feat: 商家退款申请支持证据图片 
新增 tuikuantupian 表；申请退款必传图片；打手详情与客服订单详情返回退款图。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 07:12:43 +08:00
XingQue
bf4fd468e8 fix: 封禁打手禁止 wdlyhdl 登录并返回明确提示 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 05:56:30 +08:00
XingQue
5b0db2c8fd feat: 封禁原因字段与身份状态刷新接口 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 05:40:50 +08:00
XingQue
40c489de39 fix: 补全组队接口 _club/_uid，修复 /zudui/dating 500 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 05:04:42 +08:00
XingQue
1ae4796e1a fix: wdlyhdl 不再把商家/管事身份错误写成恒为1 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 04:57:58 +08:00
XingQue
842cfbe5e1 feat: 投诉工单支持填写QQ/微信/手机联系方式 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 04:15:59 +08:00
XingQue
f59ae2416f feat: 打手订单列表组队标记，队友也可看单；详情返回队友昵称 
列表附 has_team/角色/人数；组队在队成员纳入订单列表查询。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 03:33:35 +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
e9e5ee85e2 feat: 客服平台/商家订单列表与详情返回自动结算倒计时并支持筛选 
对齐小程序口径：eligible 才下发；auto_settle_pending=1 筛待自动结算。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 02:12:45 +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
97040c552e fix: 充值投诉仅允许已支付流水（前后端硬拦） 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 01:12:30 +08:00
XingQue
332fde50a3 fix: 充值记录列表补全状态/类型展示字段 
投诉选单接口返回可读时间与更完整状态文案，不筛选状态。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 01:05:41 +08:00
XingQue
4799282579 feat: 客服后台可开关投诉拦截提现（按当前俱乐部） 
投诉工单页对应 API：GET/POST /gongdan/admin/club-config/

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 00:56:43 +08:00
XingQue
890e465e40 feat: 投诉工单正规化（介入/牵连提现拦截，仅俱乐部开关） 
支持被投诉对象、平台介入、协商中状态与组长投诉；提现硬拦含管事向上牵连组长，默认仅 lxs 开启。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 00:50:31 +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
a505a1ab2d feat: 小程序资金冻结只读接口（汇总/明细/兼容字段） 
提现资产与角色信息增量返回 dongjie；新增 fund-freeze-mine/ledger 只读 API，不改扣款逻辑。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-26 19:11:47 +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>
pre-freeze-fund-v1 		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
98b4526efa feat: 新增小汐电竞种子组长/管事命令 seed_xx_invite_data 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-26 02:01:02 +08:00
XingQue
c870e7e6e9 fix: 单俱乐部视图下角色/用户/会员严格隔离，禁止泄露其他俱乐部 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-26 01:48:51 +08:00