Merge branch 'develop' into card007

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

@@ -37,6 +37,7 @@ public class GoodsHst extends TscBaseDomain {
 	private String priceUpdDt;		//가격변경일시
 	private float dcRate;		//할인율
 	private String goodsStat;		//상품상태(공통코드G008)
+	private String selfMallYn;		//자사몰노출여부
 	private String dispYn;		//노출여부
 	private String goodsGb;		//해외구매대행/병행수입 상품일 경우 주문 시 통관부호 입력 란이 추가되어야 한다
 	private String foreignBuyYn;		//해외구매대행여부

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

@@ -51,7 +51,7 @@
 		                ON ODH.AF_LINK_CD = AL.AF_LINK_CD
 		        LEFT OUTER JOIN TB_ORDER_CHANGE_DETAIL OCD
 		                     ON ODH.ORD_DTL_NO = OCD.ORD_DTL_NO
-		                    AND OCD.CHG_STAT IN ('G685_21','G685_32','G685_42')	/*취소완료,교환완료,반품완료*/
+		                    AND OCD.CHG_STAT IN ('G685_18','G685_40','G685_60')	/*취소완료,교환완료,반품완료*/
 		        WHERE  ODH.ORD_DTL_STAT IN ('G013_20','G013_99') /*결제완료,주문취소*/
 		        AND    ODH.REG_DT <![CDATA[>=]]> STR_TO_DATE(#{startDt},'%Y-%m-%d')
 		        AND    ODH.REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(#{endDt},'%Y-%m-%d'),INTERVAL 1 DAY)