From 931cc0d1d9e951e0c0b22f91075f9500c1e4e709 Mon Sep 17 00:00:00 2001 From: king Date: Thu, 1 Oct 2026 10:36:51 +0900 Subject: [PATCH] =?UTF-8?q?fix(performance):=20=ED=86=A0=EC=8A=A4=EC=87=BC?= =?UTF-8?q?=ED=95=91=20=ED=99=98=EB=B6=88=20=EA=B1=B4=EB=B3=84=20=ED=91=9C?= =?UTF-8?q?=EC=97=90=20=EC=A3=BC=EB=AC=B8=EC=9D=BC=EC=9D=84=20=EB=A9=94?= =?UTF-8?q?=EB=AA=A8=EA=B0=80=20=EC=95=84=EB=8B=8C=20=EB=B3=84=EB=8F=84=20?= =?UTF-8?q?=EC=97=B4=EB=A1=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 원본 데이터 확인 → 환불 출처별 비교 건별 표: 환불일 · 주문일 · 주문번호 · 주문상품 · 금액 · 메모 (예: 9/5 주문을 9/6 취소 → 환불일 9/6, 주문일 9/5), 메모에는 취소/반품·클레임 상태만 - 저장되는 환불 사건의 order_date(대시보드 금액 클릭 상세의 주문일 열)를 테스트로 확인 - performance.js 캐시 버전 20261001f Co-Authored-By: Claude Opus 5.5 --- app/modules/performance/adapters/toss.py | 13 +++++++------ .../performance/templates/performance/index.html | 2 +- .../performance/templates/performance/settings.html | 2 +- app/modules/performance/tests/test_performance.py | 7 ++++++- app/static/performance.js | 6 ++++-- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/app/modules/performance/adapters/toss.py b/app/modules/performance/adapters/toss.py index 7f92a49..1ba3d1a 100644 --- a/app/modules/performance/adapters/toss.py +++ b/app/modules/performance/adapters/toss.py @@ -178,8 +178,8 @@ def cancel_rows(items: Iterable[dict[str, Any]], start: date, end: date) -> list continue status = str(it.get("orderProductStatus") or "") out.append({"orderId": str(it["orderId"]), "orderProductId": str(it.get("orderProductId") or ""), "_day": day, - "amount": _won(it.get("price")), "status": status, "note":f"{STATUS_KO.get(status, status)} · 주문일 " - f"{kst_day(it.get('orderedAt')) or '?'}"}) + "amount": _won(it.get("price")), "status": status, "note": STATUS_KO.get(status, status), + "order_day": kst_day(it.get("orderedAt"))}) return out @@ -195,7 +195,7 @@ def claim_rows(items: Iterable[dict[str, Any]], start: date, end: date) -> list[ continue out.append({"orderId": str(order["id"]), "orderProductId": str(order.get("orderProductId") or ""), "_day": day, "amount": _won(order.get("price")), "note": f"{it.get('type') or '?'}/{it.get('status') or '?'} · " - f"수량 {_won(product.get('quantity'))} · 주문일 {kst_day(order.get('createdDt')) or '?'}"}) + f"수량 {_won(product.get('quantity'))}", "order_day": kst_day(order.get("createdDt"))}) return out @@ -566,14 +566,14 @@ class TossAdapter(MarketplaceAdapter): # ── 환불 출처별 — 파트너스 화면 "환불"과 맞춰 보는 용도 ── candidates: list[dict[str, Any]] = [ {"key": "rule", "label": "적용 규칙(클레임 환불 + 클레임 없는 결제취소)", "rows": [ - {**r, "note": f"{'반품' if r['type'] == 'RETURN' else '취소'} · 주문일 {r.get('order_day') or '?'}"} + {**r, "note": "반품" if r["type"] == "RETURN" else "취소"} for r in refunds], "error": claims_err}, {"key": "claims", "label": "클레임 환불 완료(refundedDt, 금액 order.price)", "rows": claim_rows(claims, day, to), "error": claims_err}, {"key": "canceled", "label": f"주문 취소 시각(canceledAt, {CANCEL_LOOKBACK_DAYS}일 전 주문까지)", "rows": cancel_rows(back + items, day, to), "error": ""}, {"key": "settlement", "label": "정산 REFUND 상품 줄(거래일) — 참고", "rows": [ - {**r, "note": f"정산 REFUND · 주문일 {r.get('order_day') or '?'}"} for r in refund_rows(settle, day, to)], + {**r, "note": "정산 REFUND"} for r in refund_rows(settle, day, to)], "error": settle_err}, ] for c in candidates: @@ -581,7 +581,8 @@ class TossAdapter(MarketplaceAdapter): for r in c["rows"]: k = r["_day"].isoformat() c["days"][k] = c["days"].get(k, 0) + r["amount"] - c["rows"] = [{"date": r["_day"].isoformat(), "orderId": r["orderId"], "orderProductId": r["orderProductId"], + c["rows"] = [{"date": r["_day"].isoformat(), "orderDate": r["order_day"].isoformat() if r.get("order_day") else "", + "orderId": r["orderId"], "orderProductId": r["orderProductId"], "amount": r["amount"], "note": r.get("note") or ""} for r in sorted(c["rows"], key=lambda x: (x["_day"], x["orderId"]))][:200] diff --git a/app/modules/performance/templates/performance/index.html b/app/modules/performance/templates/performance/index.html index ca3d8a0..98b54da 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 478844d..72169ec 100644 --- a/app/modules/performance/templates/performance/settings.html +++ b/app/modules/performance/templates/performance/settings.html @@ -192,4 +192,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 455f386..e8fe5d0 100644 --- a/app/modules/performance/tests/test_performance.py +++ b/app/modules/performance/tests/test_performance.py @@ -569,6 +569,10 @@ def test_toss_collect_sales(): "toss:R51": (-7000, date(2026, 8, 10), "CANCEL"), # 앞 90일 주문 — 금액은 주문 price(판매가 × 수량) "toss:R81": (-4400, date(2026, 8, 15), "CANCEL"), # 주문 내역에 없는 오래된 주문 → 클레임 order.price } # R61: 클레임 환불(9/5)이 기간 밖 → canceledAt(9/2)으로 넣지 않음, 교환·미환불 클레임 제외 + # 환불 사건에도 원래 주문일 — 대시보드 금액 클릭 상세의 "주문일" 열(9/6 화면: 9/5 주문을 9/6 취소) + assert {k: v["order_date"] for k, v in refunds.items()} == { + "toss:R21": date(2026, 9, 1), "toss:R41": date(2026, 9, 1), "toss:R51": date(2026, 7, 15), + "toss:R81": date(2026, 8, 1)} net = {} for v in ev_.values(): net[v["sales_date"]] = net.get(v["sales_date"], 0) + v["amount"] @@ -640,7 +644,8 @@ def test_toss_reconcile_hides_personal(): assert sorted(x["orderId"] for x in cand["rule"]["rows"]) == ["7", "8"] assert cand["settlement"]["days"] == {"2026-09-10": 9900} assert cand["canceled"]["days"] == {"2026-09-10": 11900} and cand["canceled"]["rows"][0]["orderId"] == "7" - assert "주문일 2026-08-20" in cand["canceled"]["rows"][0]["note"] + assert cand["canceled"]["rows"][0]["orderDate"] == "2026-08-20" # 주문일은 따로 열로(메모 X) + assert {x["orderId"]: x["orderDate"] for x in cand["rule"]["rows"]} == {"7": "2026-08-20", "8": "2026-08-25"} assert cand["claims"]["days"] == {"2026-09-10": 5000} and len(cand["claims"]["rows"]) == 1 # 환불 안 된 클레임 제외 cf = {x["name"]: x for x in next(p for p in rec["probes"] if p["key"] == "claims")["fields"]} assert cf["requestReason"]["personal"] and cf["returnAddress"]["personal"] and cf["order.ordererPhoneNumber"]["personal"] diff --git a/app/static/performance.js b/app/static/performance.js index a4dfce3..5380ce2 100644 --- a/app/static/performance.js +++ b/app/static/performance.js @@ -1051,10 +1051,12 @@ }).join("") + "" + rc.filter(function (c) { return !c.error && (c.rows || []).length; }).map(function (c) { return '

' + esc(c.label) + " — " + fmt(c.rows.length) + "건

" + - '' + + '
날짜주문번호
' + + '' + '' + c.rows.map(function (x) { - return '"; }).join("") + "
환불일주문일주문번호주문상품금액메모
' + esc(x.date) + "" + esc(x.orderId) + "" + esc(x.orderProductId) + + return '
' + esc(x.date) + "" + esc(x.orderDate || "") + "" + + esc(x.orderId) + "" + esc(x.orderProductId) + '' + fmt(x.amount) + '' + esc(x.note) + "
"; }).join("") : "";