Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front.git into develop

src/main/java/com/style24/front/biz/dao/TsfOrderChangeDao.java

@@ -97,46 +97,6 @@ public interface TsfOrderChangeDao {
 	 */
 	Collection<OrderChange> getPagingCreList(OrderChange orderChange);
 
-	/**
-	 * 마이페이지 교환 상품 옵션 정보 조회
-	 *
-	 * @param OrderChange
-	 * @return OrderChange
-	 * @author card007
-	 * @since 2021. 04. 08
-	 */
-	OrderChange getExchangeGoodsOptionInfoList(OrderChange orderChange);
-
-	/**
-	 * 마이페이지 취소 상세 정보 조회
-	 *
-	 * @param OrderChange
-	 * @return Collection<OrderChange>
-	 * @author card007
-	 * @since 2021. 04. 08
-	 */
-	Collection<OrderChange> getCreCancelDetailInfo(OrderChange orderChange);
-
-	/**
-	 * 마이페이지 반품 상세 정보 조회
-	 *
-	 * @param OrderChange
-	 * @return Collection<OrderChange>
-	 * @author card007
-	 * @since 2021. 04. 13
-	 */
-	Collection<OrderChange> getCreReturnDetailInfo(OrderChange orderChange);
-
-	/**
-	 * 마이페이지 교환 상세 정보 조회
-	 *
-	 * @param OrderChange
-	 * @return Collection<OrderChange>
-	 * @author card007
-	 * @since 2021. 04. 13
-	 */
-	Collection<OrderChange> getCreExchangeDetailInfo(OrderChange orderChange);
-
 	/**
 	 * 마이페이지 회수지 수정
 	 *

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

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.gagaframework.web.parameter.GagaMap;
+import com.style24.core.biz.dao.TscOrderChangeDao;
 import com.style24.core.biz.service.TscOrderChangeService;
 import com.style24.core.support.env.TscConstants;
 import com.style24.front.biz.dao.TsfOrderChangeDao;
@@ -31,6 +32,9 @@ public class TsfOrderChangeService {
 	@Autowired
 	private TsfOrderChangeDao orderChangeDao;
 
+	@Autowired
+	private TscOrderChangeDao coreOrderChangeDao;
+
 	@Autowired
 	private TscOrderChangeService coreOrderChangeService;
 
@@ -227,7 +231,7 @@ public class TsfOrderChangeService {
 
 			// 교환 시 교환옵션정보 설정
 			if ("G680_40".equals(tmpOrderChange.getChgGb())) {
-				OrderChange exchangeGoodsOptionInfo = orderChangeDao.getExchangeGoodsOptionInfoList(tmpOrderChange);
+				OrderChange exchangeGoodsOptionInfo = coreOrderChangeDao.getExchangeGoodsOptionInfoList(tmpOrderChange);
 				if (exchangeGoodsOptionInfo.getItemNm().contains("!@!")) {
 					exchangeGoodsOptionInfo.setItemNmArr(exchangeGoodsOptionInfo.getItemNm().split("!@!"));
 					exchangeGoodsOptionInfo.setColorNmArr(exchangeGoodsOptionInfo.getColorNm().split(","));
@@ -269,159 +273,6 @@ public class TsfOrderChangeService {
 		return map;
 	}
 
-	/**
-	 * 마이페이지 취소 상세 정보 조회
-	 *
-	 * @param OrderChange
-	 * @return Collection<OrderChange>
-	 * @author card007
-	 * @since 2021. 04. 08
-	 */
-	public GagaMap getCreCancelDetailInfo(OrderChange orderChange) {
-		GagaMap map = new GagaMap();
-		Collection<OrderChange> result = new ArrayList<>();
-		String refundYn = "N";
-
-		for (OrderChange tmpOrderChange : orderChangeDao.getCreCancelDetailInfo(orderChange)) {
-			// 세트상품 옵션별 배열로 담기
-			if (tmpOrderChange.getItemNm().contains("!@!")) {
-				tmpOrderChange.setItemNmArr(tmpOrderChange.getItemNm().split("!@!"));
-				tmpOrderChange.setColorNmArr(tmpOrderChange.getColorNm().split(","));
-				tmpOrderChange.setOptCd1Arr(tmpOrderChange.getOptCd1().split(","));
-				tmpOrderChange.setOptCd2Arr(tmpOrderChange.getOptCd2().split(","));
-			} else {
-				String[] arr = {tmpOrderChange.getItemNm()}, arr2 = {tmpOrderChange.getColorNm()}, arr3 = {tmpOrderChange.getOptCd1()}, arr4 = {tmpOrderChange.getOptCd2()};
-				tmpOrderChange.setItemNmArr(arr);
-				tmpOrderChange.setColorNmArr(arr2);
-				tmpOrderChange.setOptCd1Arr(arr3);
-				tmpOrderChange.setOptCd2Arr(arr4);
-			}
-
-			// 취소 전표 확인 용 환불 여부 설정
-			String chgStat = tmpOrderChange.getChgStat();
-			if ("N".equals(refundYn) && (TscConstants.OrderChangeStat.PAYMENT_BEFORE_CANCEL.value().equals(chgStat) || TscConstants.OrderChangeStat.PAYMENT_AFTER_CANCEL.value().equals(chgStat))) {
-				refundYn = "Y";
-			}
-
-			result.add(tmpOrderChange);
-		}
-
-		OrderChange oneData = new OrderChange();
-		if (result.size() > 0) {
-			oneData = result.iterator().next();
-		}
-
-		map.set("refundYn", refundYn);
-		map.set("oneData", oneData);
-		map.set("cancelDetailList", result);
-
-		return map;
-	}
-
-	/**
-	 * 마이페이지 반품 상세 정보 조회
-	 *
-	 * @param OrderChange
-	 * @return Collection<OrderChange>
-	 * @author card007
-	 * @since 2021. 04. 13
-	 */
-	public GagaMap getCreReturnDetailInfo(OrderChange orderChange) {
-		GagaMap map = new GagaMap();
-		Collection<OrderChange> result = new ArrayList<>();
-		String refundYn = "N";
-
-		for (OrderChange tmpOrderChange : orderChangeDao.getCreReturnDetailInfo(orderChange)) {
-			// 세트상품 옵션별 배열로 담기
-			if (tmpOrderChange.getItemNm().contains("!@!")) {
-				tmpOrderChange.setItemNmArr(tmpOrderChange.getItemNm().split("!@!"));
-				tmpOrderChange.setColorNmArr(tmpOrderChange.getColorNm().split(","));
-				tmpOrderChange.setOptCd1Arr(tmpOrderChange.getOptCd1().split(","));
-				tmpOrderChange.setOptCd2Arr(tmpOrderChange.getOptCd2().split(","));
-			} else {
-				String[] arr = {tmpOrderChange.getItemNm()}, arr2 = {tmpOrderChange.getColorNm()}, arr3 = {tmpOrderChange.getOptCd1()}, arr4 = {tmpOrderChange.getOptCd2()};
-				tmpOrderChange.setItemNmArr(arr);
-				tmpOrderChange.setColorNmArr(arr2);
-				tmpOrderChange.setOptCd1Arr(arr3);
-				tmpOrderChange.setOptCd2Arr(arr4);
-			}
-
-			// 취소 전표 확인 용 환불 여부 설정
-			String chgStat = tmpOrderChange.getChgStat();
-			if ("N".equals(refundYn) && TscConstants.OrderChangeStat.RETURN_COMPLETE.value().equals(chgStat)) {
-				refundYn = "Y";
-			}
-
-			result.add(tmpOrderChange);
-		}
-
-		OrderChange oneData = new OrderChange();
-		if (result.size() > 0) {
-			oneData = result.iterator().next();
-		}
-
-		map.set("refundYn", refundYn);
-		map.set("oneData", oneData);
-		map.set("returnDetailList", result);
-
-		return map;
-	}
-
-	/**
-	 * 마이페이지 교환 상세 정보 조회
-	 *
-	 * @param OrderChange
-	 * @return Collection<OrderChange>
-	 * @author card007
-	 * @since 2021. 04. 13
-	 */
-	public GagaMap getCreExchangeDetailInfo(OrderChange orderChange) {
-		GagaMap map = new GagaMap();
-		Collection<OrderChange> result = new ArrayList<>();
-
-		for (OrderChange tmpOrderChange : orderChangeDao.getCreExchangeDetailInfo(orderChange)) {
-			// 세트상품 옵션별 배열로 담기
-			if (tmpOrderChange.getItemNm().contains("!@!")) {
-				tmpOrderChange.setItemNmArr(tmpOrderChange.getItemNm().split("!@!"));
-				tmpOrderChange.setColorNmArr(tmpOrderChange.getColorNm().split(","));
-				tmpOrderChange.setOptCd1Arr(tmpOrderChange.getOptCd1().split(","));
-				tmpOrderChange.setOptCd2Arr(tmpOrderChange.getOptCd2().split(","));
-			} else {
-				String[] arr = {tmpOrderChange.getItemNm()}, arr2 = {tmpOrderChange.getColorNm()}, arr3 = {tmpOrderChange.getOptCd1()}, arr4 = {tmpOrderChange.getOptCd2()};
-				tmpOrderChange.setItemNmArr(arr);
-				tmpOrderChange.setColorNmArr(arr2);
-				tmpOrderChange.setOptCd1Arr(arr3);
-				tmpOrderChange.setOptCd2Arr(arr4);
-			}
-
-			// 교환상품 옵션 정보 조회 및 설정
-			OrderChange changeOptionInfo = orderChangeDao.getExchangeGoodsOptionInfoList(tmpOrderChange);
-			if (changeOptionInfo.getItemNm().contains("!@!")) {
-				tmpOrderChange.setChgItemNmArr(changeOptionInfo.getItemNm().split("!@!"));
-				tmpOrderChange.setChgColorNmArr(changeOptionInfo.getColorNm().split(","));
-				tmpOrderChange.setChgOptCd1Arr(changeOptionInfo.getOptCd1().split(","));
-				tmpOrderChange.setChgOptCd2Arr(changeOptionInfo.getOptCd2().split(","));
-			} else {
-				tmpOrderChange.setChgItemNm(changeOptionInfo.getItemNm());
-				tmpOrderChange.setChgColorNm(changeOptionInfo.getColorNm());
-				tmpOrderChange.setChgOptCd1(changeOptionInfo.getOptCd1());
-				tmpOrderChange.setChgOptCd2(changeOptionInfo.getOptCd2());
-			}
-
-			result.add(tmpOrderChange);
-		}
-
-		OrderChange oneData = new OrderChange();
-		if (result.size() > 0) {
-			oneData = result.iterator().next();
-		}
-
-		map.set("oneData", oneData);
-		map.set("exchangeDetailList", result);
-
-		return map;
-	}
-
 	/**
 	 * 마이페이지 회수지 수정
 	 *

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

@@ -929,6 +929,20 @@ public class TsfCustomerController extends TsfBaseController {
 		return mav;
 	}
 
+	/**
+	 * 공급업체목록 화면
+	 *
+	 * @return ModelAndView
+	 * @author jsshin
+	 * @since 2021. 04. 01
+	 */
+	@PostMapping("/supply/company/layer")
+	public ModelAndView getSupplyCompanyLayer() {
+		ModelAndView mav = new ModelAndView();
+		mav.setViewName(super.getDeviceViewName("customer/SupplyComanyLayerForm"));
+		return mav;
+	}
+
 	/**
 	 * 개인정보위탁 화면
 	 *

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

@@ -882,6 +882,8 @@ public class TsfMypageController extends TsfBaseController {
 		if (ordChgSq > 0) {
 			// 취소 알림톡 관련 정보 조회
 			orderChange = coreOrderChangeService.getKakaoOrderCancelInfo(ordChgSq);
+			
+			GagaMap replaceInfo = coreOrderChangeService.getMailOrderCancelReplaceInfo(orderChange);
 
 			try {
 				// 취소 알림톡 발송
@@ -1031,7 +1033,7 @@ public class TsfMypageController extends TsfBaseController {
 
 		// 취소상세 데이터 조회
 		orderChange.setCustNo(custNo);
-		GagaMap map = orderChangeService.getCreCancelDetailInfo(orderChange);
+		GagaMap map = coreOrderChangeService.getCreCancelDetailInfo(orderChange);
 		OrderChange oneData = (OrderChange) map.get("oneData");
 		mav.addObject("cancelDetailList", map);
 		mav.addObject("oneData", oneData);
@@ -1070,7 +1072,7 @@ public class TsfMypageController extends TsfBaseController {
 
 		// 취소상세 데이터 조회
 		orderChange.setCustNo(custNo);
-		GagaMap map = orderChangeService.getCreReturnDetailInfo(orderChange);
+		GagaMap map = coreOrderChangeService.getCreReturnDetailInfo(orderChange);
 		OrderChange oneData = (OrderChange) map.get("oneData");
 		mav.addObject("returnDetailList", map);
 		mav.addObject("oneData", oneData);
@@ -1109,7 +1111,7 @@ public class TsfMypageController extends TsfBaseController {
 
 		// 취소상세 데이터 조회
 		orderChange.setCustNo(custNo);
-		GagaMap map = orderChangeService.getCreExchangeDetailInfo(orderChange);
+		GagaMap map = coreOrderChangeService.getCreExchangeDetailInfo(orderChange);
 		OrderChange oneData = (OrderChange) map.get("oneData");
 		mav.addObject("exchangeDetailList", map);
 		mav.addObject("oneData", oneData);

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

@@ -1098,7 +1098,7 @@ public class TsfNoMemberController extends TsfBaseController {
 		mav.addObject("ordPhnno", orderChange.getOrdPhnno());
 
 		// 취소상세 데이터 조회
-		GagaMap map = orderChangeService.getCreCancelDetailInfo(orderChange);
+		GagaMap map = coreOrderChangeService.getCreCancelDetailInfo(orderChange);
 		OrderChange oneData = (OrderChange) map.get("oneData");
 		mav.addObject("cancelDetailList", map);
 		mav.addObject("oneData", oneData);
@@ -1162,7 +1162,7 @@ public class TsfNoMemberController extends TsfBaseController {
 		mav.addObject("isLogin", false);
 
 		// 반품상세 데이터 조회
-		GagaMap map = orderChangeService.getCreReturnDetailInfo(orderChange);
+		GagaMap map = coreOrderChangeService.getCreReturnDetailInfo(orderChange);
 		OrderChange oneData = (OrderChange) map.get("oneData");
 		mav.addObject("returnDetailList", map);
 		mav.addObject("oneData", oneData);
@@ -1226,7 +1226,7 @@ public class TsfNoMemberController extends TsfBaseController {
 		mav.addObject("isLogin", false);
 
 		// 교환상세 데이터 조회
-		GagaMap map = orderChangeService.getCreExchangeDetailInfo(orderChange);
+		GagaMap map = coreOrderChangeService.getCreExchangeDetailInfo(orderChange);
 		OrderChange oneData = (OrderChange) map.get("oneData");
 		mav.addObject("exchangeDetailList", map);
 		mav.addObject("oneData", oneData);

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

@@ -1190,7 +1190,14 @@
 		                  , SUB_TEXT2
 		            FROM    TB_CONTENTS
 		            WHERE   1=1
+		              <choose>
+		                  <when test="contentsLoc != null and contentsLoc =='SOM005'">
+		            AND CATE_NO = 1713
+		                  </when>
+		                  <otherwise>
 		            AND     CATE_NO = #{cateNo}
+		                  </otherwise>
+		              </choose>
 		            AND     CONTENTS_LOC = #{contentsLoc}
 		            AND     USE_YN = 'Y'
 		            AND    DISP_STDT <![CDATA[<=]]> NOW()

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

@@ -2027,7 +2027,7 @@
 		               , GS.REVIEW_REG_CNT                       /*리뷰등록건수*/
 		          FROM   TB_CATE_4SRCH C4
 		          INNER JOIN TB_CATE_GOODS CG ON C4.LEAF_CATE_NO = CG.CATE_NO
-		          INNER JOIN TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11) ON CG.GOODS_CD = G.GOODS_CD
+		          INNER JOIN TB_GOODS G ON CG.GOODS_CD = G.GOODS_CD
 		          INNER JOIN TB_GOODS_STOCK S ON CG.GOODS_CD = S.GOODS_CD
 		          INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		          INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
