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

460 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
huang
041856dc8c docs: 新增迁移说明文档，reset_db.sh 添加 000114 基线检查
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m13s
Details
2026-04-14 11:56:50 +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
5e9e41db21 feat: 归档旧迁移文件，创建初始化数据迁移和重置脚本 2026-04-14 11:24:35 +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
7308afe801 归档
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m18s
Details
2026-04-13 15:03:02 +08:00
huang
c1456f3c54 docs: 补充轮询自动触发环境变量说明 2026-04-13 14:57:00 +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
814a2956b3 feat: 新增轮询自动触发配置（EnableAutoTrigger、AutoTriggerSystemUserID） 2026-04-13 14:48:12 +08:00
huang
4879d9bf07 fix: 修复公众号登录初始化失败（PowerWeChat 日志写入权限）
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m29s
Details 
NewOfficialAccountAppFromConfig 未设置 Log.Stdout=true，PowerWeChat SDK
默认尝试在工作目录创建 wechat/info.log 文件，容器环境无写权限导致
NewOfficialAccount 返回 permission denied，触发 1181 配置不可用错误。

支付配置已有此修复（NewPaymentAppFromConfig），公众号配置漏掉了。

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-13 14:39:54 +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
246ae5e123 docs: 新增 status-convention 主规范
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m20s
Details 
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-11 12:21:07 +08:00
huang
7e613a0d2b 归档: fix-status-convention-comments 
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-11 12:21:02 +08:00
huang
510a5bfb21 chore: 删除未使用的僵尸状态常量 DevCapabilityStatusEnabled/Disabled 
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
 2026-04-11 12:20:56 +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
8f66ca7bcb 文档提交
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m14s
Details
2026-04-11 11:27:43 +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
huang
23e12d8a73 fix: 卡导入 Excel 解析移除虚拟号强制校验
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m19s
Details 
虚拟号(virtual_no)为可选字段，解析时不应强制要求填写。
与 processBatch 中的处理逻辑保持一致。

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-04-10 11:58:39 +08:00
huang
4a18aac6ce fix: 资产验证支持虚拟号(virtual_no)查询
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m27s
Details 
resolveAsset 查询 IoT 卡时仅匹配 iccid，导致用户输入
虚拟号时返回"资产不存在"(1180)。将查询条件扩展为
iccid OR virtual_no，与设备查询逻辑保持一致。

顺带将 jwt.ParseWithClaims 回调的 interface{} 替换为 any。

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-04-10 11:42:23 +08:00
huang
51fa027eb8 归档 2026-04-09 17:47:06 +08:00
huang
afc6d7fc76 docs: 归档 excel-import-refactor，同步更新主 specs
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 50s
Details 
- 将变更目录移至 archive/2026-04-09-excel-import-refactor
- device-import spec：更新为固定列位置读取（IMEI 调整至第5列），新增 MaxSimSlots 范围校验说明
- iot-card-import-task spec：更新为固定列位置读取，新增"导入批次支持卡业务类型"需求

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-04-09 17:37:44 +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
huang
ff7e749bf2 归档 2026-04-09 14:53:48 +08:00
huang
0627ffec42 feat: 代理商资金可见性重构（agent-fund-visibility）
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m10s
Details 
- 将 GET /shops/commission-summary 重命名为 GET /shops/fund-summary，
  响应新增 main_balance、main_frozen_balance 两个预充值钱包字段
- 新增 GET /shops/:id/main-wallet/transactions 预充值钱包流水接口
- 将佣金统计、每日统计、发起提现从 /my/ 路径迁移至 /shops/:id/ 路径：
  GET /shops/:id/commission-stats
  GET /shops/:id/commission-daily-stats
  POST /shops/:id/withdrawal-requests
- 删除 MyCommissionService、MyCommissionHandler 及全部 /my/ 路由
- 补齐 ListShopWithdrawalRequests、ListShopCommissionRecords 的
  CanManageShop 越权校验（安全修复）
