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

309 Commits

Author SHA1 Message Date
huang
fa554c3930 feat: 注册 C 端微信 JSSDK 配置接口路由及文档生成
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m35s
Details 
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-16 18:38:43 +08:00
huang
1125701329 feat: 新增 C 端微信 JSSDK 签名配置接口 Handler 
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-16 18:38:20 +08:00
huang
ed1facc1b8 feat: 公众号服务新增 GetJSSDKConfig 方法及 JSSDK 配置 DTO 
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-16 18:37:59 +08:00
huang
0cba6fd6d5 fix: 修复轮询缓存竞态导致流量增量重复计全量的问题
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Has been cancelled
Details 
getCardWithCache 在缓存 miss 时将 writeCardToCache 由异步协程改为同步调用。
原实现中协程可能在 updateCardCache 之后才被调度执行，将
last_gateway_reading_mb 覆盖回 DB 旧值（0），导致下次轮询
increment = gatewayFlowMB - 0 = 全量，触发套餐流量重复扣减。

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-16 18:33:46 +08:00
huang
aef20d2ab1 fix: 修复禁用所有轮询配置重启后再启用无法工作的问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m23s
Details 
- 新增 RedisPollingConfigChangedChannel 常量，用于跨进程配置变更通知
- ConfigService 注入 Redis，Create/Delete/UpdateStatus 后发布 Pub/Sub 事件
- PollingConfigManager 新增 WatchChanges() 方法，收到通知立即刷新内存缓存
- PollingInitializer 新增 Restart() 方法，支持初始化完成后安全重启（CAS 防并发）
- Worker 订阅配置变更事件，configs 从空变为非空时触发 Initializer.Restart()

根因：启动时所有配置禁用导致分片队列为空，Initializer 是一次性的，
之后启用配置只更新 DB 但不重建队列，调度器无卡可处理
 2026-04-16 17:32:43 +08:00
huang
0ec16d4afa fix: 实名轮询防止上游接口故障时误降级已实名状态
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m34s
Details 
Gateway 返回 data=null 时 sonic 解析为零值结构体（ICCID="" RealStatus=false），
导致已实名卡被误判为未实名并触发停机。

通过检查响应中 ICCID 是否回填来判断数据有效性：
- ICCID 为空：视为上游接口故障，重新入队，不更新实名状态
- ICCID 有值：响应有效，正常处理（含合法的未实名降级）
 2026-04-16 16:48:14 +08:00
huang
2d0b4e9bc0 fix: 充值订单列表按当前登录资产过滤，修复越权查看其他资产数据的漏洞 
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-16 15:56:43 +08:00
huang
520b126ecf feat: JWT Claims 新增资产字段，登录 token 携带当前资产上下文 
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-16 15:55:41 +08:00
huang
5d9be1d7e4 fix: 修正轮询配置多匹配逻辑，支持同卡匹配多个配置并按 priority 合并 interval
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m27s
Details 
核心变更：
- MatchConfig 改为 MatchConfigs，返回所有匹配配置
- MergedTaskIntervals 按 task type 合并各配置，选取最高优先级（非 nil 且最小 priority 值）
- hasAnyEnabledInterval 过滤所有 interval 均为 NULL 的配置
- calcInitialDelay 重构为纯函数，接收 interval 参数
- 移除 getEnabledTaskTypes 和 getIntervalByTaskType（被 MergedTaskIntervals 替代）
- scheduler.go 新增心跳 key + 顶层 panic recovery + Init 完成守卫
- initializer.go 批量失败日志升级为 Error，逐条检查 Pipeline 命令错误
- 数据迁移：禁用 id=29 的轮询配置（所有 interval 均为 NULL）

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
 2026-04-16 14:27:47 +08:00
huang
5065d925ad fix: 修正套餐激活和时间字段nullable问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m33s
Details 
核心变更：
1. Model层时间字段改为*time.Time并设为nullable
   - PackageUsage.ActivatedAt/ExpiresAt
   - PersonalCustomerDevice/ICCID/Phone.LastUsedAt/VerifiedAt

2. 数据库迁移：
   - activated_at/expires_at列移除NOT NULL约束
   - 清洗零值记录(status=0且activated_at<'2000-01-01')

3. 新增ActivateSpecificPackage方法：精准激活指定套餐，
   修复HandlePackageQueueActivation从"查找过期包"改为直接激活payload指定套餐

