feat(performance): 카페24 적립금 제외 · 네이버 배송비 포함·환불일 환불 차감 · 주문 내역 칸·합계

- 카페24 매출 = 결제합계 − 적립금, 환불도 적립금 환불 제외, 주문 내역 [적립금 사용] 칸·합계
- 네이버 매출 = 판매금액(총) + 배송비, 환불 = 클레임 완료일 기준 취소·반품 완료(naver:{상품주문}-RF)
- 주문 내역 [배송비]·[환불금액] 칸·합계, 예전 자료는 과거 매출 가져오기로 다시 받으면 새 규칙

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-10-19 15:46:31 +09:00
parent 39d730faa0
commit 28e6cdd78a
11 changed files with 164 additions and 35 deletions
@@ -909,7 +909,7 @@ def test_cafe24_refund_total_includes_points_and_naverpay_cancels():
finally:
_tz.today_kst = orig
by = {e.external_event_id: e for e in events if e.event_type != "SALE"}
assert by["c24:C20260926-01"].amount == -(63_720 + 1_080) # 적립금 환불 포함
assert by["c24:C20260926-01"].amount == -63_720 # 적립금 환불(1,080)은 뺀다(2026-10-19 — 매출도 적립금 제외)
assert by["c24:NP1-01-CL"].amount == -55_800 and by["c24:NP1-01-CL"].event_type == "CANCEL"
assert by["c24:NP1-01-CL"].event_date == date(2026, 9, 26) and by["c24:NP1-01-CL"].marketplace_code == "cafe24"
assert by["c24:NP2-01-CL"].amount == -(40_000 - 1_000 + 3_000) # 판매가×수량 − 품목 쿠폰 + 전체취소 배송비
@@ -975,7 +975,8 @@ def test_cafe24_paid_total_matches_daily_report():
o["initial_order_amount"].update(payment_amount="42938.00", points_spent_amount="1000.00")
assert order_total(o) == 42_938 + 1_000 + 3_000 == 46_938
ev = _FakeCafe24([]).normalize_order(o)[0]
assert ev.amount == 46_938 and ev.discount_amount == 1_000 + 5_000
assert ev.amount == 46_938 - 1_000 and ev.discount_amount == 1_000 + 5_000 # 매출 = 결제합계 − 적립금(2026-10-19)
assert ev.raw["points"] == 1_000 and ev.raw["points_excluded"]
o["actual_order_amount"] = {**o["initial_order_amount"], "payment_amount": "20000.00"}
assert order_total_now(o) == 20_000 + 1_000 + 3_000
z = _c24_order("Z")
@@ -1509,7 +1510,16 @@ def test_naver_collect_sales():
}
calls = []
refunds = { # 클레임 완료일 기준 조회 — 9/10 에 B1(9/9 결제) 취소 완료·C2 반품 완료, 교환은 환불 아님
"2026-09-10": [_naver_item("B", "B1", "2026-09-09", 9900, status="CANCELED"),
_naver_item("C", "C2", "2026-09-10", 7000, status="RETURNED"),
_naver_item("E", "E1", "2026-08-30", 3000, status="EXCHANGED")]}
def get(url, params=None, headers=None, timeout=None):
if params["rangeType"] == "CLAIM_COMPLETED_DATETIME":
calls.append(("claim", params["from"][:10]))
return httpx.Response(200, json={"data": {"contents": refunds.get(params["from"][:10], []),
"pagination": {"page": params["page"], "hasNext": False}}})
key = (params["from"][:10], params["page"])
calls.append(key)
rows, more = pages.get(key, ([], False))
@@ -1530,12 +1540,17 @@ def test_naver_collect_sales():
httpx.post, httpx.get, nv.CALL_INTERVAL_SEC = orig
assert r["ok"], r
ev_ = {k[2]: v for k, v in st.events.items() if k[0] == "naver"}
assert set(ev_) == {"naver:A", "naver:B", "naver:C"} # D 미입금취소만 제외
assert ev_["naver:A"]["amount"] == 20000 + 5000 # 배송비 제외
assert set(ev_) == {"naver:A", "naver:B", "naver:C", "naver:B1-RF", "naver:C2-RF"} # D 미입금취소만 제외, 교환은 환불 아님
assert ev_["naver:A"]["amount"] == 20000 + 5000 + 3000 + 3000 # 판매금액 + 배송비(2026-10-19)
assert ev_["naver:A"]["raw"] == {"goods": 25000, "ship": 6000}
assert ev_["naver:B"]["amount"] == 9900 # 결제 뒤 취소도 결제일 매출(판매금액(총))
# 환불은 환불된 날(클레임 완료일)에 뺀다 — 결제일(9/9)이 아니라 9/10
assert (ev_["naver:B1-RF"]["amount"], ev_["naver:B1-RF"]["sales_date"], ev_["naver:B1-RF"]["event_type"]) == (-9900, date(2026, 9, 10), "CANCEL")
assert (ev_["naver:C2-RF"]["amount"], ev_["naver:C2-RF"]["event_type"], ev_["naver:C2-RF"]["raw"]["refund"]) == (-7000, "RETURN", 7000)
assert ("claim", "2026-09-09") in calls and ("claim", "2026-09-10") in calls
assert ev_["naver:A"]["quantity"] == 3 and ev_["naver:A"]["discount_amount"] == 1000
assert ev_["naver:A"]["sales_date"] == date(2026, 9, 9) and ev_["naver:A"]["product_name"] == "밀폐용기 외 1건"
assert ev_["naver:C"]["amount"] == 15000 + 7000 # 반품 줄도 포함
assert ev_["naver:C"]["amount"] == 15000 + 7000 # 반품 줄도 포함(배송비 3,000 − 할인 3,000 = 0)
assert ev_["naver:C"]["order_status"] == "구매확정/반품"
assert ("2026-09-09", 2) in calls and ("2026-09-10", 2) not in calls # hasNext 일 때만 다음 쪽
assert "홍길동" not in repr(st.events) and "010-1234-5678" not in repr(st.events)
@@ -1598,6 +1613,8 @@ def test_sync_job_progress():
def get(url, params=None, headers=None, timeout=None):
day = params["from"][:10]
if params["rangeType"] != "PAYED_DATETIME": # 환불(클레임 완료일) 조회 — 이 테스트엔 없음
return httpx.Response(200, json={"data": {"contents": [], "pagination": {"hasNext": False}}})
if day == "2026-09-10": # 둘째 날을 받는 중 — 진행 상황 중간 모습
mid.update(job.snapshot())
rows = [_naver_item("A" + day, "P" + day, day, 10000), _naver_item("B" + day, "Q" + day, day, 5000)]
@@ -1618,14 +1635,15 @@ def test_sync_job_progress():
job.finish(last_update_at="2026-09-30T10:00:00")
m = {s["code"]: s for s in mid["shops"]}
assert m["naver"]["state"] == "running" and (m["naver"]["done"], m["naver"]["total"], m["naver"]["unit"]) == (1, 2, "일")
assert m["naver"]["items"] == 2 and m["naver"]["fraction"] == 0.5
assert mid["overall"]["shops"] == 1 and mid["overall"]["fraction"] == 0.5 and not mid["finished"]
# 네이버 = 하루에 결제·환불 두 번 조회(2026-10-19) — 2일 = 4단계
assert m["naver"]["state"] == "running" and (m["naver"]["done"], m["naver"]["total"], m["naver"]["unit"]) == (1, 4, "일 조회")
assert m["naver"]["items"] == 2 and m["naver"]["fraction"] == 0.25
assert mid["overall"]["shops"] == 1 and mid["overall"]["fraction"] == 0.25 and not mid["finished"]
snap = job.snapshot()
s = {x["code"]: x for x in snap["shops"]}
assert s["naver"]["state"] == "done" and s["naver"]["upserted"] == 4 and s["naver"]["items"] == 4
assert s["naver"]["done"] == s["naver"]["total"] == 2 and s["naver"]["fraction"] == 1.0
assert s["naver"]["done"] == s["naver"]["total"] == 4 and s["naver"]["fraction"] == 1.0
assert s["ohouse"]["state"] == "error" and s["ohouse"]["status"] in ("not_implemented", "not_configured")
assert not s["ohouse"]["active"]
assert s["elevenst"]["state"] == "error" and s["elevenst"]["status"] == "not_configured" and not s["elevenst"]["active"]