|
|
@@ -230,7 +230,7 @@
|
|
|
<select id="getOrderList" parameterType="Order" resultType="Order">
|
|
|
/* order.getOrderList */
|
|
|
WITH CTE_ORDNO AS (
|
|
|
- SELECT O.ORD_NO
|
|
|
+ SELECT OD.ORD_NO
|
|
|
, OD.GOODS_CD
|
|
|
, OD.ORD_DTL_NO
|
|
|
, OD.DELV_ADDR_SQ, O.CUST_NO
|
|
|
@@ -357,6 +357,7 @@
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
+ GROUP BY OD.ORD_NO, OD.GOODS_CD, OD.ORD_DTL_NO, OD.DELV_ADDR_SQ, O.CUST_NO
|
|
|
ORDER BY OD.ORD_NO DESC
|
|
|
, OD.ORD_DTL_NO DESC
|
|
|
),
|
|
|
@@ -388,6 +389,7 @@
|
|
|
INNER JOIN CTE_PAYMENT PP
|
|
|
ON OCD.ORD_DTL_NO = PP.ORD_DTL_NO
|
|
|
WHERE 1=1
|
|
|
+ AND OCD.CHG_STAT NOT IN ('G685_69', 'G685_49') -- 반품철회, 교환철회 제외
|
|
|
GROUP BY OCD.ORD_DTL_NO
|
|
|
, OC.CHG_GB
|
|
|
, OC.CHG_REASON
|
|
|
@@ -438,7 +440,7 @@
|
|
|
, A.SYS_IMG_NM
|
|
|
, A.BRAND_CD
|
|
|
, A.BRAND_ENM
|
|
|
- , A.SKU_MODEL_NO
|
|
|
+ -- , A.SKU_MODEL_NO
|
|
|
, GROUP_CONCAT(A.ITEM_NM ORDER BY A.ORD_DTL_ITEM_SQ SEPARATOR '!@!') AS ITEM_NM
|
|
|
, GROUP_CONCAT(A.ITEM_CD ORDER BY A.ORD_DTL_ITEM_SQ) AS ITEM_CD
|
|
|
, GROUP_CONCAT(A.OPT_CD ORDER BY A.ORD_DTL_ITEM_SQ) AS OPT_CD
|
|
|
@@ -500,7 +502,7 @@
|
|
|
, (SELECT Z.BRAND_ENM
|
|
|
FROM TB_BRAND Z
|
|
|
WHERE Z.BRAND_CD = G1.BRAND_CD) AS BRAND_ENM
|
|
|
- , ODI.SKU_MODEL_NO
|
|
|
+ -- , ODI.SKU_MODEL_NO
|
|
|
, (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD = ODI.ITEM_CD) AS ITEM_NM
|
|
|
, IFNULL((SELECT COLOR_KNM FROM TB_COLOR C WHERE COLOR_CD = IFNULL(NULLIF(ODI.OPT_CD1,'') , G1.MAIN_COLOR_CD ) AND USE_YN = 'Y'), ODI.OPT_CD1) AS COLOR_NM
|
|
|
, ODI.ITEM_CD
|
|
|
@@ -586,7 +588,7 @@
|
|
|
, A.SYS_IMG_NM
|
|
|
, A.BRAND_CD
|
|
|
, A.BRAND_ENM
|
|
|
- , A.SKU_MODEL_NO
|
|
|
+ -- , A.SKU_MODEL_NO
|
|
|
, A.EXTMALL_ORDER_ID
|
|
|
, A.AGENT_ORDER_ID
|
|
|
, A.ORD_QTY
|
card007