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

220 Commits

Author SHA1 Message Date
huang
b9fc828567 订单总价和订单明细单价在代购/成本价场景会不一致，已改为同一套价格来源并支持多套餐求和
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m24s
Details
2026-04-23 12:11:48 +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
8d2e8faa84 修复退款bug
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m43s
Details
2026-04-23 11:30:46 +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
52d883d8a0 修复店铺名不存在的问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m29s
Details
2026-04-23 10:21:23 +08:00
huang
6b1fbf4a92 修复金额的问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m30s
Details
2026-04-23 10:09:23 +08:00
huang
10a35625a5 新增状态筛选条件,同时修复价格未正常写入的情况
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m35s
Details
2026-04-23 09:57:39 +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
7137ed087f 修复序列化的问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m29s
Details
2026-04-22 15:24:39 +08:00
huang
1d930cc82d 运营商名称问题TODO
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m29s
Details
2026-04-21 11:27:19 +08:00
huang
1b21d4dafa 新增运营商名称模糊搜索 2026-04-21 11:24:47 +08:00
huang
e573a82120 设备卡列表没有正确返回网络状态以及实名认证策略的问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m34s
Details
2026-04-21 11:11:03 +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
e9862a67ba fix: 修复资产卡列表未返回 realname_policy 字段
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m10s
Details 
buildDeviceResolveResponse 和 GetRealtimeStatus 中构建 BoundCardInfo 时
均遗漏了 RealnamePolicy 字段赋值，导致 resolve 和 realtime-status
两个接口的设备卡列表不返回实名认证策略。字段在 Model 和 DTO 中均
已定义，Service 层补充赋值即可。

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

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-20 14:43:09 +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
fd795d8742 feat: 新增设备切卡模式接口 SetSwitchMode
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m32s
Details
2026-04-18 16:22:30 +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
8e61cb1a54 fix: 购买时检查载体实名状态，已实名跳过 pending 直接激活 
- iot_card 载体：扩展查询字段同时读取 real_name_status，已实名则保持 Active 不切换 pending
- device 载体：通过 GORM 子查询统计绑定卡中已实名数量，count>0 则直接激活
- 查询出错时保守默认 false，不阻断购买流程
- 修复「先实名后购买」场景下套餐永久 pending 及购买后不自动复机的双重缺陷

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-18 09:30:40 +08:00
huang
6caf0f6141 feat: 新增全局操作密码功能，将线下充值验证从登录密码改为统一操作密码
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Has been cancelled
Details 
- 新增 RedisSystemOperationPasswordKey 常量函数（pkg/constants/redis.go）
- 新增 operation_password Service（Set/IsSet/Verify，bcrypt 哈希存 Redis）
- 新增 SuperAdminHandler 及两个接口：
  - POST /api/admin/super-admin/operation-password（设置/重置，仅超级管理员）
  - GET /api/admin/super-admin/operation-password/status（查询是否已设置）
- AgentRecharge.OfflinePay 操作密码验证从"查当前用户登录密码"改为"全局操作密码 Verify"
- Bootstrap/路由/文档生成器同步注册
 2026-04-18 09:06:33 +08:00
huang
ad30f5d41b feat: 代理充值支持线下支付凭证上传与存储 
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-17 18:29:06 +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
363e0efb34 feat: C 端充值、购买、实名链接接口接入实名策略拦截（before_order/after_order） 
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-17 17:31:21 +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
71498883b5 feat: iot_card/device Service 新增 UpdateRealnamePolicy 方法（含幂等检查） 
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-17 17:30:13 +08:00
huang
1d75a4c31a feat: asset Service 新增 GetEffectiveRealnamePolicy 策略判断及 HasValidRechargeOrPaidOrder 检查逻辑 
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-17 17:29:32 +08:00
huang
e0a37f4a11 fix: verify-asset 接口增加卡绑定设备校验
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m29s
Details 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
 2026-04-17 14:49:11 +08:00
huang
0a2961ecd6 fix: 支付回调补写 actual_paid_amount 字段，从支付平台回调中提取实付金额
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m48s
Details 
- HandlePaymentCallback 新增 actualPaidAmount int64 参数，Updates 写入 actual_paid_amount
- 微信 V2 回调从 TotalFee 字符串解析分值；V3 直接使用 TotalAmount
- 支付宝回调优先取 buyer_pay_amount（实付），回退 total_amount，元转分使用 math.Round
- 富友回调从 OrderAmt 字符串解析分值
- dispatchWechatCallback 同步增加 paidAmount 参数透传
 2026-04-17 11:12:35 +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
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
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
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
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
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
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
7cdb66cbe4 refactor: 统一状态名称映射为公共函数，清理废弃换卡/商户类型常量和模型 2026-04-14 11:51:58 +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
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
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
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
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
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