Merge remote-tracking branch 'origin/jsh77b' into xodud1202

src/main/java/com/style24/persistence/mybatis/shop/TscOrder.xml

@@ -6,160 +6,165 @@
 	<select id="getOrderListCount" parameterType="Order" resultType="int">
 		/* order.getOrderListCnt */
 		SELECT COUNT(1)
-		FROM   TB_ORDER O
-		INNER  JOIN TB_ORDER_DETAIL OD
-		ON     O.ORD_NO = OD.ORD_NO
-		INNER  JOIN TB_GOODS G1
-		ON     OD.GOODS_CD = G1.GOODS_CD
-		INNER  JOIN TB_ORDER_DETAIL_ITEM ODI
-		ON     OD.ORD_NO = ODI.ORD_NO
-		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'
-		INNER  JOIN TB_DELIVERY_ADDR DA
-		ON     OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
-		LEFT   OUTER JOIN (
+		  FROM TB_ORDER O
+		 INNER JOIN TB_ORDER_DETAIL OD
+		    ON O.ORD_NO = OD.ORD_NO
+		 INNER JOIN TB_GOODS G1
+		    ON OD.GOODS_CD = G1.GOODS_CD
+		 INNER JOIN TB_ORDER_DETAIL_ITEM ODI
+		    ON OD.ORD_NO = ODI.ORD_NO
+		   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'
+		 INNER JOIN TB_DELIVERY_ADDR DA
+		    ON OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
+		  LEFT OUTER JOIN (
 			SELECT OC.WD_INVOICE_NO
 			     , OC.WD_INVOICE_SEND_YN
 			     , OC.SHIP_COMP_CD
 			     , OCD.ORD_DTL_NO
 			     , OCD.CHG_QTY
 			     , OCD.CHG_STAT
-			FROM   TB_ORDER_CHANGE OC
-			INNER  JOIN TB_ORDER_CHANGE_DETAIL OCD
-			ON     OC.ORD_CHG_SQ  = OCD.ORD_CHG_SQ
-			WHERE  1=1
-			GROUP  BY OC.WD_INVOICE_NO, OC.WD_INVOICE_SEND_YN, OC.SHIP_COMP_CD, OCD.ORD_DTL_NO, OCD.CHG_QTY, OCD.CHG_STAT
+			  FROM TB_ORDER_CHANGE OC
+			 INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
+			    ON OC.ORD_CHG_SQ  = OCD.ORD_CHG_SQ
+			 WHERE 1=1
+			 GROUP BY OC.WD_INVOICE_NO
+			     , OC.WD_INVOICE_SEND_YN
+			     , OC.SHIP_COMP_CD
+			     , OCD.ORD_DTL_NO
+			     , OCD.CHG_QTY
+			     , OCD.CHG_STAT
 		) OCD
-		ON     OD.ORD_DTL_NO = OCD.ORD_DTL_NO
-		WHERE  1=1
+		    ON OD.ORD_DTL_NO = OCD.ORD_DTL_NO
+	 	 WHERE 1=1
 		<if test='siteCd != null and siteCd != ""'>
-		AND    O.SITE_CD = #{siteCd}
+		   AND O.SITE_CD = #{siteCd}
 		</if>
 		<if test='mallCd != null and mallCd != ""'>
-		AND    O.MALL_GB = #{mallCd}
+		   AND O.MALL_GB = #{mallCd}
 		</if>
 		<if test='supplyCompCd != null and supplyCompCd != ""'>
-		AND    OD.SUPPLY_COMP_CD = #{supplyCompCd}
+		   AND OD.SUPPLY_COMP_CD = #{supplyCompCd}
 		</if>
 		<if test="multiBrand != null and multiBrand != ''">
-		AND    G1.BRAND_CD IN
+		   AND G1.BRAND_CD IN
 			<foreach collection="multiBrand" item="item" index="index"  open="(" close=")" separator=",">
 				#{item}
 			</foreach>
 		</if>
 		<if test="multiOrdDtlStat != null and multiOrdDtlStat != ''">
-		AND    OD.ORD_DTL_STAT IN
+		   AND OD.ORD_DTL_STAT IN
 			<foreach collection="multiOrdDtlStat" item="item" index="index"  open="(" close=")" separator=",">
 				#{item}
 			</foreach>
 		</if>
 		<if test="multiOrdDtlStat == null or multiOrdDtlStat == ''">
 			<if test="multiOrdStat != null and multiOrdStat != ''">
-		AND    OD.ORD_DTL_STAT IN
+		   AND OD.ORD_DTL_STAT IN
 				<foreach collection="multiOrdStat" item="item" index="index"  open="(" close=")" separator=",">
 					#{item}
 				</foreach>
 			</if>
 		</if>
 		<if test="chgStat != null and chgStat != ''">
-		AND    OCD.CHG_STAT = #{chgStat}
+		   AND OCD.CHG_STAT = #{chgStat}
 		</if>
 		<if test="chgStat == null or chgStat == ''">
 			<if test="chgGb != null and chgGb != ''">
-		AND    OCD.CHG_STAT = #{chgGb}
+		   AND OCD.CHG_STAT = #{chgGb}
 			</if>
 		</if>
 		<if test='search != null and search == "searchOrdNo"'>
 			<if test="condition != null and condition != ''">
-		AND    O.ORD_NO = #{condition}
+		   AND O.ORD_NO = #{condition}
 			</if>
 		</if>
 		<if test='search != null and search == "searchExtmallOrderId"'>
 			<if test="condition != null and condition != ''">
-		AND    OD.EXTMALL_ORDER_ID = #{condition}
+		   AND OD.EXTMALL_ORDER_ID = #{condition}
 			</if>
 		</if>
 		<if test='search != null and search == "searchAgentOrderId"'>
 			<if test="condition != null and condition != ''">
-		AND    OD.AGENT_ORDER_ID = #{condition}
+		   AND OD.AGENT_ORDER_ID = #{condition}
 			</if>
 		</if>
 		<if test='payMeans != null and payMeans != ""'>
-		AND    P.PAY_MEANS = #{payMeans}
+		   AND P.PAY_MEANS = #{payMeans}
 		</if>
 		<if test='orderNm != null and orderNm != ""'>
-		AND    O.ORD_NM = #{orderNm}
+		   AND O.ORD_NM = #{orderNm}
 		</if>
 		<if test='custId != null and custId != ""'>
-		AND    O.CUST_NO = #{custId}
+		   AND O.CUST_NO = #{custId}
 		</if>
 		<if test='orderPhnno != null and orderPhnno != ""'>
-		AND    O.ORD_PHNNO = #{orderPhnno}
+		   AND O.ORD_PHNNO = #{orderPhnno}
 		</if>
 		<if test='goodsCd != null and goodsCd != ""'>
-		AND    G1.GOODS_CD = #{goodsCd}
+		   AND G1.GOODS_CD = #{goodsCd}
 		</if>
 		<if test='sizeCd != null and sizeCd != ""'>
-		AND    ODI.OPT_CD2 = #{sizeCd}
+		   AND ODI.OPT_CD2 = #{sizeCd}
 		</if>
 		<if test='goodsNm != null and goodsNm != ""'>
-		AND    G1.GOODS_NM = #{goodsNm}
+		   AND G1.GOODS_NM = #{goodsNm}
 		</if>
 		<if test='payMeans != null and payMeans != ""'>
-		AND    P.PAY_MEANS = #{payMeans}
+		   AND P.PAY_MEANS = #{payMeans}
 		</if>
 		<if test='orderNm != null and orderNm != ""'>
-		AND    O.ORD_NM = #{orderNm}
+		   AND O.ORD_NM = #{orderNm}
 		</if>
 		<if test='custId != null and custId != ""'>
-		AND    O.CUST_NO = #{custId}
+		   AND O.CUST_NO = #{custId}
 		</if>
 		<if test='orderPhnno != null and orderPhnno != ""'>
-		AND    O.ORD_PHNNO = #{orderPhnno}
+		   AND O.ORD_PHNNO = #{orderPhnno}
 		</if>
 		<if test='goodsCd != null and goodsCd != ""'>
-		AND    G2.GOODS_CD = #{goodsCd}
+		   AND G2.GOODS_CD = #{goodsCd}
 		</if>
 		<if test='sizeCd != null and sizeCd != ""'>
-		AND    ODI.OPT_CD2 = #{sizeCd}
+		   AND ODI.OPT_CD2 = #{sizeCd}
 		</if>
 		<if test='goodsNm != null and goodsNm != ""'>
-		AND    G2.GOODS_NM = #{goodsNm}
+		   AND G2.GOODS_NM = #{goodsNm}
 		</if>
 		<if test='recipNm != null and recipNm != ""'>
-		AND    DA.RECIP_NM = #{recipNm}
+		   AND DA.RECIP_NM = #{recipNm}
 		</if>
 		<if test='invoiceNo != null and invoiceNo != ""'>
-		AND    OD.INVOICE_NO = #{invoiceNo}
+		   AND OD.INVOICE_NO = #{invoiceNo}
 		</if>
 		<if test='wdInvoiceSendYn != null and wdInvoiceSendYn == "Y"'>
-		AND    OD.INVOICE_SEND_YN = 'Y'
+		   AND OD.INVOICE_SEND_YN = 'Y'
 		</if>
 		<if test='wdInvoiceSendYn != null and wdInvoiceSendYn == "N"'>
-		AND    OD.INVOICE_SEND_YN = 'N'
+		   AND OD.INVOICE_SEND_YN = 'N'
 		</if>
 		<if test='searchDateGb != null and searchDateGb == "ordDt"'>
-		AND    O.ORD_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
-		AND    O.ORD_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
+		   AND O.ORD_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
+		   AND O.ORD_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
 		</if>
 		<if test='searchDateGb != null and searchDateGb == "delvStdt"'>
-		AND    OD.DELV_STDT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
-		AND    OD.DELV_STDT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
+		   AND OD.DELV_STDT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
+		   AND OD.DELV_STDT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
 		</if>
 		<if test='searchDateGb != null and searchDateGb == "soldoutDt"'>
-		AND    OD.SOLDOUT_REG_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
-		AND    OD.SOLDOUT_REG_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
+		   AND OD.SOLDOUT_REG_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
+		   AND OD.SOLDOUT_REG_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
 		</if>
 		<if test="ordNoList != null and ordNoList != ''">
-		AND    OD.ORD_NO IN
+		   AND OD.ORD_NO IN
 			<foreach collection="ordNoList" item="item" index="index"  open="(" close=")" separator=",">
 				#{item}
 			</foreach>
@@ -396,7 +401,7 @@
 			 , FN_GET_CODE_NM('G011', O.MALL_GB)          AS MALL_GB_NM
 			 , O.FRONT_GB
 			 , CASE WHEN O.FRONT_GB = 'P'
-						THEN 'PC'
+				    THEN 'PC'
 					ELSE 'MOBILE'
 			   END                                           FRONT_GB_NM
 			 , OD.EXTMALL_ID
@@ -412,7 +417,7 @@
 			 , O.ORD_TELNO
 			 , C.CUST_GB
 			 , CASE WHEN C.CUST_GB IS NULL
-						THEN '비회원'
+				    THEN '비회원'
 					ELSE FN_GET_CODE_NM('G100', C.CUST_GB)
 			   END                                           CUST_GB_NM
 			 , C.MANAGED_RSN