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

566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
XingQue
e6b1d29b11 fix: 系统超管 menu permission_codes 展开全量权限码（含002ad） 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 11:06:22 +08:00
XingQue
af513738a5 feat: 客服改平台订单/商品抢单要求（002ad 隔离接口） 
仅状态1/7可改订单；批量只改本店类型下商品三字段；各俱乐部闸门隔离无白名单特殊化。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 07:48:11 +08:00
XingQue
c3a0143eff fix: 集团任职硬删除，杜绝 NULL 重复冒出多条 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 06:53:06 +08:00
XingQue
52e714b9b2 fix: 紧急封杀后台账号命令 nuke_kefu_admin 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 06:49:11 +08:00
XingQue
559e903a0c fix: 停用集团任职同时摘掉 IsSuperuser，杜绝超管绕过 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 06:46:14 +08:00
XingQue
ad760a9b42 fix: 后台停用/禁用真正生效（重复集团任职与超管绕过） 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 06:42:21 +08:00
XingQue
fa746448cc fix: 源店计划启用即返回 show_entry，与是否有资产无关 
EOF

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 04:58:52 +08:00
XingQue
589a653a94 docs: 明确迁移入口仅随计划启用，与强制拦截解耦 
EOF

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 04:51:28 +08:00
XingQue
da62ea8be9 fix: 迁移子会员时长按总会员有效覆盖累加，避免少加天数 
EOF

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 04:46:29 +08:00
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
df89c82731 fix: 迁移闸门优先用小程序 club_id/X-Club-Id，避免源店不弹窗 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-29 03:23:57 +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
568dcb720e fix: IM俱乐部过滤返回current_club_id并规范化比对 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 15:28:24 +08:00
XingQue
e91bf6c982 fix: 强制结单组队分账+按打手俱乐部冻结 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 15:03:54 +08:00
XingQue
4414b74119 fix: 超管强制结单跳过客服统计，避免 kefu 为 None 整单回滚 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 14:43:51 +08:00
XingQue
bc20fd85e0 fix: kefu.py 补 import re，修复聊天俱乐部过滤接口加载失败 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 14:34:21 +08:00
XingQue
5ded53bca8 fix: 平台微信退款改用俱乐部收款配置（付呗/直连分路，不动支付宝） 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 14:17:24 +08:00
XingQue
5cfb4a1b2b feat: 客服聊天按用户俱乐部过滤待接入会话 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 14:08:59 +08:00
XingQue
2ff5df09bc feat: 专区图标支持后台上传 OSS，查询接口下发 tupian_url 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-28 02:12:09 +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
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