fix(performance): 카페24 결제합계 = 실결제 + 적립금 + 예치금 + 네이버포인트

9/23 대조 진단으로 확인: 카페24 일별 매출내역 결제합계 1,874,738 =
실결제 1,713,128(initial payment_amount) + 적립금 10,110 + 예치금 0 +
네이버포인트 151,500(주문 naver_point). "상품구매금액 + 배송비 − 할인 − 쿠폰"은
1,874,800 으로 할인 필드에 안 잡히는 차이(62원)가 남는다 — 카페24 화면의
상품구매금액은 결제 금액에서 거꾸로 맞춘 값. 상품추가할인은 0 이라 원인 아님.

- order_total / order_total_now: 실결제 + 적립금 + 예치금 + 네이버포인트
  (모두 0인 주문만 상품식)
- 품목 상품추가할인 차감 제거(직전 커밋의 잘못된 추정)
- 대조 표: 실결제·적립금·예치금·네이버포인트 줄을 카페24 열과 비교,
  상품식은 참고 줄로
- 테스트 갱신

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-09-29 22:08:18 +09:00
parent 20d19792dd
commit 398e5181fd
6 changed files with 56 additions and 52 deletions
+29 -25
View File
@@ -7,9 +7,11 @@
카페24 관리자 "일별 매출내역"과 같은 기준으로 센다(Admin API 문서 2026-09-01 확인).
- 결제합계(SALE, +): GET /admin/orders date_type=pay_date(결제일), 결제된(paid=T) 주문마다
상품구매금액 + 배송비 − 할인 − 쿠폰 (주문의 initial_order_amount — 결제 당시 금액)
카페24 화면의 상품구매금액은 품목의 상품추가할인(items[].additional_discount_price)을 뺀 값이다 —
initial_order_amount 에는 이 할인이 없어 품목에서 더해 뺀다(실데이터: 상품구매금액이 100원 단위가 아닌 날만 차이).
실결제금액 + 적립금 + 예치금 + 네이버포인트 = 고객이 실제로 낸 금액
(initial_order_amount 의 payment_amount·points_spent_amount·credits_spent_amount + 주문의 naver_point)
"상품구매금액 + 배송비 − 할인 − 쿠폰"은 할인 필드에 안 잡히는 차이(수십~수만 원)가 생겨 쓰지 않는다
(2026-09-23 실데이터: 카페24 1,874,738 = 1,713,128 + 10,110 + 151,500, 상품식은 1,874,800).
위 네 값이 모두 0인 주문(0원 결제 등)만 상품식으로 계산한다.
환불은 따로 빼므로 취소 후 금액(actual_order_amount)이 아니라 결제 당시 금액을 쓴다.
- 환불합계(CANCEL/RETURN, −): GET /admin/refunds date_type=refund_date(환불완료일),
실제 환불액(actual_refund_amount). 환불코드가 R 로 시작하면 반품, 그 밖은 취소.
@@ -107,12 +109,13 @@ def target_code(market_id: Any, order_place_id: Any = None) -> str:
return "cafe24"
return MARKET_MAP.get(_key(market_id)) or MARKET_MAP[_key(order_place_id)]
# 결제합계 = 상품구매금액 + 배송비 − 할인 − 쿠폰 (initial_order_amount 의 필드)
# 참고식(상품구매금액 + 배송비 − 할인 − 쿠폰)의 필드 — 결제합계는 PAID_FIELDS + naver_point 로 센다
DISCOUNT_FIELDS = ("membership_discount_amount", "set_product_discount_amount", "app_discount_amount",
"market_other_discount_amount", "shipping_fee_discount_amount")
COUPON_FIELDS = ("coupon_discount_price", "coupon_shipping_fee_amount")
AMOUNT_FIELDS = ("order_price_amount", "shipping_fee", *DISCOUNT_FIELDS, *COUPON_FIELDS,
"points_spent_amount", "credits_spent_amount", "payment_amount")
PAID_FIELDS = ("payment_amount", "points_spent_amount", "credits_spent_amount")
def _won(value: Any) -> int:
@@ -134,24 +137,27 @@ def _day(value: Any) -> date | None:
return None
def item_additional_discount(order: dict[str, Any], *, active_only: bool = False) -> int:
"""품목 상품추가할인 합계(items[].additional_discount_price, 품목 줄 금액). 주문 금액(initial/actual)에는 없다.
active_only 면 취소·반품된 품목은 빼고(현재 금액 계산용)."""
return sum(_won(i.get("additional_discount_price")) for i in order.get("items") or []
if not (active_only and str(i.get("order_status") or "")[:1] in ("C", "R")))
def order_amounts(order: dict[str, Any]) -> dict[str, int]:
"""결제 당시 금액(initial_order_amount, 없으면 actual_order_amount) 항목별 원 단위 + 품목 상품추가할인."""
"""결제 당시 금액(initial_order_amount, 없으면 actual_order_amount) 항목별 원 단위 + 네이버포인트(주문 필드)."""
a = order.get("initial_order_amount") or order.get("actual_order_amount") or {}
return {**{k: _won(a.get(k)) for k in AMOUNT_FIELDS}, "additional_discount_price": item_additional_discount(order)}
return {**{k: _won(a.get(k)) for k in AMOUNT_FIELDS}, "naver_point": _won(order.get("naver_point"))}
def goods_total(w: dict[str, int]) -> int:
"""참고식: 상품구매금액 + 배송비 − 할인 − 쿠폰."""
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 _paid_total(w: dict[str, int]) -> int:
"""결제합계 = 실결제금액 + 적립금 + 예치금 + 네이버포인트. 모두 0이면 참고식."""
paid = sum(w[k] for k in PAID_FIELDS) + w["naver_point"]
return paid if paid > 0 else goods_total(w)
def order_total(order: dict[str, Any]) -> int:
"""결제합계 = 상품구매금액(− 품목 상품추가할인) + 배송비 − 할인 − 쿠폰."""
a = order_amounts(order)
return (a["order_price_amount"] - a["additional_discount_price"] + a["shipping_fee"]
- sum(a[k] for k in DISCOUNT_FIELDS) - sum(a[k] for k in COUPON_FIELDS))
"""결제합계(결제 당시) — 카페24 일별 매출내역 결제합계와 같은 기준."""
return _paid_total(order_amounts(order))
def refund_total(refund: dict[str, Any]) -> int:
@@ -162,9 +168,7 @@ def refund_total(refund: dict[str, Any]) -> int:
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"] - item_additional_discount(order, active_only=True) + w["shipping_fee"]
- sum(w[k] for k in DISCOUNT_FIELDS) - sum(w[k] for k in COUPON_FIELDS))
return _paid_total({**{k: _won(a.get(k)) for k in AMOUNT_FIELDS}, "naver_point": _won(order.get("naver_point"))})
def is_self_market(market_id: Any) -> bool:
@@ -457,8 +461,7 @@ class Cafe24Adapter(MarketplaceAdapter):
order_date=_day(order.get("order_date")), payment_date=pay_day, event_date=pay_day,
amount=max(0, order_total(order)), product_name=name,
quantity=sum(int(i.get("quantity") or 0) for i in items), order_status="결제완료",
discount_amount=sum(order_amounts(order)[k]
for k in ("additional_discount_price", *DISCOUNT_FIELDS, *COUPON_FIELDS)),
discount_amount=sum(order_amounts(order)[k] for k in DISCOUNT_FIELDS + COUPON_FIELDS),
raw={"order_id": oid, "market_id": order.get("market_id"), "order_place_id": order.get("order_place_id"),
"items": len(items), **{f"initial_{k}": v for k, v in order_amounts(order).items()}},
)]
@@ -514,7 +517,7 @@ class Cafe24Adapter(MarketplaceAdapter):
def empty() -> dict[str, int]:
return {"orders": 0, "items": 0, "lines": 0, **{k: 0 for k in AMOUNT_FIELDS},
"additional_discount_price": 0, "total": 0}
"naver_point": 0, "goods_total": 0, "total": 0}
def channel(mid: Any, place: Any, place_name: Any = None) -> dict[str, Any]:
"""(market_id, 주문경로) 한 쌍 = 한 줄. self 안에도 PC쇼핑몰·모바일웹 경로가 섞여 있어 나눠 본다."""
@@ -582,6 +585,7 @@ class Cafe24Adapter(MarketplaceAdapter):
g["lines"] += len(o.get("items") or [])
for k, v in order_amounts(o).items():
g[k] += v
g["goods_total"] += goods_total(order_amounts(o))
g["total"] += order_total(o)
if ch["target"] == "cafe24":
oid_ = str(o.get("order_id") or "")
@@ -733,5 +737,5 @@ class Cafe24Adapter(MarketplaceAdapter):
"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),
"diag": {part: dict(sorted(v.items())) for part, v in diag.items()}, "odd_orders": odd,
"formula": "결제합계 = 상품구매금액(− 품목 상품추가할인) + 배송비 − 할인(" + ", ".join(DISCOUNT_FIELDS) +
") − 쿠폰(" + ", ".join(COUPON_FIELDS) + ")"}
"formula": "결제합계 = 실결제금액 + 적립금 + 예치금 + 네이버포인트(결제 당시). 참고식 = 상품구매금액 + 배송비 − 할인("
+ ", ".join(DISCOUNT_FIELDS) + ") − 쿠폰(" + ", ".join(COUPON_FIELDS) + ")"}
@@ -239,4 +239,4 @@
} | tojson }}</script>
{% endblock %}
{% block scripts %}<script src="/static/performance.js?v=20260930m" defer></script>{% endblock %}
{% block scripts %}<script src="/static/performance.js?v=20260930n" defer></script>{% endblock %}
@@ -155,4 +155,4 @@
</section>
{% endblock %}
{% block scripts %}<script src="/static/performance.js?v=20260930m" defer></script>{% endblock %}
{% block scripts %}<script src="/static/performance.js?v=20260930n" defer></script>{% endblock %}
@@ -650,39 +650,38 @@ def test_cafe24_scope_and_replace_range():
("naver", "direct-naver-1"), ("cafe24", "sample")}, got
def test_cafe24_item_additional_discount():
"""카페24 상품구매금액 = 판매가 합계 − 품목 상품추가할인(additional_discount_price). 주문 금액에는 없다.
실데이터: 9/23 카페24 상품구매금액 1,860,738 — 판매가 합계 1,860,800 과 62원 차이."""
def test_cafe24_paid_total_matches_daily_report():
"""카페24 결제합계 = 실결제금액 + 적립금 + 예치금 + 네이버포인트(결제 당시). 상품식과 다를 수 있다.
실데이터 9/23: 1,713,128 + 10,110 + 0 + 151,500 = 1,874,738 (상품식 1,874,800)."""
from app.modules.performance.adapters.cafe24 import order_total, order_total_now
o = _c24_order("A") # 50,000 + 3,000 − 1,000 − 5,000
o["items"][0]["additional_discount_price"] = "38.00"
o["items"][1]["additional_discount_price"] = "24.00"
assert order_total(o) == 47_000 - 62
o = _c24_order("A", naver_point="3000.00") # 상품식 50,000 + 3,000 − 1,000 − 5,000 = 47,000
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 == 62 + 1_000 + 5_000
assert ev.amount == 46_938 and ev.discount_amount == 1_000 + 5_000
o["actual_order_amount"] = {**o["initial_order_amount"], "payment_amount": "20000.00"}
assert order_total_now(o) == 20_000 + 1_000 + 3_000
assert order_total(_c24_order("Z")) == 47_000 # 결제 필드가 모두 0이면 상품식
# 대조 진단: 원본 금액 필드 합계 + 이상 주문(개인정보 숫자 필드는 제외)
import app.timezone as _tz
from app.modules.performance.adapters.base import AdapterContext
from app.modules.performance.adapters.cafe24 import money_fields
assert money_fields({"bank_account_no": "1234567890", "order_price_amount": "100.50", "x": {"coupon_discount_price": 3}}) == {"order_price_amount": 101, "x.coupon_discount_price": 3}
got = money_fields({"bank_account_no": "1234567890", "order_price_amount": "100.50", "x": {"coupon_discount_price": 3}})
assert got == {"order_price_amount": 101, "x.coupon_discount_price": 3}
o2 = _c24_order("B", price=10_050)
o2["items"] = [{"order_item_code": "B-01", "product_price": "10000.00", "option_price": "0", "quantity": 1,
"additional_discount_price": "0.00", "order_status": "N40"}]
"order_status": "N40"}]
orig, _tz.today_kst = _tz.today_kst, (lambda: date(2026, 9, 29))
try:
rec = _FakeCafe24([[o, o2]]).reconcile(AdapterContext(code="cafe24", credentials=None), date(2026, 9, 29))
finally:
_tz.today_kst = orig
assert rec["diag"]["item"]["additional_discount_price"] == 62
assert rec["diag"]["order"]["naver_point"] == 3_000
assert rec["diag"]["initial"]["order_price_amount"] == 60_050 and "bank_account_no" not in rec["diag"]["order"]
odd = {x["order_id"]: x for x in rec["odd_orders"]}
assert odd["B"]["items_gross"] == 10_000 and odd["B"]["order_price_amount"] == 10_050
# 현재 금액: 취소된 품목의 추가할인은 빼지 않는다
o["actual_order_amount"] = dict(o["initial_order_amount"])
o["items"][1]["order_status"] = "C40"
assert order_total_now(o) == 47_000 - 38
def test_daily_check_db_vs_live():