csxj2026/junhong_cmp_fiber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
882 Commits 4 Branches 0 Tags
69b37eb89bc3c068dcff6c0a8b1191cee21bac20
Commit Graph

882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
break
69b37eb89b docs(员工代收款): 补充审批中通过后撤销兜底语义并清理死参数
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 9m24s
Details 
- spec.md 增补「审批中收到通过后撤销」场景与规范条文：释放该次尝试全部审批中预占、转异常终态并记录原因、保留审计、禁止自动重提
- design.md「企业微信审批结果消费」补充审批中命中该决策的兜底处理与理由（避免申请永久停在审批中且预占永久占用账单）
- query/employeecollection 删除 approvalStatusOfAttempts 恒为 true 的 withOpinion 形参、修正失真注释，行为不变

OpenSpec Change: add-employee-collection-bills
 2026-09-10 18:45:43 +08:00
break
ce24d5612e feat(员工代收款): 新增员工代收款账单闭环
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 9m20s
Details 
- 新增 6 张表与成对迁移 000212，扩展企业微信审批场景业务类型白名单
- 后台线下套餐订单与两条代理线下充值入账路径在来源成功事务内建账，来源唯一键幂等
- 核销申请、审批尝试记录、账单分摊预占与驳回重提，审批业务类型 employee_collection_approval
- 企业微信终态消费幂等：通过转已核销、驳回释放预占、通过后撤销不回滚并转异常终态
- 退款成功事务内按 bill_id+refund_id 幂等冲销账单或仅写退款关联提示
- 线下收款方式字典、账单查询/统计/关闭、申请查询与代办权限，均写入事务内审计

OpenSpec Change: add-employee-collection-bills
 2026-09-10 18:24:05 +08:00
break
dc4e0d4103 归档支付商户池变更并同步主规格
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 1m25s
Details
2026-09-10 12:03:28 +08:00
break
1e776da292 补齐上下文健康检查证据链
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 1m27s
Details
2026-09-10 11:39:56 +08:00
break
b9e8592cc4 修复换货迁移后 after_order 实名门槛误判
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m33s
Details 
换货迁移只迁移套餐权益不迁移订单，已支付订单仍挂在旧资产上，
导致新资产 HasValidRechargeOrPaidOrder 查不到支付事实，返回 1189。
现增加套餐权益兜底：当前世代存在未退款套餐权益且其关联订单已支付，
即视为满足充值/购买条件。
 2026-09-10 11:26:07 +08:00
break
54823290c3 完成支付购包自动复机变更任务 2026-09-10 11:26:07 +08:00
break
b38b2b39c9 修复支付购包后自动复机 2026-09-10 11:26:07 +08:00
break
6f8db180fb 补齐支付商户池字段备注
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m41s
Details
2026-09-10 11:03:20 +08:00
break
a9e2302f7c 1 2026-09-10 10:53:07 +08:00
break
bcb1304937 修复支付商户路由权限泄漏
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m8s
Details 
registerPaymentMerchantRoutes 使用空前缀 Group 承载权限中间件，
Fiber 将其等价于在整个 /api/admin 上 Use，导致代理账号访问
/api/admin/agent-recharges 等无关路由被误拦。

改为 requirePaymentMerchantAccess 包装函数，仅包装 payment-merchants、
payment-merchant-pools、wechat-authorizations 共 13 个管理路由，
路径、方法与权限语义不变。
 2026-09-10 10:00:53 +08:00
break
88d7965641 固定测试镜像迁移工具版本
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m31s
Details
2026-09-09 18:34:23 +08:00
break
e09c4632fb 修正测试环境按提交镜像部署
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Failing after 6m5s
Details 
Gitea workflow 只以 github.sha 构建/推送镜像标签，部署时写入
IMAGE_TAG 到 .env；compose 的 api/worker image 引用 IMAGE_TAG，
默认 latest 仅作本地兜底，测试部署必须解析为提交 SHA。
 2026-09-09 18:18:13 +08:00
