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

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

@@ -71,15 +71,6 @@ public interface TsfCartDao {
 	 */
 	void updateCartInfo(Cart param);
 
-	/**
-	 * 장바구니 수정
-	 * @param param
-	 * @return void
-	 * @author xodud1202
-	 * @since 2021. 03. 01
-	 */
-	void updateCart(Cart param);
-
 	/**
 	 * 장바구니 상세 수정
 	 * @param param
@@ -299,5 +290,5 @@ public interface TsfCartDao {
 	 * @author xodud1202
 	 * @since 2021. 04. 04
 	 */
-	int updateCartGoodsQty(Order param);
+	int updateCartGoodsQty(Cart param);
 }

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

@@ -112,10 +112,20 @@ public interface TsfOrderChangeDao {
 	 * 마이페이지 교환 상품 옵션 정보 조회
 	 *
 	 * @param OrderChange
-	 * @return Collection<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);
+
 }

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

@@ -731,14 +731,18 @@ public class TsfCartService {
 
 		// 업체별 상품 합계 금액 저장
 		int compCnt = 0;
+		String delvYn;
 		Order lastCompCheck = new Order();
 		for (Order delv : delvFeeInfo) {
+			lastCompCheck = null;
 			compCnt = 0;
+			delvYn = "N";
 			for (Order param : params) {
 				if (param.getDelvFeeCd().equals(delv.getDelvFeeCd())) {
 					compCnt++;
 					if("N".equals(param.getSoldoutYn()) && "Y".equals(param.getOrdCanYn()) && param.getGoodsQty() >= param.getMinOrdQty() && param.getGoodsQty() <= param.getMaxOrdQty()) {
 						delv.setCompSumPrice(delv.getCompSumPrice() + param.getCurrPrice());
+						delvYn = "Y";
 					}
 					if (compCnt == 1) {
 						param.setFirstCompYn("Y");
@@ -749,7 +753,15 @@ public class TsfCartService {
 				}
 			}
 
-			lastCompCheck.setAddDelvFeeYn("Y");
+			if(lastCompCheck != null) {
+				// 한 업체의 마지막 상품 체크
+				lastCompCheck.setAddDelvFeeYn("Y");
+
+				// 배송 상품 존재 여부
+				lastCompCheck.setDelvYn(delvYn);
+
+				log.info("CHECK CART_SQ ::: {} / {} / {}", lastCompCheck.getCartSq(), lastCompCheck.getDelvYn(), lastCompCheck.getAddDelvFeeYn());
+			}
 		}
 
 		int wmsSumPrice = 0, wmsMinOrdAmt = 0, wmsDelvFee = 0;
@@ -787,6 +799,11 @@ public class TsfCartService {
 			} else {
 				order.setWmsDelvFee(wmsDelvFee);
 			}
+
+			// 배송 상품 존재 여부
+			if(wmsSumPrice > 0) {
+				order.setDelvYn("Y");
+			}
 		}
 	}
 
@@ -1074,7 +1091,7 @@ public class TsfCartService {
 					cartDao.deleteCartDetail(param);
 				}
 			} else {		// 동일 상품 없을 시 UPDATE
-				cartDao.updateCart(param);						// 장바구니 마스터 정보 저장
+				cartDao.updateCartGoodsQty(param);						// 장바구니 마스터 정보 저장
 				cartDao.insertCartHst(param);					// 장바구니 이력 정보 저장
 				for(int i = 0 ; i < param.getCartDtlSqArr().length ; i++) {
 					param.setItemCd(param.getItemCds()[i]);
@@ -1107,7 +1124,7 @@ public class TsfCartService {
 					cartDao.deleteCartDetail(param);			// 현재 장바구니 삭제
 				}
 			} else {
-				cartDao.updateCart(param);						// 장바구니 마스터 정보 저장
+				cartDao.updateCartGoodsQty(param);						// 장바구니 마스터 정보 저장
 				cartDao.insertCartHst(param);					// 장바구니 수정 이력 저장
 
 				param.setItemCd(param.getItemCds()[0]);
@@ -1177,14 +1194,14 @@ public class TsfCartService {
 	}
 
 	/**
-	 * 장바구니 주문하기 버튼 클릭시 재고 및 상태 체크
+	 * 장바구니 최소/최대 주문 수량으로 변경
 	 * @param Order
 	 * @return Collection<Order>
 	 * @author xodud1202
 	 * @since 2021. 04. 02
 	 */
 	@Transactional("shopTxnManager")
-	public Order updateCartGoodsQty(Order param) {
+	public Order updateCartGoodsQty(Cart param) {
 		if(TsfSession.isLogin()) {
 			param.setCustNo(TsfSession.getInfo().getCustNo());
 			param.setUpdNo(param.getCustNo());

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

@@ -318,4 +318,45 @@ 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<>();
+		List<Integer> ordDtlNoList = new ArrayList<>();
+
+		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);
+			}
+
+			ordDtlNoList.add(tmpOrderChange.getOrdDtlNo());
+			result.add(tmpOrderChange);
+		}
+
+		OrderChange oneData = result.iterator().next();
+		oneData.setOrdDtlNoArr(ordDtlNoList.stream().mapToInt(Integer::intValue).toArray());
+
+		map.set("oneData", oneData);
+		map.set("cancelDetailList", result);
+
+		return map;
+	}
+
 }

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

