|
|
@@ -1021,7 +1021,7 @@
|
|
|
, Z.ADM_RPL
|
|
|
, Z.ADM_RPL_REG_NO
|
|
|
, Z.ADM_RPL_DT
|
|
|
- , ROW_NUMBER() OVER(ORDER BY Z.REG_DT DESC) AS RNUM
|
|
|
+ , ROW_NUMBER() OVER(ORDER BY Z.ORD_DT DESC) AS RNUM
|
|
|
FROM (SELECT O.ORD_NO
|
|
|
, DATE_FORMAT(O.ORD_DT, '%Y.%m.%d') AS ORD_DT
|
|
|
, DATE_FORMAT(O.PAY_DT, '%Y-%m-%d') AS PAY_DT
|
|
|
@@ -1148,9 +1148,8 @@
|
|
|
LEFT OUTER JOIN TB_COLOR C ON ODI.OPT_CD1 = C.COLOR_CD
|
|
|
AND C.USE_YN = 'Y'
|
|
|
WHERE 1=1
|
|
|
- AND O.PAY_DT > DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL #{reviewExpireDay} DAY), '%Y%M%D%H%I%S')
|
|
|
+ AND O.ORD_DT > DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL #{reviewExpireDay} DAY), '%Y%M%D%H%I%S')
|
|
|
AND O.CUST_NO = #{custNo}
|
|
|
- AND O.DISP_YN = 'Y'
|
|
|
AND R.CONFIRM_YN = 'Y'
|
|
|
AND OD.ORD_DTL_NO IN (SELECT R.ORD_DTL_NO FROM TB_REVIEW R WHERE R.DEL_YN = 'N' AND DISP_YN = 'Y' AND R.ORD_NO = O.ORD_NO AND R.ORD_DTL_NO = OD.ORD_DTL_NO AND R.CUST_NO = #{custNo})
|
|
|
AND O.SITE_CD = #{siteCd}
|
|
|
@@ -1160,7 +1159,7 @@
|
|
|
, Z.SAVE_PNT_AMT, Z.CNCL_RTN_AMT, Z.PNT_DC_AMT, Z.GFCD_USE_AMT, Z.INVOICE_NO
|
|
|
, Z.SUPPLY_COMP_CD, Z.DELV_FEE_CD, Z.SHOT_DELV_YN, Z.CHANGEABLE_YN, Z.SELF_GOODS_YN, Z.BRAND_NM, Z.BRAND_ENM, Z.ORD_DTL_STAT_NM
|
|
|
, Z.ORD_REQ_CHG_QTY, Z.ORD_CAN_CHG_QTY, Z.REVIEW_SQ
|
|
|
- ORDER BY Z.ORD_NO DESC, Z.ORD_DTL_STAT, Z.SELF_GOODS_YN DESC, Z.SHOT_DELV_YN DESC, Z.SUPPLY_COMP_CD
|
|
|
+ ORDER BY Z.ORD_NO DESC
|
|
|
<include refid="selectForPagingFooter"/>
|
|
|
</select>
|
|
|
|
sowon4187