diff --git a/app/modules/performance/adapters/cafe24.py b/app/modules/performance/adapters/cafe24.py index 4c0bae8..b768ac7 100644 --- a/app/modules/performance/adapters/cafe24.py +++ b/app/modules/performance/adapters/cafe24.py @@ -51,8 +51,8 @@ CHUNK_DAYS = 60 EVENT_PREFIX = "c24:" # 매출 대조 전용 — 클레임 완료 주문 조회 날짜 유형과 "완료" 상태(입금전취소 C47~49 는 결제 전이라 제외) -CLAIM_DATE_TYPES = (("cancel_complete_date", "취소완료"), ("return_complete_date", "반품완료"), - ("exchange_complete_date", "교환완료")) +CLAIM_DATE_TYPES = (("cancel_complete_date", "취소완료"), ("cancel_date", "주문취소일"), + ("return_complete_date", "반품완료"), ("exchange_complete_date", "교환완료")) CLAIM_DONE = frozenset({"C40", "C41", "C42", "C43", "R40", "R41", "R42", "R43", "E40"}) UNPAID_CANCEL = frozenset({"C47", "C48", "C49"}) @@ -418,6 +418,7 @@ class Cafe24Adapter(MarketplaceAdapter): by_payment: dict[str, dict[str, Any]] = {} # 결제수단 조합별(카페24 열 주문만) unpaid = 0 paid_self: dict[str, int] = {} # 그날 결제된 카페24 열 주문 → (결제 당시 − 현재) 금액 + reduced: dict[str, dict[str, Any]] = {} # 그중 금액이 줄어든 주문(취소·반품) — 환불 기록과 대조 for o in self.paid_orders(ctx, day, day): if o.get("paid") != "T": unpaid += 1 @@ -446,7 +447,22 @@ class Cafe24Adapter(MarketplaceAdapter): 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) + oid_ = str(o.get("order_id") or "") + paid_self[oid_] = order_total(o) - order_total_now(o) + if paid_self[oid_] > 0: + reduced[oid_] = { + "order_id": oid_, "channel": str(o.get("order_place_name") or o.get("market_id") or ""), + "payment": " + ".join(str(n) for n in (o.get("payment_method_name") or []) if n), + "initial": order_total(o), "now": order_total_now(o), "diff": paid_self[oid_], + "statuses": sorted({f"{i.get('order_status') or ''} {i.get('status_text') or ''}".strip() + for i in o.get("items") or []}), + "naver_pay": sorted({str(i.get("naver_pay_claim_status")) for i in o.get("items") or [] + if i.get("naver_pay_claim_status")}), + "claim_dates": sorted({str(i.get(k))[:10] for i in o.get("items") or [] + for k in ("cancel_date", "refund_date", "return_confirmed_date") + if i.get(k)}), + "refunded": 0, "refund_dates": [], + } 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}, @@ -528,6 +544,11 @@ class Cafe24Adapter(MarketplaceAdapter): 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 + for x in later: + r_ = reduced.get(str(x.get("order_id") or "")) + if r_ is not None: + r_["refunded"] += _won(x.get("actual_refund_amount")) + _won(x.get("used_points")) + _won(x.get("used_credits")) + r_["refund_dates"] = sorted({*r_["refund_dates"], str(x.get("refund_date") or "")[:10]}) comp = refund_basis["completed"] no_refund = csum(lambda c: not c["has_refund"]) @@ -557,6 +578,7 @@ class Cafe24Adapter(MarketplaceAdapter): "by_channel": channels_out, "refund_basis": refund_basis, "refund_list": sorted(refund_list.values(), key=lambda r: r["refund_code"]), "claims": claims, "refund_candidates": candidates, + "reduced_orders": sorted(reduced.values(), key=lambda r: r["diff"] - r["refunded"], reverse=True), "by_payment": sorted(by_payment.values(), key=lambda v: v["total"], reverse=True), "formula": "결제합계 = 상품구매금액 + 배송비 − 할인(" + ", ".join(DISCOUNT_FIELDS) + ") − 쿠폰(" + ", ".join(COUPON_FIELDS) + ")"} diff --git a/app/modules/performance/templates/performance/index.html b/app/modules/performance/templates/performance/index.html index 17e5925..f20d3e5 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 a980e9c..7144ec3 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 b453e50..d7a38a9 100644 --- a/app/modules/performance/tests/test_performance.py +++ b/app/modules/performance/tests/test_performance.py @@ -498,6 +498,9 @@ def test_cafe24_normalize_matches_daily_report(): 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) + red = {x["order_id"]: x for x in rec["reduced_orders"]} + assert set(red) == {"A", "D", "E", "F", "G"} and red["A"]["refunded"] == 12_610 and red["D"]["refunded"] == 0 + assert rec["reduced_orders"][-1]["order_id"] == "A" # 환불 기록으로 설명 안 되는 금액이 큰 순 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 00e959c..e023872 100644 --- a/app/static/performance.js +++ b/app/static/performance.js @@ -566,6 +566,21 @@ '' + won(x.used_points + x.used_credits) + "" + esc((x.methods || []).join(", ") || "–") + ""; }).join("") + "" : "") + + ((r.reduced_orders || []).length + ? '

그날 결제한 주문 중 금액이 줄어든 주문 (취소·반품) — "환불 기록 없음"이 환불 API 에 안 잡힌 건

' + + '' + + '' + + "" + + r.reduced_orders.map(function (x) { + const miss = x.diff - x.refunded; + return " 0 ? ' class="perf-row-match"' : "") + '>"; + }).join("") + "
주문번호채널결제수단품목 상태취소·환불일결제 당시현재줄어든 금액환불 기록
' + esc(x.order_id) + "" + + esc(x.channel || "–") + "" + esc(x.payment || "–") + "" + + esc(x.statuses.join(", ") + (x.naver_pay.length ? " / 네이버페이 " + x.naver_pay.join(",") : "")) + "" + + esc(x.claim_dates.join(", ") || "–") + '' + won(x.initial) + '' + + won(x.now) + '' + won(x.diff) + '' + + (x.refunded ? won(x.refunded) + ' ' + esc(x.refund_dates.join(", ")) + "" : "없음") + "
" + : "") + (r.claims ? '

그날 취소·반품·교환 완료 품목 (주문 API)

' + ((r.claims.errors || []).length ? '

' + esc(r.claims.errors.join(" / ")) + "

" : "") +