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

118 Commits

Author SHA1 Message Date
XingQue
4d1677a660 Merge branch 'main' of https://git.gvsds.com/XingQue/Django 2026-07-10 15:11:55 +08:00
XingQue
a3cf7803d8 chore: 拉取远程前保留本地改动 
含 kefu_base 修改及 club_payment_channel 相关文件。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 15:11:53 +08:00
TermiNexus
e123510185 Merge branch 'main' of https://git.gvsds.com/XingQue/Django 2026-07-10 14:04:32 +08:00
TermiNexus
4652f3394a 修复了订单状态（所有支付接口）更新的问题 2026-07-10 14:03:42 +08:00
XingQue
390202b9e4 fix: 资料页仅改头像不再误判为手机号认证 
手机号认证流需同时带头像与 shoujihao_code 且无昵称；普通编辑只上传头像可正常保存。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 00:12:34 +08:00
TermiNexus
581295443a 给所有支付接口加上了支付宝 2026-07-09 22:06:46 +08:00
XingQue
914e8c70f2 修复手机号认证完成后仍反复弹窗的问题 
认证提交接口在仅上传头像时错误返回成功，检查接口也未兼容已有手机号的老数据。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-09 21:57:23 +08:00
TermiNexus
7443fef6de 修复了认证上传失效问题 2026-07-09 21:09:39 +08:00
TermiNexus
d734ce1dcc 测试 2026-07-09 21:05:09 +08:00
XingQue
d5fbc08364 fix: 自动提现按俱乐部解析微信openid，修复已登录仍提示微信登录 2026-07-09 01:06:08 +08:00
XingQue
b2a2da0f97 fix: 自动提现不再要求手机号/收款码，仅校验微信OpenID；手动提现保持原校验收款信息 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 22:16:26 +08:00
XingQue
39dfe3d52e fix: 统一微信用户定位，修复wechatlogin等UserName(openid)重复1062 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 21:28:23 +08:00
XingQue
1ffd92758d fix: 押金提现不再封号，统一加强打手/收款校验 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 21:06:28 +08:00
XingQue
ad33ee6c86 fix: User.ClubID默认xq导致星之界新用户误判，创建时置空并以wx绑定为准 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 18:34:45 +08:00
XingQue
e0c48073f1 fix: 老小程序不改端，后端兼容扫码注册(dashouzhuce/wdlyhdl) 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 18:20:45 +08:00
XingQue
7fe49775b9 fix: dashouzhuce返回dashoustatus供前端识别注册成功 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 18:06:54 +08:00
XingQue
2225722ab5 fix: 邀请校验管事无ClubID时以当前小程序为准，注册失败打日志 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 18:06:22 +08:00
XingQue
aeaa54583a fix: 扫码注册统一用户查找与俱乐部校验，修复wdlyhdl与自动注册失败 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 18:00:29 +08:00
XingQue
a47d4ee0a6 fix: 扫码注册按俱乐部微信配置换openid，Referer识别小程序 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 17:37:51 +08:00
XingQue
cec7d69199 fix: 停止每次拉单补回已删会员；后台移除标记充值单撤销 
ddhq 不再全量 sync 充值单；jian_huiyuan 标记权益已撤销防复活；clumber 只读 huiyuangoumai。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 15:49:07 +08:00
XingQue
aaa745baf4 fix: dddhq与dashouxinxi每次请求同步刷新会员clumber 
抢单池拉单前先 sync 权益；老端依赖 yaoqiuleixing=0 与 clumber 即时更新。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 15:34:10 +08:00
XingQue
12f9100b17 fix: 适配老小程序抢单池展示，登录clumber含体验会员 
老端仅认 yaoqiuleixing=0 或 clumber.huiyuanid 严格匹配；统一 build_auth_clumber 与 dddhq 同源含 czjilu 兜底。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 15:27:58 +08:00
XingQue
bcfa30d5de fix: 抢单池展示只校验对应会员未过期，体验与正式同等 
ddhq 不区分体验/正式；qiangdan 校验会员+过期；提现仍禁体验会员。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 15:21:01 +08:00
XingQue
b54904a9f2 fix: 严格校验体验会员不可提现，抢单按会员类型匹配 
展示层 clumber 与提现/抢单权限分离：佣金提现须正式会员并双重拦截体验期；抢单走 resolve_order_membership_ids + 总会员包含判断。

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

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-08 13:47:05 +08:00
XingQue
1e3d65e0e4 fix: 排行榜昵称与管事/组长统计字段对齐 
管事/组长不再展示 openid，改读业务昵称；俱乐部榜补充无效/有效邀请与收益字段；管事按有效人数、组长按收益总额排序。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-07 21:49:36 +08:00
XingQue
bfd5a63cb4 fix: 订单类型接口与 menu-access 对齐鉴权，去掉业务 401 
kfhqptddlx 不再校验 phone/UserType，仅 JWT + is_kefu_backend_account，避免菜单能进但类型接口 401 踢登录。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-06 19:35:23 +08:00
XingQue
2edca09859 fix: 俱乐部角色ORM过滤+商家订单权限002ab/003aa+legacy兜底+perm-debug 2026-07-06 19:25:15 +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
df6c6912d9 fix: 恢复全局角色权限校验，修复商家订单403 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-06 18:36:39 +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
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
TermiNexus
c5ae30507b 进行了完整的视图拆分，同步了 merchant_ops 的修改 2026-07-05 10:01:09 +08:00
XingQue
2fb1411b78 fix: 客服订单详情罚款状态使用统一标签，支持平台审核中 2026-07-02 13:12:22 +08:00
XingQue
c21168ad2d 商家罚款增加平台审核：新增状态5、证据图、审核API；审核通过前不影响抢单，提现仍拦截未结案罚单 2026-07-02 01:53:25 +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
634796b012 feat: H5链接配对群ID与客服订单详情扩展(指定响应/罚款) 2026-06-29 06:51:49 +08:00
XingQue
645b075f89 feat: add dashou deposit increase requires group executive 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-29 01:51:31 +08:00
XingQue
fb495197b8 fix: zuzhang rank today query uses UserZuzhang not UserBoss 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-29 01:44:31 +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
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
54f8e23488 fix: separate penalty czjilu from merchant recharge and correct finance stats 2026-06-27 18:50:32 +08:00
XingQue
ee7867b36f fix: 罚单/积分处罚归属申请人俱乐部；申请锁定分红缴纳按锁定值入账 2026-06-27 18:15:42 +08:00
XingQue
374dd26855 fix: 罚款微信支付使用俱乐部openid并安全解析微信响应 2026-06-27 17:59:53 +08:00
XingQue
d19b6250ae fix: 罚单申请时锁定分红利率与应得金额，缴纳按锁定值入账 2026-06-27 17:46:39 +08:00
XingQue
93bf2193d2 fix: 商家分红利率预览回退全局配置；撤销罚单记录处理人；防重复分红 2026-06-27 07:55:06 +08:00