liujiahui
2229dfaf04
## 改动概述 本 PR 含两个主题(关联 7-1 邀请页 / 兑换时区工作)。 ### 1. 邀请好友列表「已比价」状态 - `get_invitees` 返回新增 `is_compared` 字段(= `compare_reward_granted`)。 客户端据此区分好友列表「去提醒 / 邀请成功」、在途列表只取未比价、算在途好友数与在途收益。 - 新增开发接口 `POST/DELETE /invite/seed-fake`(仅非生产, `is_prod` 挡 404): 造未比价 + 已比价虚拟好友, 已比价者走真实入账发 2 元邀请奖励金, 方便真机联调在途 / 好友列表 UI; 清理时原路退回, 不留脏账。 ### 2. 每日兑换定时器时区修复 - `deploy/daily-exchange.service` / `.timer` 锁定 `Asia/Shanghai`, 避免按服务器本地时区在错误时刻触发每日兑换(此前隐患: worker 已用 cn_today, 但 systemd timer 仍按服务器本地时区)。 - 新增 `test_daily_exchange_timezone` 覆盖同一北京日内幂等。 ## 测试 - 邀请 + 兑换时区相关用例全过(`28 passed`)。 - 说明: 仓库预存的 3 个 proxy 转发测试(`test_compare_proxy` / `test_coupon_proxy`)失败, 已在干净 HEAD 上复现确认与本改动无关, 不在本 PR 处理范围。 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: no_gen_mu <liujianhishen@gmail.com> Reviewed-on: #104 Co-authored-by: liujiahui <liujiahui@wonderable.ai> Co-committed-by: liujiahui <liujiahui@wonderable.ai>
45 lines
2.0 KiB
Python
45 lines
2.0 KiB
Python
import logging
|
|
|
|
from fastapi import APIRouter
|
|
|
|
from app.api.deps import CurrentUser, DbSession
|
|
from app.repositories import invite as crud_invite
|
|
from app.repositories import savings as crud_savings
|
|
from app.schemas.order import OrderReportOut, OrderReportRequest
|
|
|
|
logger = logging.getLogger("shagua.order")
|
|
|
|
router = APIRouter(prefix="/api/v1/order", tags=["order"])
|
|
|
|
|
|
@router.post(
|
|
"/report",
|
|
response_model=OrderReportOut,
|
|
summary="上报归因订单(比价后5分钟内点链接 + 支付金额与比价价相差≤1元)",
|
|
)
|
|
def report_order(req: OrderReportRequest, user: CurrentUser, db: DbSession) -> OrderReportOut:
|
|
# 记账唯一真相表是 savings_record(source='compare')。
|
|
rec, duplicated = crud_savings.create_from_report(db, user.id, req)
|
|
# 邀请 v2 发奖:被邀请人【实际下单】(而非仅完成比价)才给邀请人发邀请奖励金(幂等,只发一次)。
|
|
# 触发点从"比价成功上报"挪到这里(冰:完成比价并实际下单才算成功)。仅首次真实上报触发,
|
|
# 重复上报(duplicated)跳过。best-effort:发奖异常不影响订单上报本身(rec 已 commit),只 log;
|
|
# try_reward_on_compare 自带 compare_reward_granted 幂等闸,漏发靠后续对账补。
|
|
if not duplicated:
|
|
try:
|
|
reward = crud_invite.try_reward_on_compare(db, user.id)
|
|
if reward.status == "granted":
|
|
logger.info(
|
|
"invite order reward granted inviter=%s invitee=%s cents=%s",
|
|
reward.inviter_user_id, user.id, reward.reward_cents,
|
|
)
|
|
except Exception as e: # noqa: BLE001 best-effort,发奖失败不阻塞订单上报
|
|
logger.warning("invite order reward failed invitee=%s: %s", user.id, e)
|
|
return OrderReportOut(
|
|
id=rec.id,
|
|
platform=rec.platform or req.platform,
|
|
pay_channel=rec.pay_channel or req.pay_channel,
|
|
compared_price_cents=rec.compared_price_cents or 0,
|
|
paid_amount_cents=rec.order_amount_cents,
|
|
duplicated=duplicated,
|
|
)
|