HI-VPN/hi-server
4
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity
735 Commits 29 Branches 0 Tags
b98d718f3c79598a82799f637efafd3a4cb00e0a
Commit Graph

506 Commits

Author SHA1 Message Date
shanshanzhong147 b98d718f3c 修复(#11): 修复家庭组订单退款订阅归属 (#13) 
Co-authored-by: multica-agent <github@multica.ai>
 2026-06-07 08:23:19 -07:00
shanshanzhong147 bcb8cd222c 修复(#10): 禁止通用订单状态接口标记退款 (#12) 
Co-authored-by: multica-agent <github@multica.ai>
 2026-06-05 23:35:42 -07:00
shanshanzhong147 34cd1c524e 修复(#8): 分组管理核心缺陷与测试覆盖 (#11) 
Co-authored-by: multica-agent <github@multica.ai>
 2026-06-04 03:13:38 -07:00
shanshanzhong147 19d28a8f89 修复(#1): 服务器用户列表缓存按 protocol 隔离 + 兜底不写缓存 
服务器用户列表缓存跨协议污染修复（HIF-1 / 详见 PR #5 四件套）：

1. 缓存 key 加 protocol 维度（`server:user:{server_id}:{protocol}`），对齐 ServerConfig 已有约定
2. 显式枚举协议清除用户列表缓存（AllProtocols + ServerUserListCacheKeysForServer），不用 SCAN
3. 三个兜底分支不写缓存 + Errorw 日志（带 server_id + protocol 字段）
4. hysteria2 → hysteria 兼容归一化 + 6 个新单测

Closes HIF-1
 2026-06-03 05:37:03 -07:00
shanshanzhong147 c540091ef9 修复(#143): 邀请权益查询排序，消除 map 迭代序 flake 
Closes HIF-143. 让 `inviteeAndInviterIds` 在 append 后 `slices.Sort` 升序，让 sqlmock IN 参数匹配稳定，同时让生产 SQL EXPLAIN 计划稳定。修复 GitHub Actions Deploy Staging 自 2026-06-03 03:51 起连续 8 次 `go test ./...` 失败问题。

测试: go test -count=10 修复前 4/10 fail, 修复后 30/30 pass.
改动: 2 files, +4/-2 (internal/logic/admin/invite/{benefits.go,benefits_test.go})
 2026-06-02 22:04:16 -07:00
shanshanzhong147 87ebfa1fac 修复(#137): DeferCloseOrder 关单前反查支付网关 (启用 confirmationPayment)
Build docker and publish / build (20.15.1) (push) Failing after 18m47s
Details
Build docker and publish / build (20.15.1) (pull_request) Failing after 19m31s
Details 
Squash merge of fix/137-defer-close-反查网关 (1367c4f).

DeferCloseOrder 直接将 status=1 订单关单，会把已经在网关侧完成支付但
notify 静默失败的订单错误关闭。本次在关单前调用 EPay 的网关查询接口
(confirmationPayment) 拿到三态结果：

- Paid: 原子化把 status 1->2，写回 trade_no，再投递 asynq 走激活流程
- Unpaid: 继续原来的 close 事务，把 status 改为 cancelled
- Unknown / 网关失败: 保持 status=1，下一轮 DeferClose 再试

新增 closeOrderLogic_test.go (232 行)，覆盖三态分支 + recoverPaidOrder
的并发幂等。单测全量 PASS, go build + go vet 均干净。E2E 验收因测试环境
访问受限暂未跑，QA 已在 issue 上注明阻塞原因 (qa_partial_blocked_on_e2e_access)。

Co-authored-by: multica-agent <github@multica.ai>
 2026-06-02 20:24:32 -07:00
shanshanzhong147 ac25eb4d91 修复(#140): 去掉 cancelWithdrawalLogic 在新流程下的重复退款
Build docker and publish / build (20.15.1) (push) Has been cancelled
Details
Build docker and publish / build (20.15.1) (pull_request) Has been cancelled
Details 
Squash merge of fix/140-去掉撤销提现的重复退款 (86896cd).

HIF-22 引入 rejectWithdrawal 反查支付网关后，cancelWithdrawalLogic 仍在
事务体内调用 UpdateCommission(+amount)，对已在 rejectWithdrawal 中退还
的金额做了二次退款。本次只保留 withdrawal.status -> Cancelled，与
rejectWithdrawal 行为对齐。

新增 cancelWithdrawalLogic_test.go 用 sqlmock 严格断言：撤销 happy path
只触发 BEGIN / SELECT FOR UPDATE / UPDATE withdrawals / COMMIT 四条 SQL,
对 user / system_logs 零读零写。

Co-authored-by: multica-agent <github@multica.ai>
 2026-06-02 20:23:45 -07:00
架构师 750b7be424 修复(#136): EPay notify 静默失败硬化 + 回写 trade_no
Build docker and publish / build (20.15.1) (push) Failing after 8m55s
Details
Build docker and publish / build (20.15.1) (pull_request) Failing after 22m22s
Details 
P01 签名校验失败由 return nil 改为返回 xerr.SignatureInvalid，handler 回 400，EPay 网关重试；Debug 旁路保留
P02 订单不存在维持 error 返回，仅 status=5 Finished 保留 nil 作幂等短路
P03 支付完成路径写入 order.trade_no = req.TradeNo，再 UpdateOrderStatus 刷缓存
附加：TradeStatus != TRADE_SUCCESS 降为 INFO 日志 + metric epay_notify_trade_not_success
抽离纯决策函数 evaluateEPayNotify，新增单测覆盖 4 个核心分支 + 签名优先级回归 + SQL 写路径 + URL 解析（9/9 PASS，-race 干净）

仅 internal/logic/notify/ePayNotifyLogic.go 与对应单测，无其他文件变更。

Co-authored-by: multica-agent <github@multica.ai>
 2026-06-01 03:08:31 -07:00
架构师 aa11588c8f 修复(#129): 新注册无历史用户不再误命中沉默促销
Build docker and publish / build (20.15.1) (push) Failing after 22m17s
Details
Build docker and publish / build (20.15.1) (pull_request) Failing after 22m28s
Details 
evaluateInactiveUserPromo 在 ErrRecordNotFound 时之前 return true，导致
新注册无任何订阅历史的用户被错误判定为"沉默用户"命中 inactive_user 规则。
改为 return false 保持判定语义一致：没有历史订阅 ≠ 沉默用户。

Squash from origin/fix/129-新注册误命中沉默促销 (77377ed)

Co-authored-by: multica-agent <github@multica.ai>
 2026-06-01 00:28:26 -07:00
shanshanzhong147 5b9f384f81 修复(#132): 退款幂等校验 + 已退款订单防重新激活
Build docker and publish / build (20.15.1) (push) Failing after 21m4s
Details
Build docker and publish / build (20.15.1) (pull_request) Failing after 21m47s
Details 
P01：refundOrderLogic.RefundOrder 在事务内 FOR UPDATE 后、lockCommissionSource 前新增
333 退款日志扫描，命中即返回 OrderAlreadyRefunded(61006)，不再写日志/扣 commission/
改 order.status。

P02：堵住已退款订单状态被回退入口
- queue/logic/order/stuckOrderRecoveryLogic.go：批扫 status=6 时新增 333 日志守卫，
  已退款订单不再被重置为 5 + 重新入队 activate（HIF-131 trace 中订单 53647 被刷回 5
  的真凶）
- queue/logic/order/activateOrderLogic.go：releaseClaim 同步加守卫做防御性兜底

新增 internal/model/log/refund.go 共享 helper HasRefundCommissionLog：
type=33 + content LIKE 走索引粗筛，再 JSON 反序列化确认 content.type==333 AND
content.order_no==orderNo，防 LIKE 子串误判。

测试：单元测试覆盖正常退款 / 已有 333 日志拒绝 / 子串误判防御 / 脏 JSON 容错；
sqlmock 严格断言命中后事务序列只含 BEGIN/SELECT order FOR UPDATE/SELECT
system_logs/ROLLBACK，无任何 commission 写入。

不做：calculateCommission、status 枚举拆分、表结构变更、支付通道 notify、用户余额回补。

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-31 20:19:35 -07:00
shanshanzhong147 7236ca4cf2 修复(#128): 按规则类型决定促销资格，让 InactiveUser/Campaign 对老用户生效
Build docker and publish / build (20.15.1) (push) Has been cancelled
Details
Build docker and publish / build (20.15.1) (pull_request) Has been cancelled
Details 
此前 calculatePurchasePrice 把 allowPromo 绑死在 orderType == 1，导致只要用户
有任何过往付费订阅（含已过期），就会被 paidSubscriptionQuery 路由为续费
（orderType=2），跳过所有促销评估。后果：

  - InactiveUser 召回促销永远无法触发（其目标人群恰好就是有过期订阅的用户）
  - Campaign 全员活动对老用户 / 升级加购场景完全失效
  - 套餐列表（loadSubscribePromoMap）直接调 EvaluatePromo 不感知 orderType，
    可能显示促销价但下单时却拿到原价

修复方式：把 isFirstPurchase 下放给 EvaluatePromo，由规则类型决定 gating：

  - NewUser    要求 isFirstPurchase=true（保留首购语义）
  - InactiveUser 由规则自身的"上次订阅过期 N 月以上"条件判定
  - Campaign   时间窗内对任意用户生效

新增 common.HasPaidSubscription 助手，套餐列表与下单走同一份 isFirstPurchase
判定，确保展示价与实际下单价口径一致。

测试：补充 EvaluatePromo / calculatePurchasePrice 的 NewUser 屏蔽 + Campaign
放开用例；更新 loadSubscribePromoMap 测试覆盖新增 HasPaidSubscription 查询。

注：renewalLogic.go 仍未接入促销（属于方向 B 的彻底统一，本次未涵盖）。
 2026-05-31 19:00:30 -07:00
shanshanzhong147 ae126296e3 修复(#128): 统一续费场景促销判断
Build docker and publish / build (20.15.1) (push) Failing after 23m3s
Details
Build docker and publish / build (20.15.1) (pull_request) Failing after 19m4s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-30 23:12:39 -07:00
shanshanzhong147 1e99cfb83c 修复(#128): 兼容促销规则毫秒时间戳
Build docker and publish / build (20.15.1) (push) Failing after 19m21s
Details
Build docker and publish / build (20.15.1) (pull_request) Failing after 19m48s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-30 04:16:21 -07:00
shanshanzhong147 0659a930f8 修复(#128): 修复家庭成员邀请流水可见性
Build docker and publish / build (20.15.1) (push) Failing after 18m41s
Details
Build docker and publish / build (20.15.1) (pull_request) Failing after 19m16s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-30 03:27:04 -07:00
shanshanzhong147 c2d1b5a0d8 修复(#130): 统一家庭成员促销资格口径
Build docker and publish / build (20.15.1) (push) Failing after 22m15s
Details
Build docker and publish / build (20.15.1) (pull_request) Failing after 18m6s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-30 01:58:15 -07:00
shanshanzhong147 3644e9ce3f 修复(#128): 统一促销价格资格口径
Build docker and publish / build (20.15.1) (push) Failing after 18m40s
Details
Build docker and publish / build (20.15.1) (pull_request) Failing after 19m24s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-29 22:42:04 -07:00
shanshanzhong147 e5d6539d79 修复(#126): 修复家庭组邀请记录漏查验收分支
Build docker and publish / build (20.15.1) (push) Failing after 20m3s
Details
Build docker and publish / build (20.15.1) (pull_request) Failing after 21m10s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-29 20:35:37 -07:00
shanshanzhong147 e17dc4a273 修复: GET /v1/admin/promo/price/list 字段不匹配导致 400
Build docker and publish / build (20.15.1) (push) Failing after 21m12s
Details
Build docker and publish / build (20.15.1) (pull_request) Failing after 22m17s
Details 
前端发 rule_id/subscribe_id (均可选), 后端 API 定义为 promo_rule_id
(required), 直接返回 "PromoRuleId is a required field"。

对齐前端约定 (与 usage/list 命名一致):
- API: promo_rule_id(required) → rule_id + subscribe_id, 均可选
- model.QueryPriceList: 改为接 PriceFilter, 按条件过滤
- 同步 fake mock 与校验测试签名
 2026-05-29 01:04:37 -07:00
shanshanzhong147 b162022d39 修复: 邀请列表 UNIX_TIMESTAMP 在 DATETIME(N) 上返回小数导致 Scan int64 失败
Build docker and publish / build (20.15.1) (pull_request) Successful in 7m37s
Details
Build docker and publish / build (20.15.1) (push) Failing after 20m37s
Details 
MySQL DATETIME 带小数秒精度时, UNIX_TIMESTAMP() 返回 "1779966403.631"
形式的 DECIMAL, Go 端 int64 字段无法 Scan, 触发 100 条 Scan error,
前端拿到的 invited_at/created_at 全为 0。

改用 CAST(UNIX_TIMESTAMP(...) AS SIGNED) 在 SQL 层截断转 BIGINT,
与 getInviteRecordsLogic / getInviteSalesLogic 的现有约定一致。
 2026-05-28 23:15:13 -07:00
shanshanzhong147 075c1215ca 还原: 撤销 fefbd4f5 的 go-zero stub 方案，回到 goctl 1.7.2 + gin 原生 routes
Build docker and publish / build (20.15.1) (pull_request) Failing after 21m54s
Details
Build docker and publish / build (20.15.1) (push) Failing after 20m31s
Details 
fefbd4f5 (#104) 用本地 third_party/gozero stub 假冒 go-zero 依赖，
让 goctl 1.9.2 生成的 rest.Server/rest.Route 风格 routes.go 能编译，
但带来非标 vendor、Dockerfile 漏拷、新人误解等维护成本。

本次回到 fefbd4f5 之前的方案：
- routes.go 用 gin 原生 publicUserGroupRouter.GET(...) 风格（goctl 1.7.2）
- server.go 直接 handler.RegisterHandlers(r, svc)，无需 rest.NewGinServer
- svc/serviceContext.go 不再持有 AuthMiddleware/DeviceMiddleware/ServerMiddleware 字段
- go.mod 删除 zeromicro/go-zero require + replace 指令
- 删除 third_party/gozero/ stub 模块
- 删除 fefbd4f5 引入的 28 个 goctl 生成的空 stub 文件和 nodeserver/apple 转发器
- Dockerfile 不再需要 COPY third_party/

invite_sales 还原路由保留（gin 老风格写法）。
 2026-05-28 21:46:33 -07:00
shanshanzhong147 3e265bd837 新功能: 还原 v1/public/user/invite_sales 接口 + promo schema 修复迁移
Build docker and publish / build (20.15.1) (push) Failing after 13m47s
Details
Build docker and publish / build (20.15.1) (pull_request) Failing after 15m7s
Details 
- 还原 /v1/public/user/invite_sales 接口及 /invite/sales 别名（与 invite_records 并存）
  逻辑/handler/types 与 197fed7d 删除前版本完全一致，按 fefbd4f5 新 routes 结构注册
- 新增迁移 02155_promo_schema_fix: 幂等修复 subscribe_promo / order 列类型与索引偏差
- 同步 etc/ppanel.yaml 数据库连接配置
- 补齐相关需求与设计文档
 2026-05-28 20:46:37 -07:00
shanshanzhong147 fefbd4f56a 修复(#104): 修复 goctl 重新生成代码漂移
Build docker and publish / build (20.15.1) (push) Failing after 58s
Details
Build docker and publish / build (20.15.1) (pull_request) Failing after 52s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-27 23:54:26 -07:00
shanshanzhong147 197fed7d12 新功能(#102): 新增邀请记录接口并删除旧邀请销售接口
Build docker and publish / build (20.15.1) (push) Failing after 10m56s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 8m50s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-27 22:50:16 -07:00
shanshanzhong147 f452f80100 配置(#98): 扩展文件上传 Content-Type 白名单支持图片
Build docker and publish / build (20.15.1) (push) Failing after 9m55s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 8m7s
Details 
- 在 etc/ppanel.yaml 与 internal/config/config.go 的 S3.AllowedContentTypes 新增 image/jpeg,image/jpg,image/png,image/webp,image/gif,image/heic,image/heif,image/bmp
- 保留原 zip/gzip/text/json/octet-stream
- validateInitRequest 在拒绝时携带 content_type is not allowed 业务消息
- 新增 internal/logic/public/file/common_test.go，覆盖允许/拒绝及无 Content-Type 嗅探
- doc/tapi-file-upload-zh.md 同步允许类型列表与错误码说明

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-27 19:50:51 -07:00
shanshanzhong147 1022160ff8 新功能(#89): 增强邀请列表接口 + 新增全局邀请管理接口
Build docker and publish / build (20.15.1) (push) Failing after 9m30s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 7m48s
Details 
P01: GET /v1/admin/user/invite/list 增加 search/enable/user_id_search
筛选参数，响应新增 order_count/has_purchased/inviter_commission/
inviter_gift_days/invitee_gift_days 权益字段。

P02: 新增 GET /v1/admin/invite/list 全局邀请管理接口，支持按
邀请人/被邀请人筛选和搜索，返回邀请关系及权益聚合数据。

共用 QueryBenefits 批量查询防 N+1，分页上限 100。

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-27 10:32:28 -07:00
shanshanzhong147 82eff47f38 新功能(#69): 用户级限速覆盖 — 数据层 + 核心逻辑 + 管理接口
Build docker and publish / build (20.15.1) (push) Failing after 8m52s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 7m51s
Details 
- 新增 migration 02153: user_subscribe 表添加 speed_limit、traffic_limit 列（幂等）
- model 层 Subscribe/SubscribeDetails 新增用户级限速字段（*string 类型支持 nil 回退）
- server 用户列表和管理员详情接口支持用户级限速覆盖优先级计算
- 更新管理员订阅更新接口支持写入/清除用户级限速

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-27 08:07:16 -07:00
shanshanzhong147 d351b50066 修复(#71): 管理员订阅限速接口拒绝负数限速和非法 traffic_limit
Build docker and publish / build (20.15.1) (push) Failing after 8m50s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 7m56s
Details 
- SpeedLimit 加 validate:"gte=0" 校验
- TrafficLimit 加 JSON 格式校验
- 新增单测覆盖负数限速和非法 JSON 场景

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-27 07:13:05 -07:00
shanshanzhong147 4366a9be8b 修复(#79): 促销管理后台API + 审查问题修复
Build docker and publish / build (20.15.1) (push) Failing after 9m10s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 8m18s
Details 
- 实现促销管理接口：规则CRUD、优惠价配置、使用记录查询
- 修复 UpsertPrices 新增记录时提前 return 的问题
- DeleteRule/DeletePrice 不存在记录返回 code=404
- SetPromoPriceRequest.items 空数组校验
- 分页参数限制 page>0、1<=size<=200
- 下单侧促销价格按数量档总价口径计算（含 #87 修复）

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-27 06:32:42 -07:00
shanshanzhong147 b5e50d1ee5 修复(#75): 按数量精确匹配套餐列表促销
Build docker and publish / build (20.15.1) (push) Failing after 9m2s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 7m58s
Details 
- loadSubscribePromoMap 返回 map[subscribeID]map[quantity]*SubscribePromo 二级映射
- 候选查询按 subscribe_id、quantity、priority DESC 排序，一次取出所有 quantity 档位
- 下单路径 QueryEligibleRules 将 quantity 条件移至 JOIN，精确匹配
- 永久订阅(expire_time=0)用 CASE WHEN 排序兜底，不再误判为回归促销
- 新增 promoEligibility、model、subscribe promo 单元测试

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-27 06:22:49 -07:00
shanshanzhong147 02b41e7a2c 修复(#85): 促销系统 quantity 设计修正补丁（跨任务统一修复）
Build docker and publish / build (20.15.1) (push) Failing after 8m50s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 8m19s
Details 
- subscribe_promo 表加 quantity 字段，BIGINT NOT NULL DEFAULT 1
- EvaluatePromo 加 quantity 参数，按 subscribeID + quantity 精确匹配
- Promo 从 Subscribe 顶层移到 SubscribeDiscount
- 查询加 quantity，返回 map[subscribeID][quantity] 二级映射
- recordPromoUsage 错误向上传播，不再静默吞掉
- preCreate 和 purchase 的 allowPromo 判定统一为 orderType==1
- 迁移脚本增加幂等处理（guarded DROP/ADD/MODIFY）

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-27 05:57:21 -07:00
shanshanzhong147 d12c340743 新功能(#77): 套餐列表 API 返回规格级促销信息
Build docker and publish / build (20.15.1) (push) Failing after 8m23s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 7m54s
Details 
将 promo 字段从 Subscribe 顶层移至 SubscribeDiscount（discount[] 项内），
促销查询按 subscribe_id + quantity 维度写入，每个规格独立命中最高优先级规则。

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-27 02:19:58 -07:00
shanshanzhong147 b9192db042 feat: 文件上传接口直接返回完整 URL + 提现 content 改为非必填
Build docker and publish / build (20.15.1) (push) Failing after 8m29s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 8m3s
Details 
- FileUploadResponse / FileUploadCompleteResponse 精简为只返回 url
- S3Store.BuildObjectURL 拼接完整访问地址
- 提现 method=0 时 content 不再参与必填校验
- 新增用户端 API 接口文档
 2026-05-27 00:57:21 -07:00
shanshanzhong147 48e507783e 新功能(#77): 套餐列表返回促销信息
Build docker and publish / build (20.15.1) (push) Failing after 8m34s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 8m4s
Details 
- 新增 SubscribePromo 响应结构，套餐列表每项追加 promo 字段
- 新增 promo.go 促销候选规则查询与资格评估逻辑
- 重构 authMiddleware 提取 authenticateRequest，新增 OptionalAuthMiddleware
- /v1/public/subscribe/list 改为可选鉴权，未登录仅展示 campaign 类型促销
- /node/list、/group/list 保持强制鉴权不变
- 每个规格只返回最高优先级命中的规则，promo_price 为单价，expires_at 为秒级时间戳
- 新增单测覆盖 campaign/new_user 命中、活动窗口判定等场景

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-26 22:40:58 -07:00
shanshanzhong147 d2f9289338 新功能(#76): 促销系统下单流程集成
Build docker and publish / build (20.15.1) (push) Has been cancelled
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 8m28s
Details 
- 新增促销规则/规格促销价/使用记录模型与幂等迁移
- EvaluatePromo 支持 new_user/inactive_user/campaign 规则判定
- purchase/preCreate 接入促销判定：命中促销时跳过百分比折扣
- activate 激活后按 order_no 幂等写入 promo_usage
- 订单模型和响应结构新增 promo_rule_id、promo_discount 字段

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-26 22:18:44 -07:00
shanshanzhong147 92e303aaa7 修复(#80): 修复wrapf非常量格式串vet阻断
Build docker and publish / build (20.15.1) (push) Has been cancelled
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 8m39s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-26 22:18:26 -07:00
shanshanzhong147 54328b197d 新功能(#78): 预算订单 API 返回 promo_discount 字段
Build docker and publish / build (20.15.1) (push) Has been cancelled
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 7m54s
Details 
PreOrderResponse 新增 promo_discount 字段，未接入促销时默认返回 0。
促销命中逻辑待 HIF-76 接入后生效。

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-26 22:13:40 -07:00
shanshanzhong147 5ebfe0a981 新功能(#65): 添加用户订阅限速数据层字段
Build docker and publish / build (20.15.1) (push) Failing after 8m30s
Details
Build docker and publish / build (20.15.1) (pull_request) Successful in 7m58s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-26 11:23:57 -07:00
shanshanzhong147 f9fa4756e9 新功能(#41): 提现优化 — 收款方式选择 + 取消提现 + 收款码上传
Build docker and publish / build (20.15.1) (push) Failing after 8m37s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-26 08:36:25 -07:00
shanshanzhong147 27f1203282 修复(#49): 修复清空备注时数据丢失 — RefererId 改为指针类型 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-26 08:35:45 -07:00
shanshanzhong147 8b4e7561f4 修复: scripts 编译冲突 + order 统计 is_new 字段修正 
- scripts/ 下两个独立脚本移到各自子目录，消除 package main 冲突
- model/order/model.go 统计查询 type→is_new 字段修正（7处）

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-26 08:06:50 -07:00
shanshanzhong147 b798f520c8 fix: add zero-value guard for RefererId to prevent clearing inviter on remark update
Build docker and publish / build (20.15.1) (push) Failing after 8m39s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-25 20:04:22 -07:00
shanshanzhong147 bae234fe15 Merge remote-tracking branch 'remotes/origin/agent/agent/bfdd0bdd' into merge-to-internal
Build docker and publish / build (20.15.1) (push) Failing after 8m14s
Details
2026-05-25 18:17:24 -07:00
shanshanzhong147 79ab4460bc feat: add GET /v1/admin/log/message/detail endpoint 
Adds a temporary admin endpoint to query log_message by ID,
returning the full record including context (JSON) and digest
fields that the existing /error_message/detail endpoint omits.

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-25 12:18:27 -07:00
shanshanzhong147 b6b5bccde6 fix: use withdrawals table consistently
Build docker and publish / build (20.15.1) (push) Failing after 8m20s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-25 10:43:24 -07:00
shanshanzhong147 eba256bdc9 merge: sync internal with main
Build docker and publish / build (20.15.1) (push) Failing after 8m22s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-25 10:32:06 -07:00
shanshanzhong147 0bd7560b64 fix: P1 activation path hardening - Bug 4-9 
Bug 4: resolveRenewalActivationSubscription - add fallback by user_id+subscribe_id
  with SELECT FOR UPDATE when token lookup fails

Bug 5: appleIAPNotifyLogic - return error on product ID mapping failure instead of
  silently dropping the notification

Bug 6: NewPurchase fallback query - wrap in transaction with SELECT FOR UPDATE to
  prevent concurrent duplicate subscription creation

Bug 7: appleIAPNotifyLogic - fix UserId=0 by reverse-lookup from original purchase
  order; create renewal audit order record for DID_RENEW/SUBSCRIBED notifications

Bug 8: UpdateOrderStatus - pre-delete cache before DB write (double-delete) to
  close TOCTOU window between DB update and cache invalidation

Bug 9: validateNewUserOnlyEligibilityAtActivation - add Redis distributed lock on
  user_id to serialise concurrent new-user-only order activations

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-25 02:18:19 -07:00
shanshanzhong147 a0f2d8a7b8 fix: persist guest/redemption activation context to DB to survive Redis TTL expiry (Bug 1 + Bug 10) 
- Add `activation_context` TEXT column to `order` table (migration 02150)
- purchaseLogic: write TemporaryOrderInfo JSON to order.ActivationContext in the same
  insert transaction; Redis write is now best-effort (non-fatal)
- redeemCodeLogic: write redemption {type, redemption_code_id, unit_time, quantity} JSON
  to order.ActivationContext at order creation; Redis write is now best-effort (non-fatal)
- getTempOrderInfo: on Redis miss, fall back to order.ActivationContext from DB;
  logs CRITICAL and returns error if both are missing (old orders with no DB record)
- RedemptionActivate: on Redis miss, fall back to order.ActivationContext from DB;
  same CRITICAL log path for legacy orders

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-25 02:18:19 -07:00
shanshanzhong147 80751eb8ef fix: move withdrawal commission deduction from application to approval
Build docker and publish / build (20.15.1) (push) Failing after 8m28s
Details 
- commissionWithdrawLogic: remove upfront commission deduction;
  balance check now includes sum of all pending withdrawals to prevent
  double-spending; transaction only creates the withdrawal record (status=0)
- approveWithdrawal: add FOR UPDATE lock on user row, balance check before
  deducting, atomic commission decrement and commission log inside one
  transaction; clear user cache after commit
- rejectWithdrawal: remove commission refund and log — commission was never
  deducted on application under the new flow
- add migration 02150: refund commission for existing status=0 withdrawals
  that were deducted under the old logic; includes rollback script

Co-authored-by: multica-agent <github@multica.ai>
 2026-05-24 20:26:42 -07:00
shanshanzhong147 3bbce5ce84 fix: 修复退款与仪表盘订单统计口径
Build docker and publish / build (20.15.1) (push) Failing after 8m16s
Details 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-24 17:50:29 -07:00
shanshanzhong147 1726a584fa feat: add admin order refund flow 
Co-authored-by: multica-agent <github@multica.ai>
 2026-05-24 17:50:23 -07:00