@@ -259,7 +259,7 @@ public class TsfCartController extends TsfBaseController {
 	 */
 	@ResponseBody
 	@PostMapping("/update/goodsQty")
-	public Order updateCartGoodsQty(@RequestBody Order param) {
+	public Order updateCartGoodsQty(@RequestBody Cart param) {
 		return cartService.updateCartGoodsQty(param);
 	}
 

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

@@ -17,6 +17,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.rest.server.GagaResponse;
+import com.gagaframework.web.rest.server.GagaResponseStatus;
 import com.style24.core.biz.service.TscCouponService;
 import com.style24.core.biz.service.TscCustomerService;
 import com.style24.core.biz.service.TscKakaoPayService;
@@ -56,10 +59,6 @@ import com.style24.persistence.domain.WishList;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.rest.server.GagaResponse;
-import com.gagaframework.web.rest.server.GagaResponseStatus;
-
 /**
  * 마이페이지 Controller
  * 
@@ -819,13 +818,9 @@ public class TsfMypageController extends TsfBaseController {
 	 * @since 2021. 02. 04
 	 */
 	@GetMapping({"/cre/list/form"})
-	public ModelAndView mypageCreListForm(@RequestBody(required = false) OrderChange orderChange) {
+	public ModelAndView mypageCreListForm() {
 		ModelAndView mav = new ModelAndView();
 
-		if (orderChange == null) {
-			orderChange = new OrderChange();
-		}
-
 		// 고객번호 설정
 		int custNo = TsfSession.getInfo().getCustNo();
 		mav.addObject("custNo", custNo);
@@ -836,7 +831,6 @@ public class TsfMypageController extends TsfBaseController {
 		mav.addObject("orderCount", coreOrderService.getOrderStatCount(order));
 
 		// 주문상세상태코드 설정
-		// mav.addObject("chgStatList", rendererService.getAvailCommonCodeList("G685"));
 		mav.addObject("chgStatList", rendererService.getCommonCodeList("G685", "Y", new String[] {"G685_10", "G685_11", "G685_19"}));
 
 		mav.setViewName(super.getDeviceViewName("mypage/MypageCreListForm"));
@@ -879,6 +873,34 @@ public class TsfMypageController extends TsfBaseController {
 		return map;
 	}
 
+	/**
+	 * 마이페이지 취반교 취소 상세 화면
+	 *
+	 * @return ModelAndView
+	 * @author card007
+	 * @since 2021. 04. 12
+	 */
+	@PostMapping({"/cre/cancel/detail/form"})
+	public ModelAndView mypageCreCancelDetailForm(OrderChange orderChange) {
+		ModelAndView mav = new ModelAndView();
+
+		// 고객번호 설정
+		int custNo = TsfSession.getInfo().getCustNo();
+		mav.addObject("custNo", custNo);
+
+		// 취소상세 데이터 조회
+		mav.addObject("cancelDetailList", orderChangeService.getCreCancelDetailInfo(orderChange));
+
+		// 주문 결제정보 조회
+		Order order = new Order();
+		order.setOrdNo(orderChange.getOrdNo());
+		mav.addObject("paymentInfo", orderService.getPaymentInfoForMypage(order));
+
+		mav.setViewName(super.getDeviceViewName("mypage/MypageCreCancelDetailForm"));
+
+		return mav;
+	}
+
 	/**
 	 * 마이페이지 STYLE24 포인트화면
 	 *

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

@@ -201,6 +201,12 @@ public class TsfOrderController extends TsfBaseController {
 		// 3.1 즉시할인, 다다익선 할인금액 정보 적용 정보
 		Collection<Order> tmtbGoodsApplyList = cartService.getMoreBetterAmtList(order);
 		
+		// 3.1.1 상품목록이 없으면 장바구니이동 
+		if (tmtbGoodsApplyList.size() < 1) {
+			mav.setViewName("redirect:/cart/list/form");		// 비회원주문서화면
+			return mav;
+		}
+		
 		// 3.2 배송정보조회(장바구니상품목록)
 		GagaMap delvOrderMap = coreOrderService.getCartDelvGoodsCntList(tmtbGoodsApplyList, order);
 		
@@ -781,6 +787,20 @@ public class TsfOrderController extends TsfBaseController {
 		// 2. 결제완료정보조회
 		GagaMap resultMap = coreOrderService.getOrderCompleteInfo(order);
 		
+		// 2.1 본인회원인 경우 체크
+		Order orderInfo = (Order) resultMap.get("orderInfo");
+		if (orderInfo.getCustNo() != 0) {
+			if (TsfSession.isLogin()) {
+				if (!TsfSession.getInfo().getCustNo().equals(orderInfo.getCustNo())) {
+					mav.setViewName("redirect:/cart/list/form");
+					return mav;
+				}
+			} else {
+				mav.setViewName("redirect:/cart/list/form");
+				return mav;
+			}
+		}
+		
 		// 3. 화면전송변수설정
 		mav.addObject("orderInfo"			, resultMap.get("orderInfo"));			// 주문기본정보
 		mav.addObject("ordSumAmt"			, resultMap.get("ordSumAmt"));			// 주문금액합계

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

@@ -25,6 +25,7 @@ import com.style24.front.biz.service.TsfCouponService;
 import com.style24.front.biz.service.TsfPlanningService;
 import com.style24.front.support.controller.TsfBaseController;
 import com.style24.front.support.security.session.TsfSession;
+import com.style24.persistence.TscPageRequest;
 import com.style24.persistence.domain.Coupon;
 import com.style24.persistence.domain.CustDeliveryAddr;
 import com.style24.persistence.domain.Customer;
@@ -238,17 +239,24 @@ public class TsfPlanningController extends TsfBaseController {
 	 * @author sowon	
 	 * @since 2021. 04. 08
 	 */
-	@GetMapping("/reply/list")
+	@PostMapping("/reply/list")
 	@ResponseBody
-	public GagaMap getReplyList(@RequestParam(value="planSq")Integer planSq) {
+	public GagaMap getReplyList(Plan plan) {
 		GagaMap result = new GagaMap();
-		Plan plan = new Plan();
-		plan.setPlanSq(planSq);
+		plan.setPlanSq(plan.getPlanSq());
 		
 		result.set("replyList",planningService.getReplyList(plan));
 		if (TsfSession.isLogin()) {
 			result.set("custNo",TsfSession.getInfo().getCustNo());
 		}
+		TscPageRequest pageable = new TscPageRequest((plan.getPageNo() > 0 ? plan.getPageNo() - 1 : 0), plan.getPageSize(), plan.getPageUnit());
+		//pageable.setTotalCount(reviewService.getCompleteReviewCount(review));
+		pageable.setTotalCount(10);
+		plan.setPageable(pageable);
+		log.info("pageable: {}", pageable);
+		log.info("totalCount {}", pageable.getTotalCount());
+		
+		result.set("paging", plan);
 		return result;
 	}
 

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

@@ -1,6 +1,7 @@
 package com.style24.front.biz.web;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mobile.device.Device;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,7 +36,7 @@ public class TsfSocialController extends TsfBaseController {
 	 * @since 2021. 3. 11
 	 */
 	@GetMapping("/main/form")
-	public ModelAndView socialMainForm(Social social) throws Exception {
+	public ModelAndView socialMainForm(Social social, Device device) throws Exception {
 		ModelAndView mav = new ModelAndView();
 		
 		// 디바이스 set

src/main/java/com/style24/persistence/domain/Social.java

@@ -65,6 +65,8 @@ public class Social extends TscBaseDomain{
 		private String afLinkCd;
 		private String optCd;
 		private String goodsType;
+		private String brandGroupNm;	//브랜드 그룹명
+		
 		
 		// 고객
 		private Integer custNo;		//고객번호

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

@@ -174,28 +174,6 @@
 		/* TsfCart.updateCartInfo : 장바구니 UPDATE */
 		UPDATE TB_CART SET
 			  GOODS_QTY = GOODS_QTY + #{goodsQty}
-			, DEAL_GOODS_CD = #{dealGoodsCd}
-			, AF_LINK_CD = #{afLinkCd}
-			, ITHR_CD = #{ithrCd}
-			, CONTENTS_LOC = #{contentsLoc}
-			, PLAN_DTL_SQ = #{planDtlSq}
-			, UPD_NO = #{updNo}
-			, UPD_DT = CURRENT_TIMESTAMP
-		WHERE CART_SQ = #{cartSq}
-		AND   GOODS_CD = #{goodsCd}
-		AND   CUST_NO = #{custNo}
-	</update>
-
-	<!-- 장바구니 UPDATE -->
-	<update id="updateCart" parameterType="Cart">
-		/* TsfCart.updateCart : 장바구니 UPDATE */
-		UPDATE TB_CART SET
-			  GOODS_QTY = #{goodsQty}
-			, DEAL_GOODS_CD = #{dealGoodsCd}
-			, AF_LINK_CD = #{afLinkCd}
-			, ITHR_CD = #{ithrCd}
-			, CONTENTS_LOC = #{contentsLoc}
-			, PLAN_DTL_SQ = #{planDtlSq}
 			, UPD_NO = #{updNo}
 			, UPD_DT = CURRENT_TIMESTAMP
 		WHERE CART_SQ = #{cartSq}

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

@@ -281,6 +281,8 @@
 			 , SUM(OD.SAVE_PNT_AMT)     AS SAVE_PNT_AMT
 			 , SUM(DF.DELV_CPN_DC_AMT)  AS DELV_CPN_DC_AMT
 			 , SUM(DF.REAL_DELV_AMT)    AS REAL_DELV_AMT
+			 , SUM(P.PAY_AMT)           AS PAY_AMT
+			 , SUM(P.NPAY_PNT_AMT)      AS NPAY_PNT_AMT
 		  FROM TB_ORDER_DETAIL OD
 		  LEFT OUTER JOIN (
 			  SELECT ORD_NO
@@ -291,7 +293,16 @@
 				 AND DELV_FEE_GB = 'G018_10'
 			   GROUP BY ORD_NO
 		  ) DF
-		  ON OD.ORD_NO = DF.ORD_NO
+		    ON OD.ORD_NO = DF.ORD_NO
+		  LEFT OUTER JOIN (
+		      SELECT ORD_NO
+		           , SUM(PAY_AMT)    AS PAY_AMT
+		           , SUM(NPAY_PNT_AMT)    AS NPAY_PNT_AMT
+		        FROM TB_PAYMENT
+		       WHERE ORD_NO = #{ordNo}
+		       GROUP BY ORD_NO
+		  ) P
+		    ON OD.ORD_NO = P.ORD_NO
 		 WHERE OD.ORD_NO = #{ordNo}
 		   AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25', 'G013_97', 'G013_98', 'G013_99')
 	</select>
@@ -382,6 +393,7 @@
 		 INNER JOIN TB_ORDER_DETAIL OD
 		    ON OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
 		   AND OD.ORD_NO = #{ordNo}
+		   AND OD.ORD_EXCH_GB = 'O'
 		<if test="supplyCompCd != null and supplyCompCd != ''">
 		   AND OD.SUPPLY_COMP_CD = #{supplyCompCd}
 		</if>
@@ -393,6 +405,7 @@
 		</if>
 		  LEFT OUTER JOIN TB_DELIVERY_LOC DL
 		    ON OD.DELV_LOC_CD = DL.DELV_LOC_CD
+		   AND DL.USE_YN = 'Y'
 		 LIMIT 1
 	</select>
 

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

@@ -747,4 +747,148 @@
 		  ) Z
 		 GROUP BY Z.ORD_CHG_SQ, Z.CHG_GB, Z.ORD_DTL_NO, Z.ORG_ORD_DTL_NO, Z.ORD_DTL_STAT
 	</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.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.LIST_PRICE
+		     , 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_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
+		  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.CPN1_DC_AMT
+		             , OD.REAL_ORD_AMT
+		             , OD.PNT_DC_AMT
+		             , OD.GFCD_USE_AMT
+		             , OCD.ORD_DTL_NO
+		             , G1.GOODS_CD
+		             , CONCAT(B.BRAND_ENM, ' ', B.BRAND_KNM)                            AS BRAND_NM
+		             , OD.SHOT_DELV_YN
+		             , G1.SELF_GOODS_YN
+		             , G1.GOODS_NM
+		             , IFNULL(C.COLOR_KNM, 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
+		             , G1.LIST_PRICE
+		             , 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_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
+		          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
+		          LEFT OUTER JOIN TB_COLOR C
+		            ON C.COLOR_CD = IFNULL(NULLIF(ODI.OPT_CD1,'') , G1.MAIN_COLOR_CD)
+		           AND C.USE_YN = 'Y'
+		          LEFT OUTER JOIN TB_REFUND R
+		            ON R.ORD_CHG_SQ = OC.ORD_CHG_SQ
+		         WHERE OCD.DEL_YN = 'N'
+		           AND O.DISP_YN = 'Y'
+		<choose>
+			<when test="custNo != null and custNo != ''">
+		           AND O.CUST_NO = #{custNo}
+			</when>
+			<otherwise>
+		           AND O.ORD_NO = #{ordNo}
+		           AND O.ORD_NM = #{orderNm}
+			</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.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.LIST_PRICE, 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_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
+		 ORDER BY Z.ORD_CHG_SQ DESC
+	</select>
 </mapper>

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

@@ -112,6 +112,9 @@
 		     , FN_GET_GOODS_NM(G.GOODS_NM,G.GOODS_GB,G.FOREIGN_BUY_YN,G.PARALLEL_IMPORT_YN,G.ORDER_MADE_YN) AS GOODS_FULL_NM /*상품FULL명*/
 		     , G.GOODS_TNM
 		     , G.GOODS_TYPE
+		     , G.BRAND_GROUP_NM
+		     , G.GOODS_NM
+		     , G.GOODS_TNM
 		     , G.MAIN_COLOR_CD
 		     , G.LIST_PRICE
 		     , FN_GET_BENEFIT_PRICE(#{frontGb},G.GOODS_CD,G.CURR_PRICE,#{custGb})                     AS CURR_PRICE    /*현재판매가*/

src/main/webapp/WEB-INF/views/mob/cart/CartChangeOptionPopupMob.html

@@ -131,7 +131,7 @@
 						<form class="form_wrap">
 							<div class="form_field">
 								<th:block th:each="color, index : ${comp.cartColorList}">
-									<div class="select_custom item_opt2 sizeList" th:classappend="|${comp.goodsCd}_${color.optCd1} sizeList${comp.goodsCd}|" th:style="${color.cartColorNm != null ? 'display:block' : 'display:none'}">
+									<div class="select_custom item_opt2 sizeList" th:classappend="|${comp.goodsCd}_${color.optCd1} sizeList${comp.goodsCd}|" th:style="${color.cartColorNm != null ? 'display:inline-block' : 'display:none'}">
 										<div class="combo">
 											<div class="select" th:classappend="|size_${comp.goodsCd}_size_nm|" th:text="${comp.optCd2}" th:data="${color.goodsCd}"></div>
 											<ul class="list setSizeSelect" th:classappend="|size_${comp.goodsCd}|" th:data="${comp.goodsCd}">
@@ -188,7 +188,7 @@
 						<form class="form_wrap">
 							<div class="form_field">
 								<th:block th:each="color, index : ${comp.cartColorList}">
-									<div class="select_custom item_opt2 sizeList" th:classappend="|${comp.goodsCd}_${color.optCd1} sizeList${comp.goodsCd}|" th:style="${color.cartColorNm != null ? 'display:block' : 'display:none'}">
+									<div class="select_custom item_opt2 sizeList" th:classappend="|${comp.goodsCd}_${color.optCd1} sizeList${comp.goodsCd}|" th:style="${color.cartColorNm != null ? 'display:inline-block' : 'display:none'}">
 										<div class="combo">
 											<div class="select" th:classappend="|size_${comp.goodsCd}_size_nm|" th:text="${comp.optCd2}" th:data="${color.goodsCd}"></div>
 											<ul class="list setSizeSelect" th:classappend="|size_${comp.goodsCd}|" th:data="${comp.goodsCd}">
@@ -292,7 +292,7 @@
 					let img = color[i].cartImgList[j];
 					if(optCd1 == img.colorCd) {
 						imgHtml += "<li>\n<span class='thumb'>\n";
-						imgHtml += "<img src='" + cart.imgPath + "/" + img.sysImgNm + "' onerror='this.src='" + [[${@environment.getProperty('domain.uximage')}]] + "/images/pc/thumb/bg_item_none.png' alt='" + img.sysImgNm + "' />\n";
+						imgHtml += "<img src='" + _uploadGoodsUrl + "/" + img.sysImgNm + "' onerror='this.src='" + [[${@environment.getProperty('domain.uximage')}]] + "/images/pc/thumb/bg_item_none.png' alt='" + img.sysImgNm + "' />\n";
 						imgHtml += "</span>\n</li>\n";
 					}
 				}

src/main/webapp/WEB-INF/views/mob/cart/CartListAjaxFormMob.html

@@ -623,611 +623,611 @@
 				<button type="button" id="btn_purchase" class="btn btn_primary"><span>구매하기 (<em class="realOrderQtyText" th:text="${order.totCartCnt}"></em>개)</span></button> <!-- 210406_ID 추가 -->
 			</div>
 		</div>
-	</form>
 
-	<!-- 쿠폰사용안내 팝업 -->
-	<div class="modal fade couponInfo_pop cartCpnInfoModal" id="couponInfoPop" tabindex="-1" role="dialog" aria-labelledby="couponInfoLabel" aria-hidden="true">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title" id="couponInfoLabel"></h5>
-				</div>
-				<div class="modal-body">
-					<div class="pop_cont">
-						<dl>
-							<div>
-								<dt>사용조건</dt>
-								<dd class="cpnCondition"></dd>
-							</div>
-							<div class="cartCpnPubLimitQty">
-								<dt>발급수량</dt>
-								<dd class="custPubLimitQtyTxt"></dd>
-							</div>
-							<div>
-								<dt>유효기간</dt>
-								<dd class="availDt"></dd>
-							</div>
-							<div>
-								<dt>대상조건</dt>
-								<dd class="refVal"></dd>
-							</div>
-						</dl>
+		<!-- 쿠폰사용안내 팝업 -->
+		<div class="modal fade couponInfo_pop cartCpnInfoModal" id="couponInfoPop" tabindex="-1" role="dialog" aria-labelledby="couponInfoLabel" aria-hidden="true">
+			<div class="modal-dialog" role="document">
+				<div class="modal-content">
+					<div class="modal-header">
+						<h5 class="modal-title" id="couponInfoLabel"></h5>
+					</div>
+					<div class="modal-body">
+						<div class="pop_cont">
+							<dl>
+								<div>
+									<dt>사용조건</dt>
+									<dd class="cpnCondition"></dd>
+								</div>
+								<div class="cartCpnPubLimitQty">
+									<dt>발급수량</dt>
+									<dd class="custPubLimitQtyTxt"></dd>
+								</div>
+								<div>
+									<dt>유효기간</dt>
+									<dd class="availDt"></dd>
+								</div>
+								<div>
+									<dt>대상조건</dt>
+									<dd class="refVal"></dd>
+								</div>
+							</dl>
+						</div>
 					</div>
 				</div>
 			</div>
+			<a href="#close-modal" rel="modal:close" id="couponInfoPop_close" class="close-modal">Close</a>
 		</div>
-		<a href="#close-modal" rel="modal:close" id="couponInfoPop_close" class="close-modal">Close</a>
-	</div>
-	<!-- //쿠폰사용안내 팝업 -->
-
-	<!-- 옵션변경 팝업 -->
-	<div id="optModifyPop01" class="popup_box optModifyPop optModifyPop01"></div>
-	<!-- //옵션변경 팝업 -->
-
-	<script th:inline="javascript">
-		let sumRealPayAmt = [[${order.sumRealPayAmt + order.totDelvFee}]];
-		let totDcAmt = [[${order.totDcAmt}]];
-		let loginInfo = [[${loginInfo}]];
-		let orderFlag = true;
-
-		$(document).ready(function() {
-			if([[${!order.shotCanYn.equals('Y')}]]) {
-				//$(".shotDelvSelect").hide();
-			}
+		<!-- //쿠폰사용안내 팝업 -->
 
-			$("#cartListForm .area_salecoupon .coupon_box").hide();
+		<!-- 옵션변경 팝업 -->
+		<div id="optModifyPop01" class="popup_box optModifyPop optModifyPop01"></div>
+		<!-- //옵션변경 팝업 -->
 
-			if(!loginInfo || loginInfo.custNo == null || loginInfo.custNo == 0) {
-				$("#cartListForm .area_salecoupon").parent().hide();
-			}
-		});
-
-		function cancelCartCpn() {
-			$("#cartListForm #sumRealPayAmt").text(Number(sumRealPayAmt).toLocaleString());
-			$("#cartListForm #totDcAmt").text(Number(totDcAmt).toLocaleString());
-			$("#cartListForm .area_salecoupon .coupon_box").hide();
-
-			$("#bottomOrderArea .realOrderAmtText").text(Number(sumRealPayAmt).toLocaleString());
-		}
-
-		function serialCpnApply() {
-			let cartArr = [];
-			let currPrices = [];
-			$("#cartListForm input[name=cartSqArr]:checked").each(function(index, item) {
-				cartArr.push($(this).val());
-				currPrices.push($(this).parents(".cartInfo").find("input[name=tmtbDcAmt]").val());
-			});
+		<script th:inline="javascript">
+			let sumRealPayAmt = [[${order.sumRealPayAmt + order.totDelvFee}]];
+			let totDcAmt = [[${order.totDcAmt}]];
+			let loginInfo = [[${loginInfo}]];
+			let orderFlag = true;
 
-			let data = {
-				rdCpnNm : $("#cartListForm #serialCpnNm").val(),
-				cartSqArr : cartArr,
-				currPrices : currPrices
-			}
+			$(document).ready(function() {
+				if([[${!order.shotCanYn.equals('Y')}]]) {
+					//$(".shotDelvSelect").hide();
+				}
 
-			let jsonData = JSON.stringify(data);
-
-			$.ajax( {
-				type: "POST",
-				url : '/cart/list/serialCpnApply',
-				contentType: 'application/json',
-				dataType : 'json',
-				data : jsonData,
-				success : function(result) {
-					if(result.serialCpnInfo.result == "SUCCESS") {
-						let cpnInfo = result.serialCpnInfo;
-						$("#cartListForm .area_salecoupon .coupon_box").show();
-
-						// 합계 금액
-						if(cartArr.length > 0) {
-							$("#cartListForm #sumRealPayAmt").text(Number(sumRealPayAmt - cpnInfo.dcAmt).toLocaleString());
-							$("#cartListForm #totDcAmt").text(Number(totDcAmt - cpnInfo.dcAmt).toLocaleString());
-							$("#bottomOrderArea .realOrderAmtText").text(Number(sumRealPayAmt - cpnInfo.dcAmt).toLocaleString());
-						}
+				$("#cartListForm .area_salecoupon .coupon_box").hide();
 
-						// 쿠폰 정보
-						$("#cartListForm .area_salecoupon .cp_name").text(cpnInfo.cpnNm);
-						$("#cartListForm .area_salecoupon .cp_condition").html(cpnInfo.cpnDesc + "<span><em class='tag'>1장 보유</em></span>");
-						$("#cartListForm .area_salecoupon .availStdt").text(cpnInfo.availStdt);
-						$("#cartListForm .area_salecoupon .availEddt").text(cpnInfo.availEddt);
-						if (cpnInfo.dcWay == "G240_10") {
-							$("#cartListForm .area_salecoupon .cp_dc_val").html("<em>" + Number(cpnInfo.dcVal).toLocaleString() + "</em> 원");
-						} else if (cpnInfo.dcWay == "G240_11") {
-							$("#cartListForm .area_salecoupon .cp_dc_val").html("<em>" + cpnInfo.dcVal + "%</em>");
-						}
+				if(!loginInfo || loginInfo.custNo == null || loginInfo.custNo == 0) {
+					$("#cartListForm .area_salecoupon").parent().hide();
+				}
+			});
 
-						let conditionComment = "", refValComment = "";
+			function cancelCartCpn() {
+				$("#cartListForm #sumRealPayAmt").text(Number(sumRealPayAmt).toLocaleString());
+				$("#cartListForm #totDcAmt").text(Number(totDcAmt).toLocaleString());
+				$("#cartListForm .area_salecoupon .coupon_box").hide();
 
-						if(cpnInfo.buyLimitAmt > 0) { conditionComment += "<span>" + Number(cpnInfo.buyLimitAmt).toLocaleString() + "</span>원 이상 구매 시 "; }
-						if(cpnInfo.maxDcAmt > 0) { conditionComment += "최대 <span>" +  Number(cpnInfo.maxDcAmt).toLocaleString() + "</span>원 할인"; }
+				$("#bottomOrderArea .realOrderAmtText").text(Number(sumRealPayAmt).toLocaleString());
+			}
 
-						if("A" == cpnInfo.applyScope) {
-							refValComment += "전체<br/>";
-						} else {
-							if(cpnInfo.refCateCnt > 0) {
-								refValComment += cpnInfo.refCateNm + " 카테고리";
-								if(cpnInfo.refCateCnt > 1) { refValComment += " 外"; }
-								refValComment += "<br/>";
-							}
-							if(cpnInfo.refSupplyCompCnt > 0) {
-								refValComment += cpnInfo.refSupplyCompNm + " 업체";
-								if(cpnInfo.refSupplyCompCnt > 1) { refValComment += " 外"; }
-								refValComment += "<br/>";
-							}
-							if(cpnInfo.refBrandCnt > 0) {
-								refValComment += cpnInfo.refBrandNm;
-								refValComment += " 브랜드";
-								if(cpnInfo.refBrandCnt > 2) { refValComment += " 外"; }
-								refValComment += "<br/>";
-							}
-							if(cpnInfo.refGoodsCnt > 0) {
-								refValComment += cpnInfo.refGoodsNm + " 상품";
-								if(cpnInfo.refGoodsCnt > 1) { refValComment += " 外"; }
-								refValComment += "<br/>";
-							}
-						}
-						refValComment += "일부상품, 특가상품 제외";
+			function serialCpnApply() {
+				let cartArr = [];
+				let currPrices = [];
+				$("#cartListForm input[name=cartSqArr]:checked").each(function(index, item) {
+					cartArr.push($(this).val());
+					currPrices.push($(this).parents(".cartInfo").find("input[name=tmtbDcAmt]").val());
+				});
 
-						$(".cartCpnInfoModal .modal-header").html('<h5 class="modal-title" id="couponInfoLabel">' + cpnInfo.cpnNm + '</h5>');
+				let data = {
+					rdCpnNm : $("#cartListForm #serialCpnNm").val(),
+					cartSqArr : cartArr,
+					currPrices : currPrices
+				}
 
-						if(conditionComment != "") { $(".cartCpnInfoModal .cpnCondition").html(conditionComment); }
-						else { $(".cartCpnInfoModal .cartCpnCondition").hide(); }
+				let jsonData = JSON.stringify(data);
+
+				$.ajax( {
+					type: "POST",
+					url : '/cart/list/serialCpnApply',
+					contentType: 'application/json',
+					dataType : 'json',
+					data : jsonData,
+					success : function(result) {
+						if(result.serialCpnInfo.result == "SUCCESS") {
+							let cpnInfo = result.serialCpnInfo;
+							$("#cartListForm .area_salecoupon .coupon_box").show();
+
+							// 합계 금액
+							if(cartArr.length > 0) {
+								$("#cartListForm #sumRealPayAmt").text(Number(sumRealPayAmt - cpnInfo.dcAmt).toLocaleString());
+								$("#cartListForm #totDcAmt").text(Number(totDcAmt - cpnInfo.dcAmt).toLocaleString());
+								$("#bottomOrderArea .realOrderAmtText").text(Number(sumRealPayAmt - cpnInfo.dcAmt).toLocaleString());
+							}
 
-						if(cpnInfo.custPubLimitQty > 0) { $(".cartCpnInfoModal .custPubLimitQtyTxt").html("1인 최대 <span>" + Number(cpnInfo.custPubLimitQty).toLocaleString() + "</span>매"); }
-						else { $(".cartCpnInfoModal .cartCpnPubLimitQty").hide(); }
+							// 쿠폰 정보
+							$("#cartListForm .area_salecoupon .cp_name").text(cpnInfo.cpnNm);
+							$("#cartListForm .area_salecoupon .cp_condition").html(cpnInfo.cpnDesc + "<span><em class='tag'>1장 보유</em></span>");
+							$("#cartListForm .area_salecoupon .availStdt").text(cpnInfo.availStdt);
+							$("#cartListForm .area_salecoupon .availEddt").text(cpnInfo.availEddt);
+							if (cpnInfo.dcWay == "G240_10") {
+								$("#cartListForm .area_salecoupon .cp_dc_val").html("<em>" + Number(cpnInfo.dcVal).toLocaleString() + "</em> 원");
+							} else if (cpnInfo.dcWay == "G240_11") {
+								$("#cartListForm .area_salecoupon .cp_dc_val").html("<em>" + cpnInfo.dcVal + "%</em>");
+							}
 
-						$(".cartCpnInfoModal .availDt").html('<span>' + cpnInfo.availStdtTime + "</span> ~ <span>" + cpnInfo.availEddtTime + "</span>");
-						$(".cartCpnInfoModal .refVal").html(refValComment);
-					} else {
-						mcxDialog.alert(result.serialCpnInfo.result);
-					}
-				}
-			});
-		}
+							let conditionComment = "", refValComment = "";
 
-		$("input[name=cartSqArr]").on("change", function(e) {
-			changeCartSqArr();
-		});
+							if(cpnInfo.buyLimitAmt > 0) { conditionComment += "<span>" + Number(cpnInfo.buyLimitAmt).toLocaleString() + "</span>원 이상 구매 시 "; }
+							if(cpnInfo.maxDcAmt > 0) { conditionComment += "최대 <span>" +  Number(cpnInfo.maxDcAmt).toLocaleString() + "</span>원 할인"; }
 
-		function changeCartSqArr() {
-			let cartArr = [];
+							if("A" == cpnInfo.applyScope) {
+								refValComment += "전체<br/>";
+							} else {
+								if(cpnInfo.refCateCnt > 0) {
+									refValComment += cpnInfo.refCateNm + " 카테고리";
+									if(cpnInfo.refCateCnt > 1) { refValComment += " 外"; }
+									refValComment += "<br/>";
+								}
+								if(cpnInfo.refSupplyCompCnt > 0) {
+									refValComment += cpnInfo.refSupplyCompNm + " 업체";
+									if(cpnInfo.refSupplyCompCnt > 1) { refValComment += " 外"; }
+									refValComment += "<br/>";
+								}
+								if(cpnInfo.refBrandCnt > 0) {
+									refValComment += cpnInfo.refBrandNm;
+									refValComment += " 브랜드";
+									if(cpnInfo.refBrandCnt > 2) { refValComment += " 外"; }
+									refValComment += "<br/>";
+								}
+								if(cpnInfo.refGoodsCnt > 0) {
+									refValComment += cpnInfo.refGoodsNm + " 상품";
+									if(cpnInfo.refGoodsCnt > 1) { refValComment += " 外"; }
+									refValComment += "<br/>";
+								}
+							}
+							refValComment += "일부상품, 특가상품 제외";
 
-			// 선택된 장바구니 번호
-			$("#cartListForm input[name=cartSqArr]:checked").each(function () {
-				cartArr.push($(this).val());
-			});
+							$(".cartCpnInfoModal .modal-header").html('<h5 class="modal-title" id="couponInfoLabel">' + cpnInfo.cpnNm + '</h5>');
 
-			// 선택된 장바구니 정보 가공
-			let data = {	cartSqArr : cartArr }
-			let jsonData = JSON.stringify(data);
-
-			$.ajax( {
-				type: "POST",
-				url : '/cart/change/goods/list',
-				contentType: 'application/json',
-				dataType : 'json',
-				data : jsonData,
-				success : function(result) {
-					fnChangeCartListInfo(result);
-				}
-			});
-		}
-
-		function fnChangeCartListInfo(order) {
-			let shotList = order.shotCartList;
-			let wmsList = order.wmsCartList;
-			let delvList = order.delvCartList;
-			let cartList = new Array();
-
-			// 다다익선 정보 숨김
-			$("#cartListForm .applyTmtb").hide();
-			$("#cartListForm .notApplyTmtb").hide();
-
-			// 장바구니 각 상품 가격 정보 할인 전으로 변경
-			$("#cartListForm .cartInfo input[name=cartSq]").each(function() {
-				if($(this).parent().find(".calc_box .price_org").text() != "") {
-					$(this).parent().find(".calc_box .price_sale").text($(this).parent().find(".calc_box .price_org").text());
-					$(this).parent().find(".calc_box .price_org").remove();
-				}
-			});
+							if(conditionComment != "") { $(".cartCpnInfoModal .cpnCondition").html(conditionComment); }
+							else { $(".cartCpnInfoModal .cartCpnCondition").hide(); }
 
-			$("#cartListForm").find(".delvFeeArea").html("<div class='info_dlvr'><span class='dlvr_fee'>배송비 무료</span></div>");
-			for(let i = 0 ; i < shotList.length ; i++) {
-				cartList.push(shotList[i]);
-				$("#cartListForm .shotCartInfo input[name=cartSq]").each(function() {
-					if(shotList[i].cartSq == $(this).val()) {
-						let shot = shotList[i];
-						$(this).parent().find(".od_moresale .applyTmtbNm > ul").html("");
-						$(this).parent().find(".od_moresale .notApplyTmtbNm > ul").html("");
-
-						// 다다익선 적용 정보 생성성
-						if(shot.qtyTmtbSq > 0 && shot.applyQtySectionYn == "Y") {
-							$(this).parent().find(".applyTmtb").show();
-						}
-						if(shot.amtTmtbSq > 0 && shot.applyAmtSectionYn == "Y") {
-							$(this).parent().find(".applyTmtb").show();
-						}
-						if(shot.qtyTmtbSq > 0 && shot.applyQtySectionYn == "N") {
-							$(this).parent().find(".notApplyTmtb").show();
-						}
-						if(shot.amtTmtbSq > 0 && shot.applyAmtSectionYn == "N") {
-							$(this).parent().find(".notApplyTmtb").show();
-						}
+							if(cpnInfo.custPubLimitQty > 0) { $(".cartCpnInfoModal .custPubLimitQtyTxt").html("1인 최대 <span>" + Number(cpnInfo.custPubLimitQty).toLocaleString() + "</span>매"); }
+							else { $(".cartCpnInfoModal .cartCpnPubLimitQty").hide(); }
 
-						// 다다익선 할인가 적용
-						if(shot.tmtbDcAmt < shot.currPrice) {
-							$(this).parent().find(".calc_box .price_sale").text(Number(shot.tmtbDcAmt).toLocaleString() + " 원");
-							$(this).parent().find(".calc_box").prepend("<p><span class='price_org'><em>" + Number(shot.currPrice).toLocaleString() + "</em>원</span></p>");
-							$(this).parent().find("input[name=tmtbDcAmt]").val(shot.tmtbDcAmt);
+							$(".cartCpnInfoModal .availDt").html('<span>' + cpnInfo.availStdtTime + "</span> ~ <span>" + cpnInfo.availEddtTime + "</span>");
+							$(".cartCpnInfoModal .refVal").html(refValComment);
+						} else {
+							mcxDialog.alert(result.serialCpnInfo.result);
 						}
 					}
 				});
 			}
 
-			for(let i = 0 ; i < wmsList.length ; i++) {
-				cartList.push(wmsList[i]);
-				$("#cartListForm .wmsCartInfo input[name=cartSq]").each(function() {
-					if(wmsList[i].cartSq == $(this).val()) {
-						let wms = wmsList[i];
-						$(this).parent().find(".od_moresale .applyTmtbNm > ul").html("");
-						$(this).parent().find(".od_moresale .notApplyTmtbNm > ul").html("");
-
-						// 다다익선 적용 정보 생성성
-						if(wms.qtyTmtbSq > 0 && wms.applyQtySectionYn == "Y") {
-							$(this).parent().find(".applyTmtb").show();
-						}
-						if(wms.amtTmtbSq > 0 && wms.applyAmtSectionYn == "Y") {
-							$(this).parent().find(".applyTmtb").show();
-						}
-						if(wms.qtyTmtbSq > 0 && wms.applyQtySectionYn == "N") {
-							$(this).parent().find(".notApplyTmtb").show();
-						}
-						if(wms.amtTmtbSq > 0 && wms.applyAmtSectionYn == "N") {
-							$(this).parent().find(".notApplyTmtb").show();
-						}
+			$("input[name=cartSqArr]").on("change", function(e) {
+				changeCartSqArr();
+			});
 
-						// 다다익선 할인가 적용
-						if(wms.tmtbDcAmt < wms.currPrice) {
-							$(this).parent().find(".calc_box .price_sale").text(Number(wms.tmtbDcAmt).toLocaleString() + " 원");
-							$(this).parent().find(".calc_box").prepend("<p><span class='price_org'><em>" + Number(wms.currPrice).toLocaleString() + "</em>원</span></p>");
-							$(this).parent().find("input[name=tmtbDcAmt]").val(wms.tmtbDcAmt);
-						}
+			function changeCartSqArr() {
+				let cartArr = [];
+
+				// 선택된 장바구니 번호
+				$("#cartListForm input[name=cartSqArr]:checked").each(function () {
+					cartArr.push($(this).val());
+				});
+
+				// 선택된 장바구니 정보 가공
+				let data = {	cartSqArr : cartArr }
+				let jsonData = JSON.stringify(data);
+
+				$.ajax( {
+					type: "POST",
+					url : '/cart/change/goods/list',
+					contentType: 'application/json',
+					dataType : 'json',
+					data : jsonData,
+					success : function(result) {
+						fnChangeCartListInfo(result);
 					}
 				});
 			}
 
-			// 자사 상품 배송비
-			if(order.wmsDelvFee == 0) {
-				$(".selfGoodsDelv").html("<span class='dlvr_fee'>배송비 무료</span>");
-			} else {
-				let html = "<span class='dlvr_fee'>배송비 <em>" + Number(order.wmsDelvFee).toLocaleString() + "</em> 원</span><a href='#' class='btn_popup_save'>배송비 SAVE 상품 보기</a>";
-				$(".selfGoodsDelv").html(html);
-			}
+			function fnChangeCartListInfo(order) {
+				let shotList = order.shotCartList;
+				let wmsList = order.wmsCartList;
+				let delvList = order.delvCartList;
+				let cartList = new Array();
+
+				// 다다익선 정보 숨김
+				$("#cartListForm .applyTmtb").hide();
+				$("#cartListForm .notApplyTmtb").hide();
+
+				// 장바구니 각 상품 가격 정보 할인 전으로 변경
+				$("#cartListForm .cartInfo input[name=cartSq]").each(function() {
+					if($(this).parent().find(".calc_box .price_org").text() != "") {
+						$(this).parent().find(".calc_box .price_sale").text($(this).parent().find(".calc_box .price_org").text());
+						$(this).parent().find(".calc_box .price_org").remove();
+					}
+				});
 
-			for(let i = 0 ; i < delvList.length ; i++) {
-				cartList.push(delvList[i]);
-				$("#cartListForm .delvList .delvCartInfo input[name=cartSq]").each(function() {
-					if(delvList[i].cartSq == $(this).val()) {
-						let delv = delvList[i];
-						$(this).parent().find(".od_moresale .applyTmtbNm > ul").html("");
-						$(this).parent().find(".od_moresale .notApplyTmtbNm > ul").html("");
-
-						// 다다익선 적용 정보 생성성
-						if(delv.qtyTmtbSq > 0 && delv.applyQtySectionYn == "Y") {
-							$(this).parent().find(".applyTmtb").show();
-						}
-						if(delv.amtTmtbSq > 0 && delv.applyAmtSectionYn == "Y") {
-							$(this).parent().find(".applyTmtb").show();
-						}
-						if(delv.qtyTmtbSq > 0 && delv.applyQtySectionYn == "N") {
-							$(this).parent().find(".notApplyTmtb").show();
-						}
-						if(delv.amtTmtbSq > 0 && delv.applyAmtSectionYn == "N") {
+				$("#cartListForm").find(".delvFeeArea").html("<div class='info_dlvr'><span class='dlvr_fee'>배송비 무료</span></div>");
+				for(let i = 0 ; i < shotList.length ; i++) {
+					cartList.push(shotList[i]);
+					$("#cartListForm .shotCartInfo input[name=cartSq]").each(function() {
+						if(shotList[i].cartSq == $(this).val()) {
+							let shot = shotList[i];
+							$(this).parent().find(".od_moresale .applyTmtbNm > ul").html("");
+							$(this).parent().find(".od_moresale .notApplyTmtbNm > ul").html("");
+
+							// 다다익선 적용 정보 생성성
+							if(shot.qtyTmtbSq > 0 && shot.applyQtySectionYn == "Y") {
+								$(this).parent().find(".applyTmtb").show();
+							}
+							if(shot.amtTmtbSq > 0 && shot.applyAmtSectionYn == "Y") {
+								$(this).parent().find(".applyTmtb").show();
+							}
+							if(shot.qtyTmtbSq > 0 && shot.applyQtySectionYn == "N") {
+								$(this).parent().find(".notApplyTmtb").show();
+							}
+							if(shot.amtTmtbSq > 0 && shot.applyAmtSectionYn == "N") {
+								$(this).parent().find(".notApplyTmtb").show();
+							}
+
+							// 다다익선 할인가 적용
+							if(shot.tmtbDcAmt < shot.currPrice) {
+								$(this).parent().find(".calc_box .price_sale").text(Number(shot.tmtbDcAmt).toLocaleString() + " 원");
+								$(this).parent().find(".calc_box").prepend("<p><span class='price_org'><em>" + Number(shot.currPrice).toLocaleString() + "</em>원</span></p>");
+								$(this).parent().find("input[name=tmtbDcAmt]").val(shot.tmtbDcAmt);
+							}
 						}
+					});
+				}
 
-						// 다다익선 할인가 적용
-						if(delv.tmtbDcAmt < delv.currPrice) {
-							$(this).parent().find(".calc_box .price_sale").text(Number(delv.tmtbDcAmt).toLocaleString() + " 원");
-							$(this).parent().find(".calc_box").prepend("<p><span class='price_org'><em>" + Number(delv.currPrice).toLocaleString() + "</em>원</span></p>");
-							$(this).parent().find("input[name=tmtbDcAmt]").val(delv.tmtbDcAmt);
+				for(let i = 0 ; i < wmsList.length ; i++) {
+					cartList.push(wmsList[i]);
+					$("#cartListForm .wmsCartInfo input[name=cartSq]").each(function() {
+						if(wmsList[i].cartSq == $(this).val()) {
+							let wms = wmsList[i];
+							$(this).parent().find(".od_moresale .applyTmtbNm > ul").html("");
+							$(this).parent().find(".od_moresale .notApplyTmtbNm > ul").html("");
+
+							// 다다익선 적용 정보 생성성
+							if(wms.qtyTmtbSq > 0 && wms.applyQtySectionYn == "Y") {
+								$(this).parent().find(".applyTmtb").show();
+							}
+							if(wms.amtTmtbSq > 0 && wms.applyAmtSectionYn == "Y") {
+								$(this).parent().find(".applyTmtb").show();
+							}
+							if(wms.qtyTmtbSq > 0 && wms.applyQtySectionYn == "N") {
+								$(this).parent().find(".notApplyTmtb").show();
+							}
+							if(wms.amtTmtbSq > 0 && wms.applyAmtSectionYn == "N") {
+								$(this).parent().find(".notApplyTmtb").show();
+							}
+
+							// 다다익선 할인가 적용
+							if(wms.tmtbDcAmt < wms.currPrice) {
+								$(this).parent().find(".calc_box .price_sale").text(Number(wms.tmtbDcAmt).toLocaleString() + " 원");
+								$(this).parent().find(".calc_box").prepend("<p><span class='price_org'><em>" + Number(wms.currPrice).toLocaleString() + "</em>원</span></p>");
+								$(this).parent().find("input[name=tmtbDcAmt]").val(wms.tmtbDcAmt);
+							}
 						}
+					});
+				}
 
-						if(delv.delvFee == 0) {
-							$(".delvList").find(".delv_" + delv.delvFeeCd).html("<span class='dlvr_fee'>배송비 무료</span><span class='dlvr_fee'><em>" + delv.supplyCompNm + "</em> 업체직배송</span>");
-						} else {
-							let html = "<div className='order_delivery'><span class='dlvr_fee'>배송비 <em>" + Number(delv.delvFee).toLocaleString() + "</em>원</span><span class='dlvr_shop'><em>" + delv.supplyCompNm + "</em> 업체직배송</span><a href='#' className='btn_popup_save'>배송비 SAVE 상품 보기</a></div>";
-							$(".delvList").find(".delv_" + delv.delvFeeCd).html(html);
+				// 자사 상품 배송비
+				if(order.wmsDelvFee == 0) {
+					$(".selfGoodsDelv").html("<span class='dlvr_fee'>배송비 무료</span>");
+				} else {
+					let html = "<span class='dlvr_fee'>배송비 <em>" + Number(order.wmsDelvFee).toLocaleString() + "</em> 원</span><a href='#' class='btn_popup_save'>배송비 SAVE 상품 보기</a>";
+					$(".selfGoodsDelv").html(html);
+				}
+
+				for(let i = 0 ; i < delvList.length ; i++) {
+					cartList.push(delvList[i]);
+					$("#cartListForm .delvList .delvCartInfo input[name=cartSq]").each(function() {
+						if(delvList[i].cartSq == $(this).val()) {
+							let delv = delvList[i];
+							$(this).parent().find(".od_moresale .applyTmtbNm > ul").html("");
+							$(this).parent().find(".od_moresale .notApplyTmtbNm > ul").html("");
+
+							// 다다익선 적용 정보 생성성
+							if(delv.qtyTmtbSq > 0 && delv.applyQtySectionYn == "Y") {
+								$(this).parent().find(".applyTmtb").show();
+							}
+							if(delv.amtTmtbSq > 0 && delv.applyAmtSectionYn == "Y") {
+								$(this).parent().find(".applyTmtb").show();
+							}
+							if(delv.qtyTmtbSq > 0 && delv.applyQtySectionYn == "N") {
+								$(this).parent().find(".notApplyTmtb").show();
+							}
+							if(delv.amtTmtbSq > 0 && delv.applyAmtSectionYn == "N") {
+							}
+
+							// 다다익선 할인가 적용
+							if(delv.tmtbDcAmt < delv.currPrice) {
+								$(this).parent().find(".calc_box .price_sale").text(Number(delv.tmtbDcAmt).toLocaleString() + " 원");
+								$(this).parent().find(".calc_box").prepend("<p><span class='price_org'><em>" + Number(delv.currPrice).toLocaleString() + "</em>원</span></p>");
+								$(this).parent().find("input[name=tmtbDcAmt]").val(delv.tmtbDcAmt);
+							}
+
+							if(delv.delvFee == 0) {
+								$(".delvList").find(".delv_" + delv.delvFeeCd).html("<span class='dlvr_fee'>배송비 무료</span><span class='dlvr_fee'><em>" + delv.supplyCompNm + "</em> 업체직배송</span>");
+							} else {
+								let html = "<div className='order_delivery'><span class='dlvr_fee'>배송비 <em>" + Number(delv.delvFee).toLocaleString() + "</em>원</span><span class='dlvr_shop'><em>" + delv.supplyCompNm + "</em> 업체직배송</span><a href='#' className='btn_popup_save'>배송비 SAVE 상품 보기</a></div>";
+								$(".delvList").find(".delv_" + delv.delvFeeCd).html(html);
+							}
 						}
-					}
-				});
-			}
+					});
+				}
 
-			// 결제 총액 영역 수정
-			$("#cartListForm .checkSelectCartListCnt").text(Number(order.totCartCnt).toLocaleString());
-			$("#cartListForm .sumListPrice").text(Number(order.sumListPrice).toLocaleString());
-			$("#cartListForm .totDelvFee").text(Number(order.totDelvFee).toLocaleString());
-			sumRealPayAmt = order.sumRealPayAmt + order.totDelvFee;
-			totDcAmt = order.totDcAmt;
-
-			// 하단 구매하기 버튼 수량 및 금액 변경
-			$("#bottomOrderArea .realOrderQtyText").text(Number(order.totCartCnt).toLocaleString());
-			$("#bottomOrderArea .realOrderAmtText").text(Number(sumRealPayAmt).toLocaleString());
-
-			// 할인코드 쿠폰 금액 재확인
-			if($("#cartListForm #serialCpnNm").val()) {
-				serialCpnApply();
-			} else {
-				$("#cartListForm .totDcAmt").text(Number(totDcAmt).toLocaleString());
-				$("#cartListForm .sumRealPayAmt").text(Number(sumRealPayAmt).toLocaleString());
-				cancelCartCpn();
-			}
-		}
+				// 결제 총액 영역 수정
+				$("#cartListForm .checkSelectCartListCnt").text(Number(order.totCartCnt).toLocaleString());
+				$("#cartListForm .sumListPrice").text(Number(order.sumListPrice).toLocaleString());
+				$("#cartListForm .totDelvFee").text(Number(order.totDelvFee).toLocaleString());
+				sumRealPayAmt = order.sumRealPayAmt + order.totDelvFee;
+				totDcAmt = order.totDcAmt;
+
+				// 하단 구매하기 버튼 수량 및 금액 변경
+				$("#bottomOrderArea .realOrderQtyText").text(Number(order.totCartCnt).toLocaleString());
+				$("#bottomOrderArea .realOrderAmtText").text(Number(sumRealPayAmt).toLocaleString());
 
-		function fnOrderValidation(list, listIndex, cartSqArr, allYn) {
-			// listIndex가 -1이면 (마지막이 지난후)
-			if(listIndex ==  - 1) {
-				if(allYn == "Y" && orderFlag) {
-					$("#cartListForm").submit();
+				// 할인코드 쿠폰 금액 재확인
+				if($("#cartListForm #serialCpnNm").val()) {
+					serialCpnApply();
 				} else {
-					if(orderFlag) {
-						let html	 = "<input type='hidden' name='cartSqArr' value='" + cartSqArr + "' />";
-						html		+= "<input type='hidden' name='shotDelvUseYn' value='" + $("input[name=shotDelvUseYn]:checked").val() + "' />";
-						$("#cartInfoForm").html(html);
-						$("#cartInfoForm").submit();
-					}
+					$("#cartListForm .totDcAmt").text(Number(totDcAmt).toLocaleString());
+					$("#cartListForm .sumRealPayAmt").text(Number(sumRealPayAmt).toLocaleString());
+					cancelCartCpn();
 				}
 			}
 
-			let info = list[listIndex];
-			let removeCartSq = 0, updateCartSq = 0, goodsQty = 0;
-			listIndex++;
-
-			// list[listIndex]가 null이 아니라면
-			if(info != null) {
-				if (info.ordCanYn == "N") {		// 주문 불가
-					let message = info.goodsNm + " 상품은 구매 할 수 없습니다. 제외하고 계속 주문하시겠습니까?";
-					fnRemoveCartSqConfirm(message, cartSqArr, info.cartSq, list, listIndex, allYn);
-				} else if (info.soldoutYn == "Y") {		// 품절
-					if (info.goodsStat == "G008_70" || info.ordCanQty < info.minOrdQty) {		// 상품 상태가 품절이거나 주문 가능 수량이 최소주문수량보다 적을경우
-						let message = info.goodsNm + " 상품은 품절입니다. 제외하고 계속 주문하시겠습니까?";
-						fnRemoveCartSqConfirm(message, cartSqArr, info.cartSq, list, listIndex, allYn)
-					} else if (info.goodsQty < info.ordCanQty) {		// 주문 가능 수량이 0일경우
-						let message = info.goodsNm + "의 " + info.colorNm + " 옵션이 품절되었습니다. 제외하고 계속 주문하시겠습니까?";
-						fnRemoveCartSqConfirm(message, cartSqArr, info.cartSq, list, listIndex, allYn)
+			function fnOrderValidation(list, listIndex, cartSqArr, allYn) {
+				// listIndex가 -1이면 (마지막이 지난후)
+				if(listIndex ==  - 1) {
+					if(allYn == "Y" && orderFlag) {
+						$("#cartListForm").submit();
+					} else {
+						if(orderFlag) {
+							let html	 = "<input type='hidden' name='cartSqArr' value='" + cartSqArr + "' />";
+							html		+= "<input type='hidden' name='shotDelvUseYn' value='" + $("input[name=shotDelvUseYn]:checked").val() + "' />";
+							$("#cartInfoForm").html(html);
+							$("#cartInfoForm").submit();
+						}
+					}
+				}
+
+				let info = list[listIndex];
+				let removeCartSq = 0, updateCartSq = 0, goodsQty = 0;
+				listIndex++;
+
+				// list[listIndex]가 null이 아니라면
+				if(info != null) {
+					if (info.ordCanYn == "N") {		// 주문 불가
+						let message = info.goodsNm + " 상품은 구매 할 수 없습니다. 제외하고 계속 주문하시겠습니까?";
+						fnRemoveCartSqConfirm(message, cartSqArr, info.cartSq, list, listIndex, allYn);
+					} else if (info.soldoutYn == "Y") {		// 품절
+						if (info.goodsStat == "G008_70" || info.ordCanQty < info.minOrdQty) {		// 상품 상태가 품절이거나 주문 가능 수량이 최소주문수량보다 적을경우
+							let message = info.goodsNm + " 상품은 품절입니다. 제외하고 계속 주문하시겠습니까?";
+							fnRemoveCartSqConfirm(message, cartSqArr, info.cartSq, list, listIndex, allYn)
+						} else if (info.goodsQty < info.ordCanQty) {		// 주문 가능 수량이 0일경우
+							let message = info.goodsNm + "의 " + info.colorNm + " 옵션이 품절되었습니다. 제외하고 계속 주문하시겠습니까?";
+							fnRemoveCartSqConfirm(message, cartSqArr, info.cartSq, list, listIndex, allYn)
+						} else if (listIndex < list.length) {
+							// 혹시 else일 경우
+							fnOrderValidation(list, listIndex, cartSqArr, allYn);
+						}
+					} else if (info.ordCanQty < info.goodsQty) {		// 최소 주문 수량보다 장바구니에 적게 들어왔을 경우
+						let message;
+						if ("G056_S" == info.goodsType) {
+							message = info.goodsNm + " 의" + info.itemNm + "/" + info.colorNm + "/" + info.optCd2 + "의 수량이 부족합니다.\n구매가능 수량은 " + info.ordCanQty + "개입니다.\n구매가능 수량만큼 주문하시겠습니까?";
+						} else {
+							message = info.goodsNm + " 의" + info.colorNm + "/" + info.optCd2 + "의 수량이 부족합니다.\n구매가능 수량은 " + info.ordCanQty + "개입니다.\n구매가능 수량만큼 주문하시겠습니까?";
+						}
+
+						fnUpdateConfirmChangeQty(message, info.cartSq, info.minOrdQty, list, listIndex, cartSqArr, allYn);
+					} else if (info.goodsQty < info.minOrdQty) {
+						let message = info.goodsNm + " 의 최소 구매수량은 " + info.minOrdQty + "개입니다.\n최소 구매 수량으로 주문하시겠습니까?";
+						fnUpdateConfirmChangeQty(message, info.cartSq, info.minOrdQty, list, listIndex, cartSqArr, allYn);
+					} else if (info.goodsQty > info.maxOrdQty) {
+						let message = info.goodsNm + " 의 최대 구매 사능 수량은 " + info.maxOrdQty + "개입니다. 최대 구매 가능한 수량으로 주문하시겠습니까?";
+						fnUpdateConfirmChangeQty(message, info.cartSq, info.minOrdQty, list, listIndex, cartSqArr, allYn);
 					} else if (listIndex < list.length) {
-						// 혹시 else일 경우
 						fnOrderValidation(list, listIndex, cartSqArr, allYn);
-					}
-				} else if (info.ordCanQty < info.goodsQty) {		// 최소 주문 수량보다 장바구니에 적게 들어왔을 경우
-					let message;
-					if ("G056_S" == info.goodsType) {
-						message = info.goodsNm + " 의" + info.itemNm + "/" + info.colorNm + "/" + info.optCd2 + "의 수량이 부족합니다.\n구매가능 수량은 " + info.ordCanQty + "개입니다.\n구매가능 수량만큼 주문하시겠습니까?";
 					} else {
-						message = info.goodsNm + " 의" + info.colorNm + "/" + info.optCd2 + "의 수량이 부족합니다.\n구매가능 수량은 " + info.ordCanQty + "개입니다.\n구매가능 수량만큼 주문하시겠습니까?";
+						fnOrderValidation(list, -1, cartSqArr, allYn);
 					}
-
-					fnUpdateConfirmChangeQty(message, info.cartSq, info.minOrdQty, list, listIndex, cartSqArr, allYn);
-				} else if (info.goodsQty < info.minOrdQty) {
-					let message = info.goodsNm + " 의 최소 구매수량은 " + info.minOrdQty + "개입니다.\n최소 구매 수량으로 주문하시겠습니까?";
-					fnUpdateConfirmChangeQty(message, info.cartSq, info.minOrdQty, list, listIndex, cartSqArr, allYn);
-				} else if (info.goodsQty > info.maxOrdQty) {
-					let message = info.goodsNm + " 의 최대 구매 사능 수량은 " + info.maxOrdQty + "개입니다. 최대 구매 가능한 수량으로 주문하시겠습니까?";
-					fnUpdateConfirmChangeQty(message, info.cartSq, info.minOrdQty, list, listIndex, cartSqArr, allYn);
-				} else if (listIndex < list.length) {
-					fnOrderValidation(list, listIndex, cartSqArr, allYn);
 				} else {
 					fnOrderValidation(list, -1, cartSqArr, allYn);
 				}
-			} else {
-				fnOrderValidation(list, -1, cartSqArr, allYn);
 			}
-		}
-
-		function fnUpdateConfirmChangeQty(message, cartSq, goodsQty, list, listIndex, cartSqArr, allYn) {
-			mcxDialog.confirmC(message, { //내용
-				btn     : ["취소", "확인"],
-				btnClick: function (index) {
-					if (index == 1) { //button1 일때 처리문
-						orderFlag = false; return false;
-					} else {	//button2 일때 처리문
-						updateGoodsQty(cartSq, goodsQty);
-						fnOrderValidation(list, listIndex, cartSqArr, allYn);
+
+			function fnUpdateConfirmChangeQty(message, cartSq, goodsQty, list, listIndex, cartSqArr, allYn) {
+				mcxDialog.confirmC(message, { //내용
+					btn     : ["취소", "확인"],
+					btnClick: function (index) {
+						if (index == 1) { //button1 일때 처리문
+							orderFlag = false; return false;
+						} else {	//button2 일때 처리문
+							updateGoodsQty(cartSq, goodsQty);
+							fnOrderValidation(list, listIndex, cartSqArr, allYn);
+						}
 					}
-				}
-			});
-		}
-
-		function fnRemoveCartSqConfirm(message, cartSqArr, cartSq, list, listIndex, allYn) {
-			mcxDialog.confirmC(message, { //내용
-				btn     : ["취소", "확인"],
-				btnClick: function (index) {
-					if (index == 1) { //button1 일때 처리문
-						orderFlag = false; return false;
-					} else {	//button2 일때 처리문
-						fnCheckOffCartSqArr(cartSqArr, info.cartSq);
-						fnOrderValidation(list, listIndex, cartSqArr, allYn);
+				});
+			}
+
+			function fnRemoveCartSqConfirm(message, cartSqArr, cartSq, list, listIndex, allYn) {
+				mcxDialog.confirmC(message, { //내용
+					btn     : ["취소", "확인"],
+					btnClick: function (index) {
+						if (index == 1) { //button1 일때 처리문
+							orderFlag = false; return false;
+						} else {	//button2 일때 처리문
+							fnCheckOffCartSqArr(cartSqArr, info.cartSq);
+							fnOrderValidation(list, listIndex, cartSqArr, allYn);
+						}
 					}
-				}
-			});
-		}
+				});
+			}
 
-		function fnCheckOffCartSqArr(cartSqArr, cartSq) {
-			// 체크박스 해제
-			$("#cartListForm input[name=cartSqArr]").each(function () {
-				if ($(this).val() == cartSq) {
-					$(this).prop("checked", false);
-				}
-			});
+			function fnCheckOffCartSqArr(cartSqArr, cartSq) {
+				// 체크박스 해제
+				$("#cartListForm input[name=cartSqArr]").each(function () {
+					if ($(this).val() == cartSq) {
+						$(this).prop("checked", false);
+					}
+				});
 
-			// 장바구니 선택된것 삭제 > cartSq 0으로 변경
-			for (let i = 0; i < cartSqArr.length; i++) {
-				if (cartSqArr[i] == cartSq) {
-					cartSqArr[i] = 0;
+				// 장바구니 선택된것 삭제 > cartSq 0으로 변경
+				for (let i = 0; i < cartSqArr.length; i++) {
+					if (cartSqArr[i] == cartSq) {
+						cartSqArr[i] = 0;
+					}
 				}
 			}
-		}
 
-		// 주문하기
-		function fnSubmitNoMember(cartSq) {
-			let cartSqArr = [];
-			orderFlag = true;
+			// 주문하기
+			function fnSubmitNoMember(cartSq) {
+				let cartSqArr = [];
+				orderFlag = true;
 
-			if($("#cartListForm input[name=cartSqArr]:checked").length < 1) {
-				mcxDialog.alert("구매하실 상품을 선택해주세요.");
-				return false;
-			}
+				if($("#cartListForm input[name=cartSqArr]:checked").length < 1) {
+					mcxDialog.alert("구매하실 상품을 선택해주세요.");
+					return false;
+				}
 
-			if(loginInfo == null || loginInfo.custNo == null || loginInfo.custNo == 0) {
-				var btn = ["비회원 구매", "로그인 후 구매"];
-				mcxDialog.confirmC("로그인 후 구매 시 다양한 혜택을 받으실 수 있습니다.", { //내용
-					btn: btn,
-					btnClick: function(index){
-						if (index == 1){ //button1 일때 처리문
-							if(cartSq == "all") {
-								// 선택된 장바구니 번호
-								$("#cartListForm input[name=cartSqArr]:checked").each(function () {
-									cartSqArr.push($(this).val());
-								});
-
-								fnOrderCheck(cartSqArr, 0, "Y");
-							} else {
-								fnOrderCheck(cartSq, 0, "N");
+				if(loginInfo == null || loginInfo.custNo == null || loginInfo.custNo == 0) {
+					var btn = ["비회원 구매", "로그인 후 구매"];
+					mcxDialog.confirmC("로그인 후 구매 시 다양한 혜택을 받으실 수 있습니다.", { //내용
+						btn: btn,
+						btnClick: function(index){
+							if (index == 1){ //button1 일때 처리문
+								if(cartSq == "all") {
+									// 선택된 장바구니 번호
+									$("#cartListForm input[name=cartSqArr]:checked").each(function () {
+										cartSqArr.push($(this).val());
+									});
+
+									fnOrderCheck(cartSqArr, 0, "Y");
+								} else {
+									fnOrderCheck(cartSq, 0, "N");
+								}
+							} else {	//button2 일때 처리문
+								location.href="/signin";
 							}
-						} else {	//button2 일때 처리문
-							location.href="/signin";
 						}
-					}
-				});
-			} else {
-				if(cartSq == "all") {
-					// 선택된 장바구니 번호
-					$("#cartListForm input[name=cartSqArr]:checked").each(function () {
-						cartSqArr.push($(this).val());
 					});
-
-					fnOrderCheck(cartSqArr, loginInfo.custNo, "Y");
 				} else {
-					fnOrderCheck(cartSq, loginInfo.custNo, "N");
+					if(cartSq == "all") {
+						// 선택된 장바구니 번호
+						$("#cartListForm input[name=cartSqArr]:checked").each(function () {
+							cartSqArr.push($(this).val());
+						});
+
+						fnOrderCheck(cartSqArr, loginInfo.custNo, "Y");
+					} else {
+						fnOrderCheck(cartSq, loginInfo.custNo, "N");
+					}
 				}
 			}
-		}
 
-		// 주문 데이터 밸리데이션 체크
-		function fnOrderCheck(cartSq, custNo, allYn) {
-			// 선택된 장바구니 정보 가공
-			let data = {	  cartSqArr : cartSq
-				, custNo : custNo
+			// 주문 데이터 밸리데이션 체크
+			function fnOrderCheck(cartSq, custNo, allYn) {
+				// 선택된 장바구니 정보 가공
+				let data = {	  cartSqArr : cartSq
+					, custNo : custNo
+				}
+				let jsonData = JSON.stringify(data);
+
+				$.ajax( {
+					type: "POST",
+					url : '/cart/order/list/check',
+					contentType: 'application/json',
+					dataType : 'json',
+					data : jsonData,
+					success : function(result) {
+						if(result == null || result.length == 0) {
+							mcxDialog.alert("주문 가능한 상품이 존재하지 않습니다. 새로고침 후 다시 시도해주세요.");
+						} else {
+							fnOrderValidation(result, 0, cartSq, allYn);
+						}
+					}
+				});
 			}
-			let jsonData = JSON.stringify(data);
-
-			$.ajax( {
-				type: "POST",
-				url : '/cart/order/list/check',
-				contentType: 'application/json',
-				dataType : 'json',
-				data : jsonData,
-				success : function(result) {
-					if(result == null || result.length == 0) {
-						mcxDialog.alert("주문 가능한 상품이 존재하지 않습니다. 새로고침 후 다시 시도해주세요.");
-					} else {
-						fnOrderValidation(result, 0, cartSq, allYn);
+
+			//옵션변경 팝업열기
+			function fnChangeCartOptCd(cartSq) {
+				$.ajax( {
+					type: "POST",
+					url : '/cart/goods/info',
+					dataType : 'html',
+					data : {cartSq : cartSq},
+					success : function(result) {
+						$("#cartOptionModal").remove();
+						$("#optModifyPop01").html(result);
+						$('#optModifyPop01').show().addClass("active");
+						$("body").css({"overflow":"hidden"});
 					}
+				});
+			}
+
+			// 장바구니 구매 수량 변경
+			function updateGoodsQty(cartSq, goodsQty) {
+				let url = '/cart/update/goodsQty';
+				// 선택된 장바구니 정보 가공
+				let data = {	  cartSq : cartSq
+					, goodsQty : goodsQty
 				}
-			});
-		}
-
-		//옵션변경 팝업열기
-		function fnChangeCartOptCd(cartSq) {
-			$.ajax( {
-				type: "POST",
-				url : '/cart/goods/info',
-				dataType : 'html',
-				data : {cartSq : cartSq},
-				success : function(result) {
-					$("#cartOptionModal").remove();
-					$("#optModifyPop01").html(result);
-					$('#optModifyPop01').show().addClass("active");
-					$("body").css({"overflow":"hidden"});
+				let jsonData = JSON.stringify(data);
+
+				gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
+					//alert(result.changeQty);
+				});
+			}
+
+			// 페이지 이동
+			function fnGoToGoodsDetail(goodsCd) {
+				cfnGoToPage(_PAGE_GOODS_DETAIL + goodsCd);
+			}
+
+			// 전체선택 버튼
+			$("#od_item_all").on("change", function() {
+				if($("#od_item_all").is(":checked")) {
+					$("input[name=cartSqArr]").prop("checked", true);
+					changeCartSqArr();
+				} else {
+					$("input[name=cartSqArr]").prop("checked", false);
+					// 하단 합계금액, 구매하기 수량 변경
+					$("#cartListForm .realOrderAmtText").text("0");
+					$("#cartListForm .realOrderQtyText").text("0");
+					$("#cartListForm .area_order .number").text("0");
+					$("#cartListForm .od_amount_box .sumListPrice").text("0");
+					$("#cartListForm .od_amount_box .totDelvFee").text("0");
+					$("#cartListForm .od_amount_box .totDcAmt").text("0");
+					$("#cartListForm .totalprice_box .sumRealPayAmt").text("0");
 				}
 			});
-		}
-
-		// 장바구니 구매 수량 변경
-		function updateGoodsQty(cartSq, goodsQty) {
-			let url = '/cart/update/goodsQty';
-			// 선택된 장바구니 정보 가공
-			let data = {	  cartSq : cartSq
-				, goodsQty : goodsQty
-			}
-			let jsonData = JSON.stringify(data);
 
-			gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-				//alert(result.changeQty);
+			//수량조절 이벤트
+			$(document).on('click','.optModifyPop01 .number_count .minus',function(e){
+				var $input = $(this).parent().find('input');
+				var count = parseInt($input.val()) - 1;
+				count = count < 1 ? 1 : count;
+				$input.val(count);
+				$input.change();
+				//수량1개 이하 감소버튼 비활성화
+				if ($input.val() == 1) {
+					$('.optModifyPop01 .number_count .minus').addClass('min_val');
+				}
+				return false;
+			}).on('click','.optModifyPop01 .number_count .plus',function(e){
+				var $input = $(this).parent().find('input');
+				$input.val(parseInt($input.val()) + 1);
+				$input.change();
+				//수량2개 이상부터 감소버튼 활성화
+				$('.optModifyPop01 .number_count .minus').removeClass('min_val');
+				return false;
+			}).on('keyup','.optModifyPop01 .number_count input[type=text]',function(e){
+				//텍스트, 0 입력금지
+				$(this).val($(this).val().replace(/[^1-9]/g,""));
 			});
-		}
 
-		// 페이지 이동
-		function fnGoToGoodsDetail(goodsCd) {
-			cfnGoToPage(_PAGE_GOODS_DETAIL + goodsCd);
-		}
+			/* 팝업 - 옵션변경 > 컬러선택 표기 */
+			$(document).on('click','.optModifyPop .opt_color ul li a',function(e){
+				$(this).parents('.opt_color').find('li a').removeClass('on');
+				$(this).addClass('on');
+				var optColor = $('.optModifyPop .opt_color ul li a.on img').attr('alt');
+				$('.optModify_pop .opt_color .opt_header .color').text(optColor);
+				return false;
+			});
 
-		// 전체선택 버튼
-		$("#od_item_all").on("change", function() {
-			if($("#od_item_all").is(":checked")) {
-				$("input[name=cartSqArr]").prop("checked", true);
-				changeCartSqArr();
-			} else {
-				$("input[name=cartSqArr]").prop("checked", false);
-				// 하단 합계금액, 구매하기 수량 변경
-				$("#cartListForm .realOrderAmtText").text("0");
-				$("#cartListForm .realOrderQtyText").text("0");
-				$("#cartListForm .area_order .number").text("0");
-				$("#cartListForm .od_amount_box .sumListPrice").text("0");
-				$("#cartListForm .od_amount_box .totDelvFee").text("0");
-				$("#cartListForm .od_amount_box .totDcAmt").text("0");
-				$("#cartListForm .totalprice_box .sumRealPayAmt").text("0");
+			/* 쿠폰정보 닫기 */
+			function cancelCartCpn() {
+				$("#cartListForm #sumRealPayAmt").text(Number(sumRealPayAmt).toLocaleString());
+				$("#cartListForm #totDcAmt").text(Number(totDcAmt).toLocaleString());
+				$("#cartListForm .area_salecoupon .coupon_box").hide();
 			}
-		});
-
-		//수량조절 이벤트
-		$(document).on('click','.optModifyPop01 .number_count .minus',function(e){
-			var $input = $(this).parent().find('input');
-			var count = parseInt($input.val()) - 1;
-			count = count < 1 ? 1 : count;
-			$input.val(count);
-			$input.change();
-			//수량1개 이하 감소버튼 비활성화
-			if ($input.val() == 1) {
-				$('.optModifyPop01 .number_count .minus').addClass('min_val');
-			}
-			return false;
-		}).on('click','.optModifyPop01 .number_count .plus',function(e){
-			var $input = $(this).parent().find('input');
-			$input.val(parseInt($input.val()) + 1);
-			$input.change();
-			//수량2개 이상부터 감소버튼 활성화
-			$('.optModifyPop01 .number_count .minus').removeClass('min_val');
-			return false;
-		}).on('keyup','.optModifyPop01 .number_count input[type=text]',function(e){
-			//텍스트, 0 입력금지
-			$(this).val($(this).val().replace(/[^1-9]/g,""));
-		});
-
-		/* 팝업 - 옵션변경 > 컬러선택 표기 */
-		$(document).on('click','.optModifyPop .opt_color ul li a',function(e){
-			$(this).parents('.opt_color').find('li a').removeClass('on');
-			$(this).addClass('on');
-			var optColor = $('.optModifyPop .opt_color ul li a.on img').attr('alt');
-			$('.optModify_pop .opt_color .opt_header .color').text(optColor);
-			return false;
-		});
-
-		/* 쿠폰정보 닫기 */
-		function cancelCartCpn() {
-			$("#cartListForm #sumRealPayAmt").text(Number(sumRealPayAmt).toLocaleString());
-			$("#cartListForm #totDcAmt").text(Number(totDcAmt).toLocaleString());
-			$("#cartListForm .area_salecoupon .coupon_box").hide();
-		}
-	</script>
+		</script>
+	</form>
 </th:block>
 </body>
 </html>

src/main/webapp/WEB-INF/views/mob/cart/CartListFormMob.html

@@ -104,6 +104,15 @@
 		//배송요청사항
 		// var my_deilivery_selecter = new sCombo('.my .ship_request .select_custom');
 
+		//상품옵션변경 팝업 > 컬러선택 표기
+		$(document).on('click','.optModifyPop .opt_color ul li a',function(e){
+			$(this).parents('.opt_color').find('li a').removeClass('on');
+			$(this).addClass('on');
+			var optColor = $(this).find("img").attr('alt');
+			$(this).parent().parent().parent().find(".info").text(optColor);
+			return false;
+		});
+
 		//상품옵션변경 팝업 > 컬러선택 표기
 		$(document).on('change','input[name=shotDelvUseYn]',function(e){
 			let data = {shotDelvUseYn : $("input[name=shotDelvUseYn]:checked").val()};

src/main/webapp/WEB-INF/views/mob/order/OrderCompleteMob.html

@@ -0,0 +1,454 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="mob/common/layout/SubLayoutMob">
+<!--
+ *******************************************************************************
+ * @source  : OrderCompleteMob.html
+ * @desc    : 주문완료 Page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.04.12   jsh77b     최초 작성
+ *******************************************************************************
+ -->
+<body>
+<th:block layout:fragment="content">
+<main role="" id="" class="container od">
+	<section class="content completed">
+		<div class="inner wide">
+			<div class="info_complete">
+				<img src="/images/mo/ico_complete_check.png" alt="주문이 완료 되었습니다.">
+				<p class="txt_box">주문이 완료되었습니다.</p>
+				<dl class="report_box">
+					<div>
+						<dt>주문번호</dt>
+						<dd><span th:text="${orderInfo.ordNo}"></span></dd>
+					</div>
+				</dl>
+			</div>
+		</div>
+		<!-- 무통장입금 결제시 -->
+		<th:block th:if="${orderInfo.payMeans} == 'G014_20'">
+			<div class="inner">
+				<div class="tbl_wrap">
+					<div class="tbl_tit"> 
+						<h3>무통장 입금 정보</h3>
+					</div>
+					<div class="tbl type1">
+						<table>
+							<colgroup>
+								<col width="107">
+								<col width="*">
+							</colgroup>   
+							<tbody>
+								<tr>
+									<th>은행명/명의자</th>
+									<td>
+										<div>
+											<span th:text="${orderInfo.cardNm}"></span>/<span th:text="${orderInfo.ordNm}"></span>
+										</div>
+									</td>
+								</tr>
+								<tr>
+									<th>계좌번호</th>
+									<td>
+										<div>
+											<span th:text="${orderInfo.vaNo}"></span>
+										</div>
+									</td>
+								</tr>
+								<tr>
+									<th>입금기한</th>
+									<td>
+										<div>
+											<span th:text="|${orderInfo.vaDeadline}"></span><!-- <span>12:00:00</span> --> 까지
+										</div>
+									</td>
+								</tr>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</div>
+		</th:block>
+		<div class="inner wide">
+			<!-- 폴딩리스트 -->
+			<div class="ui_row">
+				<div class="foldGroup">
+					<ul>
+						<li class="fold_mbinfo">
+							<div class="fold_head">
+								<a href="javascript:void(0)">
+									<div>
+										<div class="fold_tit">
+											<span th:text="${orderInfo.ordNm}"></span>
+										</div>
+										<div class="data">
+											<span th:text="${orderInfo.ordNm}"></span>
+											<span th:text="${orderInfo.ordPhnno}"></span>
+										</div>
+									</div>
+								</a>
+							</div>
+							<div class="fold_cont">
+								<div class="customer_info">
+									<dl>
+										<div>
+											<dt><span class="sr-only">주문자명</span></dt>
+											<dd th:text="${orderInfo.ordNm}"></dd>
+										</div>
+										<div>
+											<dt><span class="sr-only">이메일</span></dt>
+											<dd th:text="${orderInfo.ordEmail}"></dd>
+										</div>
+										<div>
+											<dt><span class="sr-only">휴대폰 번호</span></dt>
+											<dd th:text="${orderInfo.ordPhnno}"></dd>
+										</div>
+									</dl>
+								</div>
+							</div>
+						</li>
+					</ul>
+				</div>
+			</div>
+			<!-- 폴딩리스트 -->
+		</div>
+		<div class="inner wide">
+			<!-- 폴딩리스트 -->
+			<div class="ui_row">
+				<div class="foldGroup shipfold">
+					<ul>
+						<li class="fold_delivery">
+							<div class="fold_head">
+								<a href="javascript:void(0)">
+									<div>
+										<div class="fold_tit">
+											<span>배송지 정보</span>
+										</div>
+										<div class="data">
+											<span class="recipAddr" th:text="${orderInfo.recipBaseAddr} + '    ' + ${orderInfo.recipDtlAddr}"></span>
+										</div>
+									</div>
+								</a>
+							</div>
+							<div class="fold_cont">
+								<!-- //배송지 정보 변경불가 -->
+								<div class="ship_info">
+									<button type="button" id="btn_adrsChange_pop" class="btn_popup"><span>배송지 변경</span></button>
+									<dl>
+										<div class="company">
+											<dt><span class="sr-only">배송지명</span></dt>
+											<dd id="recipNm" th:text="${orderInfo.recipNm}">
+												<!-- 
+												<span class="icon_tag">
+													<em class="tag_stype1">기본 배송지</em>
+													<em class="tag_stype2">총알배송</em>
+												</span>
+												 -->
+											</dd>
+										</div>
+										<div class="phone">
+											<dt><span class="sr-only">휴대폰 번호</span></dt>
+											<dd id="recipPhnno" th:text="${orderInfo.recipPhnno}"></dd>
+										</div>
+										<div class="addr">
+											<dt><span class="sr-only">배송주소</span></dt>
+											<dd id="recipAddr" th:text="${orderInfo.recipBaseAddr} + '    ' + ${orderInfo.recipDtlAddr}"></dd>
+										</div>
+										<div class="ship_request">
+											<dt>배송요청 사항</dt>
+											<dd id="delvMemo" th:text="${orderInfo.delvMemo}"></dd>
+										</div>
+									</dl>
+								</div>
+								<!-- //배송지 정보 변경불가 -->
+							</div>
+						</li>
+					</ul>
+				</div>
+			</div>
+			<!-- 폴딩리스트 -->
+		</div>
+		<div class="inner">
+			<div class="tbl_wrap pay_wrap">
+				<div class="tbl_tit"> 
+					<h3>결제 정보</h3>
+					<strong class="pay"><span th:text="${#numbers.formatInteger(realOrdSumAmt, 1, 'COMMA')}"></span>원</strong>
+				</div>
+				<div class="tbl type1">
+					<table>
+						<colgroup>
+							<col width="227">
+							<col width="*">
+						</colgroup>   
+						<tr>
+							<td>
+								<dl>
+									<!-- 210330 : 태그 분할 -->
+									<div>
+										<dt>상품금액</dt>
+										<dd>
+											<div><span th:text="${#numbers.formatInteger(goodsSumAmt, 1, 'COMMA')}"></span>원</div>
+										</dd>
+									</div>
+									<div>
+										<dt>배송비</dt>
+										<dd>
+											<div><span th:text="${#numbers.formatInteger(delvFeeSumAmt, 1, 'COMMA')}"></span>원</div>
+										</dd>
+									</div>
+									<!-- //210330 : 태그 분할 -->
+									<div>
+										<dt>상품할인(즉시할인)</dt>
+										<th:block th:if="${cpn1DcSumAmt}>0">
+											<dd><div><span th:text="|- ${#numbers.formatInteger(cpn1DcSumAmt, 1, 'COMMA')}|"></span>원</div></dd>
+										</th:block>
+										<th:block th:if="${cpn1DcSumAmt}<1">
+											<dd><div><span>0</span>원<div></dd>
+										</th:block>
+									</div>
+									<!-- 회원인경우노출 -->
+									<th:block th:if="${isLogin}">
+										<div>
+											<dt>다다익선 할인</dt>
+											<th:block th:if="${tmtbSumAmt}>0">
+												<dd><div><span th:text="|- ${#numbers.formatInteger(tmtbSumAmt, 1, 'COMMA')}|"></span>원</div></dd>
+											</th:block>
+											<th:block th:if="${tmtbSumAmt}<1">
+												<dd><div><span >0</span>원</div></dd>
+											</th:block>
+										</div>
+										<div>
+											<dt>쿠폰할인</dt>
+											<th:block th:if="${cpnDcSumAmt}>0">
+												<dd><div><span th:text="|- ${#numbers.formatInteger(cpnDcSumAmt, 1, 'COMMA')}|"></span>원</div></dd>
+											</th:block>
+											<th:block th:if="${cpnDcSumAmt}<1">
+												<dd><div><em>0</em>원</div></dd>
+											</th:block>
+										</div>
+										<div>
+											<dt>선 포인트 사용</dt>
+											<th:block th:if="${prePntDcSumAmt}>0">
+												<dd><div><em th:text="|- ${#numbers.formatInteger(prePntDcSumAmt, 1, 'COMMA')}|"></em>P</div></dd>
+											</th:block>
+											<th:block th:if="${prePntDcSumAmt}<1">
+												<dd><div><span>0</span>P</div></dd>
+											</th:block>
+										</div>
+										<div>
+											<dt>포인트 사용</dt>
+											<th:block th:if="${pntDcSumAmt}>0">
+												<dd><div><span th:text="|- ${#numbers.formatInteger(pntDcSumAmt, 1, 'COMMA')}|"></span></div>P</dd>
+											</th:block>
+											<th:block th:if="${pntDcSumAmt}<1">
+												<dd><div><span>0</span>P</div></dd>
+											</th:block>
+										</div>
+										<div>
+											<dt>상품권 사용</dt>
+											<th:block th:if="${gfcdUseSumAmt}>0">
+												<dd><div><span th:text="|- ${#numbers.formatInteger(gfcdUseSumAmt, 1, 'COMMA')}|"></span>원</div></dd>
+											</th:block>
+											<th:block th:if="${gfcdUseSumAmt}<1">
+												<dd><div><span>0</span>원</div></dd>
+											</th:block>
+										</div>
+									</th:block>
+									<div>
+										<dt>마일리지 사용</dt>
+										<th:block th:if="${mileageDcAmt}>0">
+											<dd><div><span th:text="|- ${#numbers.formatInteger(mileageDcAmt, 1, 'COMMA')}|"></span>원</div></dd>
+										</th:block>
+										<th:block th:if="${mileageDcAmt}<1">
+											<dd><div><span>0</span>원</div></dd>
+										</th:block>
+									</div>
+									<div>
+										<dt>제휴 할인</dt>
+										<th:block th:if="${allianceDcAmt}>0">
+											<dd><div><span th:text="|- ${#numbers.formatInteger(allianceDcAmt, 1, 'COMMA')}|"></span>원</div></dd>
+										</th:block>
+										<th:block th:if="${allianceDcAmt}<1">
+											<dd><div><span>0</span>원</div></dd>
+										</th:block>
+									</div>
+									<div>
+										<dt>적립예정 포인트</dt>
+										<dd>
+											<div>
+												<span th:text="${#numbers.formatInteger(savePntSumAmt, 1, 'COMMA')}">3000</span>P
+											</div>
+										</dd>
+									</div>
+									<div>
+										<dt>결제방법</dt>
+										<!-- kcp 신용카드 -->
+										<th:block th:if="${orderInfo.payMeans} == 'G014_30'">
+											<!--  체크카드 -->
+											<th:block th:if="${orderInfo.cardType} == 'Y'">
+												<dd><div><span th:text="|체크카드(${orderInfo.cardNm})/${orderInfo.cardMips}|"></span></div></dd>
+											</th:block>
+											<!--  신용카드 -->
+											<th:block th:if="${orderInfo.cardType} == 'N'">
+												<dd><div><span th:text="|체크카드(${orderInfo.cardNm})/${orderInfo.cardMips}|"></span></div></dd>
+											</th:block>
+										</th:block>
+										<th:block th:if="${orderInfo.payMeans} != 'G014_30'">
+											<dd><div><span th:text="${orderInfo.payType}"></span></div></dd>
+										</th:block>
+									</div>
+								</dl>
+							</td>
+						</tr>
+					</table>
+				</div>
+			</div>
+			<div class="btn_group btn_group_flex">
+				<div><button type="button" class="btn btn_gost"><span>주문 상세보기</span></button></div>
+				<div><button type="button" class="btn btn_dark"><span>쇼핑 계속하기</span></button></div>
+			</div>
+		</div>
+	</section>
+</main>
+
+
+<script th:inline="javascript">
+// 배송관련정보 변수선언
+var ordNo			= [[${orderInfo.ordNo}]]		// 배송목록
+var isLogin			= [[${isLogin}]];				// 로그인여부
+var delvAddrSq		= [[${delvAddrSq}]];			// 배송지번호
+
+// 2.1 회원 배송지변경 팝업열기
+$('#btn_adrsChange_pop').on("click", function(){
+	// 회원인경우
+	if (isLogin == true) {
+		$.ajax( {
+			type		: "POST",
+			url 		: '/common/delvAddrChangePop',
+			dataType 	: 'html',
+			beforeSend : function(xhr, settings) {
+				xhr.setRequestHeader("AJAX"			, "true");
+				xhr.setRequestHeader('Accept'		, 'application/json');
+				xhr.setRequestHeader('Content-Type'	, 'application/json');
+				gagajf.showProgressbar(true);
+			},
+			success 	: function(result) {
+				$("#adrsChangePop .modal-dialog .modal-content").html(result);
+				$("#adrsChangePop").modal("show");
+			}
+		});
+	}
+	// 비회원인경우
+	else {
+		$.ajax( {
+			type		: "POST",
+			url 		: '/common/delvAddrAddPop',
+			dataType 	: 'html',
+			beforeSend : function(xhr, settings) {
+				xhr.setRequestHeader("AJAX"			, "true");
+				xhr.setRequestHeader('Accept'		, 'application/json');
+				xhr.setRequestHeader('Content-Type'	, 'application/json');
+				gagajf.showProgressbar(true);
+			},
+			success 	: function(result) {
+				$("#adrsAddPop .modal-dialog .modal-content").html(result);
+				$("#adrsAddPop").modal("show");
+			}
+		});	
+	}
+});
+
+// 2.2 배송요청사항 팝업열기
+$("#btn_rqstModify_pop").on("click", function(e){
+	var jsonObj = new Object();
+	jsonObj.delvMemo = $("#delvMemo").text();
+	
+	$.ajax({
+		type		: "POST",
+		url 		: "/common/delvMemoChangePop",
+		data		: JSON.stringify(jsonObj),
+		dataType 	: "html",
+		beforeSend 	: function(xhr, settings) {
+			xhr.setRequestHeader("AJAX"			, "true");
+			xhr.setRequestHeader('Accept'		, 'application/json');
+			xhr.setRequestHeader('Content-Type'	, 'application/json');
+			gagajf.showProgressbar(true);
+		},
+		success 	: function(result) {
+			if (result != null) {
+				$("#rqstModifyPop .modal-dialog .modal-content").html(result);
+				$("#rqstModifyPop").modal("show");
+			}
+		}
+	});
+	
+	return false;
+});
+
+// 1.18 배송지정보 설정
+var delvAddrSet = function(delvObj) {
+	
+	var rtnStr = "";
+	rtnStr += "| recipNm 			::: " + delvObj.recipNm;
+	rtnStr += "| recipPhnno 		::: " + delvObj.recipPhnno;
+	rtnStr += "| recipZipcode 		::: " + delvObj.recipZipcode;
+	rtnStr += "| recipBaseAddr 		::: " + delvObj.recipBaseAddr;
+	rtnStr += "| recipDtlAddr 		::: " + delvObj.recipDtlAddr;
+	rtnStr += "| delvMemo 			::: " + delvObj.delvMemo;
+	
+	$("#recipNm").text(delvObj.recipNm);
+	$("#recipPhnno").text(delvObj.recipPhnno);
+	$("#recipAddr").text(delvObj.recipBaseAddr + '    ' + delvObj.recipDtlAddr);
+	$("#delvMemo").text(delvObj.delvMemo);
+	
+	// 변수값 설정
+	var jsonObj = {
+		"delvAddrSq" 		: delvAddrSq
+		, "recipNm"			: delvObj.recipNm
+		, "recipPhnno"		: delvObj.recipPhnno
+		, "recipZipcode"	: delvObj.recipZipcode
+		, "recipBaseAddr"	: delvObj.recipBaseAddr
+		, "recipDtlAddr"	: delvObj.recipDtlAddr
+		, "delvMemo"		: delvObj.delvMemo
+	}
+	
+	gagajf.ajaxJsonSubmit(
+		"/common/updateDeliverAddr"
+		, JSON.stringify(jsonObj)
+		, function (result) {
+			mcxDialog.alert("수정되었습니다.");
+		}
+	)
+}
+
+// 1.19 배송메모설정
+var delvMemoSet = function(delvMemoObj) {
+	
+	var rtnStr = "";
+	rtnStr += "| delvMemo 			::: " + delvMemoObj.delvMemo;
+
+	// 변수값 설정
+	var jsonObj = {
+		"delvAddrSq" 		: delvAddrSq
+		, "delvMemo"		: delvMemoObj.delvMemo
+	}
+	
+	$("#delvMemo").text(delvMemoObj.delvMemo);
+	
+	gagajf.ajaxJsonSubmit(
+		"/common/updateDeliverAddrDelvMemo"
+		, JSON.stringify(jsonObj)
+		, function (result) {
+			mcxDialog.alert("수정되었습니다.");
+		}
+	)
+}
+
+</script>
+</th:block>
+</body>
+</html>

src/main/webapp/WEB-INF/views/mob/order/OrderDcAmtInfoMob.html

@@ -66,7 +66,7 @@
 									</th:block>
 									<div class="form_field">
 										<div class="input_wrap">
-											<input type="text" class="form_control" maxlength="13" placeholder="할인코드를 입력해주세요.">
+											<input type="text" class="form_control" id="serialCpnNm" maxlength="13" placeholder="할인코드를 입력해주세요.">
 											<button type="button" class="btn btn_dark btn_sm" onclick="serialCpnApply()">
 												<span>적용</span>
 											</button>

src/main/webapp/WEB-INF/views/mob/order/OrderFormMob.html

@@ -302,13 +302,7 @@
 											</div>
 											<div>
 												<dt>할인금액</dt>
-													<th:block th:if="${cpn1DcSumAmt} > 0">
-														<dd><div><span class="dcSumAmt disc_amount" id="cpn1DcSumAmt" th:text="|-${#numbers.formatInteger(cpn1DcSumAmt, 1, 'COMMA')}|"></span>원</div></dd>
-													</th:block>
-													<th:block th:if="${cpn1DcSumAmt} < 1">
-														<dd><div><span class="dcSumAmt disc_amount" id="cpn1DcSumAmt" th:text="|${#numbers.formatInteger(cpn1DcSumAmt, 1, 'COMMA')}|"></span>원</div></dd>
-													</th:block>
-												</dd>
+												<dd><div><span class="dcSumAmt disc_amount"></span>원</div></dd>
 											</div>
 										</dl>
 									</td>
@@ -1007,7 +1001,7 @@ var paymentInfoSet = function() {
 							
 							var pgGb = $("#order_info input[name=pgGb]").val();
 							
-							if (pgGb == "NAVFER") {
+							if (pgGb == "NAVER") {
 								fnNaverPaymentReady();
 							} else if (pgGb == "KAKAO") {
 								fnKakaoPaymentReady();
@@ -1162,6 +1156,21 @@ var dcAmtInfoSet = function() {
 								$("#chk-maxdisc").attr("checked", false);
 							}
 						});
+						
+						// 1.8.5 쿠폰 최대할인금액 초기화 버튼 설정
+						$("#chk-maxdisc").on("click", function(){
+							if ($(this).is(":checked")) {
+								// 상품&장바구니쿠폰 초기환
+								custGoodsCpnInit();
+								
+								// 배송비쿠폰 초기환
+								custDelvCpnInit();
+								
+								$("#chk-maxdisc01").attr("checked", true);
+							} else {
+								$("#chk-maxdisc01").attr("checked", false);
+							}
+						});
 					}
 				});
 				
@@ -1241,7 +1250,7 @@ var dcAmtInfoSet = function() {
 					
 					// 포인트 적용
 					$("#orderAmtForm .pntDcSumAmt").text(pntDcAmt);
-					$("#pntDcAmt").text(getZeroMinusDelAmt(pntDcAmt)+" 원");
+					$("#pntDcAmt").text(getZeroMinusDelAmt(pntDcAmt));
 					
 					// 상품권리렛기능
 					gfcdUseAmtReset();
@@ -1285,7 +1294,7 @@ var dcAmtInfoSet = function() {
 					
 					// 상품권 적용
 					$("#orderAmtForm .gfcdUseSumAmt").text(gfcdUseAmt);
-					$("#gfcdUseAmt").text("-"+gfcdUseAmt.addComma()+" 원");
+					$("#gfcdUseAmt").text(getZeroMinusDelAmt(gfcdUseAmt));
 					
 					// 금액전체계산
 					custCpnSumAmtCal();
@@ -1748,7 +1757,7 @@ var prePntDcAmtReset = function() {
 	$("#orderForm input[name='prePntDcAmt']").val(rmPrePntAmt);
 	
 	// 선포인트사용여부 체크 후 적용
-	$("#orderFrom input[name='rdi-beforpoint']").each(function(){
+	$("#orderForm input[name='rdi-beforpoint']").each(function(){
 		// 선포인트 초기 설정 사용함
 		if ($(this).val() == "Y") {
 			$(this).attr("checked", true);
@@ -1872,6 +1881,8 @@ var custCpnSumAmtCal = function() {
 	var gfcdUseSumAmt 		= parseInt($("#orderAmtForm .gfcdUseSumAmt").text());
 	var realOrdSumAmt		= 0;
 	var savePntSumAmt		= 0;
+	var totDcSumAmt			= 0;
+	
 	
 	$("#orderAmtForm .cartSq").each(function(){
 		var orgCurrPrice 	= parseInt($(this).parent().find(".orgCurrPrice").text());
@@ -1883,8 +1894,8 @@ var custCpnSumAmtCal = function() {
 		var goodsCpnDcAmt	= parseInt($(this).parent().find(".goodsCpnDcAmt").text());
 		var cartCpnDcAmt	= parseInt($(this).parent().find(".cartCpnDcAmt").text());
 		var prePntDcAmt1	= parseInt($(this).parent().find(".prePntDcAmt1").text());
-		var dcSumAmt		= 0;
 		var savePntAmt1		= parseInt($(this).parent().find(".savePntAmt1").text());
+		var dcSumAmt		= 0;
 		
 		// 주문금액 = ((판매가 - 즉시할인가) + 옵션추가금액) * 장바구니수량
 		orgGoodsSumAmt		= orgGoodsSumAmt + (orgCurrPrice + optAddPrice) * goodsQty;
@@ -1908,6 +1919,8 @@ var custCpnSumAmtCal = function() {
 			dcSumAmt		= tmtb1DcAmt + tmtb2DcAmt + goodsCpnDcAmt + cartCpnDcAmt;
 		}
 		
+		totDcSumAmt			= totDcSumAmt + dcSumAmt;
+		
 		// 주문금액설정
 		$(this).parent().find(".ordAmt").text(ordAmt);
 		$(this).parent().find(".dcSumAmt").text(dcSumAmt);
@@ -1933,7 +1946,7 @@ var custCpnSumAmtCal = function() {
 			leftGfcdAmt		= leftGfcdAmt - gfcdUseAmt1;
 		}
 		
-		var realOrdAmt1		= ordAmt - dcSumAmt - (pntDcAmt1 - gfcdUseAmt1);
+		var realOrdAmt1		= ordAmt - dcSumAmt - pntDcAmt1 - gfcdUseAmt1;
 		realOrdSumAmt		= realOrdSumAmt + realOrdAmt1;
 		
 		$(this).parent().find(".pntDcAmt1").text(pntDcAmt1);
@@ -1961,6 +1974,8 @@ var custCpnSumAmtCal = function() {
 	$("#realOrdAmt").text(realOrdSumAmt.addComma()); 					// 총 결제 예정 금액
 	$("#orderForm .realOrdAmt").text(realOrdSumAmt.addComma()); 		// 총 결제 예정 금액
 	$("#orderForm .orgGoodsSumAmt").text(orgGoodsSumAmt.addComma());
+	$("#orderForm #btn_payment").text(realOrdSumAmt.addComma());		// 총 결제 예정 금액
+	$("#orderForm .dcSumAmt").text(totDcSumAmt.addComma());				// 할인금액합계
 	
 	var tempSavePnt			= savePntSumAmt - prePntDcAmt;
 	

src/main/webapp/WEB-INF/views/mob/order/OrderFreegiftInfoMob.html

@@ -90,7 +90,7 @@
 										</th:block>
 									</th:block>
 									<div class="gift">
-										<input type="radio" th:name="'rdi-gift'+${i.count}" th:id="${i.count}+'0'" class="chk_img freegiftRdo" value="noSel" usepoint="0" allYn="N"> 
+										<input type="radio" th:name="'rdi-gift'+${i.count}" th:id="${i.count}+'0'" class="chk_img freegiftRdo" value="noSel" usepoint="0" allYn="N" checked> 
 										<label th:for="${i.count}+'0'">
 											<span class="thumb"><img src="/images/pc/thumb/tmp_gift_empty.jpg" width="" alt=""></span>
 											<span class="name">사은품 수령안함</span> <span class="deduct">수령거부</span>

src/main/webapp/WEB-INF/views/mob/order/OrderListInfoMob.html

@@ -126,10 +126,10 @@
 						<div>
 							<dt>상품할인(즉시할인)</dt>
 							<th:block th:if="${cpn1DcSumAmt} > 0">
-								<dd><span class="disc_amount" id="cpn1DcSumAmt" th:text="|-${#numbers.formatInteger(cpn1DcSumAmt, 1, 'COMMA')} 원|"></span></dd>
+								<dd><span class="disc_amount" id="cpn1DcSumAmt" th:text="|-${#numbers.formatInteger(cpn1DcSumAmt, 1, 'COMMA')}원|"></span></dd>
 							</th:block>
 							<th:block th:if="${cpn1DcSumAmt} < 1">
-								<dd><span class="disc_amount" id="cpn1DcSumAmt" th:text="|${#numbers.formatInteger(cpn1DcSumAmt, 1, 'COMMA')} 원|"></span></dd>
+								<dd><span class="disc_amount" id="cpn1DcSumAmt" th:text="|${#numbers.formatInteger(cpn1DcSumAmt, 1, 'COMMA')}원|"></span></dd>
 							</th:block>
 						</div>
 						
@@ -138,10 +138,10 @@
 							<div>
 								<dt>다다익선할인</dt>
 								<th:block th:if="${tmtbDcSumAmt} > 0">
-									<dd><span class="disc_amount" id="tmtbDcSumAmt" th:text="|-${#numbers.formatInteger(tmtbDcSumAmt, 1, 'COMMA')} 원|"></span></dd>
+									<dd><span class="disc_amount" id="tmtbDcSumAmt" th:text="|-${#numbers.formatInteger(tmtbDcSumAmt, 1, 'COMMA')}원|"></span></dd>
 								</th:block>
 								<th:block th:if="${tmtbDcSumAmt} < 1">
-									<dd><span class="disc_amount" id="tmtbDcSumAmt" th:text="|${#numbers.formatInteger(tmtbDcSumAmt, 1, 'COMMA')} 원|"></span></dd>
+									<dd><span class="disc_amount" id="tmtbDcSumAmt" th:text="|${#numbers.formatInteger(tmtbDcSumAmt, 1, 'COMMA')}원|"></span></dd>
 								</th:block>
 							</div>
 							<div>
@@ -153,10 +153,10 @@
 							<div>
 								<dt>선포인트 사용</dt>
 								<th:block th:if="${prePntDcAmt} > 0">
-									<dd><span class="disc_amount" id="prePntDcAmt" th:text="|-${#numbers.formatInteger(prePntDcAmt, 1, 'COMMA')} 원|"></span></dd>
+									<dd><span class="disc_amount" id="prePntDcAmt" th:text="|-${#numbers.formatInteger(prePntDcAmt, 1, 'COMMA')}원|"></span></dd>
 								</th:block>
 								<th:block th:if="${prePntDcAmt} < 1">
-									<dd><span class="disc_amount" id="prePntDcAmt" th:text="|${#numbers.formatInteger(prePntDcAmt, 1, 'COMMA')} 원|"></span></dd>
+									<dd><span class="disc_amount" id="prePntDcAmt" th:text="|${#numbers.formatInteger(prePntDcAmt, 1, 'COMMA')}원|"></span></dd>
 								</th:block>
 							</div>
 							<div>

src/main/webapp/WEB-INF/views/mob/order/OrderNoMemberMob.html

@@ -129,7 +129,6 @@ $(document).ready( function() {
 	
 // 주문하기버튼
 $("#btn_order").on("click", function() {
-	/*
 	// TODO 유효성 체크 추가
 	if (gagajf.isNull($("#orderForm input[name=custNm]").val())) {
 		mcxDialog.alert("이름을 입력해주세요.");
@@ -177,7 +176,6 @@ $("#btn_order").on("click", function() {
 		mcxDialog.alert("비회원 개인정보 수집 이용에 동의해주세요.");
 		return false;
 	}
-	*/
 	
 	// 주문서전송
 	$("#orderForm").submit();
@@ -216,7 +214,12 @@ var fnOpenDaumAddr = function() {
 			$('#orderForm input[name=recipZipcode]').val(data.zonecode);
 			$('#orderForm input[name=recipBaseAddr]').val(cfnGetDaumRoadAddr(data));
 			$('#orderForm input[name=recipDtlAddr]').focus();
+			
 			cfnCloseDaumAddr();
+			
+			// 2021.04.12 이태영 지원 닫기버튼 기능
+			$(".jquery-modal.blocker.current").hide();
+			$("body").css("overflow", "");
 		},
 		width: '100%'
 	});

src/main/webapp/WEB-INF/views/mob/pg/KakaoPaymentRequestMob.html

@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : KakaoPaymentRequestMob.html
+ * @desc    : 카카오페이 결제 요청 결과 화면
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2021 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.04.12   card007     최초 작성
+ *******************************************************************************
+ -->
+<head th:replace="~{mob/common/fragments/HeadMob :: head}"></head>
+<th:block th:replace="~{mob/common/fragments/VariablesMob :: variables}"></th:block>
+<th:block th:replace="~{mob/common/fragments/ScriptsMob :: scripts}"></th:block>
+<body>
+
+<script th:inline="javascript">
+	let pgToken = [[${pgToken}]];
+
+	$(document).ready(function() {
+		let result = opener.fnKakaoPaymentRequest(pgToken);
+		if (result) {
+			self.close();
+		}
+	});
+</script>
+</body>
+</html>

src/main/webapp/WEB-INF/views/mob/pg/NaverPaymentRequestMob.html

@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : NaverPaymentRequestWeb.html
+ * @desc    : 네이버페이 결제 요청 결과 화면
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2021 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.04.12   card007     최초 작성
+ *******************************************************************************
+ -->
+<head th:replace="~{mob/common/fragments/HeadMob :: head}"></head>
+<th:block th:replace="~{mob/common/fragments/VariablesMob :: variables}"></th:block>
+<th:block th:replace="~{mob/common/fragments/ScriptsMob :: scripts}"></th:block>
+<body>
+
+<script th:inline="javascript">
+	let paymentId = [[${paymentId}]];
+
+	$(document).ready(function() {
+		let result = opener.fnNaverPaymentRequest(paymentId);
+		if (result) {
+			self.close();
+		}
+	});
+</script>
+</body>
+</html>

src/main/webapp/WEB-INF/views/mob/social/SocialMainFormMob.html

@@ -0,0 +1,135 @@
+<!DOCTYPE html>
+<html lang="ko"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+	layout:decorator="mob/common/layout/DefaultLayoutMob">
+<!--
+ *******************************************************************************
+ * @source  : SocialMainFormMob.html
+ * @desc    : 핫딜(소셜) Page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.04.12   sowon     최초 작성
+ *******************************************************************************
+ -->
+<body>
+<th:block layout:fragment="content">
+<main role="" id="" class="container dp">
+			<section class="content dp_hotdeal">
+				<div class="inner wide">
+                    <div class="hotdeal">
+                        <div id="countdown">
+                            <span>남은시간 </span>
+                            <span id="h-hours"></span>
+                            <span id="h-minutes"></span>
+                            <span id="h-seconds"></span>
+                        </div>
+                    </div>
+                </div>
+                <div class="inner">
+                    <div class="list_content">
+						<div class="itemsGrp rowtype"><!-- itemsGrp rank hot deal --> <!-- rowtype 추가시 가로형태로 출력 -->
+						<th:block th:each="SocialData, SocialStat : ${socialGoods}">
+							<div class="item_prod" th:class="${SocialData.stockQtySum == 0 ? 'item_prod sold_out' : 'item_prod'}">
+								<div class="item_state">
+									<button type="button" th:class="${SocialData.likeIt == 'likeit'}? 'itemLike likeit' : 'itemLike'" onclick="cfnPutWishList(this);" th:attr="goodsCd=${SocialData.goodsCd}, ithrCd='', contentsLoc='', planDtlSq=''">관심상품 추가</button>
+									 <a href="javascript:void(0);" class="itemLink" th:onclick="cfnGoToGoodsDetail([[${SocialData.goodsCd}]])" >
+										<div class="shape ranker"><span>특가</span></div>
+										<div class="itemPic">
+											<img class="vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + SocialData.sysImgNm}">
+										</div>
+										<p class="itemBrand" th:text="${SocialData.brandGroupNm}"></p>
+										<div class="itemName" th:text="${SocialData.goodsNm}"></div>
+										<p class="itemPrice">
+											<span class="itemPrice_original" th:text="${#numbers.formatInteger(SocialData.listPrice,0,'COMMA')}"></span>
+											 [[${#numbers.formatInteger(SocialData.currPrice,0,'COMMA')} + 원]]
+											<span class="itemPercent"  th:text="${#numbers.formatDecimal(SocialData.dcRate,1,0)} + '%'"></span>
+										</p>
+										<div class="itemcolorchip">
+											<span class="chip_color35" value="ABM">BEIGE</span>
+											<span class="chip_color54" value="BDS">BLACK</span>
+											<span class="chip_color40" value="YBR">WHITE</span>
+										</div>
+										<p class="itemBadge">
+											<span class="badge13">베스트 </span>
+										</p>
+										<div class="itemComment" th:if="${SocialData.goodsTnm!=null}" th:text="${SocialData.goodsTnm}"></div>
+										<div class="itemEt">
+											<div class="shopBag">
+												<button class="btn btn_default" onclick="socialAddCart(this)" th:attr="goodsCd=${SocialData.goodsCd}, minOrdQty=${SocialData.minOrdQty}, goodsType=${SocialData.goodsType}, optCd=${SocialData.optCd}"><span>쇼핑백담기</span></button>
+											</div>
+									    </div>
+									</a>
+								</div>
+							</div>
+							</th:block>
+						</div>
+                    </div>
+				</div>
+			</section>
+		</main>
+
+<script th:inline="javascript">
+var socialInfo = [[${socialInfo}]];
+var socialAddCart = function (obj) {
+	let btnType = "C";
+	let params = [];
+
+	let cart = new Object();
+    cart.goodsCd = $(obj).attr("goodsCd");
+	cart.optCd = $(obj).attr("optCd");
+	cart.goodsQty = $(obj).attr("minOrdQty");
+	cart.goodsType = $(obj).attr("goodsType");
+	cart.cartGb = btnType;
+	cart.afLinkCd = $(obj).attr("afLinkCd");
+	cart.ithrCd = "";
+	cart.contentsLoc =  "";
+	cart.planDtlSq = "";
+	params.push(cart); 
+	
+	// 장바구니담기
+	if (params.length > 0){
+		cfnAddCart(params);	
+	} 
+}
+
+
+$(function(){
+    /* 핫딜 countDown */
+    function hotdealTimer() {
+        var endTime = new Date(socialInfo.socialEddt); // 남은시간 지정
+
+            endTime = (Date.parse(endTime) / 1000);
+
+            var now = new Date();
+            now = (Date.parse(now) / 1000);
+
+            var timeLeft = endTime - now;
+
+            var days = Math.floor(timeLeft / 86400); 
+            var hours = Math.floor((timeLeft - (days * 86400)) / 3600);
+            var minutes = Math.floor((timeLeft - (days * 86400) - (hours * 3600 )) / 60);
+            var seconds = Math.floor((timeLeft - (days * 86400) - (hours * 3600) - (minutes * 60)));
+
+            if (hours < '10') { hours = '0' + hours; }
+            if (minutes < '10') { minutes = '0' + minutes; }
+            if (seconds < '10') { seconds = '0' + seconds; }
+
+            //$('#d-days').html(days);
+            $('#h-hours').html(hours + ' :');
+            $('#h-minutes').html(minutes+ ' :');
+            $('#h-seconds').html(seconds);		
+    }
+    setInterval(function() { hotdealTimer(); }, 1000);
+    /* countDown */
+});
+</script>
+
+</th:block>
+
+</body>
+</html>

src/main/webapp/WEB-INF/views/web/cart/CartListAjaxFormWeb.html

@@ -82,6 +82,7 @@
 								<!-- 주문상품 -->
 								<th:block th:each="cart, status : ${order.shotCartList}">
 									<div class="cartInfo goods_info shotCartInfo">
+										<input type="hidden" name="supplyCompNm" value="WMS" />
 										<input type="hidden" name="applyQtySectionYn" th:value="${cart.applyQtySectionYn}" />
 										<input type="hidden" name="applyAmtSectionYn" th:value="${cart.applyAmtSectionYn}" />
 										<input type="hidden" name="qtyTmtbSq" th:value="${cart.qtyTmtbSq}" />
@@ -197,6 +198,7 @@
 								<!-- 주문상품 -->
 								<th:block th:each="cart, status : ${order.wmsCartList}">
 									<div class="cartInfo goods_info wmsCartInfo">
+										<input type="hidden" name="supplyCompNm" value="WMS" />
 										<input type="hidden" name="applyQtySectionYn" th:value="${cart.applyQtySectionYn}" />
 										<input type="hidden" name="applyAmtSectionYn" th:value="${cart.applyAmtSectionYn}" />
 										<input type="hidden" name="qtyTmtbSq" th:value="${cart.qtyTmtbSq}" />
@@ -299,10 +301,10 @@
 					</div>
 
 					<!-- 자사 배송비 -->
-					<div class="goods_foot" style="margin-top:40px;">
+					<div class="goods_foot" style="margin-top:40px;" th:style="${'Y'.equals(order.delvYn) ? 'display:block' : 'display:none'}">
 						<div class="order_delivery selfGoodsDelv" th:classappend="|delv_${order.cartDelvFeeCd}|">
-							<span class="dlvr_fee" th:if="${order.wmsDelvFee == 0}">배송비 무료</span>
-							<span class="dlvr_fee" th:if="${order.wmsDelvFee > 0}">배송비&nbsp;<em th:text="${#numbers.formatInteger(order.wmsDelvFee, 1, 'COMMA')}"></em>원</span>
+							<span class="dlvr_fee delvFeeArea" th:if="${order.wmsDelvFee == 0}">배송비 무료</span>
+							<span class="dlvr_fee delvFeeArea" th:if="${order.wmsDelvFee > 0}">배송비&nbsp;<em th:text="${#numbers.formatInteger(order.wmsDelvFee, 1, 'COMMA')}"></em>원</span>
 							<a href="#" class="btn_popup_save" th:if="${order.wmsDelvFee > 0}">배송비 SAVE 상품 보기</a>
 						</div>
 					</div>
@@ -317,6 +319,7 @@
 								<div class="goods_cont">
 									<!-- 주문상품 -->
 									<div class="cartInfo goods_info delvCartInfo">
+										<input type="hidden" name="supplyCompNm" th:value="${cart.supplyCompNm}" />
 										<input type="hidden" name="applyQtySectionYn" th:value="${cart.applyQtySectionYn}" />
 										<input type="hidden" name="applyAmtSectionYn" th:value="${cart.applyAmtSectionYn}" />
 										<input type="hidden" name="qtyTmtbSq" th:value="${cart.qtyTmtbSq}" />
@@ -414,11 +417,11 @@
 								</div>
 
 								<!-- 입점업체 배송비 -->
-								<div class="goods_foot" th:if="${'Y'.equals(cart.addDelvFeeYn)}">
+								<div class="goods_foot" th:if="${'Y'.equals(cart.addDelvFeeYn)}" th:style="${'Y'.equals(cart.delvYn) ? 'display:block' : 'display:none'}">
 								<!-- <div class="goods_foot" th:if="${cart.compCnt == status.index + 1}"> -->
 									<div class="order_delivery" th:classappend="|delv_${cart.delvFeeCd}|">
-										<span class="dlvr_fee" th:if="${cart.delvFee == 0}">배송비 무료</span>
-										<span class="dlvr_fee" th:if="${cart.delvFee > 0}">배송비&nbsp;<em th:text="${#numbers.formatInteger(cart.delvFee, 1, 'COMMA')}"></em>원</span>
+										<span class="dlvr_fee delvFeeArea" th:if="${cart.delvFee == 0}">배송비 무료</span>
+										<span class="dlvr_fee delvFeeArea" th:if="${cart.delvFee > 0}">배송비&nbsp;<em th:text="${#numbers.formatInteger(cart.delvFee, 1, 'COMMA')}"></em>원</span>
 										<span class="dlvr_shop"><em th:text="${cart.supplyCompNm}"></em>&nbsp;업체직배송</span>
 										<a href="#" class="btn_popup_save" th:if="${cart.delvFee > 0}">배송비 SAVE 상품 보기</a>
 									</div>
@@ -782,74 +785,6 @@
 			return false;
 		});
 
-		/*function deleteCartAjax(cartArr) {
-			if(cartArr.length < 1) {
-				mcxDialog.alert("삭제하실 상품을 선택해 주세요.");
-				return false;
-			}
-
-			let data = {
-				cartSqArr : cartArr
-			}
-
-			let jsonData = JSON.stringify(data);
-
-			$.ajax( {
-				type: "POST",
-				url : '/cart/deleteCart',
-				contentType: 'application/json',
-				dataType : 'json',
-				data : jsonData,
-				success : function(result) {
-					mcxDialog.alert("삭제 되었습니다.");
-					let data = {shotDelvUseYn : $("input[name=shotDelvUseYn]:checked").val()};
-					getCartList(data);
-				}
-			});
-		}*/
-
-		/*function deleteCart(gbn) {
-			let cartArr = [];
-			let confirmMessage = "";
-			if(gbn == "WMS_SELECT") {
-				$("#cartListForm .wmsList input[name=cartSqArr]:checked").each(function () {
-					cartArr.push($(this).val());
-				});
-
-				confirmMessage = "총 " + cartArr.length + "개의 상품을 삭제합니다.";
-			} else if(gbn == "DELV_SELECT") {
-				$("#cartListForm .delvList input[name=cartSqArr]:checked").each(function () {
-					cartArr.push($(this).val());
-				});
-
-				confirmMessage = "총 " + cartArr.length + "개의 상품을 삭제합니다.";
-			} else if(gbn == "WMS_ALL") {
-				$("#cartListForm .wmsList input[name=cartSqArr]").each(function() {
-					cartArr.push($(this).val());
-				});
-
-				confirmMessage = "총알배송상품을 전부 삭제하시겠습니까?";
-			} else if(gbn == "DELV_ALL") {
-				$("#cartListForm .delvList input[name=cartSqArr]").each(function() {
-					cartArr.push($(this).val());
-				});
-
-				confirmMessage = "업체직배송 상품을 전부 삭제하시겠습니까?";
-			} else {
-				cartArr.push(gbn);
-				deleteCartAjax(cartArr);
-				return false;
-			}
-
-			mcxDialog.confirm(confirmMessage, {
-				cancelBtnText: "취소/닫기",			//취소 또는 닫기 버튼명
-				sureBtnText  : "확인",				//처리문 버튼명
-				sureBtnClick : function () {
-					deleteCartAjax(cartArr);
-				}
-			});
-		}*/
-
 		$("input[name=cartSqArr]").on("change", function(e) {
 			changeCartSqArr();
 		});
@@ -888,6 +823,19 @@
 			$("#cartListForm .applyTmtb").hide();
 			$("#cartListForm .notApplyTmtb").hide();
 
+			// 배송비 정보 0원으로 모두 변경 (체크 되지 않은 업체는 0원처리)
+			$("#cartListForm .goods_foot .delvFeeArea").text("배송비 0원");
+
+			/*$("#cartListForm .goods_foot").each(function() {
+				alert($(this).parent().find("input[name=supplyCompNm]").val());
+				let compNm = $(this).parent().find("input[name=supplyCompNm]").val();
+				let html = "<span class='dlvr_fee delvFeeArea'>배송비 <em>0</em>원</span>";
+				if(compNm != "WMS") {
+					html += "<span class='dlvr_shop'><em>" + compNm + "</em> 업체직배송</span>";
+				};
+				$(this).find(".order_delivery").html(html);
+			});*/
+
 			// 장바구니 각 상품 가격 정보 할인 전으로 변경
 			$("#cartListForm .cartInfo input[name=cartSq]").each(function() {
 				if($(this).parent().find(".calc_box .price_org").text() != "") {
@@ -896,7 +844,7 @@
 				}
 			});
 
-			$("#cartListForm").find(".delvFeeArea").html("<div class='info_dlvr'><span class='dlvr_fee'>배송비 무료</span></div>");
+			// $("#cartListForm").find(".delvFeeArea").html("<div class='info_dlvr'><span class='dlvr_fee'>배송비 무료</span></div>");
 			for(let i = 0 ; i < shotList.length ; i++) {
 				cartList.push(shotList[i]);
 				$("#cartListForm .shotCartInfo input[name=cartSq]").each(function() {
@@ -929,6 +877,16 @@
 				});
 			}
 
+			// 자사 상품 배송비
+			if(order.delvYn == "N" || order.delvYn == null) {
+
+			} else if(order.wmsDelvFee == 0) {
+				$(".selfGoodsDelv").html("<span class='dlvr_fee'>배송비 무료</span>");
+			} else {
+				let html = "<span class='dlvr_fee'>배송비 <em>" + Number(order.wmsDelvFee).toLocaleString() + "</em> 원</span><a href='#' class='btn_popup_save'>배송비 SAVE 상품 보기</a>";
+				$(".selfGoodsDelv").html(html);
+			}
+
 			for(let i = 0 ; i < wmsList.length ; i++) {
 				cartList.push(wmsList[i]);
 				$("#cartListForm .wmsCartInfo input[name=cartSq]").each(function() {
@@ -961,14 +919,6 @@
 				});
 			}
 
-			// 자사 상품 배송비
-			if(order.wmsDelvFee == 0) {
-				$(".selfGoodsDelv").html("<span class='dlvr_fee'>배송비 무료</span>");
-			} else {
-				let html = "<span class='dlvr_fee'>배송비 <em>" + Number(order.wmsDelvFee).toLocaleString() + "</em> 원</span><a href='#' class='btn_popup_save'>배송비 SAVE 상품 보기</a>";
-				$(".selfGoodsDelv").html(html);
-			}
-
 			for(let i = 0 ; i < delvList.length ; i++) {
 				cartList.push(delvList[i]);
 				$("#cartListForm .delvList .delvCartInfo input[name=cartSq]").each(function() {
@@ -997,10 +947,11 @@
 							$(this).parent().find("input[name=tmtbDcAmt]").val(delv.tmtbDcAmt);
 						}
 
+						// 입점업체 배송비 목록
 						if(delv.delvFee == 0) {
-							$(".delvList").find(".delv_" + delv.delvFeeCd).html("<span class='dlvr_fee'>배송비 무료</span><span class='dlvr_fee'><em>" + delv.supplyCompNm + "</em> 업체직배송</span>");
+							$(".delvList").find(".delv_" + delv.delvFeeCd).html("<span class='dlvr_fee delvFeeArea'>배송비 무료</span><span class='dlvr_fee'><em>" + delv.supplyCompNm + "</em> 업체직배송</span>");
 						} else {
-							let html = "<div className='order_delivery'><span class='dlvr_fee'>배송비 <em>" + Number(delv.delvFee).toLocaleString() + "</em>원</span><span class='dlvr_shop'><em>" + delv.supplyCompNm + "</em> 업체직배송</span><a href='#' className='btn_popup_save'>배송비 SAVE 상품 보기</a></div>";
+							let html = "<div className='order_delivery'><span class='dlvr_fee delvFeeArea'>배송비 <em>" + Number(delv.delvFee).toLocaleString() + "</em>원</span><span class='dlvr_shop'><em>" + delv.supplyCompNm + "</em> 업체직배송</span><a href='#' className='btn_popup_save'>배송비 SAVE 상품 보기</a></div>";
 							$(".delvList").find(".delv_" + delv.delvFeeCd).html(html);
 						}
 					}

src/main/webapp/WEB-INF/views/web/common/fragments/FooterWeb.html

@@ -1082,7 +1082,7 @@
 							}
 							quickShoppingBagHtml += "			<a href='javascript:fnGoToGoodsDetail(\"" + info.goodsCd + "\")' class='itemLink'>";
 							quickShoppingBagHtml += '				<div class="itemPic">';
-							quickShoppingBagHtml += '					<img alt="BLACK-a" class="vLHTC pd_img" src="' + order.imgPath1 + '/' + info.sysImgNm + '?RS=120"/>';
+							quickShoppingBagHtml += '					<img alt="BLACK-a" class="vLHTC pd_img" src="' + _uploadGoodsUrl + '/' + info.sysImgNm + '?RS=120"/>';
 							quickShoppingBagHtml += '				</div>';
 							quickShoppingBagHtml += '				<p class="itemBrand">' + info.brandEnm + ' ' + info.brandKnm + '</p>';
 							quickShoppingBagHtml += '				<div class="itemName">' + info.goodsNm + '</div>';

src/main/webapp/WEB-INF/views/web/display/AllBrandFormWeb.html

@@ -32,7 +32,7 @@
 				<div class="brand_banner_list" th:if="${mainBrandList != null}" th:with="imgUrl=${@environment.getProperty('upload.image.view')}">
 					<ul>
 						<li th:each="item, status : ${mainBrandList}">
-							<a href="javascript:void(0);" th:style="${'background-image:url('+imgUrl+ item.logoFileNm+');'}">
+							<a href="javascript:void(0);" th:onClick="cfnGoToBrandMain([[${item.brandGroupNo}]]);" th:style="${'background-image:url('+imgUrl+ item.logoFileNm+');'}">
 								<span><em th:text="${item.brandGroupNm}">BUCKAROO</em></span>
 							</a>
 						</li>

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

@@ -0,0 +1,546 @@
+<!DOCTYPE html>
+<html lang="ko"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+	layout:decorator="web/common/layout/MypageLayoutWeb">
+<!--
+ *******************************************************************************
+ * @source  : MypageCreCancelDetailFormWeb.html
+ * @desc    : 마이페이지 > 취소/반품/교환내역 > 취소상세 Page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2021 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.04.12   card007     최초 작성
+ *******************************************************************************
+ -->
+<body>
+
+<th:block layout:fragment="content">
+	<div class="content myOrderView"> <!-- 페이지특정 클래스 = myOrderView -->
+		<div class="cont_body">
+			<!-- CONT-BODY -->
+			<div class="lnb">
+				<div class="lnb_tit">
+					<h2>마이페이지</h2>
+				</div>
+				<div class="lnb_list">
+					<ul id="mypageLnbList"></ul>
+				</div>
+
+			</div>
+			<div class="cont">
+				<div class="sec_head">
+					<h3 class="subH1">취소상세</h3>
+					<span class="order_number">주문번호&nbsp;:&nbsp;<em th:text="${cancelDetailList.oneData.ordNo}"></em></span>
+				</div>
+				<div class="sec_body">
+					<div class="part_goods">
+						<div class="goods_head">
+							<p th:unless="${cancelDetailList.oneData.giftPackYn == 'Y'}">주문일 <span th:text="${cancelDetailList.oneData.ordDt}"></span></p>
+							<p th:if="${cancelDetailList.oneData.giftPackYn == 'Y'}">선물일 <span th:text="${cancelDetailList.oneData.ordDt}"></span></p>
+							<a href="javascript:void(0)" th:attr="ordNo=${cancelDetailList.oneData.ordNo}" onclick="fnGoToOrderDetail(this);">상세보기</a>
+						</div>
+						<div class="goods_cont">
+							<!-- 주문상품 -->
+							<th:block th:if="${cancelDetailList.cancelDetailList}" th:each="cancelDtl, status : ${cancelDetailList.cancelDetailList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
+								<div class="goods_info">
+									<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)">
+													<span class="thumb">
+														<img th:src="${imageUrl + '/' + cancelDtl.sysImgNm}" width="100%" alt="">
+													</span>
+													<p>
+														<span class="brand" th:text="${cancelDtl.brandNm}"></span>
+														<span class="tag primary" th:if="${cancelDtl.shotDelvYn == 'Y'}">총알배송</span>
+														<span class="tag" th:if="${cancelDtl.shotDelvYn == 'N' and cancelDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</span>
+														<span class="tag" th:if="${cancelDtl.selfGoodsYn == 'N'}">업체직배송</span>
+													</p>
+													<p>
+														<span class="name" th:text="${cancelDtl.goodsNm}"></span>
+													</p>
+												</a>
+											</div>
+											<div class="gd_opt">
+												<div class="option_wrap">
+													<span class="title sr-only">주문 옵션</span>
+													<span class="option" th:if="${cancelDtl.goodsType == 'G056_S'}" th:each="option, status : ${cancelDtl.colorNmArr}" th:text="|${cancelDtl.itemNmArr[status.index]} / ${option} / ${cancelDtl.optCd2Arr[status.index]}|"></span>
+													<span class="option" th:unless="${cancelDtl.goodsType == 'G056_S'}" th:text="|${cancelDtl.colorNm} / ${cancelDtl.optCd2}|"></span>
+												</div>
+											</div>
+											<div class="gd_calc">
+												<p>
+													<span class="count"><em th:text="${cancelDtl.chgQty}"></em>개</span>
+												</p>
+												<p>
+													<span class="price_org" th:if="${(cancelDtl.ordAmt - cancelDtl.cnclRtnAmt - cancelDtl.cpn1DcAmt) * (cancelDtl.chgQty / cancelDtl.ordQty) > (cancelDtl.realOrdAmt + cancelDtl.pntDcAmt + cancelDtl.gfcdUseAmt) * (cancelDtl.chgQty / cancelDtl.ordQty)}"><em th:text="${#numbers.formatInteger((ordDtl.ordAmt - ordDtl.cnclRtnAmt - ordDtl.cpn1DcAmt) * (cancelDtl.chgQty / cancelDtl.ordQty), 1, 'COMMA')}"></em>원</span>
+													<span class="price_sale"><em th:text="${#numbers.formatInteger((ordDtl.realOrdAmt + ordDtl.pntDcAmt + ordDtl.gfcdUseAmt) * (cancelDtl.chgQty / cancelDtl.ordQty), 1, 'COMMA')}"></em>원</span>
+												</p>
+											</div>
+										</div>
+										<div class="status_box">
+											<p>
+												<th:block th:text="${cancelDtl.chgStatNm}"></th:block>
+												<span class="date" th:text="${cancelDtl.chgDate}"></span>
+												<span class="time" th:text="${cancelDtl.chgTime}"></span>
+											</p>
+										</div>
+										<div class="button_box">
+											<p th:if="${chgStat == 'G685_20' or chgStat == 'G685_21' or chgStat == 'G685_50' or chgStat == 'G685_51'}"><button type="button" class="btn btn_default btn_sm" th:attr="ordChgSq=${cancelDtl.ordChgSq}" onclick="fnCreCancel(this);"><span>신청취소</span></button></p>
+											<p th:if="${chgStat == 'G685_21' or chgStat == 'G685_32' or chgStat == 'G685_51'}"><button type="button" class="btn btn_default btn_sm" th:attr="ordChgSq=${cancelDtl.ordChgSq}" onclick="fnCrePayAddCost(this);"><span>결제하기</span></button></p>
+											<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>
+										</div>
+									</div>
+									<!-- 결제대기 -->
+									<div class="order_text" th:if="${chgStat == 'G685_21' or (chgGb == 'G680_40' and chgStat == 'G685_32')}"><p th:text="|${cancelDtl.addPayCost}|원 결제 후 교환 가능합니다."></p></div>
+								</div>
+							</th:block>
+							<!-- //주문상품 -->
+						</div>
+					</div>
+					<h4 class="subH3">상세 정보</h4>
+					<div class="tbl type1">
+						<table>
+							<colgroup>
+								<col width="210">
+								<col width="*">
+							</colgroup>
+							<tbody><tr>
+								<th>
+									취소접수 일자
+								</th>
+								<td>
+									2021.01.18
+								</td>
+							</tr>
+							<tr>
+								<th>
+									취소완료 일자
+								</th>
+								<td>
+									2021.01.30
+								</td>
+							</tr>
+							</tbody></table>
+					</div>
+					<h4 class="subH3">환불정보</h4>
+					<div class="tbl type6">
+						<table>
+							<colgroup>
+								<col width="50%">
+								<col width="50%">
+							</colgroup>
+							<tbody><tr>
+								<td>
+									<dl>
+										<div>
+											<dt>환불 예정 금액</dt>
+											<dd>
+												<div class="price">
+													<span class="return_total_price"><em>3,546,200</em>원</span>
+												</div>
+											</dd>
+										</div>
+										<div class="include_item"> <!-- 할인항목 표기 class명 include_item -->
+											<dt>상품 취소 금액</dt>
+											<dd><em>123,456,789</em>원</dd>
+										</div>
+										<div class="include_item">
+											<dt>배송비</dt>
+											<dd><em>-2,500</em>원</dd>
+										</div>
+										<div class="include_item">
+											<dt>할인 금액 차감</dt>
+											<dd><em>-123,456,789</em>원</dd>
+										</div>
+									</dl>
+								</td>
+								<td>
+									<dl>
+										<div>
+											<dt>결제 금액 환불</dt>
+											<dd>
+												<em>123,456,789</em>원
+											</dd>
+										</div>
+										<div>
+											<dt>포인트 환불</dt>
+											<dd>
+												<em>123,456,789P</em>
+											</dd>
+										</div>
+										<div>
+											<dt>상품권 환불</dt>
+											<dd>
+												<em>-123,456,789</em>원
+											</dd>
+										</div>
+										<div>
+											<dt>환불 수단</dt>
+											<dd>
+												신용카드(현대카드) / 일시불
+											</dd>
+										</div>
+										<div>
+											<dt class="sr-only">영수증 확인</dt>
+											<dd>
+												<button type="button" class="btn btn_default btn_sm"><span>취소 전표 보기</span>
+												</button></dd>
+										</div>
+									</dl>
+								</td>
+							</tr>
+							</tbody></table>
+					</div>
+					<div class="txt_info">
+						<ul>
+							<li>
+								카드사로 결제 취소 요청이 전달된 후 환불까지는 평일 기준 3 ~7일이 소요될 수 있습니다.
+							</li>
+						</ul>
+					</div>
+					<div class="btn_footer_area">
+						<button type="button" class="btn btn_dark btn_md"><span>확인</span></button>
+					</div>
+				</div>
+			</div>
+			<!-- // CONT-BODY -->
+		</div>
+	</div>
+<script src="/ux/plugins/gaga/gaga.paging.js"></script>
+<script th:inline="javascript">
+	/*<![CDATA[*/
+	let totalCount = 0;
+	let pageSize = 0;
+
+	$(document).ready(function() {
+		// 마이페이지 LNB 설정
+		fnSetMypageLnbList(2);
+		
+		// 마이페이지 location 설정
+		fnSetMypageLocation('취소/반품/교환내역');
+		
+		// datepicker 설정
+		$('.period_datepicker').datepicker();
+
+		// 셀렉트박스 활성화
+		$('.select_custom.demand_status').each(function(index) {
+			new sCombo($(this));
+		});
+
+		// 주문 검색 기간 설정
+		$('#rdi-month2').click();
+
+		// Initialize a pagination
+		gagaPaging.init('searchForm', fnSearchCallback, 'paging', 5, 10);
+		
+		// Load data
+		gagaPaging.load(1);
+	});
+	
+	// 검색기간 버튼 클릭 이벤트 처리
+	var fnSetSearchPeriod = function(period) {
+		let date = new Date();
+		let edDate = date.getFullYear() + '-' + ('0' + (date.getMonth() + 1)).slice(-2) + '-' + ('0' + (date.getDate() + 1)).slice(-2);
+		date.setMonth(date.getMonth() - period);
+		let stDate = date.getFullYear() + '-' + ('0' + (date.getMonth() + 1)).slice(-2) + '-' + ('0' + (date.getDate() + 1)).slice(-2);
+
+		$('#edDate').val(edDate);
+		$('#searchForm input[name=edDate]').val(edDate);
+		$('#stDate').val(stDate);
+		$('#searchForm input[name=stDate]').val(stDate);
+	}
+
+	// 주문 목록 조회
+	var fnSearchCreList = function() {
+		gagaPaging.load(1);
+	}
+
+	// 주문 목록 조회 콜백
+	var fnSearchCallback = function(result) {
+		$('#creList').html(fnCreateCreList(result));
+
+		// Create pagination
+		gagaPaging.createPagination(result.creInfo.pageable);
+	}
+
+	// 검색기간 설정 체크
+	var fnCheckPeriod = function(param) {
+		let stDate = $('#stDate').val();
+		let edDate = $('#edDate').val();
+
+		let sdt = new Date(stDate);
+		let edt = new Date(edDate);
+		let dateDiff = Math.ceil((edt.getTime() - sdt.getTime()) / (1000 * 3600 * 24));
+
+		if (dateDiff > 366) {
+			let id = $(param).attr('id');
+			mcxDialog.alert('조회기간은 최대 1년을 넘을 수 없습니다.');
+			if (id == 'stDate') {
+				sdt.setFullYear(sdt.getFullYear() + 1);
+				let chgEdDate = sdt.getFullYear() + '-' + ('0' + (sdt.getMonth() + 1)).slice(-2) + '-' + ('0' + (sdt.getDate())).slice(-2);
+
+				$('#edDate').val(chgEdDate);
+				$('#searchForm input[name=edDate]').val(chgEdDate);
+			} else {
+				edt.setFullYear(edt.getFullYear() - 1);
+				let chgStDate = edt.getFullYear() + '-' + ('0' + (edt.getMonth() + 1)).slice(-2) + '-' + ('0' + (edt.getDate())).slice(-2);
+
+				$('#stDate').val(chgStDate);
+				$('#searchForm input[name=stDate]').val(chgStDate);
+			}
+		}
+	}
+
+	// 상태값 별 수량 업데이트 처리
+	var fnReloadStatusCount = function() {
+		let url = '/mypage/status/count';
+		
+		let data = {};
+		data.custNo = customerInfo.custNo;
+		
+		let jsonData = JSON.stringify(data);
+		
+		gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
+			$('#orderReceiptCount').text(result.orderCount.orderReceiptCount);
+			$('#paymentCompleteCount').text(result.orderCount.paymentCompleteCount);
+			$('#goodsPrepareCount').text(result.orderCount.goodsPrepareCount);
+			$('#shipPrepareCount').text(result.orderCount.shipPrepareCount);
+			$('#shippingCount').text(result.orderCount.shippingCount);
+			$('#shipCompleteCount').text(result.orderCount.shipCompleteCount);
+			$('#orderCreCount').text(result.orderCount.cancelCount + result.orderCount.returnCount + result.orderCount.exchangeCount);
+		});
+	}
+
+	// 주문상세상태코드 셀렉트박스 변경 이벤트
+	$('.select_custom.demand_status').find('li').on('click', function() {
+		$('#searchForm input[name=chgStat]').val($(this).attr('code'));
+	});
+
+	// 주문내역 리스트 처리
+	var fnCreateCreList = function(param) {
+		let tag = '';
+		let imageUrl = [[${@environment.getProperty('upload.goods.view')}]];
+
+		if (param.creList != null && param.creList.length > 0) {
+			$.each(param.creList, function (idx, creList) {
+				tag += '						<div class="part_goods">\n';
+				tag += '							<div class="goods_head">\n';
+				if (creList.giftPackYn == 'Y') {
+					tag += '								<p>선물일 <span>' + creList.ordDt + '</span></p>\n';
+				} else {
+					tag += '								<p>주문일 <span>' + creList.ordDt + '</span></p>\n';
+				}
+				tag += '								<a href="javascript:void(0)" ordChgSq="' + creList.ordChgSq + '" chgGb="' + creList.oneData.chgGb + '" onclick="fnGoToCreDetail(this)">상세보기</a>\n';
+				tag += '							</div>\n';
+				tag += '							<div class="goods_cont">\n';
+				$.each(creList.creList, function (index, cre) {
+					tag += '								<!-- 주문상품1 -->\n';
+					tag += '								<div class="goods_info">\n';
+					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';
+					tag += '													<span class="thumb">\n';
+					tag += '														<img src="' + imageUrl + '/' + cre.sysImgNm + '" width="100%" alt="">\n';
+					tag += '													</span>\n';
+					tag += '													<p>\n';
+					tag += '														<span class="brand">' + cre.brandNm + '</span>\n';
+					// 배송 아이콘 처리
+					if (cre.shotDelvYn == 'Y') {
+						tag += '														<span class="tag primary">총알배송</span>\n';
+					} else if (cre.selfGoodsYn == 'Y') {
+						tag += '														<span class="tag">STYLE24 일반배송</span>\n';
+					} else {
+						tag += '														<span class="tag">업체직배송</span>\n';
+					}
+					tag += '													</p>\n';
+					tag += '													<p>\n';
+					tag += '														<span class="name">' + cre.goodsNm + '</span>\n';
+					tag += '													</p>\n';
+					tag += '												</a>\n';
+					tag += '											</div>\n';
+					tag += '											<div class="gd_opt">\n';
+					tag += '												<div class="option_wrap">\n';
+					tag += '													<span class="title sr-only">주문 옵션</span>\n';
+					// 세트아이템 옵션 처리
+					if (cre.goodsType == 'G056_S') {
+						$.each(cre.colorNmArr, function (index2, option) {
+							tag += '													<span class="option">' + cre.itemNmArr[index2] + ' / ' + option + ' / ' + cre.optCd2Arr[index2] + '</span>\n';
+						});
+					} else {
+						tag += '													<span class="option">' + cre.colorNm + ' / ' + cre.optCd2 + '</span>\n';
+					}
+					tag += '												</div>\n';
+					tag += '											</div>\n';
+					tag += '											<div class="gd_calc">\n';
+					tag += '												<p>\n';
+					tag += '													<span class="count"><em>' + cre.chgQty + '</em>개</span>\n';
+					tag += '												</p>\n';
+					tag += '											</div>\n';
+					tag += '											<div class="gd_opt">\n';
+					tag += '												<div class="option_wrap">\n';
+					// 교환옵션
+					if (cre.chgGb == 'G680_40') {
+						$.each(creList.exchangeOptionList, function(index, exchange) {
+							if (cre.chgOrdDtlNo == exchange.ordDtlNo) {
+								if (cre.goodsType == 'G056_S') {
+									tag += '													<span class="title">교환 옵션</span>';
+									$.each(exchange.colorNmArr, function (index2, option) {
+										tag += '													<span class="option">' + exchange.itemNmArr[index2] + ' / ' + option + ' / ' + exchange.optCd2Arr[index2] + '</span>\n';
+									});
+								} else {
+									tag += '													<span class="option">' + exchange.colorNm + ' / ' + exchange.optCd2 + '</span>\n';
+								}
+							}
+						});
+					}
+					tag += '												</div>\n';
+					tag += '											</div>\n';
+					tag += '										</div>\n';
+					tag += '										<div class="status_box">\n';
+					tag += '											<p>\n';
+					tag += '												' + cre.chgStatNm + '\n';
+					tag += '												<span class="date">' + cre.chgDate + '</span>\n';
+					tag += '												<span class="time">' + cre.chgTime + '</span>\n';
+					tag += '											</p>\n';
+					tag += '										</div>\n';
+					tag += '										<div class="button_box">\n';
+					if (cre.chgStat == 'G685_20' || cre.chgStat == 'G685_21' || cre.chgStat == 'G685_50' || cre.chgStat == 'G685_51') {
+						tag += '											<p><button type="button" class="btn btn_default btn_sm" ordChgSq="' + cre.ordChgSq + '" onclick="fnCreCancel(this);"><span>신청취소</span></button></p>\n';
+					}
+					if (cre.chgStat == 'G685_21' || cre.chgStat == 'G685_51' || cre.chgStat == 'G685_32') {
+						tag += '											<p><button type="button" class="btn btn_default btn_sm" ordChgSq="' + cre.ordChgSq + '" onclick="fnCrePayAddCost(this);"><span>결제하기</span></button></p>\n';
+					}
+					if (cre.chgStat == 'G685_40') {
+						tag += '											<p><button type="button" class="btn btn_default btn_sm" ordDtlNo="' + cre.ordDtlNo + '" onclick="fnGoToDeliveryTrack(this);"><span>배송조회</span></button></p>\n';
+					}
+					tag += '											<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>\n';
+					tag += '										</div>\n';
+					tag += '									</div>\n';
+					//if (cre.chgStat == 'G685_10') {
+					//	tag += '									<div class="order_text"><p>' + cre.addPayCost + '원 결제 후 취소 가능합니다.</p></div>\n';
+					//}
+					// cre.chgGb == 'G680_30' : 반품
+					// cre.chgGb == 'G680_40' : 교환
+					// 교환접수
+					if (cre.chgStat == 'G685_20') {
+						tag += '									<div class="order_text"><p>교환 신청이 접수 되었습니다. 신속하게 처리하여 드리겠습니다.</p></div>\n';
+					}
+					// 교환대기
+					if (cre.chgStat == 'G685_21') {
+						tag += '									<div class="order_text"><p>' + cre.addPayCost.addComma() + '원 결제 후 교환 가능합니다.</p></div>\n';
+					}
+					// 회수요청
+					if (cre.chgStat == 'G685_30') {
+						tag += '									<div class="order_text"><p>고객님이 요청하신 회수지로 상품을 회수 중에 있습니다.</p></div>\n';
+					}
+					// 상품 검수중(교환)
+					if (cre.chgStat == 'G685_31' && cre.chgGb == 'G680_40') {
+						tag += '									<div class="order_text"><p>고객님이 교환하신 상품을 검수 중에 있습니다.</p></div>\n';
+					}
+					// 결제대기(교환)
+					if (cre.chgStat == 'G685_32' && cre.chgGb == 'G680_40') {
+						tag += '									<div class="order_text"><p>' + cre.addPayCost.addComma() + '원 결제 후 교환 가능합니다.</p></div>\n';
+					}
+					// 교환완료
+					if (cre.chgStat == 'G685_40') {
+						$.each(creList.exchangeOptionList, function(index, exchange) {
+							if (cre.chgOrdDtlNo == exchange.ordDtlNo && (exchange.ordDtlStat == 'G013_60' || exchange.ordDtlStat == 'G013_70')) {
+								tag += '									<div class="order_text"><p>교환이 완료되었습니다.</p></div>\n';
+							}
+						});
+					}
+					// 교환철회
+					if (cre.chgStat == 'G685_49') {
+						tag += '									<div class="order_text"><p>요청하신 교환을 취소하였습니다.</p></div>\n';
+					}
+					// 반품접수
+					if (cre.chgStat == 'G685_50') {
+						tag += '									<div class="order_text"><p>반품 신청이 접수 되었습니다. 신속하게 처리하여 드리겠습니다.</p></div>\n';
+					}
+					// 반품대기
+					if (cre.chgStat == 'G685_51') {
+						tag += '									<div class="order_text"><p>' + cre.addPayCost.addComma() + '원 결제 후 반품 가능합니다.</p></div>\n';
+					}
+					// 상품 검수중(반품)
+					if (cre.chgStat == 'G685_31' && cre.chgGb == 'G680_40') {
+						tag += '									<div class="order_text"><p>고객님이 반품하신 상품을 검수 중에 있습니다.</p></div>\n';
+					}
+					// 결제대기(반품)
+					if (cre.chgStat == 'G685_32' && cre.chgGb == 'G680_40') {
+						tag += '									<div class="order_text"><p>' + cre.addPayCost.addComma() + '원 결제 후 반품 가능합니다.</p></div>\n';
+					}
+					// 환불진행중
+					if (cre.chgStat == 'G685_33') {
+						tag += '									<div class="order_text"><p>' + cre.refundAmt.addComma() + '원 환불을 진행하고 있습니다.(영업일 최대 3일 내 환불 예정)</p></div>\n';
+					}
+					// 반품완료
+					if (cre.chgStat == 'G685_60') {
+						tag += '									<div class="order_text"><p>반품이 완료되었습니다.</p></div>\n';
+					}
+					// 반품철회
+					if (cre.chgStat == 'G685_69') {
+						tag += '									<div class="order_text"><p>요청하신 반품을 취소하였습니다.</p></div>\n';
+					}
+					tag += '								</div>\n';
+				});
+				tag += '							</div>\n';
+				tag += '						</div>\n';
+			});
+		} else {
+			// 데이터 없음 표시
+			tag += '						<div class="nodata">';
+			tag += '							<div class="txt_box">';
+			tag += '								<p>';
+			tag += '									취소/반품/교환내역이 없습니다.<br>';
+			tag += '								</p>';
+			tag += '							</div>';
+			tag += '						</div>';
+		}
+
+		return tag;
+	}
+	
+	// 취반교 상세 페이지 이동
+	var fnGoToCreDetail = function(param) {
+		let ordChgSq = $(param).attr('ordChgSq');
+		let chgGb = $(param).attr('chgGb');
+		
+		console.log('ordChgSq : ' + ordChgSq);
+		console.log('chgGb : ' + chgGb);
+		// TODO
+		// 취반교 상세 페이지 이동
+	}
+	
+	// 취반교 신청 취소 버튼 클릭 이벤트
+	var fnCreCancel = function(param) {
+		let ordChgSq = $(param).attr('ordChgSq');
+		// TODO
+		// 취반교 신청 철회 처리
+	}
+	
+	// 취반교 결제하기 버튼 클릭 이벤트
+	var fnCrePayAddCost = function(param) {
+		let ordChgSq = $(param).attr('ordChgSq');
+		// TODO
+		// 취반교 추가 배송비 결제 화면 이동 처리
+	}
+	
+	// 취반교 배송조회 버튼 클릭 이벤트
+	var fnGoToDeliveryTrack = function(param) {
+		let ordDtlNo = $(param).attr('ordDtlNo');
+		// TODO
+		// 최반교 배송조회 페이지 이동 처리
+	}
+/*]]>*/
+</script>
+
+</th:block>
+
+</body>
+</html>

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

@@ -152,6 +152,15 @@
 					<input type="hidden" name="edDate" value="" />
 					<input type="hidden" name="custNo" th:value ="${custNo}"/>
 				</form>
+				<form id="exchangeForm" name="exchangeForm" action="#" th:action="@{'/mypage/cre/exchange/detail/form'}" th:method="post">
+					<input type="hidden" name="ordChgSq"/>
+				</form>
+				<form id="returnForm" name="returnForm" action="#" th:action="@{'/mypage/cre/return/detail/form'}" th:method="post">
+					<input type="hidden" name="ordChgSq"/>
+				</form>
+				<form id="cancelForm" name="cancelForm" th:action="@{'/mypage/cre/cancel/detail/form'}" th:method="post">
+					<input type="hidden" name="ordChgSq"/>
+				</form>
 			</div>
 			<!-- // CONT-BODY -->
 		</div>
@@ -280,7 +289,7 @@
 				} else {
 					tag += '								<p>주문일 <span>' + creList.ordDt + '</span></p>\n';
 				}
-				tag += '								<a href="javascript:void(0)" ordChgSq="' + creList.ordChgSq + '" onclick="fnGoToCreDetail(this)">상세보기</a>\n';
+				tag += '								<a href="javascript:void(0)" ordChgSq="' + creList.ordChgSq + '" chgGb="' + creList.oneData.chgGb + '" onclick="fnGoToCreDetail(this)">상세보기</a>\n';
 				tag += '							</div>\n';
 				tag += '							<div class="goods_cont">\n';
 				$.each(creList.creList, function (index, cre) {
@@ -453,6 +462,11 @@
 	
 	// 취반교 상세 페이지 이동
 	var fnGoToCreDetail = function(param) {
+		let ordChgSq = $(param).attr('ordChgSq');
+		let chgGb = $(param).attr('chgGb');
+		
+		console.log('ordChgSq : ' + ordChgSq);
+		console.log('chgGb : ' + chgGb);
 		// TODO
 		// 취반교 상세 페이지 이동
 	}

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

@@ -407,7 +407,7 @@
 											</div>
 											<div class="include_item" th:if="${paymentInfo.npayPntAmt > 0}">
 												<dt>마일리지 사용</dt>
-												<dd><em th:text="|- ${#numbers.formatInteger(paymentInfo.npayPntAmt, 1, 'COMMA')}|"></em>원</dd>
+												<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.npayPntAmt, 1, 'COMMA')}|"></em>원</dd>
 											</div>
 											<div class="include_item" th:if="${paymentInfo.pgCpnAmt > 0}">
 												<dt>제휴할인</dt>
@@ -421,7 +421,7 @@
 												<dt>결제 금액</dt>
 												<dd>
 													<div class="price">
-														<span class="pay_total_price"><em th:text="${#numbers.formatInteger(orderAmtInfo.realOrdAmt + orderAmtInfo.realDelvAmt, 1, 'COMMA')}"></em>원</span>
+														<span class="pay_total_price"><em th:text="${#numbers.formatInteger(orderAmtInfo.payAmt - orderAmtInfo.npayPntAmt, 1, 'COMMA')}"></em>원</span>
 													</div>
 												</dd>
 											</div>
@@ -500,6 +500,7 @@
 	let oneData = [[${oneData}]];
 	let paymentInfo = [[${paymentInfo}]];
 	let orderAmtInfo = [[${orderAmtInfo}]];
+	let deliveryAddrInfo = [[${deliveryAddrInfo}]];
 	let kcpReceiptUrl = [[${@environment.getProperty('pg.kcp.receipt.url')}]];
 	let jsonObj = {};
 
@@ -587,7 +588,7 @@
 
 	// 배송지 정보 설정
 	var delvAddrSet = function(delvObj) {
-		let custDelvAddrSq = delvObj.custDelvAddrSq;
+		let delvAddrSq = deliveryAddrInfo.delvAddrSq;
 		let recipNm = delvObj.recipNm;
 		let recipPhnno = delvObj.recipPhnno;
 		let recipZipcode = delvObj.recipZipcode;
@@ -602,7 +603,7 @@
 		
 		let url = '/mypage/change/delvery/addr';
 		let data = {};
-		data.custDelvAddrSq = custDelvAddrSq;
+		data.delvAddrSq = delvAddrSq;
 		data.recipNm = recipNm;
 		data.recipPhnno = recipPhnno;
 		data.recipZipcode = recipZipcode;

src/main/webapp/WEB-INF/views/web/order/OrderCompleteWeb.html

@@ -48,7 +48,7 @@
 									</div>
 									<div class="closedate">
 										<dt>입금마감</dt>
-										<dd><span  th:text="|${orderInfo.vaDeadline}"></span>까지</dd>
+										<dd><span th:text="|${orderInfo.vaDeadline}"></span>까지</dd>
 									</div>
 								</th:block>
 								<!-- //무통장 입금 결제시 -->
@@ -359,7 +359,8 @@ var delvAddrSet = function(delvObj) {
 	
 	// 변수값 설정
 	var jsonObj = {
-		"delvAddrSq" 		: delvAddrSq
+		"ordNo" 			: ordNo
+		, "delvAddrSq" 		: delvAddrSq
 		, "recipNm"			: delvObj.recipNm
 		, "recipPhnno"		: delvObj.recipPhnno
 		, "recipZipcode"	: delvObj.recipZipcode
@@ -367,14 +368,6 @@ var delvAddrSet = function(delvObj) {
 		, "recipDtlAddr"	: delvObj.recipDtlAddr
 		, "delvMemo"		: delvObj.delvMemo
 	}
-	
-	gagajf.ajaxJsonSubmit(
-		"/common/updateDeliverAddr"
-		, JSON.stringify(jsonObj)
-		, function (result) {
-			mcxDialog.alert("수정되었습니다.");
-		}
-	)
 }
 
 // 1.19 배송메모설정
@@ -391,13 +384,7 @@ var delvMemoSet = function(delvMemoObj) {
 	
 	$("#delvMemo").text(delvMemoObj.delvMemo);
 	
-	gagajf.ajaxJsonSubmit(
-		"/common/updateDeliverAddrDelvMemo"
-		, JSON.stringify(jsonObj)
-		, function (result) {
-			mcxDialog.alert("수정되었습니다.");
-		}
-	)
+	
 }
 
 

src/main/webapp/WEB-INF/views/web/order/OrderFormWeb.html

@@ -1960,7 +1960,7 @@ var custCpnSumAmtCal = function() {
 			leftGfcdAmt		= leftGfcdAmt - gfcdUseAmt1;
 		}
 		
-		var realOrdAmt1		= ordAmt - dcSumAmt - (pntDcAmt1 - gfcdUseAmt1);
+		var realOrdAmt1		= ordAmt - dcSumAmt - pntDcAmt1 - gfcdUseAmt1;
 		realOrdSumAmt		= realOrdSumAmt + realOrdAmt1;
 		
 		$(this).parent().find(".pntDcAmt1").text(pntDcAmt1);

src/main/webapp/WEB-INF/views/web/order/OrderFreegiftInfoWeb.html

@@ -75,7 +75,7 @@
 							</th:block>
 						</th:block>
 						<div class="gift">
-							<input type="radio" th:name="'rdi-gift'+${i.count}" th:id="${i.count}+'0'" class="chk_img freegiftRdo" value="noSel" usepoint="0" allYn="N"> 
+							<input type="radio" th:name="'rdi-gift'+${i.count}" th:id="${i.count}+'0'" class="chk_img freegiftRdo" value="noSel" usepoint="0" allYn="N" checked> 
 							<label th:for="${i.count}+'0'">
 								<span class="thumb"><img src="/images/pc/thumb/tmp_gift_empty.jpg" width=""alt=""></span> 
 								<span class="name">사은품 수령안함</span>

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

@@ -126,14 +126,16 @@
 								<div class="cmt_thumb">
 									<div class="form_field">
 										<div class="imgUpload">
-											<label for="fileAdd" class="fileAdd" onclick="fnFileAdd()">업로드</label>
-											<input type="file" id="fileAdd" name="files[]" />
-											<input type="hidden" id="orgFileNm" name="orgFileNm">
-											<input type="hidden" id="sysFileNm" name="sysFileNm">
+											<label for="fileAdd" class="fileAdd">업로드</label>
+											<input type="file" id="fileAdd" name="files" />
+											<th:block th:each="num: ${#numbers.sequence(1,10)}">
+											<input type="hidden" th:id="${'orgFileNm' + num}" name="orgFileNm" >
+											<input type="hidden" th:id="${'sysFileNm' + num}" name="sysFileNm">
+											</th:block>
 										</div>
 									</div>
 								</div>
-								<button type="submit" class="btn btn_dark"><span>등록</span></button>
+								<button type="button" class="btn btn_dark" onclick="fnReplySave()"><span>등록</span></button>
 							</form>
 						</div>
 						<div class="cmt_group" id="replyList">
@@ -244,6 +246,11 @@
 <form id="pollListForm" name="pollListForm" th:action="@{'/planning/event/poll/form'}" th:method="post">
 	<input type="hidden" name="planSq" th:value="${planInfo.planSq}"/>
 </form>
+<form id="searchForm" name="searchForm" th:action="@{/planning/reply/list}" th:method="post">
+	<input type="hidden" name="pageNo" value="1" />
+	<input type="hidden" name="planSq" th:value="${planInfo.planSq}" />
+	<input type="hidden" name="pageSize" value="10" />
+</form>
 
 <!-- 댓글 이미지 팝업 -->
 	<div class="modal fade thumb_img_pop" id="thumbImgPop" tabindex="-1" role="dialog" aria-labelledby="thumbImgLabel" aria-hidden="true">
@@ -268,7 +275,7 @@
         </div>        
     </div>
 	<!-- //댓글 이미지 팝업 -->	    
-
+<script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 
 let review = [[${reviewInfo}]];
@@ -743,67 +750,69 @@ var fnTextConfirm = function() {
 	}
 }
 
-// 파일 업로드 확인
-var fnFileAdd = function() {
-	//로그인 확인
-	if (!cfCheckLogin()) {
-		mcxDialog.alert("로그인 후 참여 가능합니다.");
-		$("#replyText").val('');
-		return false;
-	}
+var ajaxReplyList = function () {
+	gagaPaging.init('searchForm', fnSearchCallback, 'paging', 10);
+	gagaPaging.load(1);
+	 /* $.getJSON('/planning/reply/list?planSq='+plan.planSq, function(result, status) { */
+		
+	/*  }); */
 }
 
-var ajaxReplyList = function () {
-	 $.getJSON('/planning/reply/list?planSq='+plan.planSq, function(result, status) {
-		 $("#replyList").html('');
-		 if (status == 'success') {
-			 var html = '';
-			 html += '<div class="cmt_list_tit">';
-			 html += '	<strong>댓글</strong><span class="cnt">('+result.replyList.length.addComma()+')</span>';
-			 html += '</div>';
-			 if (result.replyList.length>0) {
-				 html += '<ul class="cmt_list">';
-				 $.each(result.replyList, function (idx, item) {
-					 html += '	<li>';
-					 html += '		<div class="cmt_top">';
-					 html += '			<span class="writer">'+item.maskingCustId+'</span>';
-					 html += '			<span class="date">'+item.entryDt+'</span>';
-					 html += '		</div>';
-					 html += '		<div class="cmt_cont">';
-					 html += '			<div class="img_wrap clear">';
-					 html += '				<span class="pics"><img class="picsThumbs" src="/images/pc/thumb/ev_list_img01.jpg" alt="썸네일"></span>';
-					 html += '				<span class="pics"><img class="picsThumbs" src="/images/pc/thumb/ev_list_img02.jpg" alt="썸네일"></span>';
-					 html += '				<span class="pics"><img class="picsThumbs" src="/images/pc/thumb/ev_list_img03.jpg" alt="썸네일"></span>';
-					 html += '				<span class="pics"><img class="picsThumbs" src="/images/pc/thumb/ev_list_img04.jpg" alt="썸네일"></span>';
-					 html += '			</div>';
-					 html += '			<p>'+item.entryVal1+'</p>';
-					 if (item.entryCustNo == result.custNo) {
-						 html += '			<button class="btn btn_default btn_del"><span>삭제</span></button>';
-					}
-					 html += '		</div>';
-					 html += '	</li>';
-				 });
-				 html += '</ul>';
-			}else{
-				html += '<div class="nodata" id="replyNoData"> ';
-				html += '	<div class="txt_box">             ';
-				html += '		<p>                           ';
-				html += '			등록된 댓글이 없습니다.             ';
-				html += '		</p>                          ';
-				html += '	</div>                            ';
-				html += '</div>                                ';
-			}
-			 
-		 }
-		 $("#replyList").append(html);
-	 });
+var fnSearchCallback = function (result) {
+	 $("#replyList").html('');
+	 if (result!=null) {
+		 var html = '';
+		 html += '<div class="cmt_list_tit">';
+		 html += '	<strong>댓글</strong><span class="cnt">('+result.replyList.length.addComma()+')</span>';
+		 html += '</div>';
+		 if (result.replyList.length>0) {
+			 html += '<ul class="cmt_list">';
+			 $.each(result.replyList, function (idx, item) {
+				 html += '	<li>';
+				 html += '		<div class="cmt_top">';
+				 html += '			<span class="writer">'+item.maskingCustId+'</span>';
+				 html += '			<span class="date">'+item.entryDt+'</span>';
+				 html += '		</div>';
+				 html += '		<div class="cmt_cont">';
+				 html += '			<div class="img_wrap clear">';
+				 html += '				<span class="pics"><img class="picsThumbs" src="/images/pc/thumb/ev_list_img01.jpg" alt="썸네일"></span>';
+				 html += '				<span class="pics"><img class="picsThumbs" src="/images/pc/thumb/ev_list_img02.jpg" alt="썸네일"></span>';
+				 html += '				<span class="pics"><img class="picsThumbs" src="/images/pc/thumb/ev_list_img03.jpg" alt="썸네일"></span>';
+				 html += '				<span class="pics"><img class="picsThumbs" src="/images/pc/thumb/ev_list_img04.jpg" alt="썸네일"></span>';
+				 html += '			</div>';
+				 html += '			<p>'+item.entryVal1+'</p>';
+				 if (item.entryCustNo == result.custNo) {
+					 html += '			<button class="btn btn_default btn_del"><span>삭제</span></button>';
+				}
+				 html += '		</div>';
+				 html += '	</li>';
+			 });
+			 html += '</ul>';
+		}else{
+			html += '<div class="nodata" id="replyNoData"> ';
+			html += '	<div class="txt_box">             ';
+			html += '		<p>                           ';
+			html += '			등록된 댓글이 없습니다.             ';
+			html += '		</p>                          ';
+			html += '	</div>                            ';
+			html += '</div>                                ';
+		}
+		 
+	 }
+	 $("#replyList").append(html);
+	 
+	// Create pagination
+	gagaPaging.createPagination(result.paging.pageable);
 }
 
 $('#fileAdd').on('change', function() { fnChooseFile(this); });
 
-var fnChooseFile = function(obj) {
+var fnChooseFile = function(obj,fileNo) {
+	console.log($(".pics").length);
 	// multiple 속성이 있으면 files에는 다수의 객체가 할당됨
 	var file = obj.files[0];
+	
+	
 
 	if (!gagajf.isNull(file.name)) {
 		var extension = "\.(jpg|jpeg|png)$";
@@ -811,14 +820,16 @@ var fnChooseFile = function(obj) {
 			mcxDialog.alertC('이미지는 [jpg, jpeg, png] 파일만 가능합니다.', {
 				sureBtnText: "확인",
 				sureBtnClick: function() {
-					$(obj).parent('.imgUpload').finId('.removes').trigger('click');
+					$(obj).parent('.imgUpload').find('.removes').trigger('click');
+					console.log('file.size1', file.size);
 				}
 			});
 			return false;
 		}
 	}
-	
-	if (!gagajf.isNull(file.size) && Number(file.size) > 10 * 1000000) {
+	console.log('file.size2', file.size);
+	// 이거 왜 안먹히지 
+	if (!gagajf.isNull(file.size) && Number(file.size) > (10 * 1000000)) {
 		mcxDialog.alertC('이미지는 최대 10MB 이하 파일만 가능합니다.', {
 			sureBtnText: "확인",
 			sureBtnClick: function() {
@@ -829,14 +840,44 @@ var fnChooseFile = function(obj) {
 	}
 	
 	// 파일 업로드
-	gagajf.ajaxFileUpload('/common/file/upload?subDir=/reply'
+	 gagajf.ajaxFileUpload('/common/file/upload?subDir=/reply'
 			, file
 			, function(result) {
 				// 업로드한 파일명 설정
-				$('input[name=' + obj.name + 'OrgFileNm]').val(result.oldFileName);
-				$('input[name=' + obj.name + 'SysFileNm]').val(result.newFileName);
+				$('#orgFileNm' + fileNo).val(result.oldFileName);
+				$('#sysFileNm' + fileNo).val(result.newFileName);
 			}
-	);
+	); 
+}
+
+
+// 댓글 등록 버튼 클릭 시 
+var fnReplySave = function() {
+	var content = $('#replyText').val();
+	if (content.length < 2){
+		mcxDialog.alert("최소 2자 이상 입력해주세요.");
+		return;
+	}
+	
+	var yokList = new Array('개새끼','개색기','개색끼','개자식','개년','개걸래','개걸레','씨발','씨팔','씨부랄','씨바랄','시발','씹창','씹탱','씨방세','씨방새','씨펄','시펄','십탱','씨박','썅','쌍놈','쌍넘','싸가지','쓰벌','씁얼','상넘이','상놈의','상놈이','상놈을','좆','좃','존나게','존만한','같은년','넣을년','버릴년','부랄년','바랄년','미친년','니기미','니미씹','니미씨','니미럴','니미랄','호로','후레아들','호로새끼','후레자식','후래자식','후라들년','후라들넘','빠구리','병신');
+	if(yokList.indexOf(content)>=0){
+		mcxDialog.alert("입력 불가한 내용을 포함하고 있습니다.");
+		$('#replyText').val('');
+		return;
+	}
+	
+	data = {content : content};
+	var jsonData = JSON.stringify(data);
+
+	mcxDialog.confirm("댓글을 등록 하시겠습니까?", {
+		cancelBtnText : "취소",
+		sureBtnText : "확인",
+		sureBtnClick : function() {
+
+		gagajf.ajaxJsonSubmit('/planning/reply/save', jsonData,function() {
+						
+		});
+	}
 }
 
 
@@ -954,8 +995,17 @@ $(document).ready( function() {
     
 	 // 첨부파일 갯수제한
 	$('.imgUpload .fileAdd').click(function(){
+		if (!cfCheckLogin()) {
+			mcxDialog.alert("로그인 후 참여 가능합니다.");
+			$("#replyText").val('');
+			return false;
+		}
+		
 		var maxFileLength = 10; /* 최대 파일 갯수를 입력해 주세요 */
 		var imgFiles=$('.imgUpload .pics');
+		if (imgFiles.length == 10) {
+			$('#fileAdd').hide();
+		}
 		if (imgFiles.length >= maxFileLength) {
 			alert('이미지는 최대' + maxFileLength +'장 까지 첨부 가능합니다.');
 			$('#fileAdd').attr("disabled",true);

src/main/webapp/WEB-INF/views/web/social/SocialMainFormWeb.html

@@ -48,14 +48,14 @@
                                             <img alt="BLUE-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + SocialData.sysImgNm}">
                                         </div>
                                         <div class="itemSpecialPrice"><span>특가</span></div>
-                                        <p class="itemBrand" th:text="${SocialData.brandKnm}"></p>
+                                        <p class="itemBrand" th:text="${SocialData.brandGroupNm}"></p>
                                         <div class="itemName" th:text="${SocialData.goodsNm}"></div>
                                        <div class="itemComment" th:if="${SocialData.goodsTnm!=null}" th:text="${SocialData.goodsTnm}"></div>
                                         <p class="itemPrice">
                                              [[${#numbers.formatInteger(SocialData.currPrice,0,'COMMA')} + 원]]
                                             <span class="itemPrice_original" th:text="${#numbers.formatInteger(SocialData.listPrice,0,'COMMA')} + '원'"></span>
 											<span class=" itemPercent" th:text="${#numbers.formatDecimal(SocialData.dcRate,1,0)} + '%'"></span>
-                                        </p>100 - ROUND((Z.CURR_PRICE / Z.LIST_PRICE) * 100 ,0) AS DC_RATE 
+                                        </p>
                                     </a>
                                     	 <div class="shopBagBtn">
                                             <button type="button" class="btn btn_defalt" onclick="socialAddCart(this)" th:attr="goodsCd=${SocialData.goodsCd}, minOrdQty=${SocialData.minOrdQty}, goodsType=${SocialData.goodsType}, optCd=${SocialData.optCd}">