- 提现接口增加严格权限：仅代理账号本人可为自己店铺发起提现

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-04-09 14:40:39 +08:00
huang
1d6535b81b fix: 修复移除账号角色接口路由参数名错误
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Has been cancelled
Details 
RemoveRole handler 中使用 c.Params("id") 取账号 ID，
但路由注册的参数名为 account_id，导致解析失败报"无效的账号 ID"。
修正为 c.Params("account_id")。

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-04-09 14:38:01 +08:00
huang
0f6fd42aff fix: 禁用角色时检查是否已分配给账号或店铺
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Has been cancelled
Details 
角色禁用前新增分配情况检查，若角色已分配给账号或店铺则拒绝禁用操作，
需先移除相关分配后才能禁用，与删除角色的防护逻辑保持一致。

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-04-09 14:35:55 +08:00
huang
c1cec0aede fix: 修复C端订单差价佣金计算错误及自动购包订单系列ID缺失问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m11s
Details 
- C端普通订单（createPackageOrder）创建时未设置 SellerCostPrice，
  导致底层店铺得到整个零售价作为差价佣金，上级代理链无法获得任何佣金。
  修复：在 createPackageOrder 中查询卖家成本价并写入订单字段。

- purchase_validation 新增 GetCostPrice 方法，供 C 端订单查询代理渠道成本价。

- auto_purchase 自动购包订单未设置 SeriesID 和 SellerCostPrice，
  导致差价佣金计算被整体跳过。修复：在 ProcessTask 中从卡/设备获取
  SeriesID，从套餐分配记录获取 SellerCostPrice，传入 buildOrderAndItems。

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-04-09 13:35:13 +08:00
huang
6dfc5c0301 feat: 资产解析接口新增实名时间字段
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m5s
Details 
- AssetResolveResponse 新增 real_name_at 字段：card 类型取 first_realname_at，device 类型取绑定卡中最小的实名时间
- BoundCardInfo 新增 real_name_at 字段：各卡自己的 first_realname_at
- RefreshCardDataFromGateway 手动刷新路径补写实名时间：检测到 0→1 变化时同步写入 first_realname_at
- 同步更新 asset-resolve 规格文档

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-04-09 12:12:28 +08:00
huang
fce35e8a2d fix: 修复角色分配权限并发竞态导致唯一约束冲突报错
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m4s
Details 
- Store 层 Create 方法对唯一约束冲突幂等处理，消除并发写入报错
- Service 层预批量加载角色已有权限集合（1次查询），替换逐条 Exists 查询（N次查询），同时降低竞态窗口

💘 Generated with Crush

Assisted-by: Claude Sonnet 4.6 via Crush <crush@charm.land>
 2026-04-09 11:58:52 +08:00
huang
81ba84cf05 feat: 新增店铺联级查询接口
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m3s
Details 
- 新增 GET /api/admin/shops/cascade 接口，支持按店铺名模糊查询和上级ID过滤
- Store 层新增 ListForCascade（支持数据权限过滤）和 GetParentIDsWithChildren 方法
- Service 层新增 ListCascade，批量判断 has_children 避免 N+1 查询
- 返回格式：[{id, shop_name, has_children}]

💘 Generated with Crush

Assisted-by: Claude Sonnet 4.6 via Crush <crush@charm.land>
 2026-04-09 11:43:37 +08:00
huang
384a54164b feat: 新增批量移除角色权限接口
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Has been cancelled
Details 
- 新增 DELETE /api/admin/roles/:role_id/permissions 接口
- Store 层新增 BatchDelete 方法，单次 SQL 批量软删除
- Service 层新增 BatchRemovePermissions 方法
- Handler 层新增 BatchRemovePermissions 处理函数
- DTO 新增 BatchRemovePermissionsRequest/Params
- 修复 openapi generator 对 DELETE 方法 requestBody 不生成的问题
- RouteSpec 新增 Body 字段，支持显式指定 JSON 请求体

💘 Generated with Crush

Assisted-by: Claude Sonnet 4.6 via Crush <crush@charm.land>
 2026-04-09 11:41:58 +08:00