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

430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
XingQue
42963a9ace fix: 星阙(xq)微信支付改读后台 club 表配置 
移除 xq 强制回落 app_secrets 的逻辑，与星之界一致优先读 club 表；
字段为空时仍按项回落 settings，避免未配置时中断现网。
订单 fucha 查单同步使用 club 对应商户号。

回退: git reset --hard backup-before-xq-club-pay-20260710

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 19:39:15 +08:00
TermiNexus
182f18da91 修复了主动点单能力 2026-07-10 15:50:43 +08:00
XingQue
4bda89d7c3 Merge branch 'main' of https://git.gvsds.com/XingQue/Django 2026-07-10 15:42:00 +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
dcdcb7559e 修复了履约查单问题 2026-07-10 15:37:49 +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
2a99e2ea10 fix: 会员首次充值积分加满10分，后续充值不再加分 
体验会员原仅加5分且正式会员会重复加分；改为首次充值会员（任意类型）补满至10分，此后任意会员充值不再增加积分。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 01:45:50 +08:00
XingQue
390202b9e4 fix: 资料页仅改头像不再误判为手机号认证 
手机号认证流需同时带头像与 shoujihao_code 且无昵称；普通编辑只上传头像可正常保存。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 00:12:34 +08:00
XingQue
65dae4f3ab fix: 店铺二维码下载拒绝异常大文件 
超过2MB的OSS对象视为路径错误，提示重新生成而非原样返回。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 00:04:21 +08:00
XingQue
df49631401 fix: 店铺二维码生成与下载接口 
使用 stable access_token 并重试；规范化 OSS Key；下载接口返回 JSON 错误便于前端识别。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-09 23:51:00 +08:00
XingQue
90e187b65c chore: 补齐店铺管理权限码种子与SQL脚本 
新增999a~999e与1199ab~1199abe权限定义，并提供可重复执行的查询/插入SQL。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-09 23:09:37 +08:00
XingQue
a92352f2b0 fix: 店铺管理接口超级管理员权限校验失效 
改用 has_perm_code 替代 set(permissions) 交集判断，避免 _AllPermissions 被转成 set 后丢失超管放行能力。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-09 23:06:34 +08:00
XingQue
214b52badd feat: 新增后台复制店铺商品目录接口 
支持按用户ID复制商品类型、专区与商品，OSS图片独立拷贝，并提供覆盖/补充两种模式。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-09 22:58:56 +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
TermiNexus
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
TermiNexus
fb8d905fb0 修复了订单状态更新 BUG 2026-07-09 20:32:40 +08:00
TermiNexus
f702c13422 修复了支付宝 fucha 逻辑 2026-07-09 20:28:12 +08:00
TermiNexus
bf1088d0c5 修复二维码当面付问题 2026-07-09 20:06:01 +08:00
TermiNexus
51edcf9fce 使用二维码进行支付宝交易 2026-07-09 19:50:40 +08:00
TermiNexus
0826b0749d 修复了验签机制 2026-07-09 19:22:48 +08:00
TermiNexus
aa3aa932fe 修复签名生成机制 2026-07-09 19:14:57 +08:00
TermiNexus
5755730093 使用生产模式密钥 2026-07-09 18:06:24 +08:00
TermiNexus
de3ff211a6 fixed: fucha接口硬编码了微信查询 2026-07-09 03:08:14 +08:00
TermiNexus
e2b95edeb8 修复 URL 过长的问题 2026-07-09 02:53:52 +08:00
TermiNexus
92abc0d9e7 修复导入配置 2026-07-09 02:06:52 +08:00
TermiNexus
d7d38d9b08 修复了沙箱私钥解析问题 2026-07-09 01:58:38 +08:00
TermiNexus
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