csxj2026/junhong_cmp_fiber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity
644 Commits 3 Branches 0 Tags
226474b43426e1b70176488cbb2fd833a6d1e7af
Commit Graph

644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
huang
226474b434 轮训有问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m7s
Details
2026-05-22 16:21:46 +08:00
huang
860f589b9a 错误提示有问题 2026-05-22 15:54:54 +08:00
huang
2adbc87a52 Merge commit 'a03ba5d39645948f1c48ca0cfccc74c6edd1ccbf'
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m14s
Details
2026-05-22 14:20:21 +08:00
huang
6e564d1d1a Merge commit '599289a94ee0b8f36a09711122303a5bfacb265a' 2026-05-22 14:20:21 +08:00
huang
3d28e29eaa Merge commit '58bdb2f18e5dd4eef84467961a1b55f3434b9ee5' 2026-05-22 14:20:20 +08:00
huang
0948494b1c task: 修复支付宝C端入口构建失败 
移除不存在的 alipay.CalcExpireAt 调用，改为按 cfg.AliPayExpireMinutes（默认 30 分钟）
内联计算 expireAt；将所有 BuildWapPayURL 调用从 5 参数改为 4 参数（移除 returnURL）。
修复范围：getOrBuildAlipayPaymentLink、createAlipayForceRechargeOrder、createAlipayRecharge。

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-22 14:18:21 +08:00
huang
599289a94e task: 修复支付宝C端入口构建失败 
移除不存在的 alipay.CalcExpireAt 调用，改为按 cfg.AliPayExpireMinutes（默认 30 分钟）
内联计算 expireAt；将所有 BuildWapPayURL 调用从 5 参数改为 4 参数（移除 returnURL）。
修复范围：getOrBuildAlipayPaymentLink、createAlipayForceRechargeOrder、createAlipayRecharge。

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-22 14:13:46 +08:00
huang
b988f99a95 task: 完成支付宝回调安全（验签、多维度校验、业务分发） 2026-05-22 14:07:20 +08:00
huang
56adc30409 task: 完成支付宝C端入口 
新增支付宝支付方式支持：
- DTO：ClientPaymentLink、ClientPayOrderRequest/Response 增加 alipay；ClientCreateOrderRequest 增加 payment_method；ClientCreateOrderResponse 增加 payment_link；ClientCreateRechargeRequest 允许 alipay，app_type 改为微信必填；ClientRechargeResponse PayConfig 改为可选指针，增加 payment_link
- Service（client_order）：PayOrder 新增 alipay 分支（不需要 app_type/OpenID，复用或新建 pending payment，生成 WAP URL）；CreateOrder 强充路径按 payment_method 分支，alipay 不需要 app_type/OpenID；幂等命中时支付宝强充返回同一充值单对应的 payment_link；新增 getOrBuildAlipayPaymentLink（过期 payment 自动续建）；新增 createAlipayForceRechargeOrder（事务创建充值单+支付单，WAP URL 生成失败则标记 failed）
- Handler（client_wallet）：CreateRecharge 移除微信唯一限制，按 payment_method 分发到 createWechatRecharge / createAlipayRecharge；alipay 分支事务内创建充值单+支付单，然后生成 WAP URL，失败标记 payment failed
- 依赖 worker-1 共享 API：pkg/alipay.BuildWapPayURL/CalcExpireAt、Payment.ExpireAt、WechatConfig.AliReturnURL/AliPayExpireMinutes、PaymentStore.FindLatestPendingByOrderAndMethod；本 worktree 暂不能独立构建，待 leader 集成

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-22 14:07:20 +08:00
huang
53e95751b1 task: 完成支付宝共享基础（迁移/WechatConfig/PaymentStore/pkg/alipay） 2026-05-22 14:07:20 +08:00
huang
58bdb2f18e task: 完成支付宝共享基础（迁移/WechatConfig/PaymentStore/pkg/alipay） 2026-05-22 12:09:55 +08:00
huang
a03ba5d396 task: 完成支付宝回调安全（验签、多维度校验、业务分发） 2026-05-22 12:09:50 +08:00
huang
2768deb0b6 设备新增搜索条件
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m8s
Details
2026-05-20 10:27:30 +08:00
huang
e2301d5f3b chore(集成验证): gofmt 修复 DTO 格式并重新生成 OpenAPI 文档
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m3s
Details 
- 修复 ListStandaloneIotCardRequest 和 ListDeviceRequest 字段对齐格式
- 重新生成 docs/admin-openapi.yaml，两个列表接口均新增 has_active_package 参数
- go build ./cmd/api、go build ./cmd/worker 均通过验证

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-19 12:15:06 +08:00
huang
9f5c5c3680 feat(卡列表): 新增 has_active_package 查询条件筛选生效中套餐 
- DTO ListStandaloneIotCardRequest 增加 HasActivePackage *bool 字段，
  query/json 名 has_active_package，description 中文
