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

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

@@ -5,6 +5,7 @@ import java.util.Collection;
 import org.springframework.stereotype.Repository;
 
 import com.style24.core.support.annotation.ShopDs;
+import com.style24.persistence.domain.CustContactHst;
 import com.style24.persistence.domain.CustGrade;
 import com.style24.persistence.domain.CustSnsInfo;
 import com.style24.persistence.domain.Customer;
@@ -230,10 +231,10 @@ public interface TsfCustomerDao {
 	/**
 	 * 선물하기 알림톡 발송 정보 조회
 	 * 
-	 * @param Customer
+	 * @param CustContactHst
 	 * @return int
 	 * @author card007
 	 * @since 2021. 06. 04
 	 */
-	int getGiftKakaoSendInfo(Customer customer);
+	int getGiftKakaoSendInfo(CustContactHst custContactHst);
 }

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

@@ -27,6 +27,7 @@ import com.style24.front.support.security.TsfLoginDetails;
 import com.style24.front.support.security.session.TsfSession;
 import com.style24.persistence.domain.Coupon;
 import com.style24.persistence.domain.CustAccount;
+import com.style24.persistence.domain.CustContactHst;
 import com.style24.persistence.domain.CustDeliveryAddr;
 import com.style24.persistence.domain.CustGrade;
 import com.style24.persistence.domain.CustSnsInfo;
