fix: 코드 점검 — 시간대·외부 API·XSS·서버 블로킹 수정
- 네이버/카페24/발주 파일명/반품 입고일을 KST로 고정 (컨테이너 UTC 대응) - 네이버 API timeout 추가, last-changed-statuses 'more' 페이지 이어서 조회, 주문번호 중복 제거 - 스마트스토어 발주확인을 엑셀 생성 이후로 이동 - 반품 신청/입고 목록 innerHTML 이스케이프 (XSS) - 카페24 OAuth 콜백: 반사형 XSS 차단, /corm 경로로 복귀 - 블로킹 async 엔드포인트를 sync로 전환 (코드표·반품·송장 업로드·자사몰 행사·밀크런·CS 가져오기) - DB 연결 closing 처리, 세트 목록 N+1 쿼리 제거 - 반품 일괄 입고 중복 송장 건너뛰기 및 안내 - 작업 결과 메모리 1시간 TTL, 401 로그인 next 경로 중복 수정 - 송장 '.0' 처리 수정 및 네이버/카페24 송장 파싱 공용화 - SortableJS 1.15.6 고정, 중복 코드·미사용 import 정리 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -21,7 +21,6 @@ import urllib.request
|
||||
import pandas as pd
|
||||
import psycopg2
|
||||
import psycopg2.extras
|
||||
import requests
|
||||
from fastapi import APIRouter, HTTPException
|
||||
from fastapi.responses import StreamingResponse
|
||||
from pydantic import BaseModel
|
||||
@@ -227,13 +226,13 @@ def _compute_milkrun_result(text: str):
|
||||
|
||||
|
||||
@router.post("/analyze")
|
||||
async def analyze_milkrun(payload: MilkrunAnalyzeRequest):
|
||||
def analyze_milkrun(payload: MilkrunAnalyzeRequest):
|
||||
result = _compute_milkrun_result(payload.text)
|
||||
return {"status": "success", **result}
|
||||
|
||||
|
||||
@router.post("/download")
|
||||
async def download_milkrun(payload: MilkrunAnalyzeRequest):
|
||||
def download_milkrun(payload: MilkrunAnalyzeRequest):
|
||||
result = _compute_milkrun_result(payload.text)
|
||||
|
||||
df = pd.DataFrame([
|
||||
@@ -314,8 +313,7 @@ _DRIVE_CACHE_TTL_SECONDS = 300
|
||||
_drive_cache = {} # file_id -> (저장시각, 파일 bytes)
|
||||
_sheet_tabs_cache = {} # file_id -> (저장시각, 시트 목록 응답)
|
||||
|
||||
# 구글이 응답을 안 주면 무한정 매달리지 않도록 (연결 대기, 응답 대기) 초
|
||||
_HTTP_TIMEOUT = (10, 120)
|
||||
# 구글이 응답을 안 주면 무한정 매달리지 않도록 응답 대기 시간(초)을 제한한다
|
||||
_HTTP_READ_TIMEOUT = GOOGLE_READ_TIMEOUT
|
||||
|
||||
# 밀크런 출고리스트 구글 시트 (화면에서 주소를 입력하지 않아도 되도록 기본값으로 둔다)
|
||||
@@ -459,11 +457,6 @@ def _fetch_public_workbook(file_id):
|
||||
|
||||
|
||||
def _fetch_drive_workbook_authenticated(file_id):
|
||||
try:
|
||||
from google.auth.transport.requests import AuthorizedSession
|
||||
except ImportError:
|
||||
raise HTTPException(status_code=500, detail="google-auth 라이브러리가 설치되어 있지 않습니다.")
|
||||
|
||||
session = create_google_session(_load_credentials([DRIVE_SCOPE]))
|
||||
response = _drive_get(session, file_id, {"alt": "media"})
|
||||
if response.status_code != 200:
|
||||
@@ -492,8 +485,6 @@ def fetch_drive_workbook(file_id):
|
||||
def fetch_drive_file_name(file_id):
|
||||
"""파일 이름은 있으면 좋은 정보일 뿐이라, 못 가져와도 조용히 빈 값으로 둔다."""
|
||||
try:
|
||||
from google.auth.transport.requests import AuthorizedSession
|
||||
|
||||
session = create_google_session(_load_credentials([DRIVE_SCOPE]))
|
||||
response = _drive_get(session, file_id, {"fields": "name"})
|
||||
if response.status_code == 200:
|
||||
|
||||
@@ -1173,7 +1173,8 @@ def export_records():
|
||||
output = io.BytesIO()
|
||||
workbook.save(output)
|
||||
output.seek(0)
|
||||
filename = f"cs-records-{datetime.date.today().isoformat()}.xlsx"
|
||||
today = datetime.datetime.now(datetime.timezone(datetime.timedelta(hours=9))).date()
|
||||
filename = f"cs-records-{today.isoformat()}.xlsx"
|
||||
return StreamingResponse(
|
||||
output,
|
||||
media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
|
||||
@@ -1219,8 +1220,8 @@ def _completed_value(value) -> bool:
|
||||
|
||||
|
||||
@router.post("/import")
|
||||
async def import_records(file: UploadFile = File(...)):
|
||||
raw = await file.read()
|
||||
def import_records(file: UploadFile = File(...)):
|
||||
raw = file.file.read()
|
||||
if len(raw) > 15 * 1024 * 1024:
|
||||
raise HTTPException(status_code=400, detail="업로드 파일은 15MB 이하여야 합니다.")
|
||||
dataframe, permanent_dataframe, schedule_dataframe = _read_import_file(file.filename or "", raw)
|
||||
|
||||
+28
-23
@@ -32,6 +32,7 @@ import hashlib
|
||||
import io
|
||||
import json
|
||||
import re
|
||||
import threading
|
||||
import time
|
||||
import urllib.parse
|
||||
from bisect import bisect_left
|
||||
@@ -127,6 +128,8 @@ _HEADER_SCAN_ROWS = 15
|
||||
_SCAN_CACHE_MAX = 4
|
||||
_SCAN_CACHE_TTL_SECONDS = 600
|
||||
_scan_cache = OrderedDict() # sha1 -> (저장시각, 스캔결과)
|
||||
# 엔드포인트가 스레드풀에서 동시에 돌 수 있으므로 캐시 조작은 잠금 안에서 한다.
|
||||
_scan_cache_lock = threading.Lock()
|
||||
|
||||
_DATE_FORMATS = (
|
||||
"%Y-%m-%d %H:%M:%S", "%Y-%m-%d %H:%M", "%Y-%m-%d",
|
||||
@@ -262,22 +265,24 @@ def _same_name(original_filename):
|
||||
# 발주서 스캔 (read_only 1회 통과 + 해시 캐시)
|
||||
# =====================================================================
|
||||
def _cache_get(key):
|
||||
entry = _scan_cache.get(key)
|
||||
if entry is None:
|
||||
return None
|
||||
saved_at, scan = entry
|
||||
if time.monotonic() - saved_at > _SCAN_CACHE_TTL_SECONDS:
|
||||
_scan_cache.pop(key, None)
|
||||
return None
|
||||
_scan_cache.move_to_end(key)
|
||||
return scan
|
||||
with _scan_cache_lock:
|
||||
entry = _scan_cache.get(key)
|
||||
if entry is None:
|
||||
return None
|
||||
saved_at, scan = entry
|
||||
if time.monotonic() - saved_at > _SCAN_CACHE_TTL_SECONDS:
|
||||
_scan_cache.pop(key, None)
|
||||
return None
|
||||
_scan_cache.move_to_end(key)
|
||||
return scan
|
||||
|
||||
|
||||
def _cache_put(key, scan):
|
||||
_scan_cache[key] = (time.monotonic(), scan)
|
||||
_scan_cache.move_to_end(key)
|
||||
while len(_scan_cache) > _SCAN_CACHE_MAX:
|
||||
_scan_cache.popitem(last=False)
|
||||
with _scan_cache_lock:
|
||||
_scan_cache[key] = (time.monotonic(), scan)
|
||||
_scan_cache.move_to_end(key)
|
||||
while len(_scan_cache) > _SCAN_CACHE_MAX:
|
||||
_scan_cache.popitem(last=False)
|
||||
|
||||
|
||||
def _collect_row(row_index, values, orders, sequence):
|
||||
@@ -593,9 +598,9 @@ def _validate_gift(gift_item_code, gift_name, gift_qty, limit):
|
||||
|
||||
|
||||
@router.post("/first-come/analyze")
|
||||
async def first_come_analyze(file: UploadFile = File(...)):
|
||||
def first_come_analyze(file: UploadFile = File(...)):
|
||||
"""업로드된 발주서에서 주문목록(Q열) 후보를 뽑아 가나다순으로 돌려준다."""
|
||||
file_bytes = await file.read()
|
||||
file_bytes = file.file.read()
|
||||
scan = scan_order_sheet(file_bytes, file.filename)
|
||||
return {
|
||||
"status": "success",
|
||||
@@ -609,7 +614,7 @@ async def first_come_analyze(file: UploadFile = File(...)):
|
||||
|
||||
|
||||
@router.post("/first-come/preview")
|
||||
async def first_come_preview(
|
||||
def first_come_preview(
|
||||
file: UploadFile = File(...),
|
||||
selected_json: str = Form(...),
|
||||
limit: int = Form(...),
|
||||
@@ -621,7 +626,7 @@ async def first_come_preview(
|
||||
selected_names = _parse_selected(selected_json, "사은품이 지급되는 주문을 최소 1개 선택해주세요.")
|
||||
_validate_gift(gift_item_code, gift_name, gift_qty, limit)
|
||||
|
||||
file_bytes = await file.read()
|
||||
file_bytes = file.file.read()
|
||||
scan = scan_order_sheet(file_bytes, file.filename)
|
||||
result = _first_come_plan(scan, selected_names, limit)
|
||||
|
||||
@@ -647,7 +652,7 @@ async def first_come_preview(
|
||||
|
||||
|
||||
@router.post("/first-come/download")
|
||||
async def first_come_download(
|
||||
def first_come_download(
|
||||
file: UploadFile = File(...),
|
||||
selected_json: str = Form(...),
|
||||
limit: int = Form(...),
|
||||
@@ -664,7 +669,7 @@ async def first_come_download(
|
||||
selected_names = _parse_selected(selected_json, "사은품이 지급되는 주문을 최소 1개 선택해주세요.")
|
||||
gift = _validate_gift(gift_item_code, gift_name, gift_qty, limit)
|
||||
|
||||
file_bytes = await file.read()
|
||||
file_bytes = file.file.read()
|
||||
scan = scan_order_sheet(file_bytes, file.filename)
|
||||
result = _first_come_plan(scan, selected_names, limit)
|
||||
|
||||
@@ -1066,9 +1071,9 @@ def _parse_extract_mode(mode):
|
||||
|
||||
|
||||
@router.post("/event-extract/analyze")
|
||||
async def event_extract_analyze(file: UploadFile = File(...)):
|
||||
def event_extract_analyze(file: UploadFile = File(...)):
|
||||
"""업로드된 주문 CSV에서 상품명 후보를 뽑아 가나다순으로 돌려준다."""
|
||||
file_bytes = await file.read()
|
||||
file_bytes = file.file.read()
|
||||
scan = scan_event_csv(file_bytes, file.filename)
|
||||
|
||||
warnings = []
|
||||
@@ -1092,7 +1097,7 @@ async def event_extract_analyze(file: UploadFile = File(...)):
|
||||
|
||||
|
||||
@router.post("/event-extract/download")
|
||||
async def event_extract_download(
|
||||
def event_extract_download(
|
||||
file: UploadFile = File(...),
|
||||
selected_json: str = Form(...),
|
||||
mode: str = Form("product"),
|
||||
@@ -1101,7 +1106,7 @@ async def event_extract_download(
|
||||
selected_names = _parse_selected(selected_json)
|
||||
_parse_extract_mode(mode)
|
||||
|
||||
file_bytes = await file.read()
|
||||
file_bytes = file.file.read()
|
||||
scan = scan_event_csv(file_bytes, file.filename)
|
||||
result = _event_extract_select(scan, selected_names, mode)
|
||||
|
||||
|
||||
+171
-186
@@ -1,4 +1,5 @@
|
||||
from fastapi import APIRouter, HTTPException, Query
|
||||
from contextlib import closing
|
||||
from fastapi import APIRouter, HTTPException
|
||||
from pydantic import BaseModel
|
||||
from typing import Optional, List
|
||||
import os
|
||||
@@ -37,6 +38,20 @@ ORDER_DB_CONFIG = {
|
||||
def get_order_db_conn():
|
||||
return psycopg2.connect(**ORDER_DB_CONFIG, cursor_factory=psycopg2.extras.DictCursor)
|
||||
|
||||
|
||||
# 컨테이너 TZ(기본 UTC)와 무관하게 입고일은 한국 날짜로 기록한다.
|
||||
KST = datetime.timezone(datetime.timedelta(hours=9))
|
||||
|
||||
ORDER_LOOKUP_SQL = """
|
||||
SELECT vendor, recipient_name, recipient_phone, recipient_mobile, address
|
||||
FROM orders
|
||||
WHERE tracking_number = %s
|
||||
OR (tracking_number IS NOT NULL
|
||||
AND tracking_number != ''
|
||||
AND %s = ANY(regexp_split_to_array(tracking_number, '[,\\s/;]+')))
|
||||
ORDER BY order_date DESC LIMIT 1
|
||||
"""
|
||||
|
||||
class ReturnRequest(BaseModel):
|
||||
id: Optional[int] = None
|
||||
request_date: str
|
||||
@@ -63,23 +78,13 @@ class BulkReturnReceive(BaseModel):
|
||||
tracking_numbers: List[str]
|
||||
|
||||
@router.get("/lookup")
|
||||
async def return_lookup(tracking_no: str):
|
||||
def return_lookup(tracking_no: str):
|
||||
try:
|
||||
tracking_no = tracking_no.strip()
|
||||
conn = get_order_db_conn()
|
||||
cur = conn.cursor()
|
||||
# 주문일시(order_date 또는 upload_date) 기준 가장 최신 1건 조회
|
||||
cur.execute("""
|
||||
SELECT vendor, recipient_name, recipient_phone, recipient_mobile, address
|
||||
FROM orders
|
||||
WHERE tracking_number = %s
|
||||
OR (tracking_number IS NOT NULL
|
||||
AND tracking_number != ''
|
||||
AND %s = ANY(regexp_split_to_array(tracking_number, '[,\\s/;]+')))
|
||||
ORDER BY order_date DESC LIMIT 1
|
||||
""", (tracking_no, tracking_no))
|
||||
row = cur.fetchone()
|
||||
conn.close()
|
||||
with closing(get_order_db_conn()) as conn, conn.cursor() as cur:
|
||||
# 주문일시(order_date) 기준 가장 최신 1건 조회
|
||||
cur.execute(ORDER_LOOKUP_SQL, (tracking_no, tracking_no))
|
||||
row = cur.fetchone()
|
||||
|
||||
if row:
|
||||
return {"success": True, "data": dict(row)}
|
||||
@@ -89,35 +94,34 @@ async def return_lookup(tracking_no: str):
|
||||
return {"success": False, "message": str(e)}
|
||||
|
||||
@router.post("/request")
|
||||
async def create_return_request(req: ReturnRequest):
|
||||
def create_return_request(req: ReturnRequest):
|
||||
try:
|
||||
req.tracking_no = req.tracking_no.strip()
|
||||
conn = get_return_db_conn()
|
||||
cur = conn.cursor()
|
||||
if req.id:
|
||||
cur.execute("""
|
||||
UPDATE return_requests
|
||||
SET request_date=%s, request_type=%s, receiver_name=%s, address=%s, phone=%s, tracking_no=%s, mall=%s, remarks=%s
|
||||
WHERE id=%s
|
||||
""", (req.request_date, req.request_type, req.receiver_name, req.address, req.phone, req.tracking_no, req.mall, req.remarks, req.id))
|
||||
else:
|
||||
cur.execute("""
|
||||
INSERT INTO return_requests
|
||||
(request_date, request_type, receiver_name, address, phone, tracking_no, mall, remarks)
|
||||
VALUES (%s, %s, %s, %s, %s, %s, %s, %s)
|
||||
""", (req.request_date, req.request_type, req.receiver_name, req.address, req.phone, req.tracking_no, req.mall, req.remarks))
|
||||
conn.commit()
|
||||
conn.close()
|
||||
with closing(get_return_db_conn()) as conn, conn, conn.cursor() as cur:
|
||||
_save_return_request(cur, req)
|
||||
return {"success": True}
|
||||
except Exception as e:
|
||||
print(f"Request error: {e}")
|
||||
raise HTTPException(status_code=500, detail=str(e))
|
||||
|
||||
|
||||
def _save_return_request(cur, req):
|
||||
if req.id:
|
||||
cur.execute("""
|
||||
UPDATE return_requests
|
||||
SET request_date=%s, request_type=%s, receiver_name=%s, address=%s, phone=%s, tracking_no=%s, mall=%s, remarks=%s
|
||||
WHERE id=%s
|
||||
""", (req.request_date, req.request_type, req.receiver_name, req.address, req.phone, req.tracking_no, req.mall, req.remarks, req.id))
|
||||
else:
|
||||
cur.execute("""
|
||||
INSERT INTO return_requests
|
||||
(request_date, request_type, receiver_name, address, phone, tracking_no, mall, remarks)
|
||||
VALUES (%s, %s, %s, %s, %s, %s, %s, %s)
|
||||
""", (req.request_date, req.request_type, req.receiver_name, req.address, req.phone, req.tracking_no, req.mall, req.remarks))
|
||||
|
||||
@router.get("/request")
|
||||
async def get_return_requests(tracking_no: Optional[str] = None, all_records: bool = False):
|
||||
def get_return_requests(tracking_no: Optional[str] = None, all_records: bool = False):
|
||||
try:
|
||||
conn = get_return_db_conn()
|
||||
cur = conn.cursor()
|
||||
conditions, params = [], []
|
||||
if tracking_no and tracking_no.strip():
|
||||
conditions.append("regexp_replace(r.tracking_no, '[-[:space:]]', '', 'g') = %s")
|
||||
@@ -125,166 +129,153 @@ async def get_return_requests(tracking_no: Optional[str] = None, all_records: bo
|
||||
elif not all_records:
|
||||
conditions.append("r.request_date::text >= to_char(CURRENT_DATE - INTERVAL '3 months', 'YYYY-MM-DD')")
|
||||
where = ' WHERE ' + ' AND '.join(conditions) if conditions else ''
|
||||
cur.execute("""
|
||||
SELECT r.*, EXISTS (
|
||||
SELECT 1 FROM return_receivings v
|
||||
WHERE TRIM(v.tracking_no) = TRIM(r.tracking_no)
|
||||
) AS is_received
|
||||
FROM return_requests r
|
||||
""" + where + " ORDER BY r.request_date DESC, r.id DESC", params)
|
||||
rows = cur.fetchall()
|
||||
conn.close()
|
||||
with closing(get_return_db_conn()) as conn, conn.cursor() as cur:
|
||||
cur.execute("""
|
||||
SELECT r.*, EXISTS (
|
||||
SELECT 1 FROM return_receivings v
|
||||
WHERE TRIM(v.tracking_no) = TRIM(r.tracking_no)
|
||||
) AS is_received
|
||||
FROM return_requests r
|
||||
""" + where + " ORDER BY r.request_date DESC, r.id DESC", params)
|
||||
rows = cur.fetchall()
|
||||
return {"success": True, "data": [dict(r) for r in rows]}
|
||||
except Exception as e:
|
||||
return {"success": False, "message": str(e)}
|
||||
|
||||
@router.post("/receive/bulk")
|
||||
async def create_return_receive_bulk(req: BulkReturnReceive):
|
||||
def create_return_receive_bulk(req: BulkReturnReceive):
|
||||
try:
|
||||
from datetime import datetime
|
||||
today = datetime.now().strftime("%Y-%m-%d")
|
||||
|
||||
conn_return = get_return_db_conn()
|
||||
cur_return = conn_return.cursor()
|
||||
|
||||
conn_order = get_order_db_conn()
|
||||
cur_order = conn_order.cursor()
|
||||
|
||||
today = datetime.datetime.now(KST).strftime("%Y-%m-%d")
|
||||
success_count = 0
|
||||
duplicates = []
|
||||
seen = set()
|
||||
|
||||
for tracking_no in req.tracking_numbers:
|
||||
tracking_no = tracking_no.strip()
|
||||
if not tracking_no:
|
||||
continue
|
||||
with closing(get_return_db_conn()) as conn_return, closing(get_order_db_conn()) as conn_order:
|
||||
with conn_return, conn_return.cursor() as cur_return, conn_order.cursor() as cur_order:
|
||||
for tracking_no in req.tracking_numbers:
|
||||
tracking_no = tracking_no.strip()
|
||||
if not tracking_no:
|
||||
continue
|
||||
|
||||
mall = ""
|
||||
receiver_name = ""
|
||||
phone = ""
|
||||
address = ""
|
||||
# 단건 입고와 같이 이미 입고된 송장(또는 같은 입력 안의 중복)은 다시 넣지 않는다.
|
||||
if tracking_no in seen:
|
||||
duplicates.append(tracking_no)
|
||||
continue
|
||||
seen.add(tracking_no)
|
||||
cur_return.execute("SELECT 1 FROM return_receivings WHERE TRIM(tracking_no) = %s LIMIT 1", (tracking_no,))
|
||||
if cur_return.fetchone():
|
||||
duplicates.append(tracking_no)
|
||||
continue
|
||||
|
||||
# 1. Check return_requests
|
||||
cur_return.execute("SELECT mall, receiver_name, phone, address, request_type, remarks FROM return_requests WHERE TRIM(tracking_no) = %s", (tracking_no,))
|
||||
req_row = cur_return.fetchone()
|
||||
if req_row:
|
||||
mall = req_row['mall'] or ""
|
||||
receiver_name = req_row['receiver_name'] or ""
|
||||
phone = req_row['phone'] or ""
|
||||
address = req_row['address'] or ""
|
||||
req_type = req_row['request_type'] or ""
|
||||
req_remarks = req_row['remarks'] or ""
|
||||
if req_remarks:
|
||||
remarks = f"{req_type}/{req_remarks}"
|
||||
else:
|
||||
remarks = req_type
|
||||
else:
|
||||
remarks = "고객이 반품"
|
||||
# 2. Check orders
|
||||
cur_order.execute("""
|
||||
SELECT vendor, recipient_name, recipient_phone, recipient_mobile, address
|
||||
FROM orders
|
||||
WHERE tracking_number = %s
|
||||
OR (tracking_number IS NOT NULL
|
||||
AND tracking_number != ''
|
||||
AND %s = ANY(regexp_split_to_array(tracking_number, '[,\\s/;]+')))
|
||||
ORDER BY order_date DESC LIMIT 1
|
||||
""", (tracking_no, tracking_no))
|
||||
ord_row = cur_order.fetchone()
|
||||
if ord_row:
|
||||
mall = ord_row['vendor'] or ""
|
||||
receiver_name = ord_row['recipient_name'] or ""
|
||||
phone = ord_row['recipient_phone'] or ord_row['recipient_mobile'] or ""
|
||||
address = ord_row['address'] or ""
|
||||
mall = ""
|
||||
receiver_name = ""
|
||||
phone = ""
|
||||
address = ""
|
||||
|
||||
# Insert into return_receivings
|
||||
cur_return.execute("""
|
||||
INSERT INTO return_receivings
|
||||
(receive_date, tracking_no, mall, receiver_name, phone, address, remarks, receive_status)
|
||||
VALUES (%s, %s, %s, %s, %s, %s, %s, %s)
|
||||
""", (today, tracking_no, mall, receiver_name, phone, address, remarks, "환불 대기"))
|
||||
success_count += 1
|
||||
# 1. Check return_requests
|
||||
cur_return.execute("SELECT mall, receiver_name, phone, address, request_type, remarks FROM return_requests WHERE TRIM(tracking_no) = %s", (tracking_no,))
|
||||
req_row = cur_return.fetchone()
|
||||
if req_row:
|
||||
mall = req_row['mall'] or ""
|
||||
receiver_name = req_row['receiver_name'] or ""
|
||||
phone = req_row['phone'] or ""
|
||||
address = req_row['address'] or ""
|
||||
req_type = req_row['request_type'] or ""
|
||||
req_remarks = req_row['remarks'] or ""
|
||||
remarks = f"{req_type}/{req_remarks}" if req_remarks else req_type
|
||||
else:
|
||||
remarks = "고객이 반품"
|
||||
# 2. Check orders
|
||||
cur_order.execute(ORDER_LOOKUP_SQL, (tracking_no, tracking_no))
|
||||
ord_row = cur_order.fetchone()
|
||||
if ord_row:
|
||||
mall = ord_row['vendor'] or ""
|
||||
receiver_name = ord_row['recipient_name'] or ""
|
||||
phone = ord_row['recipient_phone'] or ord_row['recipient_mobile'] or ""
|
||||
address = ord_row['address'] or ""
|
||||
|
||||
conn_return.commit()
|
||||
conn_return.close()
|
||||
conn_order.close()
|
||||
cur_return.execute("""
|
||||
INSERT INTO return_receivings
|
||||
(receive_date, tracking_no, mall, receiver_name, phone, address, remarks, receive_status)
|
||||
VALUES (%s, %s, %s, %s, %s, %s, %s, %s)
|
||||
""", (today, tracking_no, mall, receiver_name, phone, address, remarks, "환불 대기"))
|
||||
success_count += 1
|
||||
|
||||
return {"success": True, "count": success_count}
|
||||
return {"success": True, "count": success_count, "duplicates": duplicates}
|
||||
except Exception as e:
|
||||
print(f"Bulk insert error: {e}")
|
||||
raise HTTPException(status_code=500, detail=str(e))
|
||||
|
||||
@router.post("/receive")
|
||||
async def create_return_receive(req: ReturnReceive):
|
||||
def create_return_receive(req: ReturnReceive):
|
||||
try:
|
||||
req.tracking_no = req.tracking_no.strip()
|
||||
conn = get_return_db_conn()
|
||||
cur = conn.cursor()
|
||||
|
||||
# 중복 송장 검사
|
||||
if req.id:
|
||||
cur.execute("""
|
||||
SELECT receive_date, receiver_name, phone, mall, receive_status, remarks
|
||||
FROM return_receivings
|
||||
WHERE TRIM(tracking_no) = %s AND id != %s
|
||||
""", (req.tracking_no, req.id))
|
||||
else:
|
||||
cur.execute("""
|
||||
SELECT receive_date, receiver_name, phone, mall, receive_status, remarks
|
||||
FROM return_receivings
|
||||
WHERE TRIM(tracking_no) = %s
|
||||
""", (req.tracking_no,))
|
||||
|
||||
dup = cur.fetchone()
|
||||
if dup:
|
||||
conn.close()
|
||||
return {
|
||||
"success": False,
|
||||
"error_type": "duplicate",
|
||||
"data": dict(dup)
|
||||
}
|
||||
|
||||
if not req.id:
|
||||
cur.execute("SELECT request_type, remarks FROM return_requests WHERE TRIM(tracking_no) = %s", (req.tracking_no,))
|
||||
req_row = cur.fetchone()
|
||||
if not req_row:
|
||||
if req.remarks:
|
||||
if "고객이 반품" not in req.remarks:
|
||||
req.remarks = "고객이 반품 / " + req.remarks
|
||||
else:
|
||||
req.remarks = "고객이 반품"
|
||||
else:
|
||||
req_type = req_row['request_type'] or ""
|
||||
req_remarks = req_row['remarks'] or ""
|
||||
auto_remark = f"{req_type}/{req_remarks}" if req_remarks else req_type
|
||||
if not req.remarks:
|
||||
req.remarks = auto_remark
|
||||
elif auto_remark not in req.remarks:
|
||||
req.remarks = f"{auto_remark} / {req.remarks}"
|
||||
|
||||
if req.id:
|
||||
# Update existing record
|
||||
cur.execute("""
|
||||
UPDATE return_receivings
|
||||
SET receive_date=%s, tracking_no=%s, mall=%s, receiver_name=%s, phone=%s, address=%s, remarks=%s, receive_status=%s
|
||||
WHERE id=%s
|
||||
""", (req.receive_date, req.tracking_no, req.mall, req.receiver_name, req.phone, req.address, req.remarks, req.receive_status, req.id))
|
||||
else:
|
||||
# Insert new record
|
||||
cur.execute("""
|
||||
INSERT INTO return_receivings
|
||||
(receive_date, tracking_no, mall, receiver_name, phone, address, remarks, receive_status)
|
||||
VALUES (%s, %s, %s, %s, %s, %s, %s, %s)
|
||||
""", (req.receive_date, req.tracking_no, req.mall, req.receiver_name, req.phone, req.address, req.remarks, req.receive_status))
|
||||
conn.commit()
|
||||
conn.close()
|
||||
return {"success": True}
|
||||
with closing(get_return_db_conn()) as conn, conn, conn.cursor() as cur:
|
||||
return _save_return_receive(cur, req)
|
||||
except Exception as e:
|
||||
raise HTTPException(status_code=500, detail=str(e))
|
||||
|
||||
|
||||
def _save_return_receive(cur, req):
|
||||
# 중복 송장 검사
|
||||
if req.id:
|
||||
cur.execute("""
|
||||
SELECT receive_date, receiver_name, phone, mall, receive_status, remarks
|
||||
FROM return_receivings
|
||||
WHERE TRIM(tracking_no) = %s AND id != %s
|
||||
""", (req.tracking_no, req.id))
|
||||
else:
|
||||
cur.execute("""
|
||||
SELECT receive_date, receiver_name, phone, mall, receive_status, remarks
|
||||
FROM return_receivings
|
||||
WHERE TRIM(tracking_no) = %s
|
||||
""", (req.tracking_no,))
|
||||
|
||||
dup = cur.fetchone()
|
||||
if dup:
|
||||
return {
|
||||
"success": False,
|
||||
"error_type": "duplicate",
|
||||
"data": dict(dup)
|
||||
}
|
||||
|
||||
if not req.id:
|
||||
cur.execute("SELECT request_type, remarks FROM return_requests WHERE TRIM(tracking_no) = %s", (req.tracking_no,))
|
||||
req_row = cur.fetchone()
|
||||
if not req_row:
|
||||
if req.remarks:
|
||||
if "고객이 반품" not in req.remarks:
|
||||
req.remarks = "고객이 반품 / " + req.remarks
|
||||
else:
|
||||
req.remarks = "고객이 반품"
|
||||
else:
|
||||
req_type = req_row['request_type'] or ""
|
||||
req_remarks = req_row['remarks'] or ""
|
||||
auto_remark = f"{req_type}/{req_remarks}" if req_remarks else req_type
|
||||
if not req.remarks:
|
||||
req.remarks = auto_remark
|
||||
elif auto_remark not in req.remarks:
|
||||
req.remarks = f"{auto_remark} / {req.remarks}"
|
||||
|
||||
if req.id:
|
||||
# Update existing record
|
||||
cur.execute("""
|
||||
UPDATE return_receivings
|
||||
SET receive_date=%s, tracking_no=%s, mall=%s, receiver_name=%s, phone=%s, address=%s, remarks=%s, receive_status=%s
|
||||
WHERE id=%s
|
||||
""", (req.receive_date, req.tracking_no, req.mall, req.receiver_name, req.phone, req.address, req.remarks, req.receive_status, req.id))
|
||||
else:
|
||||
# Insert new record
|
||||
cur.execute("""
|
||||
INSERT INTO return_receivings
|
||||
(receive_date, tracking_no, mall, receiver_name, phone, address, remarks, receive_status)
|
||||
VALUES (%s, %s, %s, %s, %s, %s, %s, %s)
|
||||
""", (req.receive_date, req.tracking_no, req.mall, req.receiver_name, req.phone, req.address, req.remarks, req.receive_status))
|
||||
return {"success": True}
|
||||
|
||||
@router.get("/receive")
|
||||
async def get_return_receives(tracking_no: Optional[str] = None, all_records: bool = False):
|
||||
def get_return_receives(tracking_no: Optional[str] = None, all_records: bool = False):
|
||||
try:
|
||||
conn = get_return_db_conn()
|
||||
cur = conn.cursor()
|
||||
conditions, params = [], []
|
||||
if tracking_no and tracking_no.strip():
|
||||
conditions.append("regexp_replace(tracking_no, '[-[:space:]]', '', 'g') = %s")
|
||||
@@ -292,33 +283,27 @@ async def get_return_receives(tracking_no: Optional[str] = None, all_records: bo
|
||||
elif not all_records:
|
||||
conditions.append("receive_date::text >= to_char(CURRENT_DATE - INTERVAL '3 months', 'YYYY-MM-DD')")
|
||||
where = ' WHERE ' + ' AND '.join(conditions) if conditions else ''
|
||||
cur.execute("SELECT * FROM return_receivings" + where + " ORDER BY receive_date DESC, mall ASC, id DESC", params)
|
||||
rows = cur.fetchall()
|
||||
conn.close()
|
||||
with closing(get_return_db_conn()) as conn, conn.cursor() as cur:
|
||||
cur.execute("SELECT * FROM return_receivings" + where + " ORDER BY receive_date DESC, mall ASC, id DESC", params)
|
||||
rows = cur.fetchall()
|
||||
return {"success": True, "data": [dict(r) for r in rows]}
|
||||
except Exception as e:
|
||||
return {"success": False, "message": str(e)}
|
||||
|
||||
@router.delete("/request/{item_id}")
|
||||
async def delete_return_request(item_id: int):
|
||||
def delete_return_request(item_id: int):
|
||||
try:
|
||||
conn = get_return_db_conn()
|
||||
cur = conn.cursor()
|
||||
cur.execute("DELETE FROM return_requests WHERE id = %s", (item_id,))
|
||||
conn.commit()
|
||||
conn.close()
|
||||
with closing(get_return_db_conn()) as conn, conn, conn.cursor() as cur:
|
||||
cur.execute("DELETE FROM return_requests WHERE id = %s", (item_id,))
|
||||
return {"success": True}
|
||||
except Exception as e:
|
||||
raise HTTPException(status_code=500, detail=str(e))
|
||||
|
||||
@router.delete("/receive/{item_id}")
|
||||
async def delete_return_receive(item_id: int):
|
||||
def delete_return_receive(item_id: int):
|
||||
try:
|
||||
conn = get_return_db_conn()
|
||||
cur = conn.cursor()
|
||||
cur.execute("DELETE FROM return_receivings WHERE id = %s", (item_id,))
|
||||
conn.commit()
|
||||
conn.close()
|
||||
with closing(get_return_db_conn()) as conn, conn, conn.cursor() as cur:
|
||||
cur.execute("DELETE FROM return_receivings WHERE id = %s", (item_id,))
|
||||
return {"success": True}
|
||||
except Exception as e:
|
||||
raise HTTPException(status_code=500, detail=str(e))
|
||||
|
||||
Reference in New Issue
Block a user