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

src/main/java/com/style24/core/biz/service/TscKakaoPayService.java

@@ -69,7 +69,7 @@ public class TscKakaoPayService {
 		String failUrl = protocol + env.getProperty("domain.front") + env.getProperty("kakao.paymentRedirectUrl");
 		String cancelUrl = protocol + env.getProperty("domain.front") + env.getProperty("kakao.paymentRedirectUrl");
 
-		if (TscConstants.FrontGb.MOB.value().equals(order.getFrontGb())) {
+		if (!TscConstants.FrontGb.PC.value().equals(order.getFrontGb())) {
 			failUrl = protocol + env.getProperty("domain.front") + "/order/payment/fail";
 			cancelUrl = protocol + env.getProperty("domain.front") + "/order/payment/fail";
 		}

src/main/java/com/style24/core/biz/service/TscKcpService.java

@@ -149,7 +149,7 @@ public class TscKcpService {
 				}
 
 				// 모바일버전 페이코 확인
-				if(TscConstants.FrontGb.MOB.value().equals(param.getFrontGb())) {
+				if(!TscConstants.FrontGb.PC.value().equals(param.getFrontGb())) {
 					String pgGb = request.getParameter("param_opt_1");
 					if(!StringUtils.isEmpty(pgGb) && TscConstants.PgGb.PAYCO.value().equals(pgGb)) {
 						result.setPgGb(TscConstants.PgGb.PAYCO.value());

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

@@ -77,9 +77,24 @@
 		ON     CAC.CUST_NO = O.CUST_NO
 		AND    CAC.DEFAULT_YN = 'Y'
 		AND    CAC.DEL_YN = 'N'
+		LEFT   OUTER JOIN (SELECT OD.ORD_NO
+		                        , OD.DELV_FEE_CD
+		                   FROM   TB_ORDER_CHANGE_DETAIL OCD
+		                   INNER  JOIN TB_ORDER_DETAIL OD
+		                   ON     OD.ORD_DTL_NO = OCD.ORD_DTL_NO
+		                   WHERE  1=1
+		                   AND    OCD.CHG_STAT IN ('G685_10', 'G685_11', 'G685_50', 'G685_51')
+		                   AND    OCD.CHG_QTY > 0
+		                   AND    OCD.DEL_YN = 'N'
+		                   GROUP  BY OD.ORD_NO, OD.DELV_FEE_CD) OCD
+		ON     OCD.ORD_NO = OD.ORD_NO
+		AND    OCD.DELV_FEE_CD = OD.DELV_FEE_CD
 		WHERE  1=1
 		AND    DA.RECIP_BASE_ADDR IS NOT NULL
 		AND    G.SELF_GOODS_YN = 'N'
+		<if test='ifYn == null or ifYn == ""'>
+		AND    OCD.ORD_NO IS NULL
+		</if>
 		<if test='supplyCompCd != null and supplyCompCd != ""'>
 		AND    OD.SUPPLY_COMP_CD = #{supplyCompCd}
 		</if>