 shanshanzhong147
|
7236ca4cf2
|
修复(#128): 按规则类型决定促销资格，让 InactiveUser/Campaign 对老用户生效
Build docker and publish / build (20.15.1) (push) Has been cancelled
Build docker and publish / build (20.15.1) (pull_request) Has been cancelled
此前 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
|
e17dc4a273
|
修复: GET /v1/admin/promo/price/list 字段不匹配导致 400
Build docker and publish / build (20.15.1) (push) Failing after 21m12s
Build docker and publish / build (20.15.1) (pull_request) Failing after 22m17s
前端发 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
Build docker and publish / build (20.15.1) (pull_request) Successful in 8m18s
- 实现促销管理接口：规则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
Build docker and publish / build (20.15.1) (pull_request) Successful in 7m58s
- 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
Build docker and publish / build (20.15.1) (pull_request) Successful in 8m19s
- 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
Build docker and publish / build (20.15.1) (pull_request) Successful in 8m28s
- 新增促销规则/规格促销价/使用记录模型与幂等迁移
- 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 |
|