Commit Graph
297 Commits
Author SHA1 Message Date
XingQueandCursor 6a3f2a869b fix: 商家订单权限与菜单一致,含本俱乐部+全局角色
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-06 19:03:23 +08:00
XingQueandCursor ffac1d6fb8 fix: 切换俱乐部仅算本俱乐部角色权限,统一权限解析
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-06 19:00:18 +08:00
XingQueandCursor ffa6fc57b1 fix: 俱乐部+全局角色权限并集,修复002ac校验
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-06 18:44:11 +08:00
XingQueandCursor 8d94aa59ed fix: 多俱乐部任职即可切换,权限按当前俱乐部计算
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-06 18:40:42 +08:00
XingQueandCursor 854eb80360 fix: 恢复全局角色权限校验,修复商家订单403
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-06 18:36:39 +08:00
XingQueandCursor ddabe219f5 fix: 俱乐部000001不再展开全部菜单权限
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-06 18:32:01 +08:00
XingQueandCursor 381438d553 fix: 顶栏仅可切换有功能角色的俱乐部
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-06 18:28:24 +08:00
XingQueandCursor 9dde539f3b fix: 角色分配按俱乐部超管权限隔离
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-06 18:23:29 +08:00
XingQueandCursor ac44b73c1f fix: 角色操作按俱乐部解析避免同名Role冲突
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-06 18:17:37 +08:00
XingQueandCursor c8037e6d4b fix: 俱乐部分配任职仅集团高层可操作
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-06 18:06:37 +08:00
XingQueandCursor 0d5efc67db feat: 多俱乐部后台权限与管理员用户俱乐部分配
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-06 17:59:59 +08:00
TermiNexus 3d2c6091e5 perf: P1 性能优化批量修复 + kefu 视图拆分
P1 性能优化(避免循环内 N+1 / N 次 DB 查询):
- shop_order_views._batch_images: 移除 ThreadPoolExecutor 掩盖的 N 次查询,改单次批量 + Python 侧分组
- product_query.DashouHuiyuanList: 5N 查询 -> 3 次批量预取 + 本地闭包判断
- roles.GetRolePermissionView / 用户列表: 循环内 RolePermission/Permission/UserRole/Role -> 批量 __in 预取
- guanli / zuzhang 杜次分红 4.2/4.3: 循环内 update_or_create + 单条 delete -> bulk_create + bulk_update + 批量 delete
- admin_config QQ 群配置: 循环内 exists/first/save/create -> 批量预取 + bulk_create + bulk_update
- jituan 服务层多处合并统计查询、批量预取 map
- rank 多处循环 N+1 改批量预取
- backend 多处循环内 count/create 改批量
- config/orders/merchant_ops 多处循环 N+1 改批量预取

