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

63 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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 f6911965dc chore: snapshot current aws standby and backup tooling work 2026-05-13 10:59:03 -07:00
shanshanzhong147 9dd5dcb9d2 fix(order): mark first renewal payments as new
Build docker and publish / build (20.15.1) (push) Failing after 5m32s
Details
2026-05-02 16:48:45 -07:00
shanshanzhong147 59b7056a20 fix family member renewal target
Build docker and publish / build (20.15.1) (push) Has been cancelled
Details
2026-04-30 09:26:52 -07:00
shanshanzhong147 ab38cd4943 x
Build docker and publish / build (20.15.1) (push) Failing after 4m44s
Details
2026-04-26 21:12:22 -07:00
shanshanzhong147 9db4762904 fix(order): prevent duplicate subscriptions and repair invite gifts
Build docker and publish / build (20.15.1) (push) Successful in 5m6s
Details
2026-04-24 21:16:21 -07:00
shanshanzhong147 9a8ae8b6fd fix: 修复非单订阅模式下过期用户重复购买产生双订阅的问题
Build docker and publish / build (20.15.1) (push) Successful in 4m45s
Details 
1. purchaseLogic: 非单订阅模式下购买前查询已有订阅，路由为续费(type=2)
2. activateOrderLogic: 续费激活时触发节点分组重算，确保过期续费后权限生效

Co-Authored-By: claude-flow <ruv@ruv.net>
 2026-04-20 20:58:01 -07:00
shanshanzhong147 e51dbea7c7 fix: getDiscount 新人取折扣最大档，非新人取折扣最小档
Build docker and publish / build (20.15.1) (push) Failing after 7m31s
Details 
- 新人：所有匹配 quantity 的条目中取 discount 值最小的（折扣力度最大）
- 非新人：所有匹配 quantity 的条目中取 discount 值最大的（折扣力度最小，接近原价）
- 不再按 new_user_only 过滤，由 isNewUserOnlyForQuantity 在上层控制准入

Co-Authored-By: claude-flow <ruv@ruv.net>
 2026-03-31 07:22:12 -07:00
shanshanzhong147 c8f172dc0e fix: getDiscount 新人取折扣最大档，非新人取最贵档
Build docker and publish / build (20.15.1) (push) Has been cancelled
Details 
- 新人：遍历所有匹配 quantity 的条目，取 discount 值最小的（折扣力度最大）
- 非新人：仅看 new_user_only=false 的条目，取 discount 值最大的（最接近原价）

Co-Authored-By: claude-flow <ruv@ruv.net>
 2026-03-31 07:18:04 -07:00
shanshanzhong147 52aaaf4de5 fix: getDiscount 新人价取值错误 — 始终优先取 new_user_only=false 的实际折扣档
Build docker and publish / build (20.15.1) (push) Has been cancelled
Details 
同一 quantity 有两条记录时：
- new_user_only=true (discount=99.64) 是新人限制标记，非实际折扣
- new_user_only=false (discount=35.36) 是实际折扣价格

原逻辑遍历到第一条即返回，导致新人拿到 99.64 而非 35.36。
修复后优先取 new_user_only=false 的条目，仅在无 false 条目时才降级到 new_user_only=true。

Co-Authored-By: claude-flow <ruv@ruv.net>
 2026-03-31 07:14:37 -07:00
shanshanzhong147 5733ebe40d fix: renewal logic 尝鲜价未生效 — 改为走 newUser 资格判断
Build docker and publish / build (20.15.1) (push) Successful in 7m17s
Details 
renewalLogic 在计算折扣时硬编码 isNewUser=false，
导致新用户在 24h 窗口内通过 renewal 接口购买时无法享受尝鲜价。
改为调用 resolveNewUserDiscountEligibility，与 purchaseLogic 保持一致。

Co-Authored-By: claude-flow <ruv@ruv.net>
 2026-03-31 06:35:14 -07:00
