diff --git a/app/modules/performance/adapters/cafe24.py b/app/modules/performance/adapters/cafe24.py index 5abd9a5..4c0bae8 100644 --- a/app/modules/performance/adapters/cafe24.py +++ b/app/modules/performance/adapters/cafe24.py @@ -141,6 +141,14 @@ def order_total(order: dict[str, Any]) -> int: - sum(a[k] for k in DISCOUNT_FIELDS) - sum(a[k] for k in COUPON_FIELDS)) +def order_total_now(order: dict[str, Any]) -> int: + """취소·반품 반영 후 현재 결제합계(actual_order_amount). 없으면 결제 당시 금액.""" + a = order.get("actual_order_amount") or order.get("initial_order_amount") or {} + w = {k: _won(a.get(k)) for k in AMOUNT_FIELDS} + return (w["order_price_amount"] + w["shipping_fee"] + - sum(w[k] for k in DISCOUNT_FIELDS) - sum(w[k] for k in COUPON_FIELDS)) + + def is_self_market(market_id: Any) -> bool: """카페24 자체몰 채널(PC·모바일·네이버페이·톡체크아웃 등)인가.""" return channel_kind(market_id) == "self" @@ -409,6 +417,7 @@ class Cafe24Adapter(MarketplaceAdapter): by_channel: dict[str, dict[str, Any]] = {} by_payment: dict[str, dict[str, Any]] = {} # 결제수단 조합별(카페24 열 주문만) unpaid = 0 + paid_self: dict[str, int] = {} # 그날 결제된 카페24 열 주문 → (결제 당시 − 현재) 금액 for o in self.paid_orders(ctx, day, day): if o.get("paid") != "T": unpaid += 1 @@ -436,6 +445,8 @@ class Cafe24Adapter(MarketplaceAdapter): for k, v in order_amounts(o).items(): g[k] += v g["total"] += order_total(o) + if ch["target"] == "cafe24": + paid_self[str(o.get("order_id") or "")] = order_total(o) - order_total_now(o) rows = [r for r in self.refunds(ctx, day, day) if str(r.get("status") or "T") == "T"] markets = self.market_ids(ctx, rows) refunds = {"self": {"count": 0, "actual_refund_amount": 0, "used_points": 0, "used_credits": 0}, @@ -507,6 +518,17 @@ class Cafe24Adapter(MarketplaceAdapter): return {"count": len(sel), "payment_amount": sum(c["payment_amount"] for c in sel), "product_amount": sum(c["product_amount"] for c in sel)} + # 결제일 기준 — 그날 결제된 주문이 그 뒤(오늘까지) 환불된 금액. 카페24 일별 매출이 환불을 원 주문 결제일에 + # 빼는지 확인하는 용도(최근일만 맞고 지난 날일수록 차이가 커지는 현상). + from app.timezone import today_kst # noqa: WPS433 + + later = [x for x in self.refunds(ctx, day, max(day, today_kst())) + if str(x.get("order_id") or "") in paid_self and str(x.get("status") or "T") == "T"] + by_pay = rsum(later) + by_pay["amount_diff"] = sum(v for v in paid_self.values() if v > 0) + by_pay["refund_dates"] = sorted({str(x.get("refund_date") or "")[:10] for x in later}) + refund_basis["by_pay_date"] = by_pay + comp = refund_basis["completed"] no_refund = csum(lambda c: not c["has_refund"]) claimed = csum(lambda c: True) @@ -514,6 +536,12 @@ class Cafe24Adapter(MarketplaceAdapter): candidates = [ {"key": "completed", "label": "환불완료일 · 실제 환불액 (현재 적용)", "amount": comp["actual_refund_amount"]}, {"key": "completed_pts", "label": "환불완료일 · 실제 환불액 + 적립금·예치금", "amount": comp["with_points"]}, + {"key": "pay_date", "label": "결제일 기준 · 그날 결제 주문의 환불(오늘까지) · 실제 환불액", + "amount": by_pay["actual_refund_amount"]}, + {"key": "pay_date_pts", "label": "결제일 기준 · 그날 결제 주문의 환불(오늘까지) · 실제 + 적립금·예치금", + "amount": by_pay["with_points"]}, + {"key": "pay_date_diff", "label": "결제일 기준 · 그날 결제 주문의 (결제 당시 금액 − 현재 금액)", + "amount": by_pay["amount_diff"]}, {"key": "accepted", "label": "환불접수일(전체 상태) · 실제 환불액", "amount": refund_basis["accepted_all"]["actual_refund_amount"]}, {"key": "accepted_pts", "label": "환불접수일(전체 상태) · 실제 + 적립금·예치금", "amount": refund_basis["accepted_all"]["with_points"]}, {"key": "claim_pay", "label": "취소·반품·교환 완료 품목 · 품목 결제금액", "amount": claimed["payment_amount"]}, diff --git a/app/modules/performance/templates/performance/index.html b/app/modules/performance/templates/performance/index.html index 32d9c25..17e5925 100644 --- a/app/modules/performance/templates/performance/index.html +++ b/app/modules/performance/templates/performance/index.html @@ -239,4 +239,4 @@ } | tojson }} {% endblock %} -{% block scripts %}{% endblock %} +{% block scripts %}{% endblock %} diff --git a/app/modules/performance/templates/performance/settings.html b/app/modules/performance/templates/performance/settings.html index d8883f5..a980e9c 100644 --- a/app/modules/performance/templates/performance/settings.html +++ b/app/modules/performance/templates/performance/settings.html @@ -143,4 +143,4 @@ {% endblock %} -{% block scripts %}{% endblock %} +{% block scripts %}{% endblock %} diff --git a/app/modules/performance/tests/test_performance.py b/app/modules/performance/tests/test_performance.py index 31e48b1..b453e50 100644 --- a/app/modules/performance/tests/test_performance.py +++ b/app/modules/performance/tests/test_performance.py @@ -474,7 +474,12 @@ def test_cafe24_normalize_matches_daily_report(): assert target_code("NCHECKOUT", "NCHECKOUT") == "cafe24" and target_code("KAKAOPAY") == "cafe24" assert target_code("naver") == "cafe24" and target_code("kakao") == "cafe24" # 결제수단과 헷갈리는 일반 이름 X # 대조: 카페24 열(자체몰 채널+모르는 채널)/다른 쇼핑몰 열 + 주문 채널별 - rec = fake.reconcile(ctx, date(2026, 9, 29)) + import app.timezone as _tz + _orig_today, _tz.today_kst = _tz.today_kst, (lambda: date(2026, 9, 29)) + try: + rec = fake.reconcile(ctx, date(2026, 9, 29)) + finally: + _tz.today_kst = _orig_today assert rec["orders"]["self"]["orders"] == 5 and rec["orders"]["self"]["total"] == 5 * 47_000 # A,D,E,F,G assert rec["orders"]["market"]["orders"] == 1 and rec["unpaid_orders"] == 1 # B(스마트스토어) assert rec["refunds"]["self"]["actual_refund_amount"] == 32_610 and rec["refunds"]["market"]["count"] == 1 @@ -489,6 +494,10 @@ def test_cafe24_normalize_matches_daily_report(): assert rb["accepted_all"]["count"] == 4 and rb["accepted_all"]["with_points"] == 12_610 + 20_000 + 9_000 + 5_000 assert {s["status"]: s["count"] for s in rb["accepted_by_status"]} == {"T": 3, "F": 1} assert {c["key"] for c in rec["refund_candidates"]} >= {"completed", "completed_pts", "claim_pay"} + # 결제일 기준: 그날 결제된 카페24 열 주문(A,D,E,F,G)의 환불만 — X(결제 없음)·M(스마트스토어)·미완료 제외 + bp = rec["refund_basis"]["by_pay_date"] + assert bp["count"] == 1 and bp["actual_refund_amount"] == 12_610 + assert bp["amount_diff"] == 5 * 50_000 # 결제 당시 − 현재(가짜 현재 상품금액 0) assert {r["refund_code"] for r in rec["refund_list"]} == {"C20260929-01", "R20260929-02", "C20260929-03", "C20260929-04"} assert "1234567890" not in str(rec["refund_list"]) # 환불 계좌 미노출 # 클레임 완료 품목: 환불 API 에 없는 취소(네이버페이 등)를 찾는다. 입금전취소·미완료는 합계 제외 diff --git a/app/static/performance.js b/app/static/performance.js index 76803df..00e959c 100644 --- a/app/static/performance.js +++ b/app/static/performance.js @@ -536,6 +536,8 @@ "