diff --git a/app/modules/performance/adapters/cafe24.py b/app/modules/performance/adapters/cafe24.py index 82a5ded..0def30a 100644 --- a/app/modules/performance/adapters/cafe24.py +++ b/app/modules/performance/adapters/cafe24.py @@ -54,7 +54,8 @@ EVENT_PREFIX = "c24:" # (실데이터 확인 2026-09-30: mobile=모바일웹, NCHECKOUT=네이버페이, KAKAOPAY=톡체크아웃). # 이 주문들은 카페24 자체몰 매출이다. 비교는 소문자로. SELF_CHANNELS: dict[str, str] = { - "": "기본", "self": "PC", "cafe24": "PC", "mobile": "모바일웹", "mobile_d": "모바일앱", + # self 는 PC 전용이 아니다 — 주문경로(order_place_name)가 "PC쇼핑몰"·"모바일웹"으로 나뉘어 섞여 있다(실데이터 확인). + "": "자체몰", "self": "자체몰", "cafe24": "자체몰", "mobile": "모바일웹", "mobile_d": "모바일앱", "ncheckout": "네이버페이", "kakaopay": "톡체크아웃", } @@ -248,8 +249,9 @@ class Cafe24Adapter(MarketplaceAdapter): {"start_date": s.isoformat(), "end_date": e.isoformat(), "date_type": "refund_date"}, REFUND_LIMIT) - def market_ids(self, ctx: AdapterContext, refunds: list[dict[str, Any]]) -> dict[str, tuple[Any, Any]]: - """환불의 원 주문 (market_id, order_place_id) — 주문일 60일 구간·100건씩 묶어 조회. 못 찾으면 자체몰.""" + def market_ids(self, ctx: AdapterContext, refunds: list[dict[str, Any]]) -> dict[str, tuple[Any, Any, Any]]: + """환불의 원 주문 (market_id, order_place_id, order_place_name) — 주문일 60일 구간·100건씩 묶어 조회. + 못 찾으면 자체몰.""" pairs = sorted({(_day(r.get("order_date")) or date.min, str(r.get("order_id") or "")) for r in refunds if r.get("order_id")}) out: dict[str, Any] = {} @@ -262,7 +264,7 @@ class Cafe24Adapter(MarketplaceAdapter): params = {"order_id": ",".join(ids), "start_date": first.isoformat(), "end_date": group[-1][0].isoformat(), "date_type": "order_date", "limit": LOOKUP_BATCH} for o in self._get(ctx, "/admin/orders", params).get("orders") or []: - out[str(o.get("order_id"))] = (o.get("market_id"), o.get("order_place_id")) + out[str(o.get("order_id"))] = (o.get("market_id"), o.get("order_place_id"), o.get("order_place_name")) i += len(group) return out @@ -274,7 +276,7 @@ class Cafe24Adapter(MarketplaceAdapter): rows = [r for r in self.refunds(ctx, start, end) if str(r.get("status") or "T") == "T"] markets = self.market_ids(ctx, rows) for r in rows: - mid, place = markets.get(str(r.get("order_id")), ("self", None)) + mid, place, _name = markets.get(str(r.get("order_id")), ("self", None, None)) yield {**r, "_market_id": mid, "_order_place_id": place} def normalize_order(self, order: dict[str, Any]) -> list[SaleEvent]: @@ -332,11 +334,14 @@ class Cafe24Adapter(MarketplaceAdapter): def empty() -> dict[str, int]: return {"orders": 0, "items": 0, "lines": 0, **{k: 0 for k in AMOUNT_FIELDS}, "total": 0} - def channel(mid: Any, place: Any) -> dict[str, Any]: - key = "" if mid is None else str(mid) + def channel(mid: Any, place: Any, place_name: Any = None) -> dict[str, Any]: + """(market_id, 주문경로) 한 쌍 = 한 줄. self 안에도 PC쇼핑몰·모바일웹 경로가 섞여 있어 나눠 본다.""" + mkey = "" if mid is None else str(mid) + pname = str(place_name or place or "") kind = channel_kind(mid, place) - return by_channel.setdefault(key, { - "market_id": key or "(없음)", "label": SELF_CHANNELS.get(_key(mid), ""), "names": set(), + return by_channel.setdefault((mkey, pname), { + "market_id": mkey or "(없음)", "place": pname, "place_id": str(place or ""), + "label": SELF_CHANNELS.get(_key(mid), ""), "names": set(), "kind": kind, "target": target_code(mid, place), "orders": 0, "total": 0, "refund_count": 0, "refund_amount": 0, # 기기 — 주문의 order_from_mobile(T=모바일에서 주문). PC 채널(self)에도 모바일 주문이 섞여 있다. @@ -351,7 +356,7 @@ class Cafe24Adapter(MarketplaceAdapter): if o.get("paid") != "T": unpaid += 1 continue - ch = channel(o.get("market_id"), o.get("order_place_id")) + ch = channel(o.get("market_id"), o.get("order_place_id"), o.get("order_place_name")) total = order_total(o) ch["orders"] += 1 ch["total"] += total @@ -379,8 +384,8 @@ class Cafe24Adapter(MarketplaceAdapter): refunds = {"self": {"count": 0, "actual_refund_amount": 0, "used_points": 0, "used_credits": 0}, "market": {"count": 0, "actual_refund_amount": 0, "used_points": 0, "used_credits": 0}} for r in rows: - mid, place = markets.get(str(r.get("order_id")), ("self", None)) - ch = channel(mid, place) + mid, place, place_name = markets.get(str(r.get("order_id")), ("self", None, None)) + ch = channel(mid, place, place_name) g = refunds["self" if ch["target"] == "cafe24" else "market"] g["count"] += 1 for k in ("actual_refund_amount", "used_points", "used_credits"): diff --git a/app/modules/performance/templates/performance/index.html b/app/modules/performance/templates/performance/index.html index e57b2ef..b2300db 100644 --- a/app/modules/performance/templates/performance/index.html +++ b/app/modules/performance/templates/performance/index.html @@ -235,4 +235,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 bb2e1e9..6ec6b29 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 ef70190..19a239f 100644 --- a/app/modules/performance/tests/test_performance.py +++ b/app/modules/performance/tests/test_performance.py @@ -483,6 +483,12 @@ def test_cafe24_normalize_matches_daily_report(): # 기기: PC 채널(self)이어도 휴대폰 주문(order_from_mobile=T)은 모바일 assert ch["self"]["mobile_orders"] == 1 and ch["self"]["pc_orders"] == 0 and ch["self"]["mobile_total"] == 47_000 assert ch["NCHECKOUT"]["pc_orders"] == 1 and ch["mobile"]["mobile_orders"] == 1 + # self 는 PC 전용이 아니다 — 주문경로(PC쇼핑몰/모바일웹)별로 한 줄씩(실데이터 확인) + fake3 = _FakeCafe24([[_c24_order("P1", order_place_name="PC쇼핑몰"), _c24_order("P2", order_place_name="PC쇼핑몰"), + _c24_order("M1", order_place_name="모바일웹", order_from_mobile="T")]]) + rows3 = {(b["market_id"], b["place"]): b for b in fake3.reconcile(ctx, date(2026, 9, 29))["by_channel"]} + assert rows3[("self", "PC쇼핑몰")]["orders"] == 2 and rows3[("self", "모바일웹")]["mobile_orders"] == 1 + assert rows3[("self", "PC쇼핑몰")]["label"] == "자체몰" # 결제수단별(카페24 열만 — 외부 마켓 B 제외) pay = {p["method"]: p for p in rec["by_payment"]} assert pay["신용카드"]["orders"] == 2 and pay["신용카드"]["total"] == 94_000 diff --git a/app/static/performance.js b/app/static/performance.js index 607052a..e9c8f08 100644 --- a/app/static/performance.js +++ b/app/static/performance.js @@ -529,7 +529,8 @@ const col = MARKET_NAMES[b.target] || b.target; const kind = b.kind === "self" ? "자체몰 채널" + (b.label ? "(" + b.label + ")" : "") : b.kind === "market" ? "외부 마켓" : '알 수 없는 채널'; - return '
PC/모바일은 주문의 모바일 주문 여부(order_from_mobile) 기준입니다 — 채널이 PC(self)여도 휴대폰에서 주문하면 모바일로 셉니다.
' + '한 줄 = market_id × 주문경로. market_id "self"는 PC 전용이 아니라 자체몰 전체이며, 그 안에 PC쇼핑몰·모바일웹 경로가 섞여 있습니다. ' + + 'PC/모바일 주문은 카페24가 주문마다 주는 모바일 주문 여부(order_from_mobile) 기준입니다.
' : "") + ((r.by_payment || []).length ? '