Commit Graph

359 Commits

Author SHA1 Message Date
6c0a461a2b 修复了订单状态的验签问题 2026-07-09 20:49:26 +08:00
XingQue
f2295717ee Merge branch 'main' of https://git.gvsds.com/XingQue/Django 2026-07-09 20:42:11 +08:00
XingQue
fd7bcde9d9 fix: 店铺订单接口 PlatformOrderExt 查询字段修正
将 dianpu_id 改为模型字段 ShopID,修复 ddltj/ddlbhq 的 FieldError;统计聚合改用 id__in 匹配 Order 主键。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 20:39:05 +08:00
fb8d905fb0 修复了订单状态更新 BUG 2026-07-09 20:32:40 +08:00
f702c13422 修复了支付宝 fucha 逻辑 2026-07-09 20:28:12 +08:00
bf1088d0c5 修复二维码当面付问题 2026-07-09 20:06:01 +08:00
51edcf9fce 使用二维码进行支付宝交易 2026-07-09 19:50:40 +08:00
0826b0749d 修复了验签机制 2026-07-09 19:22:48 +08:00
aa3aa932fe 修复签名生成机制 2026-07-09 19:14:57 +08:00
5755730093 使用生产模式密钥 2026-07-09 18:06:24 +08:00
de3ff211a6 fixed: fucha接口硬编码了微信查询 2026-07-09 03:08:14 +08:00
e2b95edeb8 修复 URL 过长的问题 2026-07-09 02:53:52 +08:00
92abc0d9e7 修复导入配置 2026-07-09 02:06:52 +08:00
d7d38d9b08 修复了沙箱私钥解析问题 2026-07-09 01:58:38 +08:00
9c11698660 测试中,尝试接入支付宝(沙箱) 2026-07-09 01:51:18 +08:00
XingQue
d64042fe46 fix: 微信openid绑定重复时不污染外层事务,登录可正常回落
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 01:18:42 +08:00
XingQue
5754f6a509 fix: 微信登录并发注册撞唯一键时正确回落已有用户
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-09 01:12:46 +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
c2db2ad583 fix: 总会员只读展开子会员类型,修复club_id默认xq查错配置;dddhq不再写库补会员
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-08 22:13:12 +08:00
XingQue
2248a61936 fix: 添加后台用户不再硬编码绑定客服角色,按所选俱乐部角色分配
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-08 21:47:50 +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
d025287785 fix: 星之界扫码允许老xq账号通过本俱乐部管事码注册
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-08 18:31:14 +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
f23c8a3360 fix: 俱乐部微信登录兼容旧用户,避免UserName重复
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-08 17:43:39 +08:00
XingQue
a47d4ee0a6 fix: 扫码注册按俱乐部微信配置换openid,Referer识别小程序
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-08 17:37:51 +08:00
XingQue
95d7e8d13d fix: 体验会员抢单池与正式同等展示,修复总会员子类型与club_id
clumber 传递 club_id 展开总会员子类型;充值单路径同步;不暴露 is_trial。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-08 16:51:42 +08:00
XingQue
f87a40fbd6 fix: 抢单池 clumber 只读合并有效期内充值单,体验会员按正式展示
不写库、不 sync;修复体验单已付但 huiyuangoumai 未落库时老端显示未开通。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-08 16:41:09 +08:00
XingQue
627eeeb29b fix: 修复 rollback --since 日期字符串解析报错
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-08 16:26:19 +08:00
XingQue
c464c31140 fix: 加固会员回滚命令,有未过期充值单绝不收回
增加 repair 指纹校验;减会员后重新付费不再误收。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-08 16:20:33 +08:00
XingQue
7c3f04e7f3 fix: 禁止过期充值单补开通 + 管理命令收回错误恢复会员
rollback_erroneous_member_restore:后台已减仍有效、充值单已过期仍显示有效。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-08 15:56:11 +08:00
XingQue
1c6e908f28 fix: 补 import _czjilu_entitlement_revoked
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-08 15:49:38 +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
38fc52241f fix: dddhq 不再把 yaoqiuleixing 改成 0,原样返回 1+huiyuan_id
体验会员与正式同走 clumber 匹配;仅提现校验正式会员。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-08 15:41:25 +08:00
XingQue
15cef26d81 fix: 修复 dddhq resolve_effective_club_id 未导入导致 500
函数内局部 import 导致 UnboundLocalError,将会员刷新 import 提前到使用处。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-08 15:37:26 +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
7edb8f22cb fix: 抢单池体验会员按正式展示,修复 czjilu 权益被总会员逻辑短路
ddhq 仅展示层变通;qiangdan 仍按会员类型校验,提现仍禁体验会员。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-08 15:14:02 +08:00
XingQue
4eb74ae968 fix: 修复抢单池 clumber 合成时 naive/aware 时间比较报错
统一 czjilu 到期时间与 now 的时区类型,修复 ddhq 500。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-08 15:09:48 +08:00
XingQue
7819f1a897 fix: 体验会员本单有权限时 yaoqiuleixing 返回 0 仅适配老端展示
逐单判断会员类型:有权限的单显示可抢,无权限/过期仍显示未开通;抢单与提现后端校验不变。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-08 15:05:48 +08:00
XingQue
3ec821ae6a fix: 抢单池按订单会员类型逐单校验,取消任意会员放开全部单
会员单不再统一 yaoqiuleixing=0;clumber 裁剪为仅有权限的会员;ddhq 返回 hasRequiredMember。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-08 14:59:00 +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
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