break
98c145fe70 实现支付商户池与微信授权配置
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Failing after 3m55s
Details 
新增收款商户、商户池轮询、微信授权配置独立管理；三类新支付
（C端套餐购买、C端资产钱包充值、代理在线预存款充值）无条件
经商户池选择并冻结路由，无旧综合配置回退。merchant_id 为空
历史支付继续按 payment_config_id 双读。凭证版本化加载与
ID+版本缓存保证轮换一致性。删除商户池新支付创建开关及全部
引用。
 2026-09-09 18:13:04 +08:00
break
ff25586dc9 修复已用完套餐展示
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m43s
Details
2026-09-08 17:25:34 +08:00
break
a48ff5d782 切换测试环境部署至八月迭代分支
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m36s
Details
2026-09-07 17:32:19 +08:00
break
696120ab38 feat: 资产套餐历史增加主子层级查询 2026-09-07 17:17:15 +08:00
break
c7c2b17d78 归档
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 54s
Details
2026-09-07 11:34:23 +08:00
break
3a093ecd6b 清理
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m36s
Details
2026-09-07 10:09:51 +08:00
break
5424751993 修复停复机忽略免实名策略并归档变更
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Has been cancelled
Details
2026-09-07 10:06:17 +08:00
break
370fd3e67f update
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 10m49s
Details
2026-09-03 09:28:28 +08:00
break
dbfeeee253 缓解io压力 2026-09-02 16:14:27 +08:00
break
395e5fb47c 修复套餐接续停机竞态与轮询兜底
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 11m13s
Details
2026-08-29 16:27:48 +08:00
break
62f3d25e81 修复批量订购 2026-08-26 14:54:26 +08:00
break
5797fd0e94 修复企微兜底机制
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 10m40s
Details
2026-08-20 18:06:45 +08:00
break
ba677a35e1 Update deploy.yaml
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Failing after 28h53m35s
Details
2026-08-20 12:06:58 +08:00
break
22b95db2f9 每日清理 2026-08-20 12:03:17 +08:00
break
143df60485 修复 2026-08-18 17:32:15 +08:00
break
656a921ff0 富友支付支持 2026-08-18 17:13:20 +08:00
break
46c8e819df 修改相关证据 2026-08-18 16:30:16 +08:00
break
247d7d9f6e 新增接口 2026-08-18 16:15:46 +08:00
break
d256f6d176 合并七月迭代分支 2026-08-18 14:53:29 +08:00
break
c8052df8eb 补充退款列表应当让本店铺的人看见
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m30s
Details
2026-08-18 11:44:30 +08:00
break
586a1cccd5 修复佣金回扣问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m25s
Details
2026-08-14 09:08:43 +08:00
break
b5285877bf 归档 2026-08-13 17:45:49 +08:00
break
cbadf77517 修复价格不一致的问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m28s
Details
2026-08-13 17:43:14 +08:00
break
6883b5b42b 归档 2026-08-13 17:26:36 +08:00
break
4c393bb427 回溯佣金
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m34s
Details
2026-08-13 17:00:06 +08:00
break
d42c92a2e1 字段
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m26s
Details
2026-08-13 16:33:55 +08:00
break
7e7f1cbb67 更新
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 53s
Details
2026-08-13 16:09:38 +08:00
break
e134552ec5 更新
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m35s
Details
2026-08-13 12:31:47 +08:00
break
fcfa347005 修复
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m38s
Details
2026-08-12 10:42:35 +08:00
break
619d0c5efe 提案
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 51s
Details
2026-08-11 15:39:51 +08:00
break
2a7a8fb49d 修复
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m28s
Details
2026-08-11 15:27:18 +08:00
break
629609a556 修复
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m25s
Details
2026-08-11 14:41:33 +08:00
break
a795ca3650 修复通知
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m25s
Details
2026-08-11 11:18:11 +08:00
break
5c01008d8a 百分比问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m24s
Details
2026-08-11 09:54:21 +08:00
break
f6b11eb9ac 修复
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m23s
Details
2026-08-10 17:37:55 +08:00
break
77ce9db722 并发监控修复
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m20s
Details
2026-08-10 16:58:33 +08:00
break
f15a64395f 修复反馈
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m30s
Details
2026-08-10 16:30:38 +08:00
break
7aa03e91fb 修复
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m25s
Details
2026-08-07 18:00:15 +08:00