@@ -2363,7 +2363,7 @@
 		                , GS.REVIEW_REG_CNT                       /*리뷰등록건수*/
 		            FROM   TB_CATE_4SRCH C4
 		            INNER JOIN TB_CATE_GOODS CG ON C4.LEAF_CATE_NO = CG.CATE_NO
-		            INNER JOIN TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11) ON CG.GOODS_CD = G.GOODS_CD
+		            INNER JOIN TB_GOODS G ON CG.GOODS_CD = G.GOODS_CD
 		            INNER JOIN TB_GOODS_STOCK S ON CG.GOODS_CD = S.GOODS_CD
 		            INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		            INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO

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

@@ -759,595 +759,6 @@
 		<include refid="selectForPagingFooter"/>
 	</select>
 	
-	<!-- 마이페이지 교환 상품 옵션 정보 조회 -->
-	<select id="getExchangeGoodsOptionInfoList" parameterType="OrderChange" resultType="OrderChange">
-		/* TsfOrderChange.getExchangeGoodsOptionInfoList */
-		SELECT Z.ORD_CHG_SQ
-		     , Z.CHG_GB
-		     , Z.ORD_DTL_NO
-		     , Z.ORG_ORD_DTL_NO
-		     , Z.ORD_DTL_STAT
-		     , Z.SHIP_COMP_CD
-		     , Z.INVOICE_NO
-		     , GROUP_CONCAT(Z.ITEM_NM ORDER BY Z.ORD_DTL_ITEM_SQ SEPARATOR '!@!')       AS ITEM_NM
-		     , GROUP_CONCAT(Z.COLOR_NM ORDER BY Z.ORD_DTL_ITEM_SQ)                      AS COLOR_NM
-		     , GROUP_CONCAT(Z.OPT_CD1 ORDER BY Z.ORD_DTL_ITEM_SQ)                       AS OPT_CD1
-		     , GROUP_CONCAT(Z.OPT_CD2 ORDER BY Z.ORD_DTL_ITEM_SQ)                       AS OPT_CD2
-		  FROM (SELECT OC.ORD_CHG_SQ
-		             , OC.CHG_GB
-		             , OD.ORD_DTL_NO
-		             , OD.ORG_ORD_DTL_NO
-		             , OD.ORD_DTL_STAT
-		             , OD.SHIP_COMP_CD
-		             , OD.INVOICE_NO
-		             , IFNULL((SELECT COLOR_KNM FROM TB_COLOR WHERE COLOR_CD = IFNULL(NULLIF(ODI.OPT_CD1,'') , G1.MAIN_COLOR_CD ) AND USE_YN  = 'Y'), ODI.OPT_CD1) AS COLOR_NM
-		             , G2.GOODS_NM                      AS ITEM_NM
-		             , ODI.OPT_CD1
-		             , ODI.OPT_CD2
-		             , ODI.ORD_DTL_ITEM_SQ
-		          FROM TB_ORDER_CHANGE OC
-		         INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
-		            ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
-		         INNER JOIN TB_ORDER_DETAIL OD
-		            ON OCD.CHG_ORD_DTL_NO = OD.ORD_DTL_NO
-		         INNER JOIN TB_ORDER_DETAIL_ITEM ODI
-		            ON OD.ORD_NO = ODI.ORD_NO
-		           AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-		         INNER JOIN TB_GOODS G1
-		            ON OD.GOODS_CD = G1.GOODS_CD
-		         INNER JOIN TB_GOODS G2
-		            ON ODI.ITEM_CD = G2.GOODS_CD
-		         WHERE OC.ORD_CHG_SQ = #{ordChgSq}
-		           AND OCD.ORD_DTL_NO = #{ordDtlNo}
-		  ) Z
-		 GROUP BY Z.ORD_CHG_SQ, Z.CHG_GB, Z.ORD_DTL_NO, Z.ORG_ORD_DTL_NO, Z.ORD_DTL_STAT, Z.SHIP_COMP_CD, Z.INVOICE_NO
-	</select>
-	
-	<!-- 마이페이지 취소 상세 정보 조회 -->
-	<select id="getCreCancelDetailInfo" parameterType="OrderChange" resultType="OrderChange">
-		/* TsfOrderChange.getCreCancelDetailInfo */
-		SELECT GROUP_CONCAT(Z.ITEM_NM ORDER BY Z.ORD_DTL_ITEM_SQ SEPARATOR '!@!')       AS ITEM_NM
-		     , GROUP_CONCAT(Z.COLOR_NM ORDER BY Z.ORD_DTL_ITEM_SQ)                      AS COLOR_NM
-		     , GROUP_CONCAT(Z.OPT_CD1 ORDER BY Z.ORD_DTL_ITEM_SQ)                       AS OPT_CD1
-		     , GROUP_CONCAT(Z.OPT_CD2 ORDER BY Z.ORD_DTL_ITEM_SQ)                       AS OPT_CD2
-		     , Z.ORD_CHG_SQ
-		     , Z.CHG_GB
-		     , Z.CHG_QTY
-		     , Z.ORD_DT
-		     , Z.CHG_DATE
-		     , Z.CHG_TIME
-		     , Z.CHG_DT
-		     , Z.COMPLETE_DT
-		     , Z.CHG_STAT
-		     , Z.CHG_STAT_NM
-		     , Z.ORD_NO
-		     , Z.ORD_AMT
-		     , Z.ORD_QTY
-		     , Z.CNCL_RTN_QTY
-		     , Z.CNCL_RTN_AMT
-		     , Z.CPN1_DC_AMT
-		     , Z.REAL_ORD_AMT
-		     , Z.PNT_DC_AMT
-		     , Z.GFCD_USE_AMT
-		     , Z.ORD_DTL_NO
-		     , Z.GOODS_CD
-		     , Z.BRAND_NM
-		     , Z.SHOT_DELV_YN
-		     , Z.SELF_GOODS_YN
-		     , Z.GOODS_NM
-		     , Z.GOODS_TYPE
-		     , Z.PRICE_ORG
-		     , Z.PRICE_SALE
-		     , Z.ADD_PAY_COST
-		     , Z.SYS_IMG_NM
-		     , Z.GIFT_PACK_YN
-		     , Z.REFUND_AMT
-		     , Z.RF_CPN1_AMT
-		     , Z.RF_TMTB1_AMT
-		     , Z.RF_TMTB2_AMT
-		     , Z.RF_GOODS_CPN_AMT
-		     , Z.RF_CART_CPN_AMT
-		     , Z.RF_DELV_CPN_AMT
-		     , Z.RF_PNT_AMT
-		     , Z.RF_PRE_PNT_AMT
-		     , Z.RF_GFCD_USE_AMT
-		     , Z.RF_CNCL_AMT
-		     , Z.RF_DELIVERY_FEE
-		     , Z.RF_REAL_CNCL_AMT
-		     , Z.PG_TID
-		     , Z.PG_GB
-		     , Z.PAY_MEANS
-		     , Z.PAY_MEANS_NM
-		  FROM (SELECT OC.ORD_CHG_SQ
-		             , OC.CHG_GB
-		             , OCD.CHG_QTY
-		             , DATE_FORMAT(O.ORD_DT, '%Y.%m.%d')                                AS ORD_DT
-		             , DATE_FORMAT(OCDH.REG_DT, '%Y.%m.%d')                             AS CHG_DATE
-		             , DATE_FORMAT(OCDH.REG_DT,'%H:%i:%S')                              AS CHG_TIME
-		             , DATE_FORMAT(OCD.REG_DT, '%Y.%m.%d')                              AS CHG_DT
-		             , DATE_FORMAT(OCD.COMPLETE_DT, '%Y.%m.%d')                         AS COMPLETE_DT
-		             , OCD.CHG_STAT
-		             , FN_GET_CODE_NM('G685', OCD.CHG_STAT)                             AS CHG_STAT_NM
-		             , OD.ORD_NO
-		             , OD.ORD_AMT
-		             , OD.ORD_QTY
-		             , OD.CNCL_RTN_QTY
-		             , OD.CNCL_RTN_AMT
-		             , OD.CPN1_DC_AMT
-		             , OD.REAL_ORD_AMT
-		             , OD.PNT_DC_AMT
-		             , OD.GFCD_USE_AMT
-		             , OCD.ORD_DTL_NO
-		             , G1.GOODS_CD
-		             , CASE BG.DISP_NM_LANG WHEN 'EN' THEN BG.BRAND_GROUP_ENM
-		                                    ELSE BG.BRAND_GROUP_KNM
-		                END                                                             AS BRAND_NM
-		             , OD.SHOT_DELV_YN
-		             , G1.SELF_GOODS_YN
-		             , G1.GOODS_NM
-		             , IFNULL((SELECT COLOR_KNM FROM TB_COLOR WHERE COLOR_CD = IFNULL(NULLIF(ODI.OPT_CD1,'') , G1.MAIN_COLOR_CD ) AND USE_YN  = 'Y'), ODI.OPT_CD1) AS COLOR_NM
-		             , G2.GOODS_NM                                                      AS ITEM_NM
-		             , G1.GOODS_TYPE
-		             , ODI.ORD_DTL_ITEM_SQ
-		             , ODI.OPT_CD1
-		             , ODI.OPT_CD2
-		             , ROUND((ODH.ORD_AMT - ODH.CPN1_DC_AMT) * (OCD.CHG_QTY / ODH.ORD_QTY)) AS PRICE_ORG
-		             , ROUND((ODH.REAL_ORD_AMT + ODH.PNT_DC_AMT + ODH.GFCD_USE_AMT) * (OCD.CHG_QTY / OD.ORD_QTY)) AS PRICE_SALE
-		             , OC.ADD_PAY_COST
-		             , CASE WHEN G1.GOODS_TYPE != 'G056_S' AND G1.SELF_GOODS_YN = 'Y' THEN (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G1.GOODS_CD AND COLOR_CD = ODI.OPT_CD1 AND DEFAULT_IMG_YN = 'Y')
-		                    ELSE (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G1.GOODS_CD AND COLOR_CD = IFNULL(G1.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y') END AS SYS_IMG_NM
-		             , OD.GIFT_PACK_YN
-		             , R.REFUND_AMT
-		             , R.RF_CPN1_AMT
-		             , R.RF_TMTB1_AMT
-		             , R.RF_TMTB2_AMT
-		             , R.RF_GOODS_CPN_AMT
-		             , R.RF_CART_CPN_AMT
-		             , R.RF_DELV_CPN_AMT
-		             , R.RF_PNT_AMT
-		             , R.RF_PRE_PNT_AMT
-		             , R.RF_GFCD_USE_AMT
-		             , R.RF_CNCL_AMT
-		             , R.RF_DELIVERY_FEE
-		             , R.RF_REAL_CNCL_AMT
-		             , P.PG_TID
-		             , P.PG_GB
-		             , P.PAY_MEANS
-		             , FN_GET_CODE_NM('G014', P.PAY_MEANS)                              AS PAY_MEANS_NM
-		          FROM TB_ORDER_CHANGE OC
-		         INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
-		            ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
-		         INNER JOIN TB_ORDER_CHANGE_DETAIL_HST OCDH
-		            ON OCD.ORD_CHG_SQ = OCDH.ORD_CHG_SQ
-		           AND OCD.ORD_DTL_NO = OCDH.ORD_DTL_NO
-		           AND OCD.CHG_STAT = OCDH.CHG_STAT
-		         INNER JOIN TB_ORDER_DETAIL OD
-		            ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
-		           AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25')
-		         INNER JOIN TB_ORDER O
-		            ON OD.ORD_NO = O.ORD_NO
-		         INNER JOIN TB_ORDER_DETAIL_ITEM ODI
-		            ON OD.ORD_NO = ODI.ORD_NO
-		           AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-		           AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25')
-		         INNER JOIN TB_ORDER_DETAIL_HST ODH
-		            ON OD.ORD_DTL_NO = ODH.ORD_DTL_NO
-		           AND ODH.ORD_DTL_STAT = 'G013_00'
-		         INNER JOIN TB_GOODS G1
-		            ON OD.GOODS_CD = G1.GOODS_CD
-		         INNER JOIN TB_GOODS G2
-		            ON ODI.ITEM_CD = G2.GOODS_CD
-		         INNER JOIN TB_BRAND B
-		            ON G1.BRAND_CD = B.BRAND_CD
-		           AND B.USE_YN = 'Y'
-		         INNER JOIN TB_BRAND_GROUP BG
-		            ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
-		           AND BG.USE_YN = 'Y'
-		          LEFT OUTER JOIN TB_REFUND R
-		            ON R.ORD_CHG_SQ = OC.ORD_CHG_SQ
-		         INNER JOIN TB_PAYMENT P
-		            ON P.ORD_NO = O.ORD_NO
-		           AND P.PAY_GB = 'O'
-		           AND P.PAY_STAT IN ('G016_10', 'G016_30')
-		         WHERE OCD.DEL_YN = 'N'
-		           AND O.DISP_YN = 'Y'
-		<choose>
-			<when test="custNo > 0">
-		           AND O.CUST_NO = #{custNo}
-			</when>
-			<otherwise>
-		           AND O.ORD_NO = #{ordNo}
-		           AND O.ORD_NM = #{ordNm}
-		           AND O.ORD_PHNNO = #{ordPhnno}
-			</otherwise>
-		</choose>
-		<if test="ordChgSq != null and ordChgSq != ''">
-		           AND OC.ORD_CHG_SQ = #{ordChgSq}
-		</if>
-		  ) Z
-		 GROUP BY Z.ORD_CHG_SQ, Z.CHG_GB, Z.CHG_QTY, Z.ORD_DT, Z.CHG_DATE, Z.CHG_TIME, Z.CHG_DT, Z.COMPLETE_DT, Z.CHG_STAT
-				, Z.CHG_STAT_NM, Z.ORD_NO, Z.ORD_AMT, Z.ORD_QTY, Z.CNCL_RTN_QTY, Z.CNCL_RTN_AMT, Z.CPN1_DC_AMT, Z.REAL_ORD_AMT, Z.PNT_DC_AMT
-				, Z.GFCD_USE_AMT, Z.ORD_DTL_NO, Z.GOODS_CD, Z.BRAND_NM, Z.SHOT_DELV_YN, Z.SELF_GOODS_YN, Z.GOODS_NM
-				, Z.GOODS_TYPE, Z.PRICE_ORG, Z.PRICE_SALE, Z.ADD_PAY_COST, Z.SYS_IMG_NM, Z.GIFT_PACK_YN, Z.REFUND_AMT, Z.RF_CPN1_AMT, Z.RF_TMTB1_AMT
-				, Z.RF_TMTB2_AMT, Z.RF_GOODS_CPN_AMT, Z.RF_CART_CPN_AMT, Z.RF_DELV_CPN_AMT, Z.RF_PNT_AMT, Z.RF_PRE_PNT_AMT, Z.RF_GFCD_USE_AMT
-				, Z.RF_CNCL_AMT, Z.RF_DELIVERY_FEE, Z.RF_REAL_CNCL_AMT, Z.PG_TID, Z.PG_GB, Z.PAY_MEANS, Z.PAY_MEANS_NM
-		 ORDER BY Z.ORD_CHG_SQ DESC
-	</select>
-
-	<!-- 마이페이지 반품 상세 정보 조회 -->
-	<select id="getCreReturnDetailInfo" parameterType="OrderChange" resultType="OrderChange">
-		/* TsfOrderChange.getCreReturnDetailInfo */
-		SELECT GROUP_CONCAT(Z.ITEM_NM ORDER BY Z.ORD_DTL_ITEM_SQ SEPARATOR '!@!')       AS ITEM_NM
-		     , GROUP_CONCAT(Z.COLOR_NM ORDER BY Z.ORD_DTL_ITEM_SQ)                      AS COLOR_NM
-		     , GROUP_CONCAT(Z.OPT_CD1 ORDER BY Z.ORD_DTL_ITEM_SQ)                       AS OPT_CD1
-		     , GROUP_CONCAT(Z.OPT_CD2 ORDER BY Z.ORD_DTL_ITEM_SQ)                       AS OPT_CD2
-		     , Z.ORD_CHG_SQ
-		     , Z.CHG_GB
-		     , Z.CHG_QTY
-		     , Z.ORD_DT
-		     , Z.CHG_DATE
-		     , Z.CHG_TIME
-		     , Z.CHG_DT
-		     , Z.COMPLETE_DT
-		     , Z.CHG_STAT
-		     , Z.CHG_STAT_NM
-		     , Z.ORD_NO
-		     , Z.ORD_AMT
-		     , Z.ORD_QTY
-		     , Z.CNCL_RTN_QTY
-		     , Z.CNCL_RTN_AMT
-		     , Z.CPN1_DC_AMT
-		     , Z.REAL_ORD_AMT
-		     , Z.PNT_DC_AMT
-		     , Z.GFCD_USE_AMT
-		     , Z.ORD_DTL_NO
-		     , Z.GOODS_CD
-		     , Z.BRAND_NM
-		     , Z.SHOT_DELV_YN
-		     , Z.SELF_GOODS_YN
-		     , Z.GOODS_NM
-		     , Z.GOODS_TYPE
-		     , Z.PRICE_ORG
-		     , Z.PRICE_SALE
-		     , Z.ADD_PAY_COST
-		     , Z.SYS_IMG_NM
-		     , Z.GIFT_PACK_YN
-		     , Z.REFUND_AMT
-		     , Z.RF_CPN1_AMT
-		     , Z.RF_TMTB1_AMT
-		     , Z.RF_TMTB2_AMT
-		     , Z.RF_GOODS_CPN_AMT
-		     , Z.RF_CART_CPN_AMT
-		     , Z.RF_DELV_CPN_AMT
-		     , Z.RF_PNT_AMT
-		     , Z.RF_PRE_PNT_AMT
-		     , Z.RF_GFCD_USE_AMT
-		     , Z.RF_CNCL_AMT
-		     , Z.RF_DELIVERY_FEE
-		     , Z.RF_REAL_CNCL_AMT
-		     , Z.PG_GB
-		     , Z.PAY_MEANS
-		     , Z.PAY_MEANS_NM
-		     , Z.WD_GB
-		     , Z.CHGER_NM
-		     , Z.CHGER_PHNNO
-		     , Z.CHGER_BASE_ADDR
-		     , Z.CHGER_DTL_ADDR
-		     , Z.CHGER_RTN_MEMO
-		     , Z.WD_INVOICE_NO
-		     , Z.SHIP_COMP_CD
-		     , Z.SHIP_COMP_NM
-		  FROM (SELECT OC.ORD_CHG_SQ
-		             , OC.CHG_GB
-		             , OCD.CHG_QTY
-		             , DATE_FORMAT(O.ORD_DT, '%Y.%m.%d')                                AS ORD_DT
-		             , DATE_FORMAT(OCDH.REG_DT, '%Y.%m.%d')                             AS CHG_DATE
-		             , DATE_FORMAT(OCDH.REG_DT,'%H:%i:%S')                              AS CHG_TIME
-		             , DATE_FORMAT(OCD.REG_DT, '%Y.%m.%d')                              AS CHG_DT
-		             , DATE_FORMAT(OCD.COMPLETE_DT, '%Y.%m.%d')                         AS COMPLETE_DT
-		             , OCD.CHG_STAT
-		             , FN_GET_CODE_NM('G685', OCD.CHG_STAT)                             AS CHG_STAT_NM
-		             , OD.ORD_NO
-		             , OD.ORD_AMT
-		             , OD.ORD_QTY
-		             , OD.CNCL_RTN_QTY
-		             , OD.CNCL_RTN_AMT
-		             , OD.CPN1_DC_AMT
-		             , OD.REAL_ORD_AMT
-		             , OD.PNT_DC_AMT
-		             , OD.GFCD_USE_AMT
-		             , OCD.ORD_DTL_NO
-		             , G1.GOODS_CD
-		             , CASE BG.DISP_NM_LANG WHEN 'EN' THEN BG.BRAND_GROUP_ENM
-		                                    ELSE BG.BRAND_GROUP_KNM
-		                END                                                             AS BRAND_NM
-		             , OD.SHOT_DELV_YN
-		             , G1.SELF_GOODS_YN
-		             , G1.GOODS_NM
-		             , IFNULL((SELECT COLOR_KNM FROM TB_COLOR WHERE COLOR_CD = IFNULL(NULLIF(ODI.OPT_CD1,'') , G1.MAIN_COLOR_CD ) AND USE_YN  = 'Y'), ODI.OPT_CD1) AS COLOR_NM
-		             , G2.GOODS_NM                                                      AS ITEM_NM
-		             , G1.GOODS_TYPE
-		             , ODI.ORD_DTL_ITEM_SQ
-		             , ODI.OPT_CD1
-		             , ODI.OPT_CD2
-		             , ((OD.ORD_AMT - OD.CNCL_RTN_AMT - OD.CPN1_DC_AMT) * (OCD.CHG_QTY / (OD.ORD_QTY - OD.CNCL_RTN_QTY))) AS PRICE_ORG
-		             , ((OD.REAL_ORD_AMT + OD.PNT_DC_AMT + OD.GFCD_USE_AMT) * (OCD.CHG_QTY / (OD.ORD_QTY - OD.CNCL_RTN_QTY))) AS PRICE_SALE
-		             , OC.ADD_PAY_COST
-		             , CASE WHEN G1.GOODS_TYPE != 'G056_S' AND G1.SELF_GOODS_YN = 'Y' THEN (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G1.GOODS_CD AND COLOR_CD = ODI.OPT_CD1 AND DEFAULT_IMG_YN = 'Y')
-		                    ELSE (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G1.GOODS_CD AND COLOR_CD = IFNULL(G1.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y') END AS SYS_IMG_NM
-		             , OD.GIFT_PACK_YN
-		             , R.REFUND_AMT
-		             , R.RF_CPN1_AMT
-		             , R.RF_TMTB1_AMT
-		             , R.RF_TMTB2_AMT
-		             , R.RF_GOODS_CPN_AMT
-		             , R.RF_CART_CPN_AMT
-		             , R.RF_DELV_CPN_AMT
-		             , R.RF_PNT_AMT
-		             , R.RF_PRE_PNT_AMT
-		             , R.RF_GFCD_USE_AMT
-		             , R.RF_CNCL_AMT
-		             , R.RF_DELIVERY_FEE
-		             , R.RF_REAL_CNCL_AMT
-		             , P.PG_GB
-		             , P.PAY_MEANS
-		             , FN_GET_CODE_NM('G014', P.PAY_MEANS)                              AS PAY_MEANS_NM
-		             , OC.WD_GB
-		             , OC.CHGER_NM
-		             , OC.CHGER_PHNNO
-		             , OC.CHGER_BASE_ADDR
-		             , OC.CHGER_DTL_ADDR
-		             , OC.CHGER_RTN_MEMO
-		             , OC.WD_INVOICE_NO
-		             , OC.SHIP_COMP_CD
-		             , (SELECT SHIP_COMP_NM
-		                  FROM TB_SHIP_COMPANY SC
-		                 WHERE SC.SHIP_COMP_CD = OC.SHIP_COMP_CD)                       AS SHIP_COMP_NM
-		          FROM TB_ORDER_CHANGE OC
-		         INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
-		            ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
-		         INNER JOIN TB_ORDER_CHANGE_DETAIL_HST OCDH
-		            ON OCD.ORD_CHG_SQ = OCDH.ORD_CHG_SQ
-		           AND OCD.ORD_DTL_NO = OCDH.ORD_DTL_NO
-		           AND OCD.CHG_STAT = OCDH.CHG_STAT
-		         INNER JOIN TB_ORDER_DETAIL OD
-		            ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
-		           AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25')
-		         INNER JOIN TB_ORDER O
-		            ON OD.ORD_NO = O.ORD_NO
-		         INNER JOIN TB_ORDER_DETAIL_ITEM ODI
-		            ON OD.ORD_NO = ODI.ORD_NO
-		           AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-		           AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25')
-		         INNER JOIN TB_GOODS G1
-		            ON OD.GOODS_CD = G1.GOODS_CD
-		         INNER JOIN TB_GOODS G2
-		            ON ODI.ITEM_CD = G2.GOODS_CD
-		         INNER JOIN TB_BRAND B
-		            ON G1.BRAND_CD = B.BRAND_CD
-		           AND B.USE_YN = 'Y'
-		         INNER JOIN TB_BRAND_GROUP BG
-		            ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
-		           AND BG.USE_YN = 'Y'
-		          LEFT OUTER JOIN TB_REFUND R
-		            ON R.ORD_CHG_SQ = OC.ORD_CHG_SQ
-		         INNER JOIN TB_PAYMENT P
-		            ON P.ORD_NO = O.ORD_NO
-		           AND P.PAY_GB = 'O'
-		           AND P.PAY_STAT = 'G016_30'
-		         WHERE O.DISP_YN = 'Y'
-		<choose>
-			<when test="custNo > 0">
-			       AND O.CUST_NO = #{custNo}
-			</when>
-			<otherwise>
-			       AND O.ORD_NO = #{ordNo}
-			       AND O.ORD_NM = #{ordNm}
-		           AND O.ORD_PHNNO = #{ordPhnno}
-			</otherwise>
-		</choose>
-		<if test="ordChgSq != null and ordChgSq != ''">
-			       AND OC.ORD_CHG_SQ = #{ordChgSq}
-		</if>
-		       ) Z
-		 GROUP BY Z.ORD_CHG_SQ, Z.CHG_GB, Z.CHG_QTY, Z.ORD_DT, Z.CHG_DATE, Z.CHG_TIME, Z.CHG_DT, Z.COMPLETE_DT, Z.CHG_STAT
-		        , Z.CHG_STAT_NM, Z.ORD_NO, Z.ORD_AMT, Z.ORD_QTY, Z.CNCL_RTN_QTY, Z.CNCL_RTN_AMT, Z.CPN1_DC_AMT, Z.REAL_ORD_AMT, Z.PNT_DC_AMT
-		        , Z.GFCD_USE_AMT, Z.ORD_DTL_NO, Z.GOODS_CD, Z.BRAND_NM, Z.SHOT_DELV_YN, Z.SELF_GOODS_YN, Z.GOODS_NM
-		        , Z.GOODS_TYPE, Z.PRICE_ORG, Z.PRICE_SALE, Z.ADD_PAY_COST, Z.SYS_IMG_NM, Z.GIFT_PACK_YN, Z.REFUND_AMT, Z.RF_CPN1_AMT, Z.RF_TMTB1_AMT
-		        , Z.RF_TMTB2_AMT, Z.RF_GOODS_CPN_AMT, Z.RF_CART_CPN_AMT, Z.RF_DELV_CPN_AMT, Z.RF_PNT_AMT, Z.RF_PRE_PNT_AMT, Z.RF_GFCD_USE_AMT, Z.RF_CNCL_AMT
-		        , Z.RF_DELIVERY_FEE, Z.RF_REAL_CNCL_AMT, Z.PG_GB, Z.PAY_MEANS, Z.PAY_MEANS_NM, Z.WD_GB, Z.CHGER_NM, Z.CHGER_PHNNO, Z.CHGER_BASE_ADDR
-		        , Z.CHGER_DTL_ADDR, Z.CHGER_RTN_MEMO, Z.WD_INVOICE_NO, Z.SHIP_COMP_CD, Z.SHIP_COMP_NM
-		 ORDER BY Z.ORD_CHG_SQ DESC
-	</select>
-
-	<!-- 마이페이지 교환 상세 정보 조회 -->
-	<select id="getCreExchangeDetailInfo" parameterType="OrderChange" resultType="OrderChange">
-		/* TsfOrderChange.getCreExchangeDetailInfo */
-		SELECT GROUP_CONCAT(Z.ITEM_NM ORDER BY Z.ORD_DTL_ITEM_SQ SEPARATOR '!@!')       AS ITEM_NM
-		     , GROUP_CONCAT(Z.COLOR_NM ORDER BY Z.ORD_DTL_ITEM_SQ)                      AS COLOR_NM
-		     , GROUP_CONCAT(Z.OPT_CD1 ORDER BY Z.ORD_DTL_ITEM_SQ)                       AS OPT_CD1
-		     , GROUP_CONCAT(Z.OPT_CD2 ORDER BY Z.ORD_DTL_ITEM_SQ)                       AS OPT_CD2
-		     , Z.ORD_CHG_SQ
-		     , Z.CHG_GB
-		     , Z.CHG_QTY
-		     , Z.ORD_DT
-		     , Z.CHG_DATE
-		     , Z.CHG_TIME
-		     , Z.CHG_DT
-		     , Z.COMPLETE_DT
-		     , Z.CHG_STAT
-		     , Z.CHG_STAT_NM
-		     , Z.ORD_DTL_STAT
-		     , Z.EXCHANGE_SHIP_COMP_CD
-		     , Z.EXCHANGE_INVOICE_NO
-		     , Z.ORD_NO
-		     , Z.ORD_AMT
-		     , Z.ORD_QTY
-		     , Z.CNCL_RTN_QTY
-		     , Z.CNCL_RTN_AMT
-		     , Z.CPN1_DC_AMT
-		     , Z.REAL_ORD_AMT
-		     , Z.PNT_DC_AMT
-		     , Z.GFCD_USE_AMT
-		     , Z.ORD_DTL_NO
-		     , Z.GOODS_CD
-		     , Z.BRAND_NM
-		     , Z.SHOT_DELV_YN
-		     , Z.SELF_GOODS_YN
-		     , Z.GOODS_NM
-		     , Z.GOODS_TYPE
-		     , Z.PRICE_ORG
-		     , Z.PRICE_SALE
-		     , Z.ADD_PAY_COST
-		     , Z.SYS_IMG_NM
-		     , Z.GIFT_PACK_YN
-		     , Z.WD_GB
-		     , Z.CHGER_NM
-		     , Z.CHGER_PHNNO
-		     , Z.CHGER_BASE_ADDR
-		     , Z.CHGER_DTL_ADDR
-		     , Z.CHGER_RTN_MEMO
-		     , Z.CHG_MEMO
-		     , Z.WD_INVOICE_NO
-		     , Z.SHIP_COMP_CD
-		     , Z.SHIP_COMP_NM
-		     , Z.DELV_ADDR_SQ
-		     , Z.RECIP_NM
-		     , Z.RECIP_PHNNO
-		     , Z.RECIP_BASE_ADDR
-		     , Z.RECIP_DTL_ADDR
-		     , Z.DELV_MEMO
-		     , Z.PG_TID
-		     , Z.PAY_MEANS
-		     , Z.PAY_MEANS_NM
-		     , Z.CARD_NM
-		     , Z.CARD_MIPS
-		     , Z.CHG_ORD_DTL_STAT
-		  FROM (SELECT OC.ORD_CHG_SQ
-		             , OC.CHG_GB
-		             , OCD.CHG_QTY
-		             , DATE_FORMAT(O.ORD_DT, '%Y.%m.%d')                                AS ORD_DT
-		             , DATE_FORMAT(OCDH.REG_DT, '%Y.%m.%d')                             AS CHG_DATE
-		             , DATE_FORMAT(OCDH.REG_DT,'%H:%i:%S')                              AS CHG_TIME
-		             , DATE_FORMAT(OCD.REG_DT, '%Y.%m.%d')                              AS CHG_DT
-		             , DATE_FORMAT(OCD.COMPLETE_DT, '%Y.%m.%d')                         AS COMPLETE_DT
-		             , OCD.CHG_STAT
-		             , FN_GET_CODE_NM('G685', OCD.CHG_STAT)                             AS CHG_STAT_NM
-		             , OD2.ORD_DTL_STAT                                                 AS ORD_DTL_STAT
-		             , OD2.INVOICE_NO                                                   AS EXCHANGE_INVOICE_NO
-		             , OD2.SHIP_COMP_CD                                                 AS EXCHANGE_SHIP_COMP_CD
-		             , OD.ORD_NO
-		             , OD.ORD_AMT
-		             , OD.ORD_QTY
-		             , OD.CNCL_RTN_QTY
-		             , OD.CNCL_RTN_AMT
-		             , OD.CPN1_DC_AMT
-		             , OD.REAL_ORD_AMT
-		             , OD.PNT_DC_AMT
-		             , OD.GFCD_USE_AMT
-		             , OCD.ORD_DTL_NO
-		             , G1.GOODS_CD
-		             , CASE BG.DISP_NM_LANG WHEN 'EN' THEN BG.BRAND_GROUP_ENM
-		                                    ELSE BG.BRAND_GROUP_KNM
-		                END                                                             AS BRAND_NM
-		             , OD.SHOT_DELV_YN
-		             , G1.SELF_GOODS_YN
-		             , G1.GOODS_NM
-		             , IFNULL((SELECT COLOR_KNM FROM TB_COLOR WHERE COLOR_CD = IFNULL(NULLIF(ODI.OPT_CD1,'') , G1.MAIN_COLOR_CD ) AND USE_YN  = 'Y'), ODI.OPT_CD1) AS COLOR_NM
-		             , G2.GOODS_NM                                                      AS ITEM_NM
-		             , G1.GOODS_TYPE
-		             , ODI.ORD_DTL_ITEM_SQ
-		             , ODI.OPT_CD1
-		             , ODI.OPT_CD2
-		             , ((OD.ORD_AMT - OD.CNCL_RTN_AMT - OD.CPN1_DC_AMT) * (OCD.CHG_QTY / (OD.ORD_QTY - OD.CNCL_RTN_QTY))) AS PRICE_ORG
-		             , ((OD.REAL_ORD_AMT + OD.PNT_DC_AMT + OD.GFCD_USE_AMT) * (OCD.CHG_QTY / (OD.ORD_QTY - OD.CNCL_RTN_QTY))) AS PRICE_SALE
-		             , OC.ADD_PAY_COST
-		             , CASE WHEN G1.GOODS_TYPE != 'G056_S' AND G1.SELF_GOODS_YN = 'Y' THEN (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G1.GOODS_CD AND COLOR_CD = ODI.OPT_CD1 AND DEFAULT_IMG_YN = 'Y')
-		                    ELSE (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G1.GOODS_CD AND COLOR_CD = IFNULL(G1.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y') END AS SYS_IMG_NM
-		             , OD.GIFT_PACK_YN
-		             , OC.WD_GB
-		             , OC.CHGER_NM
-		             , OC.CHGER_PHNNO
-		             , OC.CHGER_BASE_ADDR
-		             , OC.CHGER_DTL_ADDR
-		             , OC.CHGER_RTN_MEMO
-		             , OC.CHG_MEMO
-		             , OC.WD_INVOICE_NO
-		             , OC.SHIP_COMP_CD
-		             , (SELECT SHIP_COMP_NM
-		                  FROM TB_SHIP_COMPANY SC
-		                 WHERE SC.SHIP_COMP_CD = OC.SHIP_COMP_CD)                       AS SHIP_COMP_NM
-		             , DA.DELV_ADDR_SQ
-		             , DA.RECIP_NM
-		             , DA.RECIP_PHNNO
-		             , DA.RECIP_BASE_ADDR
-		             , DA.RECIP_DTL_ADDR
-		             , DA.DELV_MEMO
-		             , P.PG_TID
-		             , P.PAY_MEANS
-		             , FN_GET_CODE_NM('G014', P.PAY_MEANS)                              AS PAY_MEANS_NM
-		             , P.CARD_NM
-		             , IF(P.CARD_MIPS = 0, '일시불', CONCAT(P.CARD_MIPS, '개월'))          AS CARD_MIPS
-		             , OD2.ORD_DTL_STAT                                                 AS CHG_ORD_DTL_STAT
-		          FROM TB_ORDER_CHANGE OC
-		         INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
-		            ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
-		         INNER JOIN TB_ORDER_CHANGE_DETAIL_HST OCDH
-		            ON OCD.ORD_CHG_SQ = OCDH.ORD_CHG_SQ
-		           AND OCD.ORD_DTL_NO = OCDH.ORD_DTL_NO
-		           AND OCD.CHG_STAT = OCDH.CHG_STAT
-		         INNER JOIN TB_ORDER_DETAIL OD
-		            ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
-		           AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25')
-		         INNER JOIN TB_ORDER_DETAIL OD2
-		            ON OCD.CHG_ORD_DTL_NO = OD2.ORD_DTL_NO
-		           AND OD2.ORD_EXCH_GB = 'E'
-		          LEFT OUTER JOIN TB_DELIVERY_ADDR DA
-		            ON OD2.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
-		         INNER JOIN TB_ORDER O
-		            ON OD.ORD_NO = O.ORD_NO
-		         INNER JOIN TB_ORDER_DETAIL_ITEM ODI
-		            ON OD.ORD_NO = ODI.ORD_NO
-		           AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-		           AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25')
-		         INNER JOIN TB_GOODS G1
-		            ON OD.GOODS_CD = G1.GOODS_CD
-		         INNER JOIN TB_GOODS G2
-		            ON ODI.ITEM_CD = G2.GOODS_CD
-		         INNER JOIN TB_BRAND B
-		            ON G1.BRAND_CD = B.BRAND_CD
-		           AND B.USE_YN = 'Y'
-		         INNER JOIN TB_BRAND_GROUP BG
-		            ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
-		           AND BG.USE_YN = 'Y'
-		          LEFT OUTER JOIN TB_PAYMENT P
-		            ON P.ORD_CHG_SQ = OC.ORD_CHG_SQ
-		           AND P.PAY_GB = 'D'
-		           AND P.PAY_STAT = 'G016_30'
-		         WHERE O.DISP_YN = 'Y'
-		<choose>
-			<when test="custNo > 0">
-			       AND O.CUST_NO = #{custNo}
-			</when>
-			<otherwise>
-			       AND O.ORD_NO = #{ordNo}
-			       AND O.ORD_NM = #{ordNm}
-		           AND O.ORD_PHNNO = #{ordPhnno}
-			</otherwise>
-		</choose>
-		<if test="ordChgSq != null and ordChgSq != ''">
-			       AND OC.ORD_CHG_SQ = #{ordChgSq}
-		</if>
-		       ) Z
-		 GROUP BY Z.ORD_CHG_SQ, Z.CHG_GB, Z.CHG_QTY, Z.ORD_DT, Z.CHG_DATE, Z.CHG_TIME, Z.CHG_DT, Z.COMPLETE_DT, Z.CHG_STAT
-		        , Z.CHG_STAT_NM, Z.ORD_DTL_STAT, Z.EXCHANGE_SHIP_COMP_CD, Z.EXCHANGE_INVOICE_NO, Z.ORD_NO, Z.ORD_AMT, Z.ORD_QTY, Z.CNCL_RTN_QTY, Z.CNCL_RTN_AMT
-		        , Z.CPN1_DC_AMT, Z.REAL_ORD_AMT, Z.PNT_DC_AMT, Z.GFCD_USE_AMT, Z.ORD_DTL_NO, Z.GOODS_CD, Z.BRAND_NM, Z.SHOT_DELV_YN, Z.SELF_GOODS_YN, Z.GOODS_NM
-		        , Z.GOODS_TYPE, Z.PRICE_ORG, Z.PRICE_SALE, Z.ADD_PAY_COST, Z.SYS_IMG_NM, Z.GIFT_PACK_YN, Z.WD_GB, Z.CHGER_NM, Z.CHGER_PHNNO, Z.CHGER_BASE_ADDR
-		        , Z.CHGER_DTL_ADDR, Z.CHGER_RTN_MEMO, Z.CHG_MEMO, Z.WD_INVOICE_NO, Z.SHIP_COMP_CD, Z.SHIP_COMP_NM, Z.DELV_ADDR_SQ, Z.RECIP_NM, Z.RECIP_PHNNO
-		        , Z.RECIP_BASE_ADDR, Z.RECIP_DTL_ADDR, Z.DELV_MEMO, Z.PG_TID, Z.PAY_MEANS, Z.PAY_MEANS_NM, Z.CARD_NM, Z.CARD_MIPS, Z.CHG_ORD_DTL_STAT
-		 ORDER BY Z.ORD_CHG_SQ DESC
-	</select>
-	
 	<!-- 마이페이지 회수지 수정 -->
 	<update id="updateChgerAddr" parameterType="OrderChange">
 		/* TsfOrderChange.updateChgerAddr */

src/main/webapp/WEB-INF/views/mob/customer/PrivacyPolicyLayerFormMob.html

@@ -32,6 +32,9 @@
 </div>
 <script th:inline="javascript">
 /*<![CDATA[*/
+	$("#partners").click(function() {
+		cfnSupplyComanyLayer();
+	});
 	//약관내부링크
 	$(function(){
 		$(".hook_list ul li a").on("click", function(){

src/main/webapp/WEB-INF/views/mob/customer/SupplyComanyLayerFormMob.html

@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<html lang="ko"
+	  xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : SupplyComanyLayerFormMob.html
+ * @desc    : 공급업체 리스트 page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2021 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.06.09   jsshin       최초 작성
+ *******************************************************************************
+ -->
+<div class="modal-dialog" role="document">
+	<div class="modal-content">
+		<div class="modal-header">
+			<h5 class="modal-title" id="exampleFullLabel">업체 리스트</h5>
+		</div>
+		<div class="modal-body">
+			<div class="pop_cont">
+				<!-- 컨텐츠 시작 -->
+				<div class="ps ptn">
+					<table>
+						<colgroup>
+							<col width="*">
+							<col width="30%">
+						</colgroup>
+						<thead>
+							<tr>
+								<th>업체명</th>
+								<th>대표자</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr>
+								<td>(enercircle)이너서클</td>
+								<td>최인석</td>
+							</tr>
+							<tr>
+								<td>(유)결피부과학연구소</td>
+								<td>이종주</td>
+							</tr>
+							<tr>
+								<td>(유)결피부과학연구소(중복)</td>
+								<td>이종주</td>
+							</tr>
+							<tr>
+								<td>(재)아름다운커피</td>
+								<td>심상달</td>
+							</tr>
+							<tr>
+								<td>(주)CJ오쇼핑</td>
+								<td>이해선</td>
+							</tr>
+							<tr>
+								<td>(주)IDSDK</td>
+								<td>유정현</td>
+							</tr>
+							<tr>
+								<td>(주)L&D코리아</td>
+								<td>심홍섭</td>
+							</tr>
+							<tr>
+								<td>(주)M.O.V</td>
+								<td>김맹규</td>
+							</tr>
+							<tr>
+								<td>(유)결피부과학연구소(중복)</td>
+								<td>이종주</td>
+							</tr>
+							<tr>
+								<td>(enercircle)이너서클</td>
+								<td>최인석</td>
+							</tr>
+						</tbody>
+					</table>
+					<div class="pager">
+						<ul class="pageNav">
+							<li class="prev disabled"><a href="#">‹</a></li>
+							<li class="active"><a href="#">02</a></li>
+							<li class="lastpage"><a href="#">10</a></li>
+							<li class="next"><a href="#">›</a></li>
+						</ul>
+					</div>
+				</div>
+				<!-- 컨텐츠 종료 -->
+			</div>
+		</div>
+	</div>
+</div>
+<script th:inline="javascript">
+/*<![CDATA[*/
+	$(document).ready(function() {
+		$("#supplyCompanyPop").modal({closeExisting: false});
+	});
+
+	//약관내부링크
+	$(function(){
+		$(".hook_list ul li a").on("click", function(){
+			var hookHeader = $(".modal-header").outerHeight() + 3000;
+			var hookHref = $(this).attr("href");
+			var hookPot = $(hookHref == "#" || hookHref == "" ? "body" : hookHref);
+			var hookPos = hookPot.offset().top - hookHeader;
+			$("html, body").animate({ scrollTop: hookPos }, 3000);
+		});
+	});
+/*]]>*/
+</script>
+</html>

src/main/webapp/WEB-INF/views/mob/planning/PlanningDetailFormMob.html

@@ -490,7 +490,7 @@ if(planCornerList.length>0 && plan.cornerNmDispYn == "Y"){
 				html += 'onClick="cfnPutWishList(this);" goodsCd=\''+item2.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>\n';
 				html += '						<a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item2.goodsCd + '\',\'\',\'IN12_01\')"  class="itemLink">\n';
 				html += '							<div class="itemPic">\n';
-				html += '								<img class="vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item2.sysImgNm +'">\n';
+				html += '								<img class="vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item2.sysImgNm +'?RS=550">\n';
 				html += '							</div>\n';
 				html += '							<p class="itemBrand">'+item2.brandGroupNm+'</p>\n';
 				html += '							<div class="itemName">'+item2.goodsNm+'</div>\n';
@@ -1018,6 +1018,10 @@ var fnCornerClick = function(obj,obj2) {
 	$('html').animate({scrollTop :  offset.top - 77}, 400);
 } 
 
+//상품평 상세 레이어 호출후 콜백에서 호출하므로 여기에 있어야함
+var fnReviewDetailLayerCollBack = function(){
+	
+}
 
 //댓글 입력 확인
 var fnTextConfirm = function() {

src/main/webapp/WEB-INF/views/mob/planning/PlanningMainFormMob.html

@@ -77,7 +77,7 @@
 							}
 							
 							tag += '		<div class="img">\n';
-							tag += '			<img src="' + _uploadImageUrl + item.mainImg + '" alt="">\n';
+							tag += '			<img src="' + _uploadImageUrl + item.mainImg + '?RS=689" alt="">\n';
 							tag += '		</div>\n';
 							tag += '		<div class="txtWrap">\n';
 							tag += '			<p>' + item.planNm + '</p>\n';

src/main/webapp/WEB-INF/views/mob/planning/PlanningReplyPhotoFormMob.html

@@ -58,17 +58,20 @@
 <a href="javascript:void(0);" rel="modal:close"
 	onclick="cfCloseLayer('photo_full_popup')" class="close-modal">Close</a>
 <script th:inline="javascript">
-/* 210414_추가 : swiper fraction 숫자 1자리수 일때 앞에 0 스크립트 추가 */
-var togglePopOpen = function() {
-	if ($('.pop_detail').hasClass('active')) {
-		$('.pop_detail').removeClass('active');
-	}else{
-		$('.pop_detail').addClass('active');
-	}
-	
-};
+
 /*<![CDATA[*/
 	$(document).ready( function() {
+		
+		/* 210414_추가 : swiper fraction 숫자 1자리수 일때 앞에 0 스크립트 추가 */
+		var togglePopOpen = function() {
+			if ($('.pop_detail').hasClass('active')) {
+				$('.pop_detail').removeClass('active');
+			}else{
+				$('.pop_detail').addClass('active');
+			}
+			
+		};
+		
 		let replyAttchSq = 0; 
 		if (!gagajf.isNull( [[${plan.attachSq}]])){
 			replyAttchSq = [[${plan.attachSq}]];

src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html

@@ -62,7 +62,7 @@
 							</div>
 						</div>
 					</div>
-				<div class="cont_body" th:if="${fsrcInfoTop != null}" th:utext="${#strings.replace(#strings.replace(fsrcInfoTop.fsrcPc,'&amplt;','<'),'&ampgt;','>')}">
+				<div class="coner_item01" th:if="${fsrcInfoTop != null}" th:utext="${#strings.replace(#strings.replace(fsrcInfoTop.fsrcPc,'&amplt;','<'),'&ampgt;','>')}">
                     <!-- 프로모션배너 type1 --> 
                     <!-- <div class="promotion_visual type1" th:if="${fsrcInfoTop != null and planInfo.planGb == 'P'}" th:utext="${#strings.replace(#strings.replace(fsrcInfoTop.fsrcPc,'&amplt;','<'),'&ampgt;','>')}"></div> -->
                     <!-- <div class="promotion_visual type2" th:if="${fsrcInfoTop != null}" th:utext="${#strings.replace(#strings.replace(fsrcInfoTop.fsrcPc,'&amplt;','<'),'&ampgt;','>')}"></div> -->           
@@ -337,7 +337,7 @@ if(planCornerList.length>0 && plan.cornerNmDispYn == "Y"){
 				
 				html += '                         <a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item2.goodsCd + '\',\'\',\'IN12_01\')" class="itemLink">\n';
 				html += '                             <div class="itemPic">\n';
-				html += '                                 <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item2.sysImgNm +'">\n';
+				html += '                                 <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item2.sysImgNm +'?RS=550">\n';
 				html += '                             </div>\n';
 				html += '                             <p class="itemBrand">'+item2.brandGroupNm+'</p>\n';
 				html += '                             <div class="itemName">'+item2.goodsNm+'</div>\n';
@@ -416,16 +416,16 @@ if(template.length>0){
 			html += '			<div class="best_review">\n';
 			if(item.reviewSysImg!= null){
 				if (item.bestYn == 'Y') {
-					html += '				<a href="javascript:void();" id="btn_pdBestReview_pop" onclick="cfGoodsReviewDetail(\''+item.goodsCd+'\',\'Y\', \'Y\',\''+item.reviewSq+'\');">\n';
+					html += '				<a href="javascript:void();" id="btn_pdBestReview_pop" onclick="cfGoodsReviewDetail(\''+item.goodsCd+'\',\'Y\', \'Y\',\''+item.reviewSq+'\',1);">\n';
 				}else{
-					html += '				<a href="javascript:void();" id="btn_pdBestReview_pop" onclick="cfGoodsReviewDetail(\''+item.goodsCd+'\',\'N\', \'Y\',\''+item.reviewSq+'\');">\n';
+					html += '				<a href="javascript:void();" id="btn_pdBestReview_pop" onclick="cfGoodsReviewDetail(\''+item.goodsCd+'\',\'N\', \'Y\',\''+item.reviewSq+'\',1);">\n';
 				}
 				
 			}else{
 				if (item.bestYn == 'Y') {
-					html += '				<a href="javascript:void();" id="btn_pdBestReview_pop" onclick="cfGoodsReviewDetail(\''+item.goodsCd+'\',\'Y\', \'N\',\''+item.reviewSq+'\');">\n';
+					html += '				<a href="javascript:void();" id="btn_pdBestReview_pop" onclick="cfGoodsReviewDetail(\''+item.goodsCd+'\',\'Y\', \'N\',\''+item.reviewSq+'\',1);">\n';
 				}else{
-					html += '				<a href="javascript:void();" id="btn_pdBestReview_pop" onclick="cfGoodsReviewDetail(\''+item.goodsCd+'\',\'N\', \'N\',\''+item.reviewSq+'\');">\n';
+					html += '				<a href="javascript:void();" id="btn_pdBestReview_pop" onclick="cfGoodsReviewDetail(\''+item.goodsCd+'\',\'N\', \'N\',\''+item.reviewSq+'\',1);">\n';
 				}
 				
 			}
@@ -1098,6 +1098,10 @@ var contactPopSwiper = new Swiper('.thumb_img_pop .swiper-container', {
 	observeParents: true,
 });				
 
+//상품평 상세 레이어 호출후 콜백에서 호출하므로 여기에 있어야함
+var fnReviewDetailLayerCollBack = function(){
+	
+}
 
 $(document).ready( function() {
 	ajaxReplyList();

src/main/webapp/ux/mo/css/layout_m.css

@@ -1008,7 +1008,7 @@
 .modal.pd_pop[class*="bnf_"] h6 {margin-bottom:1.6rem; font-size:1.4rem; font-weight:500;}
 .modal.pd_pop[class*="bnf_"] .benefit_blk {margin-top:3rem}
 .modal.pd_pop[class*="bnf_"] .benefit_blk:first-child {margin-top:0}
-.modal.pd_pop[class*="bnf_"] .tbl.type1 {border-top:0.1rem solid #000; border-bottom:0.1rem solid #ddd;} 
+.modal.pd_pop[class*="bnf_"] .tbl.type1 {border-top:0.1rem solid #000; border-bottom:0.1rem solid #ddd;padding:0;} 
 .modal.pd_pop[class*="bnf_"] .tbl.type1 table {width:100%; text-align:left; word-break:break-all;}
 .modal.pd_pop[class*="bnf_"] .tbl.type1 table th,
 .modal.pd_pop[class*="bnf_"] .tbl.type1 table td {position:relative; padding:1.4rem 1.2rem; font-weight:300; font-size:1.3rem; letter-spacing:-0.025em;}
@@ -1832,13 +1832,14 @@
 .itemsGrp.rowtype .item_prod .shopBag .btn span::before {content:''; position:absolute; left:0; top:50%; transform:translateY(-50%); width:15px; height:18px; background: url('/images/pc/ico_shopbag.png') no-repeat 50% 50%;}
 
 /* 기획전 - dp_exhibition */
+.dp .dp_exhibition .list_content .itemsGrp{padding-top: 4rem;}
 .dp .dp_exhibition .list_content .itemsGrp.n3{margin-bottom:0; padding-bottom:0;}
 .dp .dp_exhibition .list_content .itemsGrp.n3 .item_prod {width: 31.666%; float: left; margin-right: 2.5%; margin-top:0;}
 .dp .dp_exhibition .list_content .itemsGrp.n3 .item_prod:nth-child(2n) {margin-right: 2.5%;}
 .dp .dp_exhibition .list_content .itemsGrp.n3 .item_prod:nth-child(3n) {margin-right:0;}
 .dp .dp_exhibition .list_content .itemsGrp.n3 .item_prod{margin-bottom:0;}
 .dp .dp_exhibition .list_content .list_item > div{padding-bottom:6rem;}
-.dp .dp_exhibition .list_content .list_item .visual{position:relative; margin-bottom:2rem;}
+.dp .dp_exhibition .list_content .list_item .visual{position:relative; margin-bottom:-2rem;}
 .dp .dp_exhibition .list_content .list_item .visual img {width: 100%;}
 .dp .dp_exhibition .list_content .list_item .visual .txtWrap {position: absolute; left: 0; bottom: 2rem; padding: 2rem; color: #fff; width: 100%;}
 .dp .dp_exhibition .list_content .list_item .visual .txtWrap p:first-child {display: -webkit-box; text-overflow: ellipsis; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; color: #fff; font-size: 2.4rem; font-weight: 500; line-height: 1.2;}

src/main/webapp/ux/mo/css/style24_m.css

@@ -1819,7 +1819,7 @@ background-size:100%;}
 .od .foldGroup .fold_head .data span::before {content:''; position:absolute; left:-0.2rem; top:50%; transform:translateY(-60%); width:1px; height:10px; background-color:#ddd;}
 .od .foldGroup .fold_head .data span:first-of-type {margin-left:0; padding-left:0;}
 .od .foldGroup .fold_head .data span:first-of-type::before {display:none;}
-
+.od .foldGroup .fold_selgift .fold_head .data {overflow:visible; white-space: normal; width: 60%;}
 .od .fold_cont .area_mbinfo div:first-child dd {font-size: 1.4rem;}
 .od .fold_cont .area_mbinfo div dd {font-size: 1.3rem; color:#222; font-weight: 300;}
 

src/main/webapp/ux/mo/js/common_m.js

@@ -16,21 +16,100 @@ $(document).ready(function() {
             setTimeout(scrollTo, 0, 0, 1);
         }, false);
 
-        // history back
-        var lastHeight;
-        $('a').click(function () {
-            height2 = $(document).scrollTop();
-            console.log(height2);
-        });
-        //window.onbeforeunload = function(e) {
-        //    lastHeight = $(document).scrollTop();
-        //    console.log(lastHeight);
-        //};
+
+
+        //210608_히스토리백 스크립트
         $(".btn_back").on("click", function () {
             history.back();
-            $('html').animate({scrollTop : lastHeight.top}, 400);
         });
 
+        //1.쿠키세팅
+        function setCookie(cookieName, value, exdays){
+            var exdate = new Date();
+            exdate.setDate(exdate.getDate() + exdays);
+            var cookieValue = escape(value) + ((exdays==null) ? "" : "; expires=" + exdate.toGMTString());
+            document.cookie = cookieName + "=" + cookieValue;
+        }
+        
+        function deleteCookie(cookieName){
+            var expireDate = new Date();
+            expireDate.setDate(expireDate.getDate() - 1);
+            document.cookie = cookieName + "= " + "; expires=" + expireDate.toGMTString();
+        }
+        
+        function getCookie(cookieName) {
+            cookieName = cookieName + '=';
+            var cookieData = document.cookie;
+            var start = cookieData.indexOf(cookieName);
+            var cookieValue = '';
+            if(start != -1){
+                start += cookieName.length;
+                var end = cookieData.indexOf(';', start);
+                if(end == -1)end = cookieData.length;
+                cookieValue = cookieData.substring(start, end);
+            }
+            return unescape(cookieValue);
+        }
+
+        //2. 쿠키설정
+        var category = getCookie("category"); //setCookie("category")로 세팅한 category 변수 명
+        var scrollPoint = getCookie("scrollPoint"); //setCookie("scrollPoint")로 세팅한 스크롤 위치
+        console.log(scrollPoint);
+        var currentCategory = "mainScrollPoint"; //이벤트 발생 후 새로 로드된 현재 페이지의 카테고리 지정
+
+        //3.스크롤 값 가져오기
+        $('a').on("click", function(){
+            // window.onbeforeunload = function(event) {
+                var scrollPoint = (document.documentElement && document.documentElement.scrollTop) 
+                   || document.body.scrollTop;
+                setCookie("category", "mainScrollPoint"); // 쿠키에서 사용할 category에 사용자 정의 카테고리명 세팅
+                setCookie("scrollPoint", scrollPoint); // 쿠키에 스크롤 위치 세팅
+                 console.log("vvbbbbbbbbb");
+            // function frm_submit(){
+                //스크롤 위치 저장
+                if($(this).attr('href') !== '#none' || $(this).attr('href') !== '' || $(this).attr('href') !== 'javascript:void(0)'){
+              
+                //    console.log($(this).attr('href'));
+                //    location.href="pd_deal_detail.html";
+               }
+               console.log(scrollPoint);
+    
+                    //    $("#frm").submit();
+                    // $(window).scroll(function(){
+                    //     console.log(scrollPoint);
+                    // });
+                    // window.onbeforeunload = function(e) {
+                    //     lastHeight = $(document).scrollTop();
+                    //     console.log(lastHeight);
+                    //     console.log("vv");
+                    // };
+                // }
+        //    frm_submit();
+        });
+
+        //4. 뒤로가기 시 이전페이지 스크롤 이동
+        window.onpageshow = function(event) {
+            console.log(window.onpageshow);
+            if ( event.persisted || (window.performance && window.performance.navigation.type == 2)) {
+            // Back Forward Cache로 브라우저가 로딩될 경우 혹은 브라우저 뒤로가기 했을 경우
+            // alert("히스토리백!!!!");
+                if (category != "" && category != 'undefined' 
+                    && category == currentCategory && scrollPoint != "" && scrollPoint != 'undefined') {
+                    console.log("zzzzzzzzzz");
+
+                    $('html').animate({scrollTop : scrollPoint}, 400);
+
+
+                    //  window.scroll(0, scrollPoint);
+                    //  body.scrollTop(scrollPoint);
+                }
+             setCookie("category", "");
+             setCookie("scrollPoint", "");
+            }
+        };
+
+
+
         // goTop, header (스크롤 인식)
         $(".btn_top").click(function () {
             $("html, body").animate({

src/main/webapp/ux/pc/css/layout.css

@@ -1717,7 +1717,9 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 
 	/* dp_submain 상단배너 스크롤바 슬라이드 */
 	.dp .dp_submain {position:relative;}
-	.dp .dp_submain .swiper-container .img img {width: 100%; height:auto;}
+	.dp .dp_submain .swiper-container .img {position: relative;width: 100%;margin-bottom: 0;padding-top: 100%;font-size: 0px;overflow: hidden;}
+	.dp .dp_submain .swiper-container .img img {position: absolute;width: 100%;height: auto;top: 50%;left: 0px;transform: translateY(-50%);}
+	/* .dp .dp_submain .swiper-container .img img {width: 100%; height:auto;} */
 	.dp .dp_submain .swiper-container .txt .subject {margin:20px 0; font-size: 24px; line-height: 1.5; font-weight: 300; color:#222; min-height:66px; max-height:66px; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 2; -webkit-box-orient: vertical; display: -webkit-box;}
 	.dp .dp_submain .swiper-container .txt span {font-size: 16px; font-weight: 200; color: #222; overflow: hidden;text-overflow: ellipsis;-webkit-line-clamp: 1;-webkit-box-orient: vertical;display: -webkit-box;}
 	.dp .dp_submain .swiper-controls {margin-top:60px}
@@ -3042,6 +3044,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.pd_dealitem .itemsGrp .item_prod {margin-top:60px}
 	.pd_dealitem .itemsGrp .item_prod .item_state {padding:0;}
 	.pd_dealitem .itemLink {}
+	.pd_dealitem .itemLink .itemPic::before {content: "";display: block;position: absolute;top: 0px;left: 0px;width: 100%;height: 100%;opacity: 0.03;background-color: rgb(0, 0, 0);z-index: 999;}
 	.pd_dealitem .itemLink .itemPic::after {content:''; background:none; background:rgba(34,34,34,0.8) url('/images/pc/btn_deal_item_more.png') no-repeat 50% 50%; opacity:0; -webkit-transition:all .2s ease-in-out; transition:all .2s ease-in-out; z-index:2;}
 	.pd_dealitem .itemLink:hover .itemPic::after,
 	.pd_dealitem .itemLink:active .itemPic::after {content:''; opacity:1;}
@@ -4438,9 +4441,9 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.ps.ptn .pager {padding-top: 20px;}
 	.hookGrp{margin-top: 40px;}
 	.hookGrp .hook_list{border: 1px solid #f5f5f5;padding: 40px;}
-	.hookGrp .hook_list ul{}
+	.hookGrp .hook_list ul{flex-direction: column;list-style: none;flex-wrap: wrap;height: 288px;display: flex;padding: 0;margin: 0;}
 	.hookGrp .hook_list ul:after{content: ''; clear:both; display: block;}
-	.hookGrp .hook_list ul li{float: left;width: 33.333%;}
+	.hookGrp .hook_list ul li{float: left; /*width: 33.333%;*/ }
 	.hookGrp .hook_list ul li a{display: table; color: #222222;}
 	.hookGrp .hook_list ul li a span{margin: 0px 0px 18px 0;display: block;font-size: 16px;font-weight: 300;}
 	.hookGrp .hook_list ul li a span::after{content: ''; display: block; box-sizing: border-box; border: 1px solid transparent;}
@@ -4453,6 +4456,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	
 	.hookGrp .hook_cont h4 {font-size:24px;font-weight:500;color:#222222;line-height:26px;letter-spacing:-0.025em;}
 	.hookGrp .hook_cont p {font-size:16px;color:#666666;line-height:26px;letter-spacing:-0.025em;}
+	.hookGrp .hook_cont p em {font-weight: 500;}
 	.hookGrp .hook_cont ol li {padding-left: 15px;}
 
 	.ps #prvc_sel {margin-top: 62px; margin-bottom: 160px;}
@@ -4462,7 +4466,6 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.ps #prvc_sel .select_custom .combo .list>li {padding:0 15px;}
 
 
-
 	/********** MODAL POPUP **********/
 	/* popup_자주 묻는 질문 팝업 */	
 	.modal.faq_pop {max-width: 1000px; max-height: 780px; padding:60px;}

src/main/webapp/ux/style24_link.js

@@ -34,6 +34,7 @@ const _PAGE_PRIVACY_POLICY = _frontUrl + "/customer/privacy/policy/form";
 const _PAGE_CUSTOMER_CONSENT_USERINFO = _frontUrl + "/customer/consent/useinfo/form";				// 정보 이용동의 : Yes24 로그인
 const _PAGE_USE_TERMS_LAYER = _frontUrl + "/customer/use/terms/layer";								// 회원가입 > 이용약관
 const _PAGE_PRIVACY_POLICY_LAYER = _frontUrl + "/customer/privacy/policy/layer";					// 회원가입 > 개인정보취급방침
+const _PAGE_SUPPLY_COMPANY_LAYER = _frontUrl + "/customer/supply/company/layer";					// 회원가입 > 개인정보취급방침
 const _PAGE_PRIVACY_TRUST_LAYER = _frontUrl + "/customer/privacy/trust/layer";						// 회원가입 > 개인정보취급위탁
 const _PAGE_NON_CUSTOMER_ORDER_CONFIRM = _frontUrl + "/customer/noncust/order/confirm/form";		// 고객 > 비회원주문확인
 
@@ -1005,12 +1006,27 @@ function cfnPrivacyPolicyLayer(mallGb) {
 	}
 	if ($('#policiesPrivacyPop').length == 0) {
 		$('body').append(str);
+	} else {
+		$("#policiesPrivacyPop").modal("show");
 	}
 	let params = {}
 	params.mallGb = mallGb;
 	cfnOpenLayer(_PAGE_PRIVACY_POLICY_LAYER, 'policiesPrivacyPop', params);
 }
 
+function cfnSupplyComanyLayer() {
+	let str;
+	if (_frontGb === 'P') {
+
+	} else {
+		str = '<div class="modal pop_full fade" id="supplyCompanyPop" role="dialog" aria-labelledby="partnersPopFullLabel" aria-hidden="true"></div>';
+	}
+	if($('#partnersPop').length == 0) {
+		$('body').append(str);
+	}
+	cfnOpenLayer(_PAGE_SUPPLY_COMPANY_LAYER,'supplyCompanyPop');
+}
+
 /**
  * @type   : function
  * @access : public