|
|
@@ -28,13 +28,10 @@
|
|
|
AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
|
|
|
INNER JOIN TB_GOODS G2
|
|
|
ON ODI.ITEM_CD = G2.GOODS_CD
|
|
|
- LEFT OUTER JOIN TB_GOODS_IMG GI
|
|
|
- ON ODI.ITEM_CD = GI.GOODS_CD
|
|
|
- AND ODI.OPT_CD1 = GI.COLOR_CD
|
|
|
INNER JOIN TB_PAYMENT P
|
|
|
ON O.ORD_NO = P.ORD_NO
|
|
|
AND P.PAY_GB = 'O'
|
|
|
- AND P.PAY_STAT = 'G016_30'
|
|
|
+ AND P.PAY_STAT IN ('G016_00', 'G016_30')
|
|
|
INNER JOIN TB_DELIVERY_ADDR DA
|
|
|
ON OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
|
|
|
<if test="(chgStat != null and chgStat != '') or (chgGb != null and chgGb != '')">
|
|
|
@@ -248,7 +245,7 @@
|
|
|
INNER JOIN TB_PAYMENT P
|
|
|
ON O.ORD_NO = P.ORD_NO
|
|
|
AND P.PAY_GB = 'O'
|
|
|
- AND P.PAY_STAT = 'G016_30'
|
|
|
+ AND P.PAY_STAT IN ('G016_00', 'G016_30')
|
|
|
INNER JOIN TB_DELIVERY_ADDR DA
|
|
|
ON OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
|
|
|
<if test="(chgStat != null and chgStat != '') or (chgGb != null and chgGb != '')">
|
|
|
@@ -559,7 +556,7 @@
|
|
|
INNER JOIN TB_PAYMENT P
|
|
|
ON O.ORD_NO = P.ORD_NO
|
|
|
AND P.PAY_GB = 'O'
|
|
|
- AND P.PAY_STAT = 'G016_30'
|
|
|
+ AND P.PAY_STAT IN ('G016_00', 'G016_30')
|
|
|
INNER JOIN TB_DELIVERY_ADDR DA
|
|
|
ON OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
|
|
|
LEFT OUTER JOIN (SELECT OD.ORD_DTL_NO
|
|
|
@@ -695,7 +692,7 @@
|
|
|
AND NOT EXISTS (SELECT 1
|
|
|
FROM TB_ORDER_CHANGE_DETAIL OCD
|
|
|
WHERE P.ORD_CHG_SQ = OCD.ORD_CHG_SQ
|
|
|
- AND OCD.CHG_STAT = 'G685_31')
|
|
|
+ AND OCD.CHG_STAT = 'G685_49')
|
|
|
ORDER BY P.REG_DT DESC
|
|
|
</select>
|
|
|
|
|
|
@@ -718,7 +715,7 @@
|
|
|
AND NOT EXISTS (SELECT 1
|
|
|
FROM TB_ORDER_CHANGE_DETAIL OCD
|
|
|
WHERE DF.ORD_CHG_SQ = OCD.ORD_CHG_SQ
|
|
|
- AND OCD.CHG_STAT = 'G685_31')
|
|
|
+ AND OCD.CHG_STAT = 'G685_49')
|
|
|
) Z
|
|
|
GROUP BY Z.DELV_FEE_GB
|
|
|
, Z.DELV_FEE_GB_NM
|
|
|
@@ -3493,6 +3490,7 @@
|
|
|
, GROUP_CONCAT(Z.OPT_CD2 ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD2
|
|
|
, GROUP_CONCAT(Z.ITEM_QTY ORDER BY Z.ORD_DTL_ITEM_SQ) AS ITEM_QTYR
|
|
|
, GROUP_CONCAT(Z.COLOR_NM ORDER BY Z.ORD_DTL_ITEM_SQ) AS COLOR_NM
|
|
|
+ , GROUP_CONCAT(Z.SYS_IMG_NM ORDER BY Z.ORD_DTL_ITEM_SQ) AS SYS_IMG_NM
|
|
|
FROM (
|
|
|
SELECT OD.ORD_NO
|
|
|
, OCD.ORD_DTL_NO
|
|
|
@@ -3505,6 +3503,8 @@
|
|
|
, OCD.CHG_QTY
|
|
|
, (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,'') , G.MAIN_COLOR_CD ) AND USE_YN = 'Y'), ODI.OPT_CD1) AS COLOR_NM
|
|
|
+ , CASE WHEN G.GOODS_TYPE != 'G056_S' AND G.SELF_GOODS_YN = 'Y' THEN (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = ODI.OPT_CD1 AND DEFAULT_IMG_YN = 'Y')
|
|
|
+ ELSE (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IFNULL(G.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y') END AS SYS_IMG_NM
|
|
|
, OD.CURR_PRICE
|
|
|
, ODI.ORD_DTL_ITEM_SQ
|
|
|
, ODI.OPT_ADD_PRICE
|
card007