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

135 Commits

Author SHA1 Message Date
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
6f8db180fb 补齐支付商户池字段备注
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m41s
Details
2026-09-10 11:03:20 +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
586a1cccd5 修复佣金回扣问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m25s
Details
2026-08-14 09:08:43 +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
f15a64395f 修复反馈
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m30s
Details
2026-08-10 16:30:38 +08:00
break
88cc5e96ec 暂存
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m32s
Details
2026-08-06 09:35:00 +08:00
break
5e552d99bc 收口审计治理与套餐任务进展 
Constraint: 在线热修前必须保存当前迭代分支全部有效代码进展
Confidence: medium
Scope-risk: broad
Directive: 后续修改需保持审计事件与业务事务边界一致
Tested: git diff --cached --check
Not-tested: 未运行全量测试，提交用于切换分支前保存既有工作
 2026-08-05 14:30:54 +08:00
break
b3499adfca 固化七月迭代审计治理进展以隔离线上热修 
Constraint: 切换 main 前必须保存当前七月分支全部项目进展，套餐生效提案仅属于 Iteration/7-11。

Rejected: 将七月套餐修复直接移植到 main | 两个分支的可靠投递架构不同。

Confidence: medium

Scope-risk: broad

Directive: 不得将本提交整体 cherry-pick 到 main；main 套餐热修必须基于其纯 Asynq 代码独立实施。

Tested: git diff --check；openspec validate fix-package-activation-starvation --strict。

Not-tested: 按用户要求未运行自动化测试；go build ./... 因当前审计改造中的 Enterprise 模型字面量和 role.recordFailure 参数类型错误未通过。
 2026-08-03 09:47:22 +08:00
break
cbf909b878 代理在线充值
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m6s
Details
2026-07-27 16:02:55 +08:00
break
cb26217205 让七月迭代具备可直接部署的配置基线 
补齐三套环境配置、测试环境部署门禁与 system_config 初始化，并按当前无企微应用的约束将企微凭据改为明文存储。

Constraint: 当前测试环境尚无企微应用及历史企微密文数据

Rejected: 使用启动环境变量加密企微凭据 | 用户明确要求直接明文保存并移除加密密钥

Confidence: high

Scope-risk: moderate

Directive: 企微真实闭环完成前保持两个旧审批入口开关为 true

Tested: gofmt；git diff --check；bash -n；docker compose config；Gitea workflow YAML 解析；OpenAPI 重新生成

Not-tested: go test；常规 go build；LSP；实际数据库迁移；真实测试环境部署；企微真实联调
 2026-07-25 18:18:45 +08:00
break
73f5125d3d 七月迭代短暂完结,还有很多后端的关键东西没有弄,这是一版赶时间做的东西
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m26s
Details
2026-07-25 17:06:58 +08:00
break
ad9f613dd6 移除这个没用的权限
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m12s
Details
2026-07-24 20:14:03 +08:00
break
5c4d17e9fc 收口七月卡状态回调与系列授权兼容契约
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Has been cancelled
Details 
完成运营商实名回调、业务事件观测序列与受控配置装配，同时恢复 UR43 已交付的 packages[].remove 字段及旧响应兼容，统一更新 OpenSpec、OpenAPI 和交付文档。

Constraint: 七月测试环境里程碑不新增或运行自动化测试

Rejected: 以必填 operation_type 替换 packages[].remove | 会破坏已交付前端契约

Confidence: high

Scope-risk: broad

Directive: 后续修改系列套餐管理接口必须保持 packages[].remove 和 ShopSeriesGrantResponse 兼容

Tested: go run ./cmd/gendocs；go build -buildvcs=false ./...；openspec validate complete-july-iteration-test-release --strict；git diff --check

Not-tested: 按本 Change 约定未运行 go test，真实运营商与 Gateway 联调延期
 2026-07-24 19:59:24 +08:00
break
a18ed8bc8d 暂存一下,防止丢失 2026-07-24 16:07:18 +08:00
break
ff44305d0e 实现审计覆盖门禁与外部集成日志闭环
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 10m19s
Details
2026-07-23 21:31:22 +09:00
break
17782d5f8e 实现七月迭代公共技术基础
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 9m20s
Details
2026-07-23 17:52:48 +09:00
break
8d65b26e96 实现资产预计最终到期时间 2026-07-23 13:14:43 +09:00
break
9818537239 实现套餐生效条件覆盖与购买快照 2026-07-22 21:07:08 +09:00
break
c58773e35b 实现资产双向换货链路查询 2026-07-22 18:05:38 +09:00
break
2fd11daaf0 实现店铺联系电话精确查询与索引 2026-07-22 15:06:06 +09:00
break
b5b7f9a41e 迁移
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m53s
Details
2026-06-29 12:29:31 +09:00
break
5c2ef97c24 相关问题优化以及新功能开发
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m57s
Details 
迁移 155- 157
 2026-06-22 17:21:13 +09:00
