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

219 Commits

Author SHA1 Message Date
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
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
84ab3bad99 order导出
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Failing after 3m11s
Details
2026-06-16 09:38:20 +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
016e7bee79 修改过期时间,以及修改套餐已用量
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Has been cancelled
Details
2026-06-12 10:41:24 +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
5f57429fb0 直接换货流程
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m28s
Details
2026-06-03 16:55:32 +08:00
Break
c6e65fde9b 开放接口 2026-06-02 16:56:01 +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
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
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
e2301d5f3b chore(集成验证): gofmt 修复 DTO 格式并重新生成 OpenAPI 文档
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m3s
Details 
- 修复 ListStandaloneIotCardRequest 和 ListDeviceRequest 字段对齐格式
- 重新生成 docs/admin-openapi.yaml，两个列表接口均新增 has_active_package 参数
- go build ./cmd/api、go build ./cmd/worker 均通过验证

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-19 12:15:06 +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
huang
8de9c59b1c 查询
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m13s
Details
2026-05-19 11:32:41 +08:00
huang
af5a21ed1e 新增三个同步时间字段 2026-05-18 10:47:07 +08:00
huang
480d4c4583 1
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m59s
Details
2026-05-18 10:34:04 +08:00
huang
ed071918ed 钱包订单退款时应当正确退回,充值时允许最低充值1分
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m7s
Details
2026-05-18 09:51:59 +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
81aa3c2b11 新增字段
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m15s
Details
2026-05-13 17:50:21 +08:00
huang
a5388446d3 新增字段
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m7s
Details
2026-05-12 14:10: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
95fc0b0a1b 修复一些问题,主要是生效套餐
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m16s
Details
2026-05-12 10:32:38 +08:00
huang
05a5694a5f 修复bug
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 8m5s
Details
2026-05-11 16:45:37 +08:00
huang
1350a9ed79 批量
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m53s
Details
2026-05-11 14:54:23 +08:00
huang
b6d21b81e3 文档生成 2026-05-11 11:59:36 +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
ebaf112c80 新增排查自己的逻辑
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m53s
Details
2026-05-09 15:22:29 +08:00
huang
09cf0be86e 联级,多选
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m52s
Details
2026-05-09 15:06:27 +08:00
huang
a93acc0784 有效天数问题,充值单回调问题 2026-05-08 11:46:34 +08:00
huang
d42fe2b0ca 补上参数
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m53s
Details
2026-05-06 16:44:14 +08:00
huang
eb74dd7849 补回是否启用虚流量
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m58s
Details
2026-05-06 16:07:59 +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
948243b13d 修改 2026-04-30 15:49:40 +08:00
huang
248ed55f4e 获取当前生效的appid
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m46s
Details
2026-04-30 10:52:33 +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
6b3b33b2f0 废除激活时间
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m57s
Details
2026-04-29 12:04:23 +08:00
huang
74c7b27327 切卡模式更新
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m58s
Details
2026-04-29 10:18:15 +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