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

320 Commits

Author SHA1 Message Date
break
b38df737e1 先短暂去除限制,上传迁移脚本
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m51s
Details
2026-07-09 18:23:29 +09:00
break
346156ee9b 卡只允许支付宝支付,设备只允许微信支付,钱包充值也遵循这个规则
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m53s
Details
2026-07-03 10:26:48 +09:00
break
b3fb8c7a82 资产详情新增两个字段
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Has been cancelled
Details
2026-07-02 16:49:50 +09:00
break
fc6af43baa 修复：溢出流量应优先记到主套餐而非加油包
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m47s
Details 
主套餐和加油包同时 Depleted 时，recordOverflowToDepletedPackage
原先取 id 最大的套餐，可能取到加油包，语义不对。

改为优先查 master_usage_id IS NULL（主套餐），找不到时
再回退取任意 Depleted 套餐。
 2026-07-01 12:06:19 +09:00
break
52bdbbae25 修复：套餐耗尽后流量详单断档问题 
问题：套餐 status=Depleted 后，queryActivePackages 查不到套餐，
DeductDataUsage 直接 return CodeNoAvailablePackage，导致上游
仍有真实流量时，tb_package_usage_daily_record 不再写入，详单断档。

修复：无 Active 套餐时，找最近一条 Depleted 套餐，将溢出流量
累加到 data_usage_mb 并写入当日 daily_record，保持详单连续性。
status 不变，不重复触发停机。
 2026-07-01 12:03:39 +09:00
break
76f657c986 1. 套餐过期前再主动同步一次流量
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m55s
Details 
2. 生效套餐逻辑错误的问题
 2026-06-30 15:54:55 +09:00
break
b930662817 从乐观锁变成悲观锁 2026-06-29 12:29:21 +09:00
break
f4b6a55b27 驳回
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Failing after 7m17s
Details
2026-06-26 12:12:15 +09:00
break
8cf921f11c 驳回接口
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m55s
Details
2026-06-25 17:10:24 +09:00
break
c5871b59a1 修复开放接口 wallet/package-orders 支持 IMEI 下单
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m48s
Details
2026-06-23 11:46:02 +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
ba435dd6a6 关于绑定的问题
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Has been cancelled
Details
2026-06-22 12:08:41 +09:00
break
3b7b856e48 企业授权增强与资产列表扩展
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m9s
Details 
- 企业卡授权唯一约束：新增 DB 迁移（000154），卡级部分唯一索引防止同一张卡被多个企业同时持有，Service 层新增跨企业冲突检测
- 单卡列表新增 network_status 过滤参数
- 单卡/设备列表新增 asset_status、asset_status_name、generation 响应字段
- 单卡/设备列表新增企业维度过滤（authorized_enterprise_id、is_authorized_to_enterprise）及响应中企业授权信息（批量加载，无 N+1）
- 主钱包流水/退款列表新增 asset_identifier 精确过滤参数
- 企业卡授权/收回接口升级为三模式（list/range/filter），企业设备授权/收回升级为双模式（list/filter）
- 升级 sonic v1.14.2 → v1.15.2 以兼容 Go 1.26

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-06-17 16:23:03 +09:00
Break
016e7bee79 修改过期时间,以及修改套餐已用量
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Has been cancelled
Details
2026-06-12 10:41:24 +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
32c9859b38 监控 2026-06-10 01:15: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
4ccbf13197 开放接口已用完流量查询错误的问题 2026-06-08 10:10:10 +08:00
Break
0ae8148689 审批金额
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m13s
Details
2026-06-06 14:55:48 +08:00
Break
9a802c04e5 审计日志修复
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m20s
Details
2026-06-05 17:22:05 +08:00
Break
4d419a1966 校验bug 2026-06-05 16:59:27 +08:00
Break
fe2041bcf5 机卡分离复机判断
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m13s
Details
2026-06-05 14:20:58 +08:00
Break
6ac19d6565 支撑单卡
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m16s
Details
2026-06-04 14:29:20 +08:00
Break
cce27975a1 设备关键词查询
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m7s
Details
2026-06-04 10:34:58 +08:00
Break
d86ac46761 关键词查询
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Has been cancelled
Details
2026-06-04 10:34:14 +08:00
Break
420f3d83f9 应当允许卡就算没有销售也能换货
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Has been cancelled
Details
2026-06-04 10:26:47 +08:00
Break
5089a71764 返回错误原因
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m25s
Details
2026-06-03 17:52:51 +08:00
Break
5f57429fb0 直接换货流程
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m28s
Details
2026-06-03 16:55:32 +08:00
Break
46ede81aef 修复佣金错误计算的问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m15s
Details
2026-06-03 10:25:49 +08:00
Break
a6cd550b94 1
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m18s
Details
2026-06-02 16:56:09 +08:00
Break
c6e65fde9b 开放接口 2026-06-02 16:56:01 +08:00
Break
1b47fb8f32 佣金计算问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m23s
Details
2026-06-02 16:19:42 +08:00
Break
918b9b4f25 退款也应该记录快照 2026-06-01 11:45:31 +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
1ee554daec 钱包流水新增资产信息
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m59s
Details
2026-05-29 10:52:12 +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
1550ef3cb1 修复超额流量不记录的问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m18s
Details
2026-05-28 15:19:54 +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
f4d92f99a2 新增退款凭证
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m41s
Details
2026-05-26 17:16:11 +08:00
Break
e131d6ba77 imei
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Failing after 21m51s
Details
2026-05-26 16:55:35 +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
4c1e4f428a 一次补偿
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m2s
Details
2026-05-25 14:40:34 +08:00
huang
226474b434 轮训有问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m7s
Details
2026-05-22 16:21:46 +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
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
2768deb0b6 设备新增搜索条件
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m8s
Details
2026-05-20 10:27:30 +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