|
|
@@ -584,16 +584,15 @@
|
|
|
WHERE C.SELF_GOODS_YN = 'Y' -- 자사
|
|
|
AND B.ORD_DTL_STAT = 'G013_20' -- 결제완료
|
|
|
AND B.ORD_EXCH_GB = 'O' -- 주문
|
|
|
- AND A.ORD_DT >= DATE_ADD(DATE_FORMAT(CONCAT(STR_TO_DATE(NOW(), '%Y-%m-%d'),' 10:00:00'),'%Y%m%d%H%i%S') , INTERVAL -3 DAY)
|
|
|
+ AND A.ORD_DT >= DATE_ADD(DATE_FORMAT(CONCAT(STR_TO_DATE(NOW(), '%Y-%m-%d'),' 10:00:00'),'%Y%m%d%H%i%S') , INTERVAL -1 DAY)
|
|
|
AND NOT EXISTS (SELECT '1' FROM TB_GOODS_RES_SELL WHERE GOODS_CD = B.GOODS_CD AND USE_YN ='Y')
|
|
|
- AND A.REG_DT >= DATE_ADD(DATE_FORMAT(STR_TO_DATE(NOW(), '%Y-%m-%d'),'%Y%m%d%H%i%S') , INTERVAL -3 DAY)
|
|
|
+ AND A.REG_DT >= DATE_ADD(DATE_FORMAT(STR_TO_DATE(NOW(), '%Y-%m-%d'),'%Y%m%d%H%i%S') , INTERVAL 0 DAY)
|
|
|
AND A.REG_NO in(100025,409325,0)
|
|
|
and A.MALL_GB ='G011_20'
|
|
|
- and A.ORD_NO <= 19716856
|
|
|
+ and a.ORD_NO <= 19717436
|
|
|
GROUP BY A.ORD_NO, B.ORD_EXCH_GB
|
|
|
-
|
|
|
- /*
|
|
|
- UNION ALL -- 교환 상품
|
|
|
+
|
|
|
+ UNION ALL /* 교환 상품 */
|
|
|
|
|
|
SELECT A.ORD_NO, B.ORD_EXCH_GB, (SELECT MAX(PG_GB) FROM TB_PAYMENT WHERE ORD_NO= A.ORD_NO AND PAY_GB ='O') AS PG_GB
|
|
|
FROM TB_ORDER A
|
|
|
@@ -610,10 +609,10 @@
|
|
|
AND NOT EXISTS (SELECT 1 FROM TB_EXCHANGE_DELV_FAIL WHERE ORD_NO = A.ORD_NO AND ORD_DTL_NO= D.CHG_ORD_DTL_NO AND ORD_CHG_SQ = D.ORD_CHG_SQ AND DELV_CNCL_YN ='N')
|
|
|
AND A.REG_NO in( 100025,409325,0)
|
|
|
GROUP BY A.ORD_NO, B.ORD_EXCH_GB
|
|
|
-
|
|
|
- UNION ALL -- 예약상품
|
|
|
+ /*
|
|
|
+ UNION ALL
|
|
|
|
|
|
- SELECT A.ORD_NO, B.ORD_EXCH_GB, (SELECT MAX(PG_GB) FROM TB_PAYMENT WHERE ORD_NO= A.ORD_NO AND PAY_GB ='O') AS PG_GB
|
|
|
+ SELECT A.ORD_NO, B.ORD_EXCH_GB, (SELECT MAX(PG_GB) FROM TB_PAYMENT WHERE ORD_NO= A.ORD_NO AND PAY_GB ='O') AS PG_GB -- 예약상품
|
|
|
FROM TB_ORDER A
|
|
|
JOIN TB_ORDER_DETAIL B ON A.ORD_NO = B.ORD_NO
|
|
|
JOIN TB_GOODS C ON B.GOODS_CD = C.GOODS_CD
|
|
|
@@ -625,7 +624,8 @@
|
|
|
< CASE WHEN A.ORD_DT < D.DELV_RES_DT THEN D.DELV_RES_DT ELSE A.ORD_DT END
|
|
|
AND A.REG_NO IN (100025,409325,0)
|
|
|
GROUP BY A.ORD_NO, B.ORD_EXCH_GB
|
|
|
- */
|
|
|
+ */
|
|
|
+
|
|
|
) A
|
|
|
ORDER BY ORD_NO
|
|
|
]]>
|
tsit05