4. 新增孤儿套餐恢复扫描：Worker启动或每次套餐检查时，
   自动发现并恢复无status=1主套餐的孤儿载体

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
 2026-04-16 11:14:39 +08:00
huang
97d6319b64 fix: 修正 HasValidByCarrier 有效套餐定义，仅 status=Active 才算有效
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m43s
Details 
修复Bug：原代码将 Pending(0) 也算作有效套餐，导致待生效套餐的卡
不会被触发停机指令。现改为仅生效中(Active)才算有效套餐。

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
 2026-04-15 18:14:50 +08:00
huang
0a27a78d97 fix: 修正强充订单状态映射错误，0-based DB 常量正确映射为 1-based 客户端状态
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 48s
Details 
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-15 14:58:37 +08:00
huang
647d78309d feat: 将卡状态任务类型接入队列管理、生命周期和初始化器 
queue_manager.go: allTaskTypes 追加 TaskTypePollingCardStatus，注释更正为5个队列
lifecycle_service.go: getEnabledTaskTypes 和 calcInitialDelay 新增 card_status 条件
initializer.go: initBatch 新增 CardStatusCheckInterval 块，以 LastCardStatusCheckAt 为基准写入分片队列

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-15 12:22:42 +08:00
huang
c7f486ae09 feat: 新增 PollingCardStatusHandler 及工具函数卡状态支持 
polling_cardstatus_handler.go: 新文件，实现卡开停机状态轮询
  - Gateway QueryCardStatus → 停机/0，其他/1
  - 状态变化时写 DB + 更新缓存 + 触发 EvaluateAndAct
  - verbose log 位于 gateway 块内
polling_utils.go: getIntervalByTaskType 新增 TaskTypePollingCardStatus case

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-15 12:22:34 +08:00
huang
71559547b6 feat: 为四种现有轮询 Handler 添加 verbose log 输出 
realname: verbose log 移入 gateway 块内，避免 gateway=nil 时输出零值
carddata: 添加 && h.gateway != nil 门卫，确保仅 gateway 查询成功时输出
package: verbose log 在 freshCard 加载后、EvaluateAndAct 之前输出
protect: 引入 actionTaken 变量，字段名 network_status → network_status_at_check，新增 action_taken

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-15 12:22:25 +08:00
huang
6292443f69 feat: PollingBase 新增 verboseLog 支持，Worker 传入配置 
polling_base.go: PollingBase.verboseLog bool 字段，NewPollingBase 新增参数
main.go: cfg.Polling.VerboseLog 作为第6个参数传入 NewPollingBase

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-15 12:22:16 +08:00
huang
97c196b7c6 feat: PollingConfig DTO 和 Service 支持卡状态检查间隔 
dto: 新增 CardStatusCheckInterval 字段（validate min=30，description 含枚举说明）
config_service.go: 创建/更新/响应映射均支持 CardStatusCheckInterval

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-15 12:22:09 +08:00
huang
cb328f3ec2 feat: PollingConfig 和 IotCard 模型新增卡状态检查字段 
polling.go: CardStatusCheckInterval *int（card_status_check_interval）
iot_card.go: LastCardStatusCheckAt *time.Time（last_card_status_check_at）

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-15 12:22:01 +08:00
huang
dd408fcdca 日志输出 2026-04-15 11:17:09 +08:00
huang
516bb92a16 refactor: 删除 enterprise_device service 中无路由接入的死代码方法
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Has been cancelled
Details 
ListDevicesForEnterprise、GetDeviceDetail、SuspendCard、ResumeCard、validateCardOperation 均无对应路由和 Handler 调用，且 SuspendCard/ResumeCard 仅修改本地 DB 未调 Gateway，存在错误实现风险。统一使用 iot_card stop_resume_service 处理停复机。

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-15 11:16:36 +08:00
huang
023a4309eb fix: 修正 realtime-status 路由文档描述，补充说明设备类型会实时调 Gateway 
原描述误写为不调网关，实际 GetRealtimeStatus 对设备类型会调用 SyncDeviceInfo 接口。

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-15 11:16:01 +08:00
huang
b972a776d9 重构充值订单模块：用 tb_recharge_order + tb_payment 替换 tb_asset_recharge_record
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m32s
Details 
- 新增 RechargeOrder 和 Payment 模型及对应 Store
- 新增 ClientRechargeOrderHandler 提供充值订单列表/详情接口
- 修改 client_wallet.go 使用新表读写充值数据
- 修改 callback/payment.go 将 CRCH 订单路由到 rechargeOrderService
- 修改 client_order/service.go 的强充流程使用新表
- 修改 auto_purchase.go 从 tb_recharge_order 读取 linked_package_ids
- 修改 order/service.go 的 WalletPay 使用 tb_payment 记录
- 修改 wechat_config_store.go 从 tb_recharge_order 统计待支付充值数
- 移除 AssetRechargeStore 和 AssetRechargeRecord 的注册引用
- 修复文档生成器缺失 ClientRechargeOrder handler
- 状态枚举改为 0-based: Pending=0, Paid=1, Closed=2, Refunded=3
 2026-04-15 11:00:32 +08:00
huang
8706247436 fix: 资产解析接口 BoundCardInfo 添加运营商字段
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m18s
Details
2026-04-14 17:10:28 +08:00
huang
8154a61453 fix: 移除 standaloneListColumns 中已废弃的分佣字段
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 6m51s
Details 
迁移 000116 已从 tb_iot_card 删除 first_commission_paid 和 accumulated_recharge
两列，但 standaloneListColumns 未同步清理，导致 SELECT 查询报列不存在错误。

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-14 12:40:04 +08:00
huang
7cdb66cbe4 refactor: 统一状态名称映射为公共函数，清理废弃换卡/商户类型常量和模型 2026-04-14 11:51:58 +08:00
huang
5410181e77 修复：C端资产信息接口 lan_ip 字段无值时不返回的问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m17s
Details 
去掉 DeviceRealtimeInfo.LANIP 的 omitempty 标签，
确保 device_realtime.lan_ip 始终出现在响应中（无值时返回 null）
 2026-04-14 11:49:17 +08:00
huang
548ec0cd6b feat: 补全 _name 字段公共映射函数，修正实名认证注释 2026-04-14 11:44:23 +08:00
huang
c35542f911 feat: 补全客户端订单和资产 DTO _name 字段，修复代码格式 2026-04-14 11:19:57 +08:00
huang
42c5ec912f feat: 技术债务清理（支付配置动态化、API文档补全、轮询常量提取、废弃代码清理）
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m13s
Details
2026-04-14 11:11:15 +08:00
huang
c0b64c9e30 fix: 登录时将主手机号写入 JWT，修复 bound_phone 返回空的问题
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Has been cancelled
Details
2026-04-14 11:09:42 +08:00
huang
37706bc7ce feat: 资产信息接口返回当前登录用户绑定手机号
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m30s
Details
2026-04-14 10:08:42 +08:00
huang
640ea8ec99 feat: 更新依赖注入，传入 ManualTriggerService 2026-04-13 14:52:50 +08:00
huang
8569873690 feat: ClientRealnameHandler 集成异步触发实名检查 2026-04-13 14:51:42 +08:00
huang
5196472d7e fix: 修复手动触发去重TTL和日限制次数，优化权限检查和错误日志 2026-04-13 14:50:14 +08:00
huang
8d8d426e2e feat: verify-asset 接口返回当前生效的公众号和小程序 AppID
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m51s
Details
2026-04-11 17:22:21 +08:00
huang
decb7a10ec fix: 使用专用常量 ShelfStatusOn 替代 StatusEnabled 赋值 ShelfStatus 
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-11 12:20:49 +08:00
huang
5588c7c762 fix: 修正 DTO status 字段 description 和 validate 标签 
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-11 12:20:43 +08:00
huang
eebc7194d8 fix: 修正 model status 字段 GORM comment 为 0=禁用 1=启用 
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-11 12:20:31 +08:00
huang
e945a672ed fix: 修正套餐系列状态注释格式
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m19s
Details 
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-11 12:00:01 +08:00
huang
41d3667df2 feat: 设备卡列表新增运营商类型字段 
在 DeviceCardItem DTO 和 GetDeviceCards Handler 中补充 carrier_type 字段，解决设备视角卡列表缺少运营商类型的问题

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-11 11:59:54 +08:00
huang
e9ff14df0e 规范: 新增枚举与状态字段规范并修复代理充值状态描述错误
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Has been cancelled
Details 
- 新增 docs/enum-status-standards.md：完整的枚举/状态规范，涵盖 int vs string 选择、起始值约定、description 格式统一、constants 唯一真相来源、Response DTO 必须提供 status_name
- 更新 dto-standards SKILL.md：加入枚举规范要点，AI 写 DTO 时自动触发
- 更新 AGENTS.md：常量管理章节和 Code Review 检查清单各加入枚举检查项
- 修复 agent_recharge_dto.go：description 从错误的 3 个状态改为正确的 5 个状态（原 3:已取消 实为 3:已完成）
- 修复 agent_recharge service：toResponse 补充 StatusName 中文字段，防止前端映射出错
 2026-04-11 11:25:58 +08:00
huang
c807b99a91 fix: 修复佣金明细列表多表 JOIN 时 shop_id 字段歧义问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m24s
Details 
ListByShopID 使用 tb_commission_record.shop_id 限定表名，
避免与 JOIN 的 tb_order/tb_iot_card/tb_device 表中同名字段冲突，
解决 SQLSTATE 42702 ambiguous column reference 错误。

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-11 11:06:13 +08:00
huang
677d6239ce fix: 统一佣金状态常量并修复佣金明细关联查询
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m33s
Details 
- 删除 model/commission.go 中与 constants 包冲突的旧常量（值=1/2）
- 所有服务层改用 constants.CommissionStatusReleased（值=3）写入和查询
- 数据库迁移：status 1→3（已发放），2→4（已失效）
- 修复佣金明细列表接口，通过 JOIN 关联返回 order_no、iccid、virtual_no、order_created_at
- 新增 seller_shop_id / seller_shop_name 销售来源字段
- 统计接口过滤条件从精确匹配改为排除无效（NOT IN 4,99）
- 更新 OpenAPI 文档及 commission-record-query spec
 2026-04-11 10:42:37 +08:00
huang
d0989c66bb 暂且不需要实名
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m19s
Details
2026-04-10 18:31:40 +08:00
huang
67f3286e09 fix: 修复店铺资金摘要接口username和phone字段为空的bug
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m17s
Details 
问题原因：GetPrimaryAccountsByShopIDs 在 Store 层重复应用了数据权限过滤，
导致当前用户无权限访问的店铺账号被错误过滤，accountMap 为 nil，
最终返回的 username 和 phone 为空字符串。

解决方案：移除 Store 层的 ApplyShopFilter 权限过滤，
因为调用方（Service 层）已经保证了 shopIDs 的合法性。
 2026-04-10 17:21:27 +08:00
huang
a8b52f8ae1 fix: 设备详情 RealNameStatus 取当前使用卡而非聚合最小值
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Has been cancelled
Details
2026-04-10 17:15:40 +08:00
huang
5496cb58aa feat: 订单创建时快照买家手机号/昵称和套餐类型
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Has been cancelled
Details 
新增字段：
- tb_order: buyer_phone, buyer_nickname（个人客户下单时快照）
- tb_order_item: package_type（套餐类型快照）

后台订单列表支持按 buyer_phone 精确过滤查询。

OpenSpec: order-buyer-snapshot
 2026-04-10 17:12:56 +08:00
huang
3cb16804a4 fix: 设备资产详情返回 enable_polling 字段
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m19s
Details
2026-04-10 15:54:47 +08:00
huang
2a7ac3f86e fix: 修复轮询系统缓存不一致和可观测性问题
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Has been cancelled
Details 
- OnCardStatusChanged/Enabled/Disabled 添加 InvalidateCardCache，
  解决 Refresh API 更新 DB 后 polling 缓存仍为旧值的 bug
- AssetResolveResponse 的 enable_polling/network_status 去掉
  omitempty，解决 false/0 时字段从响应中消失的问题
- Scheduler/Initializer/PackageHandler 增加 INFO 级别日志，
  可通过日志判断轮询是否工作、处理了哪些卡
 2026-04-10 15:52:38 +08:00
huang
ef8ec025bd feat: 资产套餐接口返回是否开启虚流量字段
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m26s
Details 
current-package 和 packages 两个接口的响应中新增
enable_virtual_data 字段，表示该套餐是否启用虚流量

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-04-10 14:33:05 +08:00