XingQue/along_django
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85 Commits 1 Branch 0 Tags
main
Commit Graph
85 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
XingQueandCursor 916bc79b48 修复统一下单解析微信返回缺 result_code 时 AttributeError，并记录微信原始错误。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 17:44:29 +08:00
XingQueandCursor db91626e7f 支付与收款商户号分离：支付改读 pay_* 独立配置与证书目录，收款侧不动。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-27 05:41:56 +08:00
XingQueandCursor 89fa08e5de 提现收款不再校验任何订单，有无接单中订单均可收款。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 20:26:04 +08:00
XingQueandCursor 8f867588fe 点单归属只映射抢单类型ID，押金/会员要求仍用商品后台配置，避免被商家端类型覆盖。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 19:41:01 +08:00
XingQueandCursor edcb235828 商家派单押金要求改为后台可配限额，去掉写死的 0.1-50。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 19:36:17 +08:00
XingQueandCursor fa62b5515c 开启点单指定打手功能，去掉 virtual_xiadan 临时拦截。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 19:14:56 +08:00
XingQueandCursor 442ed95acc 虚拟退款获取 access_token 时显式导入 cache，避免未导入报错。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 18:58:49 +08:00
XingQueandCursor 057e6fcaf8 客服平台退款兼容商户/虚拟支付，按订单支付方式或 DIANDAN_PAY_MODE 分支。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 18:58:27 +08:00
XingQueandCursor 2401794faf 点单支付支持后端开关切换商户/虚拟支付，默认商户支付；前端按 pay_mode 分支。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 18:45:37 +08:00
XingQueandCursor 04fcfb909b 隐藏式商品/类型增加归属商家端类型，点单按归属写入抢单字段；抢单池只返回商家端类型。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-22 16:26:43 +08:00
XingQueandCursor bc22bd0df1 去掉更换打手接单的积分门槛，并清理旧自动提现注释里的积分校验。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-21 23:39:25 +08:00
XingQueandCursor 31dfe3fd6c 点单商品仅按 guanshi_saoma 扫码标记筛选隐藏式，去掉邀请人校验。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-21 22:48:25 +08:00
XingQueandCursor 3b3c1fb06a 点单商品接口多途径解析token识别用户；有邀请人/扫码只返回隐藏式，不再误回正常商品。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-21 22:43:28 +08:00
XingQueandCursor dc22552640 点单有邀请人的打手强制隐藏式商品，并自动补写扫码标记；未登录打日志便于排查。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-21 22:38:53 +08:00
XingQueandCursor 7684fe346b 点单获取商品：打手且有邀请人也强制只返回隐藏式商品，与扫码标记同等效果。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-21 22:35:49 +08:00
XingQueandCursor 2287117397 点单获取商品先查 guanshi_saoma，扫过则强制只返回隐藏式4；扫码标记强制落库并校验。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-21 22:30:50 +08:00
XingQueandCursor 364c3f1d24 扫码接口在已是打手早退前仍写入 guanshi_saoma，注册可跳过标记不可跳过。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-21 22:25:05 +08:00
XingQueandCursor c865b51cdb 新增点单隐藏式商品类型(shenhezhuangtai=4)：扫管事码后点单可见，抢单池展示3+4，商家端仍仅3。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-21 22:12:33 +08:00
XingQueandCursor 9656973923 确认收款仅拦截接单中订单，结算中等其它状态不影响自动打款收款。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-20 19:33:06 +08:00
XingQueandCursor a723868e09 收款接口仅拦截接单中订单，其它订单状态不再阻止收款。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-18 00:57:29 +08:00
XingQueandCursor 2387d00b7e 抢单池列表对押金单按可用押金（含冻结池）伪装门槛为0，前端无需改动即可抢单。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-17 02:09:31 +08:00
XingQueandCursor 27d203810e 抢单押金校验计入冻结押金池，提现等其它场景仍只认未冻结余额。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-17 01:57:43 +08:00
XingQueandCursor d3f6ff34bb 统一记录后台敏感操作到 xiugaijilu，并提供管理员操作日志查询接口。 
覆盖商家/管事/组长资金与封禁、冻结解冻、后台账号变更；列表接口权限 000001。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-17 01:41:35 +08:00
XingQueandCursor 83ccdff0f5 修复抽成利润统计在 USE_TZ=False 下的 MySQL 时区报错。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-16 19:54:13 +08:00
XingQueandCursor fc93f1c8fc P0防双笔：查不清绝不新建第二笔；新增提现抽成利润统计接口。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-16 19:49:38 +08:00
XingQueandCursor 52e777c3a0 客服提现列表支持明细状态筛选并补充审核相关字段。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-15 06:03:48 +08:00
XingQueandCursor 5a8f2099dc 仅商户整户额度可换号，并支持后台用户绑定固定收款商户。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-15 01:19:36 +08:00
XingQueandCursor 728bac58ee 确认收款失败后跳过该商户，再点收款可换号。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-14 22:48:00 +08:00
XingQueandCursor 0271eca248 收款日志固定写入 logs/wechat_collect.log，便于 grep 排查。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-14 22:29:35 +08:00
XingQueandCursor 43ec4fd749 修复误推截断，并打印【微信官方收款】原文与每个失败商户。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-14 21:43:43 +08:00
XingQueandCursor 72ac30a5a6 修复误推的重复 process_audit_collect 语法错误。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-14 21:42:23 +08:00
XingQueandCursor e3e2cd6d6d 收款失败强制打印微信官方原文，前端回传已尝试的每个商户错误。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-14 21:41:47 +08:00
XingQueandCursor b158250d70 区分平台上限与微信商户额度，失败时明确返回已尝试的商户号。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-14 21:36:28 +08:00
XingQueandCursor 9bcd7b3a21 收款商户限额/不可用时强制静默换号，审核单记录实际打款商户号。 
对账无package一律放行；额度/IP/4xx跳过查单直接试下一户；新增 dakuan_mch_id 防止串户；平台限额文案加前缀区分。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-14 21:13:41 +08:00
XingQueandCursor 2f3889855c 修复IP白名单失败不换商户：跳过查单并放行卡住的旧单。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-14 20:31:01 +08:00
XingQueandCursor 2044df3849 强化多商户静默轮换：日额度/卡住状态自动换下一户。 
查无单不再卡10分钟宽限期；跳过本单已失败商户；ACCEPTED/PROCESSING无package时放行换号；中间失败不回前端。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-14 19:42:54 +08:00
XingQueandCursor 5c8be5da9e 回调验签改用 cryptography，去掉对缺失 rsa 包的依赖。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-14 14:09:43 +08:00
XingQueandCursor bcf304dd37 收款失败静默换下一商户，全部失败才回前端。 
日额度等 INVALID_REQUEST 不再因白名单漏匹配提前返回；查无单默认可换号，仅频率/系统错误禁换。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-14 13:39:47 +08:00
XingQueandCursor 537e538528 修复多商户轮换死锁，并加固回调解密与证书校验。 
余额不足等明确错误在查单宽限 PENDING 时会卡死不换号；现确认无单后切换，停用商户仍可解回调、请求带 notify_url。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-14 03:28:42 +08:00
XingQueandCursor ca4b52217f 允许本地 Vite(5173/127.0.0.1) 跨域访问线上接口。 
补充 CORS 与 CSRF_TRUSTED_ORIGINS，便于客服后台 localhost 联调。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-14 02:57:45 +08:00
XingQueandCursor 685c65691f 支持自动提现多商户轮换：配置入库、打款单强制记 mch_id、收款失败自动换号。 
- 新增 wechat_pay_mch_config 表，迁移时从 settings 种子默认商户
- TixianAutoRecord 增加 mch_id；查单/回调解密后按记录对齐
- 后台接口 wxmchlb/wxmchbj/wxmchscwj（权限 8080a）与证书上传

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-14 02:44:38 +08:00
XingQueandCursor c3bab3564a 加固管理员解冻：校验落库并返回余额/冻结池变动明细。 
解冻接口返回 unfreeze_result，便于后台核对池→余额是否真正写回。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-12 13:15:10 +08:00
XingQueandCursor 59af2fc18a 审核商品种子脚本改用小程序默认头像相对路径 beijing/morentouxiang.jpg。 
优先读取 tupianpeizhi leixing=2 配置；已存在商品会同步更新图标路径。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-11 01:29:47 +08:00
XingQueandCursor 241a362eb4 修复 seed_audit_shangpin 移除已删除的 AUDIT_MARKER 引用。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-11 01:26:30 +08:00
XingQueandCursor b7f5af7f20 新增审核专用商品种子脚本 seed_audit_shangpin（20条正能量电竞休闲商品）。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-11 01:23:44 +08:00
XingQueandCursor f28e08cce3 小程序展示冻结池：角色信息与提现资产接口返回 dongjie_chi 字段。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 04:30:03 +08:00
XingQueandCursor 792409de11 将 audit_freeze_feature 移到 yonghu 应用，修复 Django 无法发现命令的问题。 
a_long_dianjing 不在 INSTALLED_APPS 中，management 命令不会被加载。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 04:22:12 +08:00
XingQueandCursor a8fe48ec2b 新增资金冻结只读验收脚本 audit_freeze_feature，不修改任何业务数据。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 04:17:59 +08:00
XingQueandCursor c0aefd3f68 修复冻结迁移：WithdrawConfig 字段改到 peizhi 应用独立迁移。 
避免 yonghu.0023 跨应用修改 withdrawconfig 导致 KeyError。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 04:10:18 +08:00
XingQueandCursor 4e4aa0fa7e 修复 houtai/urls.py 遗漏 HuashuListAPIView 导入导致 migrate 失败。 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 04:08:23 +08:00
XingQueandCursor 8678f54459 实现提现资金冻结：手动/自动打款共用冻结拆分，驳回仅退 shenqing_jine。 
新增公共/用户冻结配置、流水表与后台解冻接口；修复冻结与扣款重复扣余额问题。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 04:06:08 +08:00
XingQueandCursor 146a64b710 fix: 手动打款驳回按申请扣款额全额退回各身份余额 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-07 09:52:57 +08:00
XingQueandCursor fedb32f78a fix: 服务号关注欢迎语品牌名改为文赫电竞 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-03 22:15:01 +08:00
XingQueandCursor b56e87b0fd fix: 恢复refund_balance定义，手动打款同意补齐每日提现统计 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-03 14:20:36 +08:00
XingQueandCursor bdc94d6daa fix: 手动提现取消积分限制，驳回按申请扣款额全额退回各身份余额 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-03 14:14:17 +08:00
XingQueandCursor d22b265e58 fix: 打手注册支持默认邀请码回退，修复扫码注册管事重复创建 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-02 13:59:11 +08:00
XingQueandCursor 243ab5b817 fix: JWT认证兼容旧版user_id claim，解决客服后台401 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-01 11:36:12 +08:00
XingQueandCursor 47c6e3b024 feat: 商家派单金额限额改为后台可配置，派单接口读取XcxSysPeizhi 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-01 11:00:33 +08:00
XingQueandCursor d53ddf51cc style: 修正模型注释缩进 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-27 02:54:30 +08:00
XingQueandCursor dd418146dc feat: 点单商品审核展示模式可在后台配置 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-27 02:53:51 +08:00
XingQueandCursor c26ddfa8d8 fix: 启用服务号回调、协议强制签署校验、消息会话数据修复配套接口 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-27 02:38:14 +08:00
XingQueandCursor f6152204d3 feat: 协议签署系统、海报背景资源配置组 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-27 02:27:31 +08:00
XingQueandCursor 740d64a1fd fix: 资源中文说明、补全打手日统计写入、今日榜仅读日统计表 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-27 02:02:32 +08:00
XingQueandCursor c991aa99c0 fix: 小程序配置接口改用客服权限校验，避免401踢登录 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-27 01:38:21 +08:00
XingQueandCursor d6879fbeed 页面资源默认项增加管事端 guanshiduan 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-27 01:26:08 +08:00
XingQueandCursor d56aaf4ad6 修复 paihang_views 中 UserGuanshi 未导入的 NameError 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-27 01:19:12 +08:00
XingQueandCursor 20dbc9ea45 修复 wx_cfg 误插入 try 块导致的 SyntaxError 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-27 01:17:52 +08:00
XingQueandCursor 2c4ad6e13a 排行榜按收益/流水排序；小程序配置与页面资源入库可后台管理 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-27 01:04:04 +08:00
XingQueandCursor ceaca8bf4d 新增日统计排行榜接口 phbhqsj，配置接口返回排行榜素材路径 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-27 00:38:03 +08:00
XingQueandCursor 770d198bf8 进入聊天不再重复推送订单卡片，并修正 Liaotian 记录订单ID 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-24 04:17:33 +08:00
XingQueandCursor ef2f30f321 禁用除新订单服务号广播外的所有 Celery/Beat 任务，仅保留 dingdan_guangbo 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-24 00:57:42 +08:00
XingQueandCursor 49ba67ecaf 优化服务号订单广播(Celery并发)与群聊状态实时推送 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-24 00:43:30 +08:00
XingQueandCursor 56c66846cc 抢单建群写入双方头像昵称元数据，更换打手后补建群聊 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-23 23:21:21 +08:00
XingQueandCursor 2db394b2f9 聊天配对群组ID与准备接口：打手商家同群、订单卡片推送 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-23 22:49:28 +08:00
XingQueandCursor 7daa05c8c6 修复管事双分红与押金分红：移除错误冲突校验、优化分成计算与建聊补偿 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-22 23:36:18 +08:00
XingQueandCursor bd821faf9d 商家提现取消订单状态校验 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-20 21:50:48 +08:00
XingQueandCursor 5e4be15990 放宽商家提现校验：仅校验订单状态3/5，不再校验罚单 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-06-20 21:36:04 +08:00
XingQue 09dc5cebba 之前保证金提现（leixing=5）在申请扣款时会封禁（zhanghaozhuangtai=0），驳回退款时会解封（zhanghaozhuangtai=1）。收款流程本身不会封禁，但若申请时已封禁，收款校验会拦掉。 2026-06-18 14:19:09 +08:00
XingQue ced84e8df7 去除抢单积分校验 2026-06-18 00:13:11 +08:00
XingQue 3327603066 settings里面的cors配置去掉斜杠 2026-06-16 14:12:11 +08:00
XingQue 5515d49009 优化商家订单详情接口500错误 2026-06-16 13:53:30 +08:00
XingQue 58b2bdf215 更新代码管事分红问题 2026-06-16 01:56:14 +08:00
XingQue 790f397893 阿龙电竞后端已经修复了提现问题，聊天问题,管式商家分红最新代码 2026-06-15 23:52:35 +08:00
XingQue 7fa713c335 第一次提交：阿龙电竞 Django 后端最新版本 2026-06-14 02:28:00 +08:00
XingQue 4f7bf00224 第一次提交：阿龙电竞 Django 后端最新版本 2026-06-14 02:23:24 +08:00