break
3b7b856e48 企业授权增强与资产列表扩展
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m9s
Details 
- 企业卡授权唯一约束：新增 DB 迁移（000154），卡级部分唯一索引防止同一张卡被多个企业同时持有，Service 层新增跨企业冲突检测
- 单卡列表新增 network_status 过滤参数
- 单卡/设备列表新增 asset_status、asset_status_name、generation 响应字段
- 单卡/设备列表新增企业维度过滤（authorized_enterprise_id、is_authorized_to_enterprise）及响应中企业授权信息（批量加载，无 N+1）
- 主钱包流水/退款列表新增 asset_identifier 精确过滤参数
- 企业卡授权/收回接口升级为三模式（list/range/filter），企业设备授权/收回升级为双模式（list/filter）
- 升级 sonic v1.14.2 → v1.15.2 以兼容 Go 1.26

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-06-17 16:23:03 +09:00
Break
7ec84fbc0f 导出系统
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m50s
Details
2026-06-15 15:28:29 +08:00
Break
5f57429fb0 直接换货流程
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m28s
Details
2026-06-03 16:55:32 +08:00
Break
c5126c583b 修复以前的老数据
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m51s
Details
2026-06-01 11:49:24 +08:00
Break
944526d9ef 修复订单金额落库不对的问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m17s
Details
2026-06-01 11:21:29 +08:00
Break
1ee554daec 钱包流水新增资产信息
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m59s
Details
2026-05-29 10:52:12 +08:00
Break
f4d92f99a2 新增退款凭证
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m41s
Details
2026-05-26 17:16:11 +08:00
huang
53e95751b1 task: 完成支付宝共享基础（迁移/WechatConfig/PaymentStore/pkg/alipay） 2026-05-22 14:07:20 +08:00
huang
480d4c4583 1
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m59s
Details
2026-05-18 10:34:04 +08:00
huang
a5388446d3 新增字段
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m7s
Details
2026-05-12 14:10:48 +08:00
huang
8f3a68a673 新增上游的停机原因
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m5s
Details
2026-05-12 11:13:04 +08:00
huang
95fc0b0a1b 修复一些问题,主要是生效套餐
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m16s
Details
2026-05-12 10:32:38 +08:00
huang
97851c2595 修正代理主钱包余额快照口径
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m0s
Details 
代理主钱包扣款流水必须记录扣款前后的真实余额，避免资金概况与流水展示出现双重扣减错觉。

Constraint: 项目禁止自动化测试，使用构建和数据库对账验证。

Rejected: 在资金汇总接口按历史充值总量或流水末条余额展示 | 资金概况口径应来自主钱包剩余余额。

Confidence: high

Scope-risk: narrow

Directive: 修改代理钱包扣款链路时必须同时维护余额字段与流水快照一致性。

Tested: go build ./...；migrate up 已执行到 141；只读 SQL 对账确认主钱包余额、成功流水累计、最新流水余额一致且 mismatch_tx_count=0。

Not-tested: 未新增自动化测试（项目规范禁止）。
 2026-05-11 10:22:48 +08:00
huang
66e12e9629 订单相关以及佣金相关修复
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m57s
Details
2026-04-30 09:52:39 +08:00
huang
37b4483183 赠送套餐逻辑
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m55s
Details
2026-04-28 17:40:06 +08:00
huang
fe4c545308 修正数据
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m55s
Details
2026-04-27 18:10:08 +08:00
huang
cb75b5668b 操作日志
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m10s
Details
2026-04-27 12:16:38 +08:00
huang
60debb7505 统一导出任务
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m4s
Details
2026-04-27 09:47:03 +08:00
huang
f177c26016 快照订单号以及退款订单号
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m27s
Details
2026-04-23 17:14:10 +08:00
huang
32f03cd2c1 新增退款时应当快照当时的资产
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Has been cancelled
Details
2026-04-23 11:43:15 +08:00
huang
1f1f31a7cb 退款列表快照订单号
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m30s
Details
2026-04-23 10:59:34 +08:00
huang
e049080f6c 分裂iccid长度
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m47s
Details
2026-04-21 10:55:12 +08:00
huang
33a4d25ca9 chore: 新增数据库迁移，将实名认证策略默认值改为 after_order 
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-20 15:29:25 +08:00
huang
2b3a9cb33f feat: 新增套餐使用记录实付金额快照字段 paid_amount
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m19s
Details 
- 新增迁移 000129：tb_package_usage 添加 paid_amount BIGINT 字段，存量数据通过 JOIN tb_order 回填
- PackageUsage Model 新增 PaidAmount *int64 字段
- 4 个写入点（order service 主套餐/加油包、auto_purchase 主套餐/加油包）赋值 order.ActualPaidAmount
- AssetPackageResponse DTO 新增 paid_amount 字段
- GetCurrentPackage / GetPackages 填充 paid_amount，接口直接返回购买价格无需 JOIN 订单表
 2026-04-18 10:19:21 +08:00
huang
b538e45bd9 feat: 新增数据库迁移，为 tb_agent_recharge_record 添加 payment_voucher_key 列 
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-17 18:28:38 +08:00
huang
1033d7666b 修复主账号问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m6s
Details
2026-04-17 18:07:29 +08:00
huang
505b30aa8f feat: 实现资产实名认证策略功能 (asset-realname-policy)
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 6m44s
Details 
- 新增 realname_policy 字段到 tb_iot_card、tb_device、tb_iot_card_import_task、tb_device_import_task 四张表
- 策略枚举：none(无需实名)、before_order(先实名后充值/购买)、after_order(先充值/购买后实名)
- C端充值拦截：before_order 策略下未实名用户禁止充值
- C端订单拦截：before_order 策略下未实名用户禁止购买套餐
- C端实名链接拦截：after_order 策略下无充值/订单用户禁止实名认证
- Admin API：PATCH /api/admin/assets/:identifier/realname-mode
- 新增错误码 CodeRealnameNotAvailable=1189
 2026-04-17 17:03:41 +08:00