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

src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -1369,8 +1369,6 @@ public class TsfOrderService {
 		sb.append("\t\t\t\t<stockQuantity>").append(stockQty).append("</stockQuantity>\n");
 		sb.append("\t\t\t\t<status>true</status>\n");
 
-		log.info("CHECK size / optCd.length / optCd ::::: {} / {} / {}", size, optCd.length, Arrays.toString(optCd));
-
 		// 옵션 옵션조합정보 색상
 		for(int i = 0 ; i < size ; i++) {
 			sb.append("\t\t\t\t<options>\n");

src/main/java/com/style24/front/biz/web/TsfPgController.java

@@ -162,15 +162,6 @@ public class TsfPgController extends TsfBaseController {
 		pd.setSite_cd(request.getParameter("site_cd"));
 		pd.setEscw_used(request.getParameter("escw_used") == null ? "" : request.getParameter("escw_used"));
 
-		log.info("CHECK INFO :::::: {}", pd.getGood_mny());
-		log.info("CHECK INFO :::::: {}", pd.getGood_name());
-		log.info("CHECK INFO :::::: {}", pd.getOrdr_idxx());
-		log.info("CHECK INFO :::::: {}", pd.getPay_method());
-		log.info("CHECK INFO :::::: {}", pd.getRet_URL());
-		log.info("CHECK INFO :::::: {}", pd.getSite_cd());
-		log.info("CHECK INFO :::::: {}", pd.getEscw_used());
-
-
 		String responseType = request.getParameter("response_type");
 		if("JSON".equals(responseType) || "XML".equals(responseType)) {
 			pd.setResponse_type(responseType);

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

@@ -941,7 +941,7 @@
 	<select id="selectCartGoodsColorList" parameterType="Cart" resultType="Cart">
 		/* TsfCart.selectCartGoodsColorList : 장바구니 상품 컬러 정보 조회 */
 		SELECT A.*
-		     , IFNULL(CASE WHEN SELF_GOODS_YN = 'Y' THEN C.COLOR_KNM
+		     , IFNULL(CASE WHEN A.CART_OPT_CD1 IS NOT NULL AND SELF_GOODS_YN = 'Y' THEN C.COLOR_KNM
 		                   ELSE A.CART_OPT_CD1 END, A.CART_OPT_CD1) AS CART_COLOR_NM
 		FROM   (SELECT ST.GOODS_CD
 		             , MAX(CASE WHEN SELF_GOODS_YN = 'Y' THEN (SELECT COLOR_KNM FROM TB_COLOR WHERE COLOR_CD = ST.OPT_CD1)