@@ -1231,13 +1232,13 @@ public class TsfCustomerService {
 	/**
 	 * 선물하기 알림톡 발송 정보 조회
 	 *
-	 * @param Customer
+	 * @param CustContactHst
 	 * @return int
 	 * @author card007
 	 * @since 2021. 06. 04
 	 */
-	public int getGiftKakaoSendInfo(Customer customer) {
-		return customerDao.getGiftKakaoSendInfo(customer);
+	public int getGiftKakaoSendInfo(CustContactHst custContactHst) {
+		return customerDao.getGiftKakaoSendInfo(custContactHst);
 	}
 
 }

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

@@ -59,6 +59,7 @@ import com.style24.persistence.TscPageRequest;
 import com.style24.persistence.domain.Cart;
 import com.style24.persistence.domain.Coupon;
 import com.style24.persistence.domain.CustAccount;
+import com.style24.persistence.domain.CustContactHst;
 import com.style24.persistence.domain.CustDeliveryAddr;
 import com.style24.persistence.domain.Customer;
 import com.style24.persistence.domain.GiftCard;
@@ -2586,15 +2587,17 @@ public class TsfMypageController extends TsfBaseController {
 	@PostMapping("/gift/kakao/resend")
 	public GagaResponse resendGiftKakao(@RequestBody Order order) {
 		// 선물하기 알림톡 이전 발송이력 조회
-		Customer customer = new Customer();
-		// TODO
-		// 조건 설정
-		int count = customerService.getGiftKakaoSendInfo(customer);
+		CustContactHst custContactHst = new CustContactHst();
+		custContactHst.setContactType(TscConstants.ContactType.GIFT.value());
+		custContactHst.setContactMethod(TscConstants.ContactMethod.KAKAOTALK.value());
+		custContactHst.setContactMemo(String.valueOf(order.getOrdNo()));
+
+		int count = customerService.getGiftKakaoSendInfo(custContactHst);
 		
 		if (count > 0) {
-			return super.error("메세지를 보낸지 10분이 안됐습니다.");
+			return super.error("선물하기 SMS를 조금 전 다시 발송하였습니다. 잠시 후 다시 시도해주세요.");
 		}
-		
+
 		// 선물하기 알림톡 전송 관련 정보 조회
 		GagaMap resultMap = coreOrderService.getOrderCompleteInfo(order);
 		Order orderInfo = (Order) resultMap.get("orderInfo");
@@ -2608,6 +2611,6 @@ public class TsfMypageController extends TsfBaseController {
 			return super.error(e.getMessage());
 		}
 		
-		return super.ok();
+		return super.ok(env.getProperty("SUCC_0005"));
 	}
 }

src/main/java/com/style24/front/support/security/session/TsfSession.java

@@ -9,13 +9,12 @@ import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import com.gagaframework.web.security.GagaSession;
 import com.style24.front.support.security.TsfLoginDetails;
 import com.style24.persistence.domain.Login;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.security.GagaSession;
-
 /**
  * Session
  * 
@@ -69,7 +68,7 @@ public class TsfSession extends GagaSession {
 		log.info("device.isNormal: {}", device.isNormal());
 		log.info("device.isTablet: {}", device.isTablet());
 
-		if ("Y".equals(TsfSession.getAttribute("isApp"))) {
+		if ("true".equals(TsfSession.getAttribute("isApp"))) {
 			return "A";
 		}
 

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

@@ -726,9 +726,9 @@
 	</update>
 
 	<!-- 선물하기 알림톡 발송 정보 조회 -->
-	<select id="getGiftKakaoSendInfo" parameterType="Customer" resultType="int">
+	<select id="getGiftKakaoSendInfo" parameterType="CustContactHst" resultType="int">
 		/* TsfCustomer.getGiftKakaoSendInfo */
-		SELECT COUNT(Z.*) AS CNT
+		SELECT COUNT(*) AS CNT
 		  FROM (SELECT CONTACT_HST_SQ
 		             , CONTACT_TYPE
 		             , CONTACT_METHOD
@@ -741,7 +741,7 @@
 		             , REG_NO
 		             , REG_DT
 		          FROM TB_CUST_CONTACT_HST
-		            WHERE CONTACT_TYPE = #{contactType}
+		         WHERE CONTACT_TYPE = #{contactType}
 		           AND CONTACT_METHOD = #{contactMethod}
 		           AND CONTACT_MEMO = #{contactMemo}) Z
 		 WHERE RESEND_CAN_YN = 'Y'

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

@@ -366,96 +366,49 @@
 	<select id="getCompleteReviewList" parameterType="Review" resultType="Review">
 		/* TsfReivew.getCompleteReviewList */
 		<include refid="selectForPagingHeader"/>
-		SELECT GROUP_CONCAT(Z.ITEM_NM ORDER BY Z.ORD_DTL_ITEM_SQ SEPARATOR '!@!') AS ITEM_NM
+		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(' ',CONCAT(OPT_CD1_NM,' / ', OPT_CD2) 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
-		     , GROUP_CONCAT(Z.OPT_CD1_NM ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD1_NM
-		     , Z.ORD_NO
-		     , Z.ORD_DT
-		     , Z.PAY_DT
-		     , Z.DELV_EDDT
-		     , Z.ORD_DTL_NO
-		     , Z.ORD_EXCH_GB
-		     , Z.GOODS_CD
-		     , Z.GOODS_NM
-		     , Z.LIST_PRICE
-		     , Z.GOODS_TYPE
-		     , Z.SYS_IMG_NM
-		     , Z.ORD_DTL_STAT
-		     , Z.ORD_QTY
-		     , Z.CNCL_RTN_QTY
-		     , Z.ORD_AMT
-		     , Z.REAL_ORD_AMT
-		     , Z.SAVE_PNT_AMT
-		     , Z.CNCL_RTN_AMT
-		     , Z.PNT_DC_AMT
-		     , Z.GFCD_USE_AMT
-		     , Z.INVOICE_NO
-		     , Z.SUPPLY_COMP_CD
-		     , Z.DELV_FEE_CD
-		     , Z.SHOT_DELV_YN
-		     , Z.CHANGEABLE_YN
-		     , Z.RETURNABLE_YN
-		     , Z.SELF_GOODS_YN
-		     , Z.BRAND_NM
-		     , Z.BRAND_ENM
-		     , Z.ORD_DTL_STAT_NM
-		     , Z.ORD_REQ_CHG_QTY
-		     , Z.ORD_CAN_CHG_QTY
-		     , Z.ITEMKIND_NM 
-		   	 , Z.ITEMKIND_CD 
-             , Z.SIZE_GB 
-             , Z.REMAIN_DT
-             , ROW_NUMBER() OVER(ORDER BY Z.REG_DT DESC) AS RNUM
-		  FROM (SELECT O.ORD_NO
+		        , GROUP_CONCAT(' ',CONCAT(OPT_CD1_NM,' / ', OPT_CD2) 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
+		        , GROUP_CONCAT(Z.OPT_CD1_NM ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD1_NM
+		        , Z.ORD_NO
+		        , Z.ORD_DT
+		        , Z.PAY_DT
+		        , Z.ORD_DTL_NO
+		        , Z.GOODS_CD
+		        , Z.GOODS_NM
+		        , Z.LIST_PRICE
+		        , Z.GOODS_TYPE
+		        , Z.SYS_IMG_NM
+		        , Z.BRAND_NM
+		        , Z.BRAND_ENM
+		        , Z.REMAIN_DT
+		        , ROW_NUMBER() OVER(ORDER BY Z.REG_DT DESC) AS RNUM
+		  FROM (
+		        SELECT O.ORD_NO
 		             , O.REG_DT 
-					 , DATE_FORMAT(O.ORD_DT, '%Y.%m.%d') AS ORD_DT
-					 , DATE_FORMAT(O.PAY_DT, '%Y.%m.%d') AS PAY_DT 
-					 , DATE_FORMAT(OD.DELV_EDDT, '%m/%d')								AS DELV_EDDT
-					 , OD.ORD_DTL_NO
-					 , OD.ORD_EXCH_GB
-					 , OD.GOODS_CD
-		             , OD.GIFT_ADDR_INP_YN
-					 , G.GOODS_NM
-					 , IFNULL((SELECT COLOR_KNM FROM TB_COLOR C WHERE COLOR_CD = IFNULL(NULLIF(ODI.OPT_CD1,'') , G.MAIN_COLOR_CD ) AND USE_YN  = 'Y'), ODI.OPT_CD1) AS COLOR_NM
-					 , (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD = ODI.ITEM_CD)		AS ITEM_NM
+		             , DATE_FORMAT(O.ORD_DT, '%Y.%m.%d') AS ORD_DT
+		             , DATE_FORMAT(O.PAY_DT, '%Y.%m.%d') AS PAY_DT 
+		             , DATE_FORMAT(OD.DELV_EDDT, '%m/%d')								AS DELV_EDDT
+		             , OD.ORD_DTL_NO
+		             , OD.GOODS_CD
+		             , G.GOODS_NM
+		             , IFNULL((SELECT COLOR_KNM FROM TB_COLOR C WHERE COLOR_CD = IFNULL(NULLIF(ODI.OPT_CD1,'') , G.MAIN_COLOR_CD ) AND USE_YN  = 'Y'), ODI.OPT_CD1) AS COLOR_NM
+		             , (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD = ODI.ITEM_CD)		AS ITEM_NM
 		             , ODI.ORD_DTL_ITEM_SQ
-					 , ODI.OPT_CD1
-					 , ODI.OPT_CD2
-					 , IFNULL(C.COLOR_KNM, ODI.OPT_CD1) AS OPT_CD1_NM
-					 , G.LIST_PRICE
+		             , ODI.OPT_CD1
+		             , ODI.OPT_CD2
+		             , IFNULL(C.COLOR_KNM, ODI.OPT_CD1) AS OPT_CD1_NM
+		             , G.LIST_PRICE
 		             , G.GOODS_TYPE
 		             , CASE WHEN G.GOODS_TYPE != 'G056_S' AND G.SELF_GOODS_YN = 'Y' THEN (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.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 = G.GOODS_CD AND COLOR_CD = IFNULL(G.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y') END AS SYS_IMG_NM
-					 , OD.ORD_DTL_STAT
-					 , OD.ORD_QTY
-					 , OD.CNCL_RTN_QTY
-					 , OD.ORD_AMT
-					 , OD.REAL_ORD_AMT
-					 , OD.SAVE_PNT_AMT
-					 , OD.CNCL_RTN_AMT
-					 , OD.PNT_DC_AMT
-					 , OD.GFCD_USE_AMT
-					 , OD.INVOICE_NO
-					 , OD.SUPPLY_COMP_CD
-					 , OD.DELV_FEE_CD
-					 , OD.SHOT_DELV_YN
-					 , OD.CHANGEABLE_YN
-					 , OD.RETURNABLE_YN
-					 , G.SELF_GOODS_YN
-			         , CASE BG.DISP_NM_LANG WHEN 'EN' THEN BG.BRAND_GROUP_ENM
+		             , CASE BG.DISP_NM_LANG WHEN 'EN' THEN BG.BRAND_GROUP_ENM
 		                       ELSE BG.BRAND_GROUP_KNM
 		               END                                                             AS BRAND_NM
-			         , B.BRAND_ENM
-					 , FN_GET_CODE_NM('G013', OD.ORD_DTL_STAT)							AS ORD_DTL_STAT_NM
-					 , IFNULL(OCD.ORD_REQ_CHG_QTY, 0) AS ORD_REQ_CHG_QTY
-					 , OD.ORD_QTY - OD.CNCL_RTN_QTY - IFNULL(OCD.ORD_REQ_CHG_QTY, 0)    AS ORD_CAN_CHG_QTY
-					 , I.ITEMKIND_NM 
-		   	         , I.ITEMKIND_CD 
-			         , I.SIZE_GB 
-			         ,DATEDIFF(DATE_ADD(O.ORD_DT,INTERVAL #{reviewExpireDay} DAY),NOW()) AS REMAIN_DT -- 남은시간
+		             , B.BRAND_ENM
+		             ,DATEDIFF(DATE_ADD(O.ORD_DT,INTERVAL  90 /**P*/ DAY),NOW()) AS REMAIN_DT -- 남은시간
 				  FROM TB_ORDER O
 				 INNER JOIN TB_ORDER_DETAIL OD
 				    ON O.ORD_NO = OD.ORD_NO
@@ -469,17 +422,6 @@
 				    ON B.BRAND_CD = G.BRAND_CD
 				 INNER JOIN TB_BRAND_GROUP BG
 		            ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
-				 LEFT JOIN TB_ITEMKIND I 
-				    ON G.ITEMKIND_CD = I.ITEMKIND_CD 
-				  LEFT OUTER JOIN (SELECT OD.ORD_DTL_NO
-										, SUM(OCD.CHG_QTY) AS ORD_REQ_CHG_QTY
-									 FROM TB_ORDER_CHANGE_DETAIL OCD
-									INNER JOIN TB_ORDER_DETAIL OD
-									   ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
-									WHERE OCD.DEL_YN = 'N'
-									GROUP BY OCD.ORD_DTL_NO
-								  ) OCD
-				    ON OD.ORD_DTL_NO = OCD.ORD_DTL_NO
 				LEFT OUTER JOIN TB_COLOR C ON ODI.OPT_CD1 = C.COLOR_CD
 		                                   AND C.USE_YN = 'Y'
 				  WHERE 1=1
@@ -490,12 +432,19 @@
 			 	AND O.SITE_CD = #{siteCd}
 				) Z		 
 		 WHERE Z.REMAIN_DT > 0
-		 GROUP BY Z.ORD_NO, Z.ORD_DT, Z.DELV_EDDT, Z.ORD_DTL_NO, Z.ORD_EXCH_GB
-				, Z.GOODS_CD, Z.GOODS_NM, Z.LIST_PRICE, Z.SYS_IMG_NM, Z.ORD_DTL_STAT, Z.ORD_QTY, Z.CNCL_RTN_QTY, Z.ORD_AMT, Z.REAL_ORD_AMT
-				, Z.SAVE_PNT_AMT, Z.CNCL_RTN_AMT, Z.PNT_DC_AMT, Z.GFCD_USE_AMT, Z.INVOICE_NO
-				, Z.SUPPLY_COMP_CD, Z.DELV_FEE_CD, Z.SHOT_DELV_YN, Z.CHANGEABLE_YN, Z.SELF_GOODS_YN, Z.BRAND_NM, Z.BRAND_ENM, Z.ORD_DTL_STAT_NM
-				, Z.ORD_REQ_CHG_QTY, Z.ORD_CAN_CHG_QTY
-		ORDER BY Z.ORD_NO DESC, Z.ORD_DTL_STAT, Z.SELF_GOODS_YN DESC, Z.SHOT_DELV_YN DESC, Z.SUPPLY_COMP_CD
+		 GROUP BY   Z.ORD_NO
+		          , Z.ORD_DT
+		          , Z.PAY_DT
+		          , Z.ORD_DTL_NO
+		          , Z.GOODS_CD
+		          , Z.GOODS_NM
+		          , Z.LIST_PRICE
+		          , Z.GOODS_TYPE
+		          , Z.SYS_IMG_NM
+		          , Z.BRAND_NM
+		          , Z.BRAND_ENM
+                  , Z.REMAIN_DT
+		ORDER BY Z.ORD_NO DESC
 		<include refid="selectForPagingFooter"/>
 	</select>
 	
@@ -946,89 +895,58 @@
 	<select id="getAlreadyReviewList" parameterType="Review" resultType="Review">
 		/* TsfReivew.getAlreadyReviewList */
 		<include refid="selectForPagingHeader"/>
-		        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(' ',CONCAT(OPT_CD1_NM,' / ', OPT_CD2) 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
-		             , GROUP_CONCAT(Z.OPT_CD1_NM ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD1_NM
-		             , Z.ORD_NO
-		             , Z.ORD_DT
-		             , Z.PAY_DT
-		             , Z.DELV_EDDT
-		             , Z.ORD_DTL_NO
-		             , Z.ORD_EXCH_GB
-		             , Z.GOODS_CD
-		             , Z.GOODS_NM
-		             , Z.LIST_PRICE
-		             , Z.GOODS_TYPE
-		             , Z.SYS_IMG_NM
-		             , Z.ORD_DTL_STAT
-		             , Z.ORD_QTY
-		             , Z.CNCL_RTN_QTY
-		             , Z.ORD_AMT
-		             , Z.REAL_ORD_AMT
-		             , Z.SAVE_PNT_AMT
-		             , Z.CNCL_RTN_AMT
-		             , Z.PNT_DC_AMT
-		             , Z.GFCD_USE_AMT
-		             , Z.INVOICE_NO
-		             , Z.SUPPLY_COMP_CD
-		             , Z.DELV_FEE_CD
-		             , Z.SHOT_DELV_YN
-		             , Z.CHANGEABLE_YN
-		             , Z.RETURNABLE_YN
-		             , Z.SELF_GOODS_YN
-		             , Z.BRAND_NM
-		             , Z.BRAND_ENM
-		             , Z.ORD_DTL_STAT_NM
-		             , Z.ORD_REQ_CHG_QTY
-		             , Z.ORD_CAN_CHG_QTY
-		             , Z.ITEMKIND_NM 
-		             , Z.ITEMKIND_CD 
-		             , Z.SIZE_GB 
-		             , Z.REMAIN_DT
-		             , Z.REVIEW_SQ
-		             , Z.REVIEW_GB
-		             , Z.REVIEW_CONTENT
-		             , Z.SCORE
-		             , Z.HEIGHT
-		             , Z.WEIGHT
-		             , Z.SCORE_SIZE
-		             , Z.SCORE_COLOR
-		             , Z.SCORE_FIT
-		             , Z.SCORE_THICK
-		             , Z.SCORE_WEIGHT
-		             , Z.SCORE_BALL
-		             , Z.GIVE_DUE_PNT
-		             , Z.PNT_GIVE_STAT
-		             , Z.BEST_YN
-		             , Z.GIVE_DUE_BPNT
-		             , Z.BPNT_GIVE_YN
-		             , Z.DISP_YN
-		             , Z.DEL_YN
-		             , Z.CONFIRM_YN
-		             , Z.CONFIRM_UNO
-		             , Z.CONFIRM_DT
-		             , Z.REG_NO
-		             , Z.REG_DT
-		             , Z.UPD_NO
-		             , Z.UPD_DT
-		             , Z.ADM_RPL
-		             , Z.ADM_RPL_REG_NO
-		             , Z.ADM_RPL_DT
-		             , ROW_NUMBER() OVER(ORDER BY Z.ORD_DT DESC) AS RNUM
-		       FROM (SELECT O.ORD_NO
+		SELECT GROUP_CONCAT(Z.ITEM_NM ORDER BY Z.ORD_DTL_ITEM_SQ SEPARATOR '!@!') AS ITEM_NM
+		     , GROUP_CONCAT(' ',CONCAT(OPT_CD1_NM,' / ', OPT_CD2) 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
+		     , GROUP_CONCAT(Z.OPT_CD1_NM ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD1_NM
+		     , Z.ORD_NO
+		     , Z.ORD_DT
+		     , Z.PAY_DT
+		     , Z.ORD_DTL_NO
+		     , Z.GOODS_CD
+		     , Z.GOODS_NM
+		     , Z.LIST_PRICE
+		     , Z.GOODS_TYPE
+		     , Z.SYS_IMG_NM
+		     , Z.BRAND_NM
+		     , Z.BRAND_ENM
+		     , Z.REMAIN_DT
+		     , Z.REVIEW_SQ
+		     , Z.REVIEW_GB
+		     , Z.REVIEW_CONTENT
+		     , Z.SCORE
+		     , Z.HEIGHT
+		     , Z.WEIGHT
+		     , Z.SCORE_SIZE
+		     , Z.SCORE_COLOR
+		     , Z.SCORE_FIT
+		     , Z.SCORE_THICK
+		     , Z.SCORE_WEIGHT
+		     , Z.SCORE_BALL
+		     , Z.BEST_YN
+		     , Z.DISP_YN
+		     , Z.DEL_YN
+		     , Z.CONFIRM_YN
+		     , Z.CONFIRM_UNO
+		     , Z.CONFIRM_DT
+		     , Z.REG_NO
+		     , Z.REG_DT
+		     , Z.UPD_NO
+		     , Z.UPD_DT
+		     , Z.ADM_RPL
+		     , Z.ADM_RPL_REG_NO
+		     , Z.ADM_RPL_DT
+		     , ROW_NUMBER() OVER(ORDER BY Z.ORD_DT DESC) AS RNUM
+		       FROM (    
+		             SELECT O.ORD_NO
 		                  , DATE_FORMAT(O.ORD_DT, '%Y.%m.%d') AS ORD_DT
-		                  , DATE_FORMAT(O.PAY_DT, '%Y.%m.%d') AS PAY_DT 
-		                  , DATE_FORMAT(OD.DELV_EDDT, '%m/%d')								AS DELV_EDDT
+		                  , DATE_FORMAT(O.PAY_DT, '%Y.%m.%d') AS PAY_DT
+		                  , DATE_FORMAT(OD.DELV_EDDT, '%m/%d')                                                          AS DELV_EDDT
 		                  , OD.ORD_DTL_NO
-		                  , OD.ORD_EXCH_GB
 		                  , OD.GOODS_CD
-		                  , OD.GIFT_ADDR_INP_YN
 		                  , G.GOODS_NM
-		                  , IFNULL((SELECT COLOR_KNM FROM TB_COLOR C WHERE COLOR_CD = IFNULL(NULLIF(ODI.OPT_CD1,'') , G.MAIN_COLOR_CD ) AND USE_YN  = 'Y'), ODI.OPT_CD1) AS COLOR_NM
-		                  , (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD = ODI.ITEM_CD)		AS ITEM_NM
+		                  , (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD = ODI.ITEM_CD)                AS ITEM_NM
 		                  , ODI.ORD_DTL_ITEM_SQ
 		                  , ODI.OPT_CD1
 		                  , ODI.OPT_CD2
@@ -1037,67 +955,41 @@
 		                  , G.GOODS_TYPE
 		                  , CASE WHEN G.GOODS_TYPE != 'G056_S' AND G.SELF_GOODS_YN = 'Y' THEN (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.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 = G.GOODS_CD AND COLOR_CD = IFNULL(G.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y') END AS SYS_IMG_NM
-		                  , OD.ORD_DTL_STAT
-		                  , OD.ORD_QTY
-		                  , OD.CNCL_RTN_QTY
-		                  , OD.ORD_AMT
-		                  , OD.REAL_ORD_AMT
-		                  , OD.SAVE_PNT_AMT
-		                  , OD.CNCL_RTN_AMT
-		                  , OD.PNT_DC_AMT
-		                  , OD.GFCD_USE_AMT
-		                  , OD.INVOICE_NO
-		                  , OD.SUPPLY_COMP_CD
-		                  , OD.DELV_FEE_CD
-		                  , OD.SHOT_DELV_YN
-		                  , OD.CHANGEABLE_YN
-		                  , OD.RETURNABLE_YN
-		                  , G.SELF_GOODS_YN
 		                  , CASE BG.DISP_NM_LANG WHEN 'EN' THEN BG.BRAND_GROUP_ENM
 		                       ELSE BG.BRAND_GROUP_KNM
 		                        END                                                             AS BRAND_NM
 		                  , B.BRAND_ENM
-		                  , FN_GET_CODE_NM('G013', OD.ORD_DTL_STAT)							AS ORD_DTL_STAT_NM
-		                  , IFNULL(OCD.ORD_REQ_CHG_QTY, 0) AS ORD_REQ_CHG_QTY
-		                  , OD.ORD_QTY - OD.CNCL_RTN_QTY - IFNULL(OCD.ORD_REQ_CHG_QTY, 0)    AS ORD_CAN_CHG_QTY
-		                  , I.ITEMKIND_NM 
-		                  , I.ITEMKIND_CD 
-		                  , I.SIZE_GB 
 		                  , R.REVIEW_SQ
 		                  , R.REVIEW_GB
 		                  , R.REVIEW_CONTENT
 		                  , R.SCORE
 		                  , R.HEIGHT
 		                  , R.WEIGHT
-		                  , (CASE R.SCORE_SIZE   WHEN 1 THEN '작음' 
+		                  , (CASE R.SCORE_SIZE   WHEN 1 THEN '작음'
 		                                          WHEN 2 THEN '딱맞음'
 		                                         WHEN 3 THEN '큼'
 		                                                            END) AS SCORE_SIZE
-		                  , (CASE R.SCORE_COLOR  WHEN 1 THEN '밝음' 
+		                  , (CASE R.SCORE_COLOR  WHEN 1 THEN '밝음'
 		                                         WHEN 2 THEN '똑같음'
-		                                         WHEN 3 THEN '어두움'   
+		                                         WHEN 3 THEN '어두움'
 		                                                            END) AS SCORE_COLOR
-		                  , (CASE R.SCORE_FIT    WHEN 1 THEN '슬림' 
-		                                         WHEN 2 THEN '레귤러' 
-		                                         WHEN 3 THEN '오버' 
+		                  , (CASE R.SCORE_FIT    WHEN 1 THEN '슬림'
+		                                         WHEN 2 THEN '레귤러'
+		                                         WHEN 3 THEN '오버'
 		                                                            END) AS SCORE_FIT
-		                  , (CASE R.SCORE_THICK  WHEN 1 THEN '얇음' 
-		                                         WHEN 2 THEN '적당함' 
+		                  , (CASE R.SCORE_THICK  WHEN 1 THEN '얇음'
+		                                         WHEN 2 THEN '적당함'
 		                                         WHEN 3 THEN '도톰함'
 		                                                            END) AS SCORE_THICK
-		                   , (CASE R.SCORE_WEIGHT WHEN 1 THEN '가벼움' 
+		                   , (CASE R.SCORE_WEIGHT WHEN 1 THEN '가벼움'
 		                                         WHEN 2 THEN '적당함'
 		                                         WHEN 3 THEN '무거움'
 		                                                            END) AS SCORE_WEIGHT
 		                   , (CASE R.SCORE_BALL   WHEN 1 THEN '작음'
 		                                          WHEN 2 THEN '딱맞음'
-		                                          WHEN 3 THEN '큼' 
+		                                          WHEN 3 THEN '큼'
 		                                                            END) AS SCORE_BALL
-		                   , R.GIVE_DUE_PNT
-		                   , R.PNT_GIVE_STAT
 		                   , R.BEST_YN
-		                   , R.GIVE_DUE_BPNT
-		                   , R.BPNT_GIVE_YN
 		                   , R.DISP_YN
 		                   , R.DEL_YN
 		                   , R.CONFIRM_YN
@@ -1110,7 +1002,7 @@
 		                   , R.ADM_RPL
 		                   , R.ADM_RPL_REG_NO
 		                   , DATE_FORMAT(R.ADM_RPL_DT , '%Y.%m.%d') AS ADM_RPL_DT
-		                   , DATEDIFF( DATE_ADD(O.PAY_DT,INTERVAL  #{reviewExpireDay} DAY),NOW()) AS REMAIN_DT -- 남은시간
+		                   , DATEDIFF( DATE_ADD(O.PAY_DT,INTERVAL   365 /**P*/ DAY),NOW()) AS REMAIN_DT -- 남은시간
 		    FROM TB_ORDER O
 		   INNER JOIN TB_ORDER_DETAIL OD
 		      ON O.ORD_NO = OD.ORD_NO
@@ -1129,17 +1021,6 @@
 		  	AND R.ORD_DTL_NO = OD.ORD_DTL_NO 
 		  	AND R.DEL_YN = 'N'
 		  	AND R.DISP_YN = 'Y'
-		   LEFT JOIN TB_ITEMKIND I 
-		      ON G.ITEMKIND_CD = I.ITEMKIND_CD 
-		    LEFT OUTER JOIN (SELECT OD.ORD_DTL_NO
-		                      	, SUM(OCD.CHG_QTY) AS ORD_REQ_CHG_QTY
-		                       FROM TB_ORDER_CHANGE_DETAIL OCD
-		                      INNER JOIN TB_ORDER_DETAIL OD
-		                         ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
-		                      WHERE OCD.DEL_YN = 'N'
-		                      GROUP BY OCD.ORD_DTL_NO
-		            ) OCD
-		      ON OD.ORD_DTL_NO = OCD.ORD_DTL_NO
 		  LEFT OUTER JOIN TB_COLOR C ON ODI.OPT_CD1 = C.COLOR_CD
 		                               AND C.USE_YN = 'Y'
 		     WHERE 1=1
@@ -1149,11 +1030,43 @@
 		   AND OD.ORD_DTL_NO IN (SELECT R.ORD_DTL_NO FROM TB_REVIEW R WHERE R.DEL_YN = 'N' AND DISP_YN = 'Y' AND R.ORD_NO = O.ORD_NO AND R.ORD_DTL_NO = OD.ORD_DTL_NO AND R.CUST_NO = #{custNo})
 		   AND O.SITE_CD =  #{siteCd}
 		   	) Z
-		 GROUP BY Z.ORD_NO, Z.ORD_DT, Z.DELV_EDDT, Z.ORD_DTL_NO, Z.ORD_EXCH_GB
-		        , Z.GOODS_CD, Z.GOODS_NM, Z.LIST_PRICE, Z.SYS_IMG_NM, Z.ORD_DTL_STAT, Z.ORD_QTY, Z.CNCL_RTN_QTY, Z.ORD_AMT, Z.REAL_ORD_AMT
-		        , Z.SAVE_PNT_AMT, Z.CNCL_RTN_AMT, Z.PNT_DC_AMT, Z.GFCD_USE_AMT, Z.INVOICE_NO
-		        , Z.SUPPLY_COMP_CD, Z.DELV_FEE_CD, Z.SHOT_DELV_YN, Z.CHANGEABLE_YN, Z.SELF_GOODS_YN, Z.BRAND_NM, Z.BRAND_ENM, Z.ORD_DTL_STAT_NM
-		        , Z.ORD_REQ_CHG_QTY, Z.ORD_CAN_CHG_QTY, Z.REVIEW_SQ 
+		 GROUP BY     Z.ORD_NO
+		            , Z.ORD_DT
+		            , Z.PAY_DT
+		            , Z.ORD_DTL_NO
+		            , Z.GOODS_CD
+		            , Z.GOODS_NM
+		            , Z.LIST_PRICE
+		            , Z.GOODS_TYPE
+		            , Z.SYS_IMG_NM
+		            , Z.BRAND_NM
+		            , Z.BRAND_ENM
+		            , Z.REMAIN_DT
+		            , Z.REVIEW_SQ
+		            , Z.REVIEW_GB
+		            , Z.REVIEW_CONTENT
+		            , Z.SCORE
+		            , Z.HEIGHT
+		            , Z.WEIGHT
+		            , Z.SCORE_SIZE
+		            , Z.SCORE_COLOR
+		            , Z.SCORE_FIT
+		            , Z.SCORE_THICK
+		            , Z.SCORE_WEIGHT
+		            , Z.SCORE_BALL
+		            , Z.BEST_YN
+		            , Z.DISP_YN
+		            , Z.DEL_YN
+		            , Z.CONFIRM_YN
+		            , Z.CONFIRM_UNO
+		            , Z.CONFIRM_DT
+		            , Z.REG_NO
+		            , Z.REG_DT
+		            , Z.UPD_NO
+		            , Z.UPD_DT
+		            , Z.ADM_RPL
+		            , Z.ADM_RPL_REG_NO
+		            , Z.ADM_RPL_DT
 		ORDER BY Z.ORD_NO DESC
 		<include refid="selectForPagingFooter"/>
 		</select>

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

@@ -170,7 +170,7 @@
 	
 	<select id="getQuickWishList" parameterType="WishList" resultType="Goods">
 		/* TsfWishlist.getQuickWishList*/
-SELECT Z.*
+		SELECT Z.*
 		FROM
 		(
 		WITH TAB_GOODS AS (
@@ -197,7 +197,6 @@ SELECT Z.*
 		         , G.MIN_ORD_QTY                                            /*최소주문수량*/  				
 		    FROM   TB_WISHlIST W
 		         , TB_GOODS G 
-		         , TB_GOODS_STOCK GS
 		         , TB_BRAND B
 		         , TB_BRAND_GROUP BG
 		    WHERE  W.GOODS_CD = G.GOODS_CD 

src/main/webapp/WEB-INF/views/mob/mypage/MypageCancelFormMob.html

@@ -43,9 +43,9 @@
 					<th:block th:if="${cancelList.cancelList}" th:each="cancel, status : ${cancelList.cancelList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 						<div class="goods_section">
 							<div class="goods_detail">
-								<a href="javascript:void(0)" th:attr="goodsCd=${cancel.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+								<a href="javascript:void(0)" th:attr="goodsCd=${cancel.goodsCd}, optCd1=${cancel.goodsType == 'G056_N' ? cancel.optCd1 : ''}, ithrCd='IN21_03'" onclick="fnGoToGoodsDetail(this)">
 									<div class="thumb_box">
-										<img th:src="${imageUrl + '/' + cancel.sysImgNm}" width="100%" alt="">
+										<img th:src="${imageUrl + '/' + cancel.sysImgNm + '?RS=90'}" width="100%" alt="">
 									</div>
 									<div class="info_box">
 										<div class="od_name">

src/main/webapp/WEB-INF/views/mob/mypage/MypageCreCancelDetailFormMob.html

@@ -44,9 +44,9 @@
 							<p class="dlvr_desc" 	th:text="|${cancelDtl.chgDate} ${cancelDtl.chgTime}|"></p>
 						</div>
 						<div class="goods_detail">
-							<a href="javascript:void(0)" th:attr="goodsCd=${cancelDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+							<a href="javascript:void(0)" th:attr="goodsCd=${cancelDtl.goodsCd}, optCd1=${cancelDtl.goodsType == 'G056_N' ? cancelDtl.optCd1 : ''}, ithrCd='IN21_02'" onclick="fnGoToGoodsDetail(this)">
 								<div class="thumb_box">
-									<img th:src="${imageUrl + '/' + cancelDtl.sysImgNm}" width="100%" alt="">
+									<img th:src="${imageUrl + '/' + cancelDtl.sysImgNm + '?RS=90'}" width="100%" alt="">
 								</div>
 								<div class="info_box">
 									<div class="od_name">

src/main/webapp/WEB-INF/views/mob/mypage/MypageCreExchangeDetailFormMob.html

@@ -51,9 +51,9 @@
 							<p class="dlvr_desc" th:text="|${exchangeDtl.chgDate} ${exchangeDtl.chgTime}|"></p>
 						</div>
 						<div class="goods_detail">
-							<a href="javascript:void(0)" th:attr="goodsCd=${exchangeDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+							<a href="javascript:void(0)" th:attr="goodsCd=${exchangeDtl.goodsCd}, optCd1=${exchangeDtl.goodsType == 'G056_N' ? exchangeDtl.optCd1 : ''}, ithrCd='IN21_02'" onclick="fnGoToGoodsDetail(this)">
 								<div class="thumb_box">
-									<img th:src="${imageUrl + '/' + exchangeDtl.sysImgNm}" width="100%" alt="">
+									<img th:src="${imageUrl + '/' + exchangeDtl.sysImgNm + '?RS=90'}" width="100%" alt="">
 								</div>
 								<div class="info_box">
 									<div class="od_name">

src/main/webapp/WEB-INF/views/mob/mypage/MypageCreListInfoMob.html

@@ -36,9 +36,9 @@
 							<!-- //상태값 변경 일시 -->
 						</div>
 						<div class="goods_detail">
-							<a href="javascript:void(0)" th:attr="goodsCd=${cre.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+							<a href="javascript:void(0)" th:attr="goodsCd=${cre.goodsCd}, optCd1=${cre.goodsType == 'G056_N' ? cre.optCd1 : ''}, ithrCd='IN21_01'" onclick="fnGoToGoodsDetail(this)">
 								<div class="thumb_box">
-									<img th:src="${imageUrl + '/' + cre.sysImgNm}" src="/" width="100%" alt="">
+									<img th:src="${imageUrl + '/' + cre.sysImgNm + '?RS=90'}" src="/" width="100%" alt="">
 								</div>
 								<div class="info_box">
 									<div class="od_name">

src/main/webapp/WEB-INF/views/mob/mypage/MypageDeliveryInfoFormMob.html

@@ -60,9 +60,9 @@
 								<input type="hidden" name="ordDtlNoArr" th:value="${ordDtl.ordDtlNo}"/>
 								<input type="hidden" name="cnclRtnReqQtyArr" th:value="${ordDtl.ordQty - ordDtl.cnclRtnQty}"/>
 														
-								<a href="javascript:void(0);" th:attr="goodsCd=${ordDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+								<a href="javascript:void(0);" th:attr="goodsCd=${ordDtl.goodsCd}, optCd1=${ordDtl.goodsType == 'G056_N' ? ordDtl.optCd1 : ''}, ithrCd='IN20_03'" onclick="fnGoToGoodsDetail(this)">
 									<div class="thumb_box">
-										<img th:src="${imageUrl + '/' + ordDtl.sysImgNm}" width="100%" alt="">
+										<img th:src="${imageUrl + '/' + ordDtl.sysImgNm + '?RS=90'}" width="100%" alt="">
 									</div>
 									<div class="info_box">
 										<div class="od_name">

src/main/webapp/WEB-INF/views/mob/mypage/MypageExchangeFormMob.html

@@ -40,9 +40,9 @@
 					<th:block th:if="${exchangeList.returnList}" th:each="exchange, status : ${exchangeList.returnList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 						<div class="goods_section">
 							<div class="goods_detail">
-								<a href="javascript:void(0)" th:attr="goodsCd=${exchange.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+								<a href="javascript:void(0)" th:attr="goodsCd=${exchange.goodsCd}, optCd1=${exchange.goodsType == 'G056_N' ? exchange.optCd1 : ''}, ithrCd='IN21_03'" onclick="fnGoToGoodsDetail(this)">
 									<div class="thumb_box">
-										<img th:src="${imageUrl + '/' + exchange.sysImgNm}" width="100%" alt="">
+										<img th:src="${imageUrl + '/' + exchange.sysImgNm + '?RS=90'}" width="100%" alt="">
 									</div>
 									<div class="info_box">
 										<div class="od_name">

src/main/webapp/WEB-INF/views/mob/mypage/MypageOrderDetailFormMob.html

@@ -67,9 +67,9 @@
 								<input type="hidden" name="ordDtlNoArr" th:value="${ordDtl.ordDtlNo}"/>
 								<input type="hidden" name="cnclRtnReqQtyArr" th:value="${ordDtl.ordQty - ordDtl.cnclRtnQty}"/>
 														
-								<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+								<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}, optCd1=${ordDtl.goodsType == 'G056_N' ? ordDtl.optCd1 : ''}, ithrCd='IN20_02'" onclick="fnGoToGoodsDetail(this)">
 									<div class="thumb_box">
-										<img th:src="${imageUrl + '/' + ordDtl.sysImgNm}" width="100%" alt="">
+										<img th:src="${imageUrl + '/' + ordDtl.sysImgNm + '?RS=90'}" width="100%" alt="">
 									</div>
 									<div class="info_box">
 										<div class="od_name">

src/main/webapp/WEB-INF/views/mob/mypage/MypageOrderListInfoMob.html

@@ -51,9 +51,9 @@
 							<!-- //일반배송일때 -->
 						</div>
 						<div class="goods_detail">
-							<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+							<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}, optCd1=${ordDtl.goodsType == 'G056_N' ? ordDtl.optCd1 : ''}, ithrCd='IN20_01'" onclick="fnGoToGoodsDetail(this)">
 								<div class="thumb_box">
-									<img th:src="${imageUrl + '/' + ordDtl.sysImgNm}" src="/" width="100%" alt="">
+									<img th:src="${imageUrl + '/' + ordDtl.sysImgNm + '?RS=90'}" src="/" width="100%" alt="">
 								</div>
 								<div class="info_box">
 									<div class="od_name">

src/main/webapp/WEB-INF/views/mob/mypage/MypageReturnFormMob.html

@@ -44,9 +44,9 @@
 					<th:block th:if="${returnList.returnList}" th:each="return, status : ${returnList.returnList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 						<div class="goods_section">
 							<div class="goods_detail">
-								<a href="javascript:void(0)" th:attr="goodsCd=${return.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+								<a href="javascript:void(0)" th:attr="goodsCd=${return.goodsCd}, optCd1=${return.goodsType == 'G056_N' ? return.optCd1 : ''}, ithrCd='IN21_03'" onclick="fnGoToGoodsDetail(this)">
 									<div class="thumb_box">
-										<img th:src="${imageUrl + '/' + return.sysImgNm}" width="100%" alt="">
+										<img th:src="${imageUrl + '/' + return.sysImgNm + '?RS=90'}" width="100%" alt="">
 									</div>
 									<div class="info_box">
 										<div class="od_name">

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCancelFormMob.html

@@ -42,7 +42,7 @@
 					<th:block th:if="${cancelList.cancelList}" th:each="cancel, status : ${cancelList.cancelList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 						<div class="goods_section">
 							<div class="goods_detail">
-								<a href="javascript:void(0)" th:attr="goodsCd=${cancel.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+								<a href="javascript:void(0)" th:attr="goodsCd=${cancel.goodsCd}, optCd1=${cancel.goodsType == 'G056_N' ? cancel.optCd1 : ''}, ithrCd='IN21_03'" onclick="fnGoToGoodsDetail(this)">
 									<div class="thumb_box">
 										<img th:src="${imageUrl + '/' + cancel.sysImgNm + '?RS=90'}" width="100%" alt="">
 									</div>

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreCancelDetailFormMob.html

@@ -39,7 +39,7 @@
 							<p class="dlvr_desc" 	th:text="|${cancelDtl.chgDate} ${cancelDtl.chgTime}|"></p>
 						</div>
 						<div class="goods_detail">
-							<a href="javascript:void(0)" th:attr="goodsCd=${cancelDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+							<a href="javascript:void(0)" th:attr="goodsCd=${cancelDtl.goodsCd}, optCd1=${cancelDtl.goodsType == 'G056_N' ? cancelDtl.optCd1 : ''}, ithrCd='IN21_02'" onclick="fnGoToGoodsDetail(this)">
 								<div class="thumb_box">
 									<img th:src="${imageUrl + '/' + cancelDtl.sysImgNm + '?RS=90'}" width="100%" alt="">
 								</div>

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreExchangeDetailFormMob.html

@@ -46,7 +46,7 @@
 							<p class="dlvr_desc" th:text="|${exchangeDtl.chgDate} ${exchangeDtl.chgTime}|"></p>
 						</div>
 						<div class="goods_detail">
-							<a href="javascript:void(0)" th:attr="goodsCd=${exchangeDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+							<a href="javascript:void(0)" th:attr="goodsCd=${exchangeDtl.goodsCd}, optCd1=${exchangeDtl.goodsType == 'G056_N' ? exchangeDtl.optCd1 : ''}, ithrCd='IN21_02'" onclick="fnGoToGoodsDetail(this)">
 								<div class="thumb_box">
 									<img th:src="${imageUrl + '/' + exchangeDtl.sysImgNm + '?RS=90'}" width="100%" alt="">
 								</div>

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreListInfoMob.html

@@ -29,7 +29,7 @@
 							<!-- //상태값 변경 일시 -->
 						</div>
 						<div class="goods_detail">
-							<a href="javascript:void(0)" th:attr="goodsCd=${cre.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+							<a href="javascript:void(0)" th:attr="goodsCd=${cre.goodsCd}, optCd1=${cre.goodsType == 'G056_N' ? cre.optCd1 : ''}, ithrCd='IN21_01'" onclick="fnGoToGoodsDetail(this)">
 								<div class="thumb_box">
 									<img th:src="${imageUrl + '/' + cre.sysImgNm + '?RS=90'}" width="100%" alt="">
 								</div>

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreReturnDetailFormMob.html

@@ -44,7 +44,7 @@
 						</div>
 						
 						<div class="goods_detail">
-							<a href="javascript:void(0)" th:attr="goodsCd=${returnDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+							<a href="javascript:void(0)" th:attr="goodsCd=${returnDtl.goodsCd}, optCd1=${returnDtl.goodsType == 'G056_N' ? returnDtl.optCd1 : ''}, ithrCd='IN21_02'" onclick="fnGoToGoodsDetail(this)">
 								<div class="thumb_box">
 									<img th:src="${imageUrl + '/' + returnDtl.sysImgNm + '?RS=90'}" width="100%" alt="">
 								</div>

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberDeliveryInfoFormMob.html

@@ -44,7 +44,7 @@
 								<input type="hidden" name="ordDtlNoArr" th:value="${ordDtl.ordDtlNo}"/>
 								<input type="hidden" name="cnclRtnReqQtyArr" th:value="${ordDtl.ordQty - ordDtl.cnclRtnQty}"/>
 														
-								<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+								<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}, optCd1=${ordDtl.goodsType == 'G056_N' ? ordDtl.optCd1 : ''}, ithrCd='IN20_03'" onclick="fnGoToGoodsDetail(this)">
 									<div class="thumb_box">
 										<img th:src="${imageUrl + '/' + ordDtl.sysImgNm + '?RS=90'}" width="100%" alt="">
 									</div>

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberExchangeFormMob.html

@@ -39,7 +39,7 @@
 					<th:block th:if="${exchangeList.returnList}" th:each="exchange, status : ${exchangeList.returnList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 						<div class="goods_section">
 							<div class="goods_detail">
-								<a href="javascript:void(0)" th:attr="goodsCd=${exchange.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+								<a href="javascript:void(0)" th:attr="goodsCd=${exchange.goodsCd}, optCd1=${exchange.goodsType == 'G056_N' ? exchange.optCd1 : ''}, ithrCd='IN21_03'" onclick="fnGoToGoodsDetail(this)">
 									<div class="thumb_box">
 										<img th:src="${imageUrl + '/' + exchange.sysImgNm + '?RS=90'}" width="100%" alt="">
 									</div>

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberOrderDetailFormMob.html

@@ -53,7 +53,7 @@
 								<input type="hidden" name="ordDtlNoArr" th:value="${ordDtl.ordDtlNo}"/>
 								<input type="hidden" name="cnclRtnReqQtyArr" th:value="${ordDtl.ordQty - ordDtl.cnclRtnQty}"/>
 														
-								<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+								<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}, optCd1=${ordDtl.goodsType == 'G056_N' ? ordDtl.optCd1 : ''}, ithrCd='IN20_02'" onclick="fnGoToGoodsDetail(this)">
 									<div class="thumb_box">
 										<img th:src="${imageUrl + '/' + ordDtl.sysImgNm + '?RS=90'}" width="100%" alt="">
 									</div>

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberOrderListInfoMob.html

@@ -21,7 +21,7 @@
 							<!-- //일반배송일때 -->
 						</div>
 						<div class="goods_detail">
-							<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+							<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}, optCd1=${ordDtl.goodsType == 'G056_N' ? ordDtl.optCd1 : ''}, ithrCd='IN20_01'" onclick="fnGoToGoodsDetail(this)">
 								<div class="thumb_box">
 									<img th:src="${imageUrl + '/' + ordDtl.sysImgNm + '?RS=90'}" width="100%" alt="">
 								</div>

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberReturnFormMob.html

@@ -43,7 +43,7 @@
 					<th:block th:if="${returnList.returnList}" th:each="return, status : ${returnList.returnList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 						<div class="goods_section">
 							<div class="goods_detail">
-								<a href="javascript:void(0)" th:attr="goodsCd=${return.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+								<a href="javascript:void(0)" th:attr="goodsCd=${return.goodsCd}, optCd1=${return.goodsType == 'G056_N' ? return.optCd1 : ''}, ithrCd='IN21_03'" onclick="fnGoToGoodsDetail(this)">
 									<div class="thumb_box">
 										<img th:src="${imageUrl + '/' + return.sysImgNm + '?RS=90'}" width="100%" alt="">
 									</div>

src/main/webapp/WEB-INF/views/web/mypage/MypageCancelFormWeb.html

@@ -52,9 +52,9 @@
 									<div class="order_desc">
 										<div class="goods_box">
 											<div class="gd_item">
-												<a href="javascript:void(0)" th:attr="goodsCd=${cancel.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+												<a href="javascript:void(0)" th:attr="goodsCd=${cancel.goodsCd}, optCd1=${cancel.goodsType == 'G056_N' ? cancel.optCd1 : ''}, ithrCd='IN21_03'" onclick="fnGoToGoodsDetail(this)">
 													<span class="thumb">
-														<img th:src="${imageUrl + '/' + cancel.sysImgNm}" width="100%" alt="">
+														<img th:src="${imageUrl + '/' + cancel.sysImgNm + '?RS=100'}" width="100%" alt="">
 													</span>
 													<p>
 														<span class="brand" th:text="${cancel.brandNm}"></span>

src/main/webapp/WEB-INF/views/web/mypage/MypageCreCancelDetailFormWeb.html

@@ -41,7 +41,6 @@
 						<div class="goods_head">
 							<p th:unless="${oneData.giftPackYn == 'Y'}">주문일 <span th:text="${oneData.ordDt}"></span></p>
 							<p th:if="${oneData.giftPackYn == 'Y'}">선물일 <span th:text="${oneData.ordDt}"></span></p>
-<!--							<a href="javascript:void(0)" th:attr="ordNo=${oneData.ordNo}" onclick="fnGoToOrderDetail(this);">상세보기</a>-->
 						</div>
 						<div class="goods_cont">
 							<!-- 주문상품 -->
@@ -50,9 +49,9 @@
 									<div class="order_desc">
 										<div class="goods_box">
 											<div class="gd_item">
-												<a href="javascript:void(0)" th:attr="goodsCd=${cancelDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+												<a href="javascript:void(0)" th:attr="goodsCd=${cancelDtl.goodsCd}, optCd1=${cancelDtl.goodsType == 'G056_N' ? cancelDtl.optCd1 : ''}, ithrCd='IN21_02'" onclick="fnGoToGoodsDetail(this)">
 													<span class="thumb">
-														<img th:src="${imageUrl + '/' + cancelDtl.sysImgNm}" width="100%" alt="">
+														<img th:src="${imageUrl + '/' + cancelDtl.sysImgNm + '?RS=100'}" width="100%" alt="">
 													</span>
 													<p>
 														<span class="brand" th:text="${cancelDtl.brandNm}"></span>
@@ -76,10 +75,6 @@
 												<p>
 													<span class="count"><em th:text="${cancelDtl.chgQty}"></em>개</span>
 												</p>
-<!--												<p>-->
-<!--													<span class="price_org" th:if="${cancelDtl.priceOrg > cancelDtl.priceSale}"><em th:text="${#numbers.formatInteger(cancelDtl.priceOrg, 1, 'COMMA')}"></em>원</span>-->
-<!--													<span class="price_sale"><em th:text="${#numbers.formatInteger(cancelDtl.priceSale, 1, 'COMMA')}"></em>원</span>-->
-<!--												</p>-->
 											</div>
 										</div>
 										<div class="status_box">

src/main/webapp/WEB-INF/views/web/mypage/MypageCreExchangeDetailFormWeb.html

@@ -49,9 +49,9 @@
 									<div class="order_desc">
 										<div class="goods_box">
 											<div class="gd_item">
-												<a href="javascript:void(0)" th:attr="goodsCd=${exchangeDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+												<a href="javascript:void(0)" th:attr="goodsCd=${exchangeDtl.goodsCd}, optCd1=${exchangeDtl.goodsType == 'G056_N' ? exchangeDtl.optCd1 : ''}, ithrCd='IN21_02'" onclick="fnGoToGoodsDetail(this)">
 													<span class="thumb">
-														<img th:src="${imageUrl + '/' + exchangeDtl.sysImgNm}" width="100%" alt="">
+														<img th:src="${imageUrl + '/' + exchangeDtl.sysImgNm + '?RS=100'}" width="100%" alt="">
 													</span>
 													<p>
 														<span class="brand" th:text="${exchangeDtl.brandNm}"></span>

src/main/webapp/WEB-INF/views/web/mypage/MypageCreListFormWeb.html

@@ -357,9 +357,13 @@
 					tag += '									<div class="order_desc">\n';
 					tag += '										<div class="goods_box">\n';
 					tag += '											<div class="gd_item">\n';
-					tag += '												<a href="javascript:void(0)" goodsCd="' + cre.goodsCd + '" onclick="fnGoToGoodsDetail(this)">\n';
+					if (cre.goodsType == 'G056_N') {
+						tag += '												<a href="javascript:void(0)" goodsCd="' + cre.goodsCd + '" optCd1="' + cre.optCd1 + '" ithrCd="IN21_01" onclick="fnGoToGoodsDetail(this)">\n';
+					} else {
+						tag += '												<a href="javascript:void(0)" goodsCd="' + cre.goodsCd + '" optCd1="" ithrCd="IN21_01" onclick="fnGoToGoodsDetail(this)">\n';
+					}
 					tag += '													<span class="thumb">\n';
-					tag += '														<img src="' + imageUrl + '/' + cre.sysImgNm + '" width="100%" alt="">\n';
+					tag += '														<img src="' + imageUrl + '/' + cre.sysImgNm + '?RS=100" width="100%" alt="">\n';
 					tag += '													</span>\n';
 					tag += '													<p>\n';
 					tag += '														<span class="brand">' + cre.brandNm + '</span>\n';

src/main/webapp/WEB-INF/views/web/mypage/MypageCreReturnDetailFormWeb.html

@@ -49,9 +49,9 @@
 									<div class="order_desc">
 										<div class="goods_box">
 											<div class="gd_item">
-												<a href="javascript:void(0)" th:attr="goodsCd=${returnDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+												<a href="javascript:void(0)" th:attr="goodsCd=${returnDtl.goodsCd}, optCd1=${returnDtl.goodsType == 'G056_N' ? returnDtl.optCd1 : ''}, ithrCd='IN21_02'" onclick="fnGoToGoodsDetail(this)">
 													<span class="thumb">
-														<img th:src="${imageUrl + '/' + returnDtl.sysImgNm}" width="100%" alt="">
+														<img th:src="${imageUrl + '/' + returnDtl.sysImgNm + '?RS=100'}" width="100%" alt="">
 													</span>
 													<p>
 														<span class="brand" th:text="${returnDtl.brandNm}"></span>

src/main/webapp/WEB-INF/views/web/mypage/MypageDeliveryInfoFormWeb.html

@@ -54,9 +54,9 @@
 												<input type="hidden" name="ordDtlNoArr" th:value="${ordDtl.ordDtlNo}"/>
 												<input type="hidden" name="cnclRtnReqQtyArr" th:value="${ordDtl.ordQty - ordDtl.cnclRtnQty}"/>
 												<div class="gd_item">
-													<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+													<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}, optCd1=${ordDtl.goodsType == 'G056_N' ? ordDtl.optCd1 : ''}, ithrCd='IN20_03'" onclick="fnGoToGoodsDetail(this)">
 															<span class="thumb">
-																<img th:src="${imageUrl + '/' + ordDtl.sysImgNm}" width="100%" alt="">
+																<img th:src="${imageUrl + '/' + ordDtl.sysImgNm + '?RS=100'}" width="100%" alt="">
 															</span>
 														<p>
 															<span class="brand" th:text="${ordDtl.brandNm}"></span>

src/main/webapp/WEB-INF/views/web/mypage/MypageExchangeFormWeb.html

@@ -49,9 +49,9 @@
 									<div class="order_desc">
 										<div class="goods_box">
 											<div class="gd_item">
-												<a href="javascript:void(0)" th:attr="goodsCd=${exchange.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+												<a href="javascript:void(0)" th:attr="goodsCd=${exchange.goodsCd}, optCd1=${exchange.goodsType == 'G056_N' ? exchange.optCd1 : ''}, ithrCd='IN21_03'" onclick="fnGoToGoodsDetail(this)">
 													<span class="thumb">
-														<img th:src="${imageUrl + '/' + exchange.sysImgNm}" width="100%" alt="">
+														<img th:src="${imageUrl + '/' + exchange.sysImgNm + '?RS=100'}" width="100%" alt="">
 													</span>
 													<p>
 														<span class="brand" th:text="${exchange.brandNm}"></span>

src/main/webapp/WEB-INF/views/web/mypage/MypageOrderDetailFormWeb.html

@@ -60,9 +60,9 @@
 													<input type="hidden" name="ordDtlNoArr" th:value="${ordDtl.ordDtlNo}"/>
 													<input type="hidden" name="cnclRtnReqQtyArr" th:value="${ordDtl.ordQty - ordDtl.cnclRtnQty}"/>
 													<div class="gd_item">
-														<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+														<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}, optCd1=${ordDtl.goodsType == 'G056_N' ? ordDtl.optCd1 : ''}, ithrCd='IN20_02'" onclick="fnGoToGoodsDetail(this)">
 															<span class="thumb">
-																<img th:src="${imageUrl + '/' + ordDtl.sysImgNm}" width="100%" alt="">
+																<img th:src="${imageUrl + '/' + ordDtl.sysImgNm + '?RS=100'}" width="100%" alt="">
 															</span>
 															<p>
 																<span class="brand" th:text="${ordDtl.brandNm}"></span>

src/main/webapp/WEB-INF/views/web/mypage/MypageOrderListFormWeb.html

@@ -417,7 +417,11 @@
 					tag += '									<div class="order_desc">\n';
 					tag += '										<div class="goods_box">\n';
 					tag += '											<div class="gd_item">\n';
-					tag += '												<a href="javascript:void(0)" goodsCd="' + ordDtl.goodsCd + '" onclick="fnGoToGoodsDetail(this)">\n';
+					if (ordDtl.goodsType == 'G056_N') {
+						tag += '												<a href="javascript:void(0)" goodsCd="' + ordDtl.goodsCd + '" optCd1="' + ordDtl.optCd1 + '" ithrCd="IN20_01" onclick="fnGoToGoodsDetail(this)">\n';
+					} else {
+						tag += '												<a href="javascript:void(0)" goodsCd="' + ordDtl.goodsCd + '" optCd1="" ithrCd="IN20_01" onclick="fnGoToGoodsDetail(this)">\n';
+					}
 					tag += '													<span class="thumb">\n';
 					tag += '														<img src="' + imageUrl + '/' + ordDtl.sysImgNm + '" width="100%" alt="">\n';
 					tag += '													</span>\n';

src/main/webapp/WEB-INF/views/web/mypage/MypageReturnFormWeb.html

@@ -53,9 +53,9 @@
 									<div class="order_desc">
 										<div class="goods_box">
 											<div class="gd_item">
-												<a href="javascript:void(0)" th:attr="goodsCd=${return.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+												<a href="javascript:void(0)" th:attr="goodsCd=${return.goodsCd}, optCd1=${return.goodsType == 'G056_N' ? return.optCd1 : ''}, ithrCd='IN21_03'" onclick="fnGoToGoodsDetail(this)">
 													<span class="thumb">
-														<img th:src="${imageUrl + '/' + return.sysImgNm}" width="100%" alt="">
+														<img th:src="${imageUrl + '/' + return.sysImgNm + '?RS=100'}" width="100%" alt="">
 													</span>
 													<p>
 														<span class="brand" th:text="${return.brandNm}"></span>

src/main/webapp/WEB-INF/views/web/mypage/NoMemberCancelFormWeb.html

@@ -51,9 +51,9 @@
 									<div class="order_desc">
 										<div class="goods_box">
 											<div class="gd_item">
-												<a href="javascript:void(0)" th:attr="goodsCd=${cancel.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+												<a href="javascript:void(0)" th:attr="goodsCd=${cancel.goodsCd}, optCd1=${cancel.goodsType == 'G056_N' ? cancel.optCd1 : ''}, ithrCd='IN21_03'" onclick="fnGoToGoodsDetail(this)">
 													<span class="thumb">
-														<img th:src="${imageUrl + '/' + cancel.sysImgNm}" width="100%" alt="">
+														<img th:src="${imageUrl + '/' + cancel.sysImgNm + '?RS=100'}" width="100%" alt="">
 													</span>
 													<p>
 														<span class="brand" th:text="${cancel.brandNm}"></span>

src/main/webapp/WEB-INF/views/web/mypage/NoMemberCreCancelDetailFormWeb.html

@@ -48,9 +48,9 @@
 									<div class="order_desc">
 										<div class="goods_box">
 											<div class="gd_item">
-												<a href="javascript:void(0)" th:attr="goodsCd=${cancelDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+												<a href="javascript:void(0)" th:attr="goodsCd=${cancelDtl.goodsCd}, optCd1=${cancelDtl.goodsType == 'G056_N' ? cancel.cancelDtl : ''}, ithrCd='IN21_02'" onclick="fnGoToGoodsDetail(this)">
 													<span class="thumb">
-														<img th:src="${imageUrl + '/' + cancelDtl.sysImgNm}" width="100%" alt="">
+														<img th:src="${imageUrl + '/' + cancelDtl.sysImgNm + '?RS=100'}" width="100%" alt="">
 													</span>
 													<p>
 														<span class="brand" th:text="${cancelDtl.brandNm}"></span>

src/main/webapp/WEB-INF/views/web/mypage/NoMemberCreExchangeDetailFormWeb.html

@@ -48,9 +48,9 @@
 									<div class="order_desc">
 										<div class="goods_box">
 											<div class="gd_item">
-												<a href="javascript:void(0)" th:attr="goodsCd=${exchangeDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+												<a href="javascript:void(0)" th:attr="goodsCd=${exchangeDtl.goodsCd}, optCd1=${exchangeDtl.goodsType == 'G056_N' ? exchangeDtl.optCd1 : ''}, ithrCd='IN21_02'" onclick="fnGoToGoodsDetail(this)">
 													<span class="thumb">
-														<img th:src="${imageUrl + '/' + exchangeDtl.sysImgNm}" width="100%" alt="">
+														<img th:src="${imageUrl + '/' + exchangeDtl.sysImgNm + '?RS=100'}" width="100%" alt="">
 													</span>
 													<p>
 														<span class="brand" th:text="${exchangeDtl.brandNm}"></span>

src/main/webapp/WEB-INF/views/web/mypage/NoMemberCreListFormWeb.html

@@ -356,7 +356,11 @@
 					tag += '									<div class="order_desc">\n';
 					tag += '										<div class="goods_box">\n';
 					tag += '											<div class="gd_item">\n';
-					tag += '												<a href="javascript:void(0)" goodsCd="' + cre.goodsCd + '" onclick="fnGoToGoodsDetail(this)">\n';
+					if (cre.goodsType == 'G056_N') {
+						tag += '												<a href="javascript:void(0)" goodsCd="' + cre.goodsCd + '" optCd1="' + cre.optCd1 + '" ithrCd="IN21_01" onclick="fnGoToGoodsDetail(this)">\n';
+					} else {
+						tag += '												<a href="javascript:void(0)" goodsCd="' + cre.goodsCd + '" optCd1="" ithrCd="IN21_01" onclick="fnGoToGoodsDetail(this)">\n';
+					}
 					tag += '													<span class="thumb">\n';
 					tag += '														<img src="' + imageUrl + '/' + cre.sysImgNm + '" width="100%" alt="">\n';
 					tag += '													</span>\n';

src/main/webapp/WEB-INF/views/web/mypage/NoMemberCreReturnDetailFormWeb.html

@@ -48,9 +48,9 @@
 									<div class="order_desc">
 										<div class="goods_box">
 											<div class="gd_item">
-												<a href="javascript:void(0)" th:attr="goodsCd=${returnDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+												<a href="javascript:void(0)" th:attr="goodsCd=${returnDtl.goodsCd}, optCd1=${returnDtl.goodsType == 'G056_N' ? returnDtl.optCd1 : ''}, ithrCd='IN21_02'" onclick="fnGoToGoodsDetail(this)">
 													<span class="thumb">
-														<img th:src="${imageUrl + '/' + returnDtl.sysImgNm}" width="100%" alt="">
+														<img th:src="${imageUrl + '/' + returnDtl.sysImgNm + '?RS=100'}" width="100%" alt="">
 													</span>
 													<p>
 														<span class="brand" th:text="${returnDtl.brandNm}"></span>

src/main/webapp/WEB-INF/views/web/mypage/NoMemberDeliveryInfoFormWeb.html

@@ -51,7 +51,7 @@
 												<input type="hidden" name="ordDtlNoArr" th:value="${ordDtl.ordDtlNo}"/>
 												<input type="hidden" name="cnclRtnReqQtyArr" th:value="${ordDtl.ordQty - ordDtl.cnclRtnQty}"/>
 												<div class="gd_item">
-													<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+													<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}, optCd1=${ordDtl.goodsType == 'G056_N' ? ordDtl.optCd1 : ''}, ithrCd='IN20_03'" onclick="fnGoToGoodsDetail(this)">
 															<span class="thumb">
 																<img th:src="${imageUrl + '/' + ordDtl.sysImgNm + '?RS=100'}" width="100%" alt="">
 															</span>

src/main/webapp/WEB-INF/views/web/mypage/NoMemberExchangeFormWeb.html

@@ -48,9 +48,9 @@
 									<div class="order_desc">
 										<div class="goods_box">
 											<div class="gd_item">
-												<a href="javascript:void(0)" th:attr="goodsCd=${exchange.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+												<a href="javascript:void(0)" th:attr="goodsCd=${exchange.goodsCd}, optCd1=${exchange.goodsType == 'G056_N' ? exchange.optCd1 : ''}, ithrCd='IN21_03'" onclick="fnGoToGoodsDetail(this)">
 													<span class="thumb">
-														<img th:src="${imageUrl + '/' + exchange.sysImgNm}" width="100%" alt="">
+														<img th:src="${imageUrl + '/' + exchange.sysImgNm + '?RS=100'}" width="100%" alt="">
 													</span>
 													<p>
 														<span class="brand" th:text="${exchange.brandNm}"></span>

src/main/webapp/WEB-INF/views/web/mypage/NoMemberOrderDetailFormWeb.html

@@ -58,9 +58,9 @@
 													<input type="hidden" name="ordDtlNoArr" th:value="${ordDtl.ordDtlNo}"/>
 													<input type="hidden" name="cnclRtnReqQtyArr" th:value="${ordDtl.ordQty - ordDtl.cnclRtnQty}"/>
 													<div class="gd_item">
-														<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+														<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}, optCd1=${ordDtl.goodsType == 'G056_N' ? ordDtl.optCd1 : ''}, ithrCd='IN20_02'" onclick="fnGoToGoodsDetail(this)">
 															<span class="thumb">
-																<img th:src="${imageUrl + '/' + ordDtl.sysImgNm}" width="100%" alt="">
+																<img th:src="${imageUrl + '/' + ordDtl.sysImgNm + '?RS=100'}" width="100%" alt="">
 															</span>
 															<p>
 																<span class="brand" th:text="${ordDtl.brandNm}"></span>

src/main/webapp/WEB-INF/views/web/mypage/NoMemberOrderListFormWeb.html

@@ -346,9 +346,13 @@
 					tag += '									<div class="order_desc">\n';
 					tag += '										<div class="goods_box">\n';
 					tag += '											<div class="gd_item">\n';
-					tag += '												<a href="javascript:void(0)" goodsCd="' + ordDtl.goodsCd + '" onclick="fnGoToGoodsDetail(this)">\n';
+					if (ordDtl.goodsType == 'G056_N') {
+						tag += '												<a href="javascript:void(0)" goodsCd="' + ordDtl.goodsCd + '" optCd1="' + ordDtl.optCd1 + '" ithrCd="IN20_01" onclick="fnGoToGoodsDetail(this)">\n';
+					} else {
+						tag += '												<a href="javascript:void(0)" goodsCd="' + ordDtl.goodsCd + '" optCd1="" ithrCd="IN20_01" onclick="fnGoToGoodsDetail(this)">\n';
+					}
 					tag += '													<span class="thumb">\n';
-					tag += '														<img src="' + imageUrl + '/' + ordDtl.sysImgNm + '" width="100%" alt="">\n';
+					tag += '														<img src="' + imageUrl + '/' + ordDtl.sysImgNm + '?RS=100" width="100%" alt="">\n';
 					tag += '													</span>\n';
 					tag += '													<p>\n';
 					tag += '														<span class="brand">' + ordDtl.brandNm + '</span>\n';

src/main/webapp/WEB-INF/views/web/mypage/NoMemberReturnFormWeb.html

@@ -51,9 +51,9 @@
 									<div class="order_desc">
 										<div class="goods_box">
 											<div class="gd_item">
-												<a href="javascript:void(0)" th:attr="goodsCd=${return.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+												<a href="javascript:void(0)" th:attr="goodsCd=${return.goodsCd}, optCd1=${return.goodsType == 'G056_N' ? return.optCd1 : ''}, ithrCd='IN21_03'" onclick="fnGoToGoodsDetail(this)">
 													<span class="thumb">
-														<img th:src="${imageUrl + '/' + return.sysImgNm}" width="100%" alt="">
+														<img th:src="${imageUrl + '/' + return.sysImgNm + '?RS=100'}" width="100%" alt="">
 													</span>
 													<p>
 														<span class="brand" th:text="${return.brandNm}"></span>

src/main/webapp/biz/mypage.js

@@ -72,7 +72,9 @@ var fnGoToGoodsDetail = function(param) {
 	localStorage.setItem('scrollpos', scrollpos);
 	
 	let goodsCd = $(param).attr('goodsCd');
-	cfnGoToPage(_PAGE_GOODS_DETAIL + goodsCd);
+	let colorCd = $(param).attr('optCd1');
+	let ithrCd = $(param).attr('ithrCd');
+	cfnGoToGoodsDetail(goodsCd, colorCd, ithrCd);
 }
 
 // 1:1문의 페이지 이동 처리
@@ -195,9 +197,15 @@ var fnAddCart = function(param){
 // 선물하기 SMS 재전송 버튼 클릭 이벤트
 var fnReSendSms = function(param) {
 	let ordNo = $(param).attr('ordNo');
+	let url = '/mypage/gift/kakao/resend';
+	let data = {};
+	data.ordNo = ordNo;
+	
+	let jsonData = JSON.stringify(data);
 	
-	// TODO
-	// 선물하기 SMS 재발송 처리
+	gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
+		console.log(result);
+	}, true);
 }
 
 // 반품/취소/교환 버튼 클릭 이벤트