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

130 Commits

Author SHA1 Message Date
XingQue
5556bbdb61 fix: 总榜按无效人数排行；总会员ID匹配与子类型展开修复 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-11 01:56:39 +08:00
XingQue
fda4ffb628 fix: 提现申请仅拦截进行中订单，移除打手状态误拦 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-11 00:15:13 +08:00
XingQue
b02b2dffed fix: 提现申请放行退款审核中订单，管理员拒绝退款不再500 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-11 00:06:42 +08:00
XingQue
dc6ddee0d7 fix: 打手提现申请仅拦截进行中与退款审核中订单 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 23:49:01 +08:00
XingQue
d6237ccc7b fix: 收款不再预查微信，恢复早期「有package就调起」逻辑 
接入多俱乐部后每次收款先查微信，V3查单失败会永久返回code12。
改为仅读本地：有package直接确认，无package立刻作废重试；转账失败返回明确错误。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 22:07:09 +08:00
XingQue
8bc0afb7f4 fix: 简化提现收款对账，避免永远卡在收款处理中 
- 同一审核单只保留最新一条进行中打款，多次点击不再堆叠阻塞
- 有 package 时查单失败也直接调起微信确认
- 无 package 超过20秒即作废允许重试；转账/网络失败返回明确错误而非 code12

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 21:59:28 +08:00
XingQue
921941a36d fix: 无 package 的打款单不再长时间提示收款处理中 
微信查单 not_found/失败且本地无 package 时立即允许重新发起收款。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 21:53:59 +08:00
XingQue
e1a3c07cef fix: 自动提现收款不再因查单失败卡死，失败可重试且防双笔 
- 查单失败时优先用本地 package 直接调起微信确认收款
- 单次打款失败不关审核单(保持待收款6)，允许同一审核单再次收款
- 跳过已失败打款记录；缩短 grace 至 2 分钟；去掉「核对状态」类死锁提示

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 21:48:00 +08:00
XingQue
49ad57bbb2 feat: club 表独立 mch_key 字段，后台明确区分 APIv2 收款与 APIv3 提现 
- 新增 club.mch_key 列并迁移 config_json 历史数据，api_v3_key 保持独立
- club-manage 读写 mch_key；支付读 club.mch_key 优先，兼容 config_json 回落
- 提现查单返回商户号改读俱乐部 V3 配置；不影响其他业务逻辑

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 21:34:32 +08:00
XingQue
f601541eb0 fix: 支付 openid 按俱乐部隔离，禁止跨小程序回落 legacy 字段 
appid 已正确读 club 表，但 openid 在无 xq 绑定时会错误回落 UserName/OpenID（可能是星之界 openid），导致 appid 与 openid 不匹配。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 20:47:35 +08:00
XingQue
5e758a8a46 Merge branch 'main' of https://git.gvsds.com/XingQue/Django 
Co-authored-by: Cursor <cursoragent@cursor.com>
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2026-07-10 15:39:37 +08:00
TermiNexus
5eebbfbff1 修复了罚单履约与回退机制 2026-07-10 15:18:45 +08:00
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