shanshanzhong147 3167465865 fix: 单订阅模式成员购买时用家庭主 ID 查锚点订阅
Build docker and publish / build (20.15.1) (push) Has been cancelled
Details 
ResolvePurchaseRoute 传入 entitlement.EffectiveUserID
（家庭主 ID）而非 u.Id（成员 ID），确保成员购买时
能找到家庭主已有订阅并续费，而不是新建一条订阅。

Co-Authored-By: claude-flow <ruv@ruv.net>
 2026-03-31 06:08:28 -07:00
shanshanzhong147 202c1c18d7 fix: 修复同 quantity 存在新用户和普通折扣档时老用户无法下单的问题
Build docker and publish / build (20.15.1) (push) Successful in 7m34s
Details 
isNewUserOnlyForQuantity 原逻辑取第一条匹配记录即返回，
当同一 quantity 同时配置了 new_user_only=true 和 false 两档时，
结果依赖数组顺序，导致老用户/超24h用户触发 SubscribeNewUserOnly 错误。

修复：扫描所有同 quantity 档位，仅当存在 true 且无 false 兜底时才返回 true；
有 false 兜底则返回 false，老用户可正常购买并命中普通折扣档。

Co-Authored-By: claude-flow <ruv@ruv.net>
 2026-03-30 22:30:12 -07:00
shanshanzhong147 e0b2be2058 x
Build docker and publish / build (20.15.1) (push) Successful in 7m36s
Details
2026-03-30 21:05:21 -07:00
shanshanzhong147 2a9c01ff8b x
Build docker and publish / build (20.15.1) (push) Successful in 7m28s
Details
2026-03-30 04:49:55 -07:00
shanshanzhong147 df7303738a bug: 无订阅情况 出现下多笔订单 支付状态乱
Build docker and publish / build (20.15.1) (push) Successful in 7m18s
Details
2026-03-30 00:32:41 -07:00
shanshanzhong147 8398865bd3 fix: SingleModel 下首购 isNew 判断错误导致佣金不发 
SingleModel 模式下，用户首次购买会被路由成 orderType=2（续费），
导致 isNew 判断逻辑跳过，始终为 false，激活时 shouldProcessCommission
误判为非首购，佣金不发给邀请人。

修复：去除 isNew 查询对 orderType==1 的依赖，始终通过
IsUserEligibleForNewOrder 判断用户是否有历史完成订单。

Co-Authored-By: claude-flow <ruv@ruv.net>
 2026-03-28 11:28:02 -07:00
shanshanzhong147 507ee16a30 x
Build docker and publish / build (20.15.1) (push) Successful in 8m20s
Details
2026-03-28 09:06:24 -07:00
shanshanzhong147 4a2501a3d1 fix: 折扣匹配改为精确匹配 quantity，不再取全局最小值
Build docker and publish / build (20.15.1) (push) Successful in 7m55s
Details 
将 getDiscount 和 isNewUserOnlyForQuantity 的匹配逻辑从
inputMonths >= discount.Quantity 改为 inputMonths == discount.Quantity，
买多少天就用多少天对应的折扣，避免错误配置导致折扣泄漏。
同时增加 discount 值合法性校验（>0 且 <100）。

Co-Authored-By: claude-flow <ruv@ruv.net>
 2026-03-26 01:28:50 -07:00