其他改动:
- users/views/kefu.py 拆分为 kefu_base/kefu_dashou/kefu_orders/kefu_punishment/kefu_withdraw 5 个文件
- 删除遗留脚本 check_prod_uid.py / create_rbac_tables.sql
2026-07-05 23:17:38 +08:00
XingQueandCursor 3028e66f6a fix: 假单管理补全 DATA_SCOPE_ALL 导入
修复 fake-grab-order-list 500 NameError。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-05 22:35:30 +08:00
XingQueandCursor fd5092c418 fix: 菜单种子自动补全假单管理页
检测 product.fake-orders 缺失时自动执行 seed_kefu_menu。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-05 22:32:38 +08:00
XingQueandCursor ea80181516 feat: 假单后台管理接口(按俱乐部+商品类型 CRUD)
新增 fake-grab-order-list/manage/avatar 接口,权限 2200a;支持增删改价格介绍头像等;假单展示使用自定义头像。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-05 22:28:13 +08:00
XingQueandCursor 81d7e28981 feat: 会员充值明细接口与俱乐部一键创建总会员
新增 hy-recharge-records 查询 czjilu 会员单并关联 gsfenhong 分红;hy-bundle-create 支持俱乐部一步创建总会员;会员数据分析页权限改为 3300a。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-05 18:27:48 +08:00
XingQueandCursor b25eeb54b6 feat: 总会员(包含式)模型、迁移、抢单校验与后台配置
- Huiyuan.is_bundle + club_huiyuan_bundle_include 表
- 购买/到期逻辑不变,抢单时总会员覆盖子会员类型
- dshyhq/clumber 返回 is_bundle 与 included_huiyuan_ids

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-05 18:12:57 +08:00
XingQueandCursor 9e49d055c5 feat: 打手中心全量可配置图标下发与会员卡片图上传接口
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-05 17:36:31 +08:00
XingQueandCursor dd2e299a27 fix: dashou 订单列表补全 ZHIDING_HF_TEXT 常量
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-05 17:06:32 +08:00
XingQueandCursor a54154b30d fix: dshyhq 返回会员卡片图 card_image/card_bg
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-05 16:42:14 +08:00
XingQue acc37a3981 feat: 会员充值页卡片图与 miniapp 背景图配置 2026-07-05 16:25:42 +08:00
XingQue 11044819a7 merge: 合并 origin/main 视图拆分 (9d37f59) 2026-07-05 16:17:51 +08:00
TermiNexus 9d37f59971 进行了完整的视图拆分,同步了 merchant_ops 的修改 2026-07-05 10:01:09 +08:00
XingQueandCursor efd7d31209 fix: 商家老板可绑定为其他店子客服
允许已是商家老板的用户担任其他商家子客服,禁止绑自己的店。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-04 20:48:12 +08:00
TermiNexus abc9c6d791 修复了常量归类 2026-07-04 19:58:19 +08:00
TermiNexus 72eeefee28 拆分了 config 2026-07-04 19:29:53 +08:00
TermiNexus e5cca0e191 尝试将 backend 做了视图拆分,来保证可维护性,若此版本存在生产环境问题应该回退 2026-07-04 18:52:00 +08:00
XingQue fee95ee7b0 fix: 链接页接单打手ID与指定打手分离,手机号改为选填 2026-07-04 00:04:22 +08:00
XingQue 92f07a0e55 feat: 链接填单增加拼多多订单号/手机号校验并隐藏H5价格 2026-07-03 23:32:33 +08:00
XingQue 9fdd24adda fix: 修复添加后台用户 RoleUUID 转换错误并严格校验角色绑定 2026-07-02 16:03:23 +08:00
XingQueandCursor 8f69417ca0 fix: 完全回滚公告轮播身份校验代码,恢复改前行为
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-02 14:17:26 +08:00
XingQue 4c7be4a1eb fix: 回滚公告轮播身份校验,避免前端整页无数据 2026-07-02 14:11:09 +08:00
XingQue 71b648ff16 fix: 公告轮播page_key逻辑与商家充值轮询yonghuid字段 2026-07-02 14:05:38 +08:00
XingQue 8009aecdd7 fix: 客服订单详情罚款状态使用统一标签,支持平台审核中 2026-07-02 13:12:22 +08:00
XingQue 0c8c25b7ed 公告轮播按用户身份限制 page_key,无身份仅可访问点单相关 2026-07-02 13:05:38 +08:00
XingQue d91a1553e6 fix: 平台审核仅zhuangtai=5,不再误纳入旧商家待缴纳 2026-07-02 02:54:49 +08:00
XingQue a12fb37259 fix: 平台审核队列兼容旧商家罚款+列表筛选 2026-07-02 02:38:21 +08:00
XingQue a8c314cbee fix: 修复换打手权限、后台用户重复创建及角色绑定 2026-07-02 02:20:29 +08:00
XingQue ec6ab236a7 商家罚款增加平台审核:新增状态5、证据图、审核API;审核通过前不影响抢单,提现仍拦截未结案罚单 2026-07-02 01:53:25 +08:00
XingQue 9fc7711743 feat(rank): 排行榜奖励活动期、领取审计与校验;修复邀请二维码路径 2026-07-02 00:40:50 +08:00
XingQue 111e013b3f fix: 组长邀请二维码改用 fighter 新路径,不再走 manager 2026-07-01 23:46:21 +08:00
XingQueandCursor 87980163d6 fix: 管事/组长邀请二维码改用小程序新页面路径
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-01 23:43:45 +08:00
XingQue 7a693dca2f fix: 排行榜返回完整统计字段并跟随后台排序方案 2026-07-01 19:32:29 +08:00
XingQue 19732b8e0d fix: 排行榜按方案档位展示各名次预计奖金 2026-07-01 19:17:43 +08:00
XingQueandCursor 185fcb7b50 fix: 集团总榜不展示俱乐部分奖行内金额
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-01 17:41:17 +08:00
XingQueandCursor d98c71cace feat: 排行榜奖励按俱乐部分奖与手动领取
- 新增奖励方案/档位/结算/领取四表与懒结算服务
- 小程序 phbjlxx/phbjllq/phbjlphb 新接口,phbhqsj 零改动
- 后台 phbjhq/phbjbc/phbjjl 与 phbj666 权限菜单

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-01 17:40:56 +08:00
XingQueandCursor 8b94601aa7 chore: 排行榜奖励功能开发前备份标记
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-01 17:30:22 +08:00
XingQue 54c15b9658 feat: 客服后台话术配置接口与会话管理菜单 2026-07-01 12:28:22 +08:00
XingQueandCursor b83dfd0528 feat: 小程序客服话术表与自动回复接口
- 新增 MiniappScriptScene / MiniappScriptAutoReply 模型与迁移
- 新增 /peizhi/huashuhq、/peizhi/huashu_match 接口及 Admin 配置

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-01 11:59:21 +08:00
XingQueandCursor e66538674a chore: 客服话术接口与扫码兼容改造前备份标记
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-01 11:55:56 +08:00