Merge branch 'develop' into eskim

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

@@ -410,7 +410,7 @@
 		   AND GC.COMPS_GOODS_CD = #{compsGoodsCd}
 		 INNER JOIN TB_OPTION                    OP
 		    ON IFNULL(GC.COMPS_GOODS_CD, G.GOODS_CD) = OP.GOODS_CD
-		   AND OP.OPT_CD2 = #{optCd}
+		   AND OP.OPT_CD = #{optCd}
 		 WHERE OD.ORD_DTL_NO = #{ordDtlNo}
 	</insert>
 	

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

@@ -251,10 +251,28 @@
 		<if test='frontGb != null and frontGb != "" and frontGb != "A"'>
 			AND (FRONT_GB = 'A' OR FRONT_GB = #{frontGb} )
 		</if>
-		<if test="stDate != null and stDate != '' and edDate != null and edDate != ''">
-        AND    SOCIAL_STDT <![CDATA[ >= ]]> DATE_FORMAT(#{stDate},'%Y-%m-%d %H:%i:%S')
-        AND    SOCIAL_EDDT <![CDATA[ <= ]]> DATE_FORMAT(#{stDate},'%Y-%m-%d %H:%i:%S')
-		</if>
+		<choose>
+			<when test="stDate != null and stDate != '' and edDate != null and edDate != ''">
+				AND    (
+				SOCIAL_EDDT <![CDATA[ >= ]]> DATE_FORMAT(#{stDate},'%Y-%m-%d %H:%i:%S')
+				AND
+				SOCIAL_STDT <![CDATA[ <= ]]> DATE_FORMAT(#{stDate},'%Y-%m-%d %H:%i:%S')
+				) OR
+				(
+				SOCIAL_EDDT <![CDATA[ >= ]]> DATE_FORMAT(#{edDate},'%Y-%m-%d %H:%i:%S')
+				AND
+				SOCIAL_STDT <![CDATA[ <= ]]> DATE_FORMAT(#{edDate},'%Y-%m-%d %H:%i:%S')
+				)
+			</when>
+			<when test="stDate != null and stDate != ''">
+			AND    SOCIAL_EDDT <![CDATA[ >= ]]> DATE_FORMAT(#{stDate},'%Y-%m-%d %H:%i:%S')
+			AND    SOCIAL_STDT <![CDATA[ <= ]]> DATE_FORMAT(#{stDate},'%Y-%m-%d %H:%i:%S')
+			</when>
+			<when test="edDate != null and edDate != ''">
+			AND    SOCIAL_EDDT <![CDATA[ >= ]]> DATE_FORMAT(#{edDate},'%Y-%m-%d %H:%i:%S')
+			AND    SOCIAL_STDT <![CDATA[ <= ]]> DATE_FORMAT(#{edDate},'%Y-%m-%d %H:%i:%S')
+			</when>
+		</choose>
 	</sql>
 
 	<sql id="getListPagingCondition_sql">

src/main/webapp/WEB-INF/views/order/OrderListForm.html

@@ -206,7 +206,6 @@
 							<select name="searchDateGb">
 								<option value="ordDt">주문일자</option>
 								<option value="delvStdt">출고일자</option>
-								<option value="soldoutDt">품절일자</option>
 							</select>
 							<span id="terms"></span>
 						</td>

src/main/webapp/WEB-INF/views/withdraw/WithdrawExceptionListForm.html

@@ -455,7 +455,7 @@
 		//if(params.data.chgStat == 'G685_21' || params.data.chgStat == 'G685_51'){
 			
 		
-		if (event.colDef.field == 'recallStatNm'){
+		if (event.colDef.field == 'recall'){
 			if(event.data.chgStat == "G685_21" || event.data.chgStat == "G685_51"){
 				return;
 			}
@@ -475,7 +475,7 @@
 					}
 				});
 			}
-		} else if(event.colDef.field == 'chgReason'){
+		} else if(event.colDef.field == 'chgReason2'){
 			//if(event.data.recallStat == "P" && event.data.rowspanRank == "1" && event.data.chgStat != null){
 			if(event.data.recallStat == "P"  && event.data.chgStat != null){
 				if (event.data.reasonCode == '00'){