- Service ListStandalone 将 HasActivePackage 映射为 filters["has_active_package"]
- Store applyStandaloneFilters 新增 EXISTS/NOT EXISTS 子查询，
  使用 constants.PackageUsageStatusActive，限制 master_usage_id IS NULL
  且 deleted_at IS NULL，所有查询路径（默认/两阶段/并行）均复用此函数

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-19 12:15:06 +08:00
huang
5e7e68cce7 feat(设备列表): 新增 has_active_package 查询条件 
- DTO ListDeviceRequest 增加 HasActivePackage *bool 字段（query/json: has_active_package）
- Service List 方法将 HasActivePackage 透传至 filters["has_active_package"]
- Store applyDeviceFilters 新增 applyHasActivePackageFilter：
  true  → EXISTS 子查询（生效中主套餐）
  false → NOT EXISTS 子查询
  均限制 master_usage_id IS NULL、deleted_at IS NULL，状态使用 constants.PackageUsageStatusActive

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-19 12:15:06 +08:00
huang
ca939ff617 暂存一下 2026-05-19 11:57:02 +08:00
huang
8de9c59b1c 查询
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m13s
Details
2026-05-19 11:32:41 +08:00
huang
631c5392b6 1
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m56s
Details
2026-05-18 10:47:10 +08:00
huang
af5a21ed1e 新增三个同步时间字段 2026-05-18 10:47:07 +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
ed071918ed 钱包订单退款时应当正确退回,充值时允许最低充值1分
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m7s
Details
2026-05-18 09:51:59 +08:00
huang
d597a25c69 机卡分离复机接口
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m1s
Details
2026-05-14 09:50:48 +08:00
huang
81aa3c2b11 新增字段
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m15s
Details
2026-05-13 17:50:21 +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
b7369a9c71 修复并发,暂时的,不够完整,后续还是需要重新设计,这个太乱了,傻逼AI
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 9m22s
Details
2026-05-11 17:19:40 +08:00
huang
05a5694a5f 修复bug
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m5s
Details
2026-05-11 16:45:37 +08:00
huang
1350a9ed79 批量
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m53s
Details
2026-05-11 14:54:23 +08:00
huang
93200a9074 开放接口完成
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m57s
Details
2026-05-11 14:26:10 +08:00
huang
02d522564f 删除hurl 2026-05-11 12:00:02 +08:00
huang
b6d21b81e3 文档生成 2026-05-11 11:59:36 +08:00
huang
98ff88d5c3 开放接口,修复上游同步不对的问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m55s
Details
2026-05-11 11:20:48 +08:00
huang
a9eaf1d697 修复缓存没有更新的问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m13s
Details
2026-05-11 10:38:52 +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
ebaf112c80 新增排查自己的逻辑
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m53s
Details
2026-05-09 15:22:29 +08:00
huang
09cf0be86e 联级,多选
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m52s
Details
2026-05-09 15:06:27 +08:00
huang
6a6672d0e4 允许代理看
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 10m11s
Details
2026-05-09 11:03:32 +08:00
huang
0b86720534 chore: add placeholder file 
Co-authored-by: aider (openai/gpt-5.5) <aider@aider.chat>
 2026-05-09 10:35:22 +08:00
huang
a93acc0784 有效天数问题,充值单回调问题 2026-05-08 11:46:34 +08:00
huang
7c85a8cf29 修复支付以及订单相关的问题
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Failing after 1s
Details
2026-05-08 10:15:03 +08:00
huang
348cb4e670 修复绑定的问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m55s
Details
2026-05-07 18:18:11 +08:00
huang
e77bb0d09b 跨域
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 6m57s
Details
2026-05-07 17:16:54 +08:00
huang
73a3a04204 跨域
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m59s
Details
2026-05-07 16:28:23 +08:00
huang
573e887ca5 灰度脚本 2026-05-07 11:28:42 +08:00
huang
29d3d48dbe 黑魔法
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m48s
Details
2026-05-06 16:59:10 +08:00
huang
d42fe2b0ca 补上参数
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m53s
Details
2026-05-06 16:44:14 +08:00
huang
eb74dd7849 补回是否启用虚流量
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m58s
Details
2026-05-06 16:07:59 +08:00
huang
3a2e3f2571 浅浅升级一下
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m8s
Details
2026-05-06 14:41:14 +08:00