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

92 Commits

Author SHA1 Message Date
break
992757c056 修复套餐快照集成测试与自动购包幂等 2026-07-23 12:23:52 +09:00
break
d5a35f6360 新增测试代码规范、修复响应体断言缺失与魔法数字 
- AGENTS.md 新增测试代码专项规范：常量、fixture、触发器、HTTP断言、层边界说明
- TestUpdateAllocationExpiryBaseHTTP 补全 PATCH 响应体字段断言
- 四个集成测试文件以 testIDMask 局部常量替换 0x7fffffff 魔法数字

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-07-23 11:35:38 +09:00
break
8dde55ea6d 修复 code review 问题：提取重复函数、补全缺失测试用例 
- 提取 ResolveTermsFromTx 到 service/package，消除 order 和 auto_purchase 中的重复实现
- 补全 domain 测试：新增 from_activation 覆盖用例，现覆盖两种覆盖值
- 补全激活集成测试：新增 from_purchase 立即激活场景、历史记录兼容回退计数器验证
- 补全自动购包集成测试：新增购买后修改套餐配置不影响已有快照的验证

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-07-23 11:18:38 +09:00
break
147f3eb775 修复 UR#55 代码审查问题：事务隔离、错误包装、重复辅助函数 
- resolvePackageTerms 接受 tx 参数并使用事务绑定的 Store，确保快照与写入同库
- auto_purchase.go 错误包装改用 pkgerrors.Wrap 而非标准库 errors
- shop_package_batch_allocation 去除 fmt 依赖改用 strconv 拼接
- shop_series_grant 提取 effectiveBase 局部变量避免重复调用
- 测试辅助函数统一迁移至 testutil.StringPointer，删除各文件本地重复定义
- 新增 testutil.NewRedisClient 和 testutil.StringPointer

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-07-23 11:09:08 +09:00
break
f7e0f07692 修复 code review 问题：DTO 内部字段、错误消息、重复代码与测试覆盖 
- 删除 ExpiryBaseOverrideSet 字段的 description 标签（json:"-" 内部字段不进文档）
- ValidateExpiryBaseOverride 两处 CodeInvalidParam 补充中文错误消息
- 提取 initPackageExpiryBaseFields 消除 toResponse/toResponseWithAllocation 中的重复初始化
- 删除 order/service.go 中"行业卡永远直接激活"过时注释
- 补充 T01 系列授权 HTTP 集成测试（Create + ManagePackages 两个入口）
- 补充 T03 C 端购买和平台代购（无分配）快照集成测试
- 补充 T04 from_purchase 默认值、卡未实名仍立即激活的自动购包测试
- 新增 testutil.NewRedisClient 供激活接续测试使用

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-07-23 10:56:46 +09:00
break
9818537239 实现套餐生效条件覆盖与购买快照 2026-07-22 21:07:08 +09:00
break
44fb21eb6a 修复导入重试的问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m53s
Details
2026-07-02 15:13:22 +09:00
break
8f738ffbe8 导入的问题修复
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m51s
Details
2026-07-02 13:04:36 +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
3f21f7a7d6 让超时时间设置成60秒 2026-06-21 17:06:40 +08: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
c437593a8c 修复错误购买报错的问题,修复接口返回虚流量启动错误的问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m48s
Details
2026-06-11 14:51:26 +08:00
Break
5c779cb6e0 不允许购买第二个主套餐
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m50s
Details
2026-06-10 15:24:26 +08:00
Break
6a70713b30 加分布式锁
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m0s
Details
2026-06-09 10:54:13 +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
6a3fffc46c 错误的套餐购买限制
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m48s
Details
2026-05-29 09:44:48 +08:00
Break
0d96a94e5f 关于上游流量同步覆盖修复,以及新增redis同步迁移
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m25s
Details
2026-05-27 10:59:19 +08:00
Break
bcbc290bad 卡新增imei字段
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m10s
Details
2026-05-26 16:30:12 +08:00
huang
af5a21ed1e 新增三个同步时间字段 2026-05-18 10:47:07 +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
8f3a68a673 新增上游的停机原因
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m5s
Details
2026-05-12 11:13:04 +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
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
21b73a750d c端当前套餐开始时间过期时间,以及excel导入字段
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m55s
Details
2026-05-06 09:57:58 +08:00
huang
8a3c45c577 设备导入卡槽不对的问题 2026-04-30 11:56:09 +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
60debb7505 统一导出任务
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m4s
Details
2026-04-27 09:47:03 +08:00
huang
a887f91686 修复卡轮训的问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 10m14s
Details
2026-04-26 12:41:16 +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
a207c51bfb 修复设备套餐流量不同步的问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m32s
Details
2026-04-22 18:04:53 +08:00
huang
e27758cce3 修复新卡导入时没有正确填写停机原因的问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m45s
Details
2026-04-22 16:41:33 +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
868f5a8ef3 fix: 修复轮询停机连坐、实名逆转防抖及carrier_stopped原因写入缺失三个逻辑缺陷
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 9m37s
Details
2026-04-20 11:24:56 +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
28ac58ea18 feat: PollingRealnameHandler 新增设备级套餐实名激活联动 
- 结构体新增 deviceSimBindingStore 字段，构造函数参数列表末尾追加
- 新增 triggerDeviceRealnameActivation：卡首次实名(0→1)时查询所属设备，
  若有绑定则提交 carrier_type=device 的 TaskTypePackageFirstActivation 任务
- 独立卡（无绑定设备）静默跳过，任务提交失败仅记录 Warn 日志不阻断流程
- registerPollingHandlers 传入 h.workerResult.Stores.DeviceSimBinding
- 修复「购买后某张卡实名」场景下设备级套餐永不激活的缺陷

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-18 09:30:50 +08:00
huang
1363797378 feat: 导入 Service 和 Worker 传递 realname_policy 写入资产记录 
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-17 17:31:01 +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
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
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
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
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
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
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
cd807e58e3 feat: Excel 导入按列位置读取，IoT 卡导入支持卡业务类型
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m28s
Details 
- 重写 parseCardRows：移除列名识别，固定跳过第1行表头，按 col0=ICCID、
  col1=MSISDN、col2=VirtualNo 取值，VirtualNo 升级为必填字段
- 重写 ParseDeviceExcel：移除 buildDeviceColumnIndex，IMEI 调整至第5列
  新增 MaxSimSlots 范围校验 [1,4]，整行为空时不计入 total
- 删除 findCardColumns 和 buildDeviceColumnIndex 两个冗余函数
- ImportIotCardRequest 新增 card_category 字段（normal/industry，默认 normal）
- IotCardImportTask model 新增 card_category 字段
- 迁移 000111：tb_iot_card_import_task 新增 card_category 列
- CreateImportTask 将 req.CardCategory 写入任务，空串兜底 normal
- processBatch 改用 task.CardCategory 替代写死的 CardCategoryNormal
- ImportTaskResponse 新增 card_category 字段返回

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-04-09 17:16:31 +08:00