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

108 Commits

Author SHA1 Message Date
XingQue
b54904a9f2 fix: 严格校验体验会员不可提现，抢单按会员类型匹配 
展示层 clumber 与提现/抢单权限分离：佣金提现须正式会员并双重拦截体验期；抢单走 resolve_order_membership_ids + 总会员包含判断。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 14:26:16 +08:00
XingQue
abfe497ddc fix: 抢单池有体验/已付会员一律按已开通返回 
/ddhq 有任意有效会员时 yaoqiuleixing 强制为 0；czjilu 已付单可合成 clumber；抢单校验支持充值单兜底。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 14:18:36 +08:00
XingQue
f46e36b539 fix: 老端抢单池有体验/正式会员时 yaoqiuleixing 返回 0 
/ddhq 在用户有有效会员（含体验）时将 yaoqiuleixing 置 0，老小程序不再显示未开通会员；抢单仍由服务端校验。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 14:13:24 +08:00
XingQue
eedd5fbd46 fix: 体验会员按正式会员返回抢单池数据 + 修复 MerchantStaffMember 
clumber/dashouxinxi 有效期内体验会员与正式会员同格式返回；ddhq 保持原 yaoqiuleixing/huiyuan_id 供老端匹配；补 merchant-staff 缺 import。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 14:09:12 +08:00
XingQue
86e7a60642 fix: 纯后端适配老小程序抢单池会员展示 
/ddhq 有权限时返回 yaoqiuleixing=0；clumber 统一 huiyuanid+daoqi 字符串并补齐 ID 变体；读取前自动补写已付未落库的体验/正式会员。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 14:05:22 +08:00
XingQue
dfd4bed221 fix: 抢单池会员展示加强校验与 hasRequiredMember 直返 
会员 ID 忽略前导零等价匹配；订单缺 huiyuan_id 时回退商品类型；接口直返 hasRequiredMember 并将已授权订单 yaoqiuleixing 置 0。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 13:56:54 +08:00
XingQue
3a2b8a2bba fix: 体验/总会员抢单池显示与接单权限 
统一 clumber 返回 huiyuanid 并展开总会员子类型；抢单池接口对已具备会员权限的用户将 yaoqiuleixing 置 0，使小程序无需发版即可正常显示分佣并抢单。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 13:47:05 +08:00
XingQue
7dc78acb73 fix: 会员充值链路加固（体验资格、积分分红、czjilu审计、余额抵扣） 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 00:07:54 +08:00
XingQue
6e2e1944b6 fix: 角色UUID bytes比对修复权限全空，legacy权限合并兜底 2026-07-06 19:28:35 +08:00
XingQue
2edca09859 fix: 俱乐部角色ORM过滤+商家订单权限002ab/003aa+legacy兜底+perm-debug 2026-07-06 19:25:15 +08:00
XingQue
7bb891187b fix: 按俱乐部隔离权限，menu-access 返回任职无角色提示 2026-07-06 19:21:38 +08:00
XingQue
a14cba63e6 fix: 集团可给各俱乐部分配不同功能角色，按俱乐部隔离权限校验 2026-07-06 19:14:00 +08:00
XingQue
ebcedbdea1 fix: 商家订单权限与菜单一致，含本俱乐部+全局角色 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-06 19:03:23 +08:00
XingQue
45a4dde034 fix: 切换俱乐部仅算本俱乐部角色权限，统一权限解析 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-06 19:00:18 +08:00
XingQue
553d2d5707 fix: 俱乐部+全局角色权限并集，修复002ac校验 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-06 18:44:11 +08:00
XingQue
1e54d8b871 fix: 多俱乐部任职即可切换，权限按当前俱乐部计算 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-06 18:40:42 +08:00
XingQue
df6c6912d9 fix: 恢复全局角色权限校验，修复商家订单403 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-06 18:36:39 +08:00
XingQue
64ddb7d0b8 fix: 俱乐部000001不再展开全部菜单权限 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-06 18:32:01 +08:00
XingQue
7c763ad5b4 fix: 顶栏仅可切换有功能角色的俱乐部 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-06 18:28:24 +08:00
XingQue
1c6607fa6e fix: 角色分配按俱乐部超管权限隔离 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-06 18:23:29 +08:00
XingQue
1dfb46c38c feat: 多俱乐部后台权限与管理员用户俱乐部分配 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-06 17:59:59 +08:00
TermiNexus
f1c8633345 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
XingQue
76ea5f8255 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
XingQue
59a6deef73 fix: 菜单种子自动补全假单管理页 
检测 product.fake-orders 缺失时自动执行 seed_kefu_menu。

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

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-05 22:28:13 +08:00
XingQue
2a350a2ec8 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
XingQue
37bc8f960a 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
XingQue
5754a69e0b feat: 打手中心全量可配置图标下发与会员卡片图上传接口 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-05 17:36:31 +08:00
XingQue
aaf0c95925 feat: 会员充值页卡片图与 miniapp 背景图配置 2026-07-05 16:25:42 +08:00
XingQue
c7adec20db fix: 修复添加后台用户 RoleUUID 转换错误并严格校验角色绑定 2026-07-02 16:03:23 +08:00
XingQue
725a1386c3 fix: 完全回滚公告轮播身份校验代码，恢复改前行为 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-02 14:17:26 +08:00
XingQue
593ed1ab09 fix: 公告轮播page_key逻辑与商家充值轮询yonghuid字段 2026-07-02 14:05:38 +08:00
XingQue
d8ac8521d4 公告轮播按用户身份限制 page_key，无身份仅可访问点单相关 2026-07-02 13:05:38 +08:00
XingQue
5ef4ff7c91 feat: 排行榜奖励按俱乐部分奖与手动领取 
- 新增奖励方案/档位/结算/领取四表与懒结算服务
- 小程序 phbjlxx/phbjllq/phbjlphb 新接口，phbhqsj 零改动
- 后台 phbjhq/phbjbc/phbjjl 与 phbj666 权限菜单

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-01 17:40:56 +08:00
XingQue
e533424de5 feat: 客服后台话术配置接口与会话管理菜单 2026-07-01 12:28:22 +08:00
XingQue
dc71c4f1cb feat: gate withdraw audit and add-balance to group executives only 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-29 01:30:56 +08:00
XingQue
dd9e4afa49 revert: restore gvsdsdk role/permission APIs; keep KefuProfile login fix 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-29 00:02:40 +08:00
XingQue
42cb117a8a fix: kefu permissions use legacy permission table instead of gvsdsdk 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-28 23:59:32 +08:00
XingQue
c336a893a0 fix: merge legacy user_role permissions with gvsdsdk for kefu login 2026-06-28 23:27:24 +08:00
XingQue
218001399c fix: bind kefu role by yonghuid when phone duplicated 2026-06-28 23:18:14 +08:00
XingQue
de91089743 fix: clearer no-perm message with bound roles 2026-06-28 23:11:50 +08:00
XingQue
a45bc150e8 fix: kefu menu builtin fallback when DB empty, fix menu load 2026-06-28 23:03:41 +08:00
XingQue
d7c09e230f fix: menu_access 返回 permission_codes 便于排查无菜单权限 2026-06-28 22:47:57 +08:00
XingQue
2003ee01a5 fix: 俱乐部000001不再展示集团级后台菜单与俱乐部密钥配置 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-28 16:52:25 +08:00
XingQue
3a1aaa9b61 feat(jituan): 后台按俱乐部添加考核官 khggl-add 2026-06-28 00:32:52 +08:00
XingQue
54f8e23488 fix: separate penalty czjilu from merchant recharge and correct finance stats 2026-06-27 18:50:32 +08:00
XingQue
65477592af fix: 罚单/积分处罚仅归属申请人俱乐部，查询不再按被罚人/订单混入 2026-06-27 18:26:22 +08:00
XingQue
a6d32f848e fix: filter_penalty_qs 合并 Q 条件切片错误 2026-06-27 18:22:07 +08:00
XingQue
ee7867b36f fix: 罚单/积分处罚归属申请人俱乐部；申请锁定分红缴纳按锁定值入账 2026-06-27 18:15:42 +08:00
XingQue
cf0882575e 商家首页图标key分离、商家改昵称接口、抢单列表sj_avatar 2026-06-26 17:08:50 +08:00