Merge remote-tracking branch 'style24/stage_tsit' into develop

src/main/java/com/style24/persistence/domain/Counsel.java

@@ -5,6 +5,7 @@ import com.style24.core.support.util.CryptoUtils;
 import com.style24.core.support.util.MaskingUtils;
 import com.style24.persistence.TscBaseDomain;
 import com.style24.persistence.TscPageRequest;
+import com.vdurmont.emoji.EmojiParser;
 
 import lombok.Data;
 
@@ -86,6 +87,11 @@ public class Counsel extends TscBaseDomain {
 	private int pageSize = 50;
 	private int pageUnit = 10;
 	private int cnt;
+	
+	public String getQuestContent() {
+		this.questContent=(this.questContent==null)?this.questContent:EmojiParser.removeAllEmojis(this.questContent);
+		return this.questContent;
+	}
 
 	// 암호화 대상 복호화 처리
 	public String getCustNm() {

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

@@ -177,10 +177,10 @@
 		    JOIN   TB_ORDER_RECALL_EXCEPTION_ITEM B       ON A.RECALL_EXCEPTION_NO = B.RECALL_EXCEPTION_NO
 		    LEFT   OUTER JOIN TB_ORDER_CHANGE_DETAIL CD   ON B.ORDER_DTL_NO = CD.ORD_DTL_NO AND CD.DEL_YN ='N' AND CD.CHG_STAT = 'G685_31'
 		    LEFT   OUTER JOIN TB_ORDER_CHANGE OC          ON CD.ORD_CHG_SQ = OC.ORD_CHG_SQ
-		    LEFT   OUTER JOIN TB_ORDER_DETAIL OD          ON B.ORDER_DTL_NO = OD.ORD_DTL_NO
+		    LEFT   OUTER JOIN TB_ORDER_DETAIL OD          ON B.ORDER_DTL_NO = OD.ORD_DTL_NO AND    CD.DEL_YN = 'N'
 		    WHERE  1=1
 		    AND    B.REASON_CODE NOT IN('08','10')
-		    AND    CD.DEL_YN = 'N'
+		    
 			<if test='customerName != null and customerName != ""'>
 		    AND    A.CUSTOMER_NAME = #{customerName}
 		    </if>
@@ -348,11 +348,11 @@
 		            LEFT   JOIN TB_ORDER O ON O.ORD_NO = A.ORDER_NO 
 		            LEFT   JOIN TB_OPTION C ON C.OPT_CD = B.SKU_CODE
 		            LEFT   OUTER JOIN TB_ORDER_CHANGE_DETAIL CD ON B.ORDER_DTL_NO = CD.ORD_DTL_NO
-		            LEFT   OUTER JOIN TB_ORDER_DETAIL OD ON B.ORDER_DTL_NO = OD.ORD_DTL_NO
+		            LEFT   OUTER JOIN TB_ORDER_DETAIL OD ON B.ORDER_DTL_NO = OD.ORD_DTL_NO AND    CD.DEL_YN = 'N'
 		            LEFT   OUTER JOIN TB_GOODS G ON OD.GOODS_CD = G.GOODS_CD 
 		            WHERE  1=1
 		            AND    B.REASON_CODE IN ('09','11')
-		            AND    CD.DEL_YN = 'N'
+		            
 					<if test='customerName != null and customerName != ""'>
 		            AND    A.CUSTOMER_NAME = #{customerName}
 					</if>
@@ -462,11 +462,11 @@
 		            LEFT   JOIN TB_OPTION C ON C.OPT_CD = B.SKU_CODE
 		            LEFT   OUTER JOIN TB_ORDER_CHANGE_DETAIL  CD ON B.ORDER_DTL_NO = CD.ORD_DTL_NO AND A.ORDER_EXCEPTION_NO = CD.ORD_CHG_SQ 
 		            LEFT   OUTER JOIN TB_ORDER_CHANGE         OC ON CD.ORD_CHG_SQ = OC.ORD_CHG_SQ
-		            LEFT   OUTER JOIN TB_ORDER_DETAIL         OD ON B.ORDER_DTL_NO = OD.ORD_DTL_NO
+		            LEFT   OUTER JOIN TB_ORDER_DETAIL         OD ON B.ORDER_DTL_NO = OD.ORD_DTL_NO AND    CD.DEL_YN = 'N'
 		            LEFT   OUTER JOIN TB_GOODS G ON OD.GOODS_CD = G.GOODS_CD 
 		            WHERE  1=1
 		            AND    B.REASON_CODE IN('00','02','03','04','05','06','15')
-		            AND    CD.DEL_YN = 'N'
+		            
 					<if test='customerName != null and customerName != ""'>
 		            AND    A.CUSTOMER_NAME = #{customerName}
 					</if>
@@ -576,11 +576,11 @@
 		            LEFT   JOIN TB_OPTION C ON C.OPT_CD = B.SKU_CODE
 		            LEFT   OUTER JOIN TB_ORDER_CHANGE_DETAIL  CD ON B.ORDER_DTL_NO = CD.ORD_DTL_NO 
 		            LEFT   OUTER JOIN TB_ORDER_CHANGE         OC ON CD.ORD_CHG_SQ = OC.ORD_CHG_SQ
-		            LEFT   OUTER JOIN TB_ORDER_DETAIL         OD ON B.ORDER_DTL_NO = OD.ORD_DTL_NO
+		            LEFT   OUTER JOIN TB_ORDER_DETAIL         OD ON B.ORDER_DTL_NO = OD.ORD_DTL_NO  AND    CD.DEL_YN = 'N'
 		            LEFT   OUTER JOIN TB_GOODS G ON OD.GOODS_CD = G.GOODS_CD
 		            WHERE  1=1
 		            AND    B.REASON_CODE IN('01')
-		            AND    CD.DEL_YN = 'N'
+		           
 					<if test='customerName != null and customerName != ""'>
 		            AND    A.CUSTOMER_NAME = #{customerName}
 					</if>