shanshanzhong147 bb80df5786 权限问题
Build docker and publish / build (20.15.1) (push) Has been cancelled
Details
2026-03-11 08:06:13 -07:00
shanshanzhong147 fafb229295 feat: 为折扣计算函数 getDiscount 引入新用户判断逻辑以支持新用户专属折扣。
Build docker and publish / build (20.15.1) (push) Successful in 7m37s
Details
2026-03-11 03:56:48 -07:00
shanshanzhong147 48383fa0a9 更新支付方式相关业务逻辑。
Build docker and publish / build (20.15.1) (push) Successful in 7m31s
Details
2026-03-10 21:42:02 -07:00
shanshanzhong147 26f6400e74 feat: 苹果支付uuid 及设备逻辑
Build docker and publish / build (20.15.1) (push) Successful in 8m3s
Details
2026-03-10 19:53:19 -07:00
shanshanzhong147 662ef6edb3 15分钟修改成5分钟
Build docker and publish / build (20.15.1) (push) Successful in 7m38s
Details
2026-03-09 22:29:30 -07:00
shanshanzhong147 79a97ec569 限制套餐具体到 档位
Build docker and publish / build (20.15.1) (push) Successful in 7m45s
Details
2026-03-08 21:25:07 -07:00
shanshanzhong147 94f5d0c07d map对齐
Build docker and publish / build (20.15.1) (push) Successful in 7m29s
Details
2026-03-07 07:42:09 -08:00
shanshanzhong147 4d913c1728 修复缓存
Build docker and publish / build (20.15.1) (push) Successful in 7m26s
Details
2026-03-06 21:58:29 -08:00
shanshanzhong147 4349a7ea2f 家庭组 权益修改
Build docker and publish / build (20.15.1) (push) Successful in 8m16s
Details
2026-03-04 22:02:42 -08:00
shanshanzhong147 4752f844ef 各种配置项修复，优化到后台管理端配置
Build docker and publish / build (20.15.1) (push) Has been cancelled
Details
2026-03-04 17:58:40 -08:00
shanshanzhong147 0c544268e5 refactor payment platform canonicalization and order method consistency
Build docker and publish / build (20.15.1) (push) Failing after 8m1s
Details
2026-03-04 02:15:32 -08:00
shanshanzhong147 b0eb6595ac add: 新增ci diamanté 2026-03-03 17:29:45 -08:00
shanshanzhong147 4d8516b2e1 同步历史版本代码 2026-03-03 09:32:22 -08:00
EUForest 31e75efacb Merge upstream/master into master 2026-02-13 23:06:43 +08:00
Chang lue Tsen 701d47ed21 feat(order): add validation for quantity and amount limits in order requests 2026-02-08 06:41:23 -05:00
EUForest 7e08a07e29 fix: resolve balance payment issue with coupon and fee calculation 
This commit fixes the inconsistent calculation logic between order preview
and actual order creation, which caused balance payment failures when using
coupons.

Changes:
- Standardized fee calculation order in both preCreateOrderLogic and purchaseLogic
- Moved gift amount deduction after fee calculation to ensure correct total
- Removed premature gift amount deduction before transaction in purchaseLogic
- Gift amount is now only deducted within the database transaction

The calculation order is now unified:
1. Apply coupon discount
2. Calculate handling fee based on post-coupon amount
3. Deduct gift amount from total (including fee)

This ensures the preview amount matches the actual payment amount.
 2026-02-06 23:14:04 +08:00
EUForest 7d4a19c9a3 fix: add quota limit check to prevent subscription bypass 
- Add quota check in preCreateOrderLogic for order preview
- Move quota check inside transaction in purchaseLogic to prevent race condition
- Add quota check in activateOrderLogic as final safeguard when creating subscription
- Add quota check in redeemCodeLogic when redeeming codes for new subscriptions
 2026-01-10 21:18:26 +08:00
EUForest 80ee9a6acf Merge upstream/master into develop 
Sync upstream changes from perfect-panel/server

  Includes updates from v1.0.1 to v1.2.5:
  - Currency configuration support
  - Subscribe improvements (short token, inventory check, etc.)
  - Node management enhancements
  - Database migrations
  - Bug fixes and optimizations
 2026-01-02 12:51:55 +08:00
Tension fb6adc9ae3 feat(subscribe): add inventory check and update logic for subscription plans 2025-12-28 22:44:14 +08:00
Tension 7a2000f696 feat(discount): change discount type to float64 for improved precision 2025-12-28 22:04:50 +08:00
EUForest 95ddba2332 update: Added support for floating-point calculations for discounts 2025-11-21 17:40:03 +08:00
Chang lue Tsen 900096ed12 fix(coupon): add check for zero count in coupon usage validation 2025-09-16 10:17:18 -04:00