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

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

@@ -336,9 +336,6 @@ public class TsfCartService {
 				if (cart.getTmtbDcAmt() == 0) {
 					cart.setTmtbDcAmt(cart.getCurrPrice());
 				}
-
-				log.info("CHECK TMTB_DC_AMT :::: {} / {}", cart.getCartSq(), cart.getTmtbDcAmt());
-				log.info("CHECK TMTB_INFO   :::: {} / {}", cart.getApplyQtySectionYn(), cart.getApplyAmtSectionYn());
 			}
 		}
 
@@ -664,47 +661,40 @@ public class TsfCartService {
 			lastCompCheck.setAddDelvFeeYn("Y");
 		}
 
+		int wmsSumPrice = 0, wmsMinOrdAmt = 0, wmsDelvFee = 0;
+
 		// 장바구니 업체별 합계 금액으로 무료배송 여부 저장
-		for (Order delv : delvFeeInfo) {
-			for (Order param : params) {
+		for (Order param : params) {
+			// 입점업체 배송비
+			for (Order delv : delvFeeInfo) {
 				if (param.getDelvFeeCd().equals(delv.getDelvFeeCd()) && !"WMS".equals(param.getDelvFeeCd())) {
 					param.setCompCnt(delv.getCompCnt());
 					if (TscConstants.DelvFeeCrite.FREE.value().equals(delv.getDelvFeeCrite())) {
 						param.setDelvFee(0);
-						delv.setFormalGb("TEST1");
 					} else if (TscConstants.DelvFeeCrite.NORMAL.value().equals(delv.getDelvFeeCrite()) && delv.getCompSumPrice() > delv.getMinOrdAmt()) {
 						param.setDelvFee(0);
-						delv.setFormalGb("TEST2");
 					} else {
 						param.setDelvFee(delv.getDelvFee());
-						delv.setFormalGb("TEST3");
 					}
 				}
 			}
-		}
 
-		int wmsSumPrice = 0;
-		for(Order param : params) {
+			// 자사 상품 가격 계산
 			if("WMS".equals(param.getDelvFeeCd())) {
 				if("N".equals(param.getSoldoutYn())) {
 					wmsSumPrice = wmsSumPrice + param.getCurrPrice();
+					wmsMinOrdAmt = param.getMinOrdAmt();
+					wmsDelvFee = param.getDelvFee();
 				}
 			}
 		}
 
-		// 자사 무료배송비 기준 조회
-		Envset wmsDelvFee = new Envset();
-		wmsDelvFee.setSiteCd(TscConstants.Site.STYLE24.value());
-		wmsDelvFee.setEnvsetType("O10");
-		wmsDelvFee = coreEnvsetDao.getEnvset(wmsDelvFee);
-		int wmsLimitDelvFee = Integer.parseInt(wmsDelvFee.getStrSetVal3());
-
 		// 자사 배송비 등록
 		if(params.size() > 0) {
-			if (wmsSumPrice > wmsLimitDelvFee) {
+			if (wmsSumPrice > wmsMinOrdAmt) {
 				order.setWmsDelvFee(0);
 			} else {
-				order.setWmsDelvFee(2500);
+				order.setWmsDelvFee(wmsDelvFee);
 			}
 		}
 	}

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

@@ -65,8 +65,6 @@ public class TsfCouponService {
 	 * @since 2021. 02. 16
 	 */
 	public Coupon serialCpnApplyInfo(Coupon param) {
-
-		// TODO 로그인 정보 입력
 		if (TsfSession.isLogin()) {
 			Login login = TsfSession.getInfo();
 			param.setCustNo(login.getCustNo());
@@ -112,6 +110,8 @@ public class TsfCouponService {
 		}
 
 		Coupon dtData = couponDao.getSerialCpnUseInfo(cpn);
+		cpn.setAvailStdtTime(cpn.getAvailStdt());
+		cpn.setAvailEddtTime(cpn.getAvailEddt());
 		cpn.setAvailStdt(dtData.getAvailStdt());
 		cpn.setAvailEddt(dtData.getAvailEddt());
 

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

@@ -513,6 +513,8 @@
 			 , Z.GOODS_TYPE
 			 , Z.SUPPLY_COMP_CD
 			 , Z.DELV_FEE_CD
+		     , Z.MIN_ORD_AMT
+		     , Z.DELV_FEE
 			 , Z.CART_DELV_FEE_CD
 			 , (Z.CURR_PRICE + SUM(Z.OPT_ADD_PRICE)) * Z.GOODS_QTY AS CURR_PRICE
 			 , (Z.LIST_PRICE + SUM(Z.OPT_ADD_PRICE)) * Z.GOODS_QTY AS LIST_PRICE
@@ -521,119 +523,121 @@
 					ELSE (Z.CURR_PRICE * Z.GOODS_QTY) * (Z.PNT_MRATE/100) END AS SAVE_PNT_AMT
 			 , SYS_IMG_NM
 		FROM   (SELECT C.CART_SQ
-					 , C.GOODS_CD
-					 , C.GOODS_QTY
-					 , CD.ITEM_CD
-					 , CD.OPT_CD
-					 , CD.ITEM_QTY
-					 , CD.CART_DTL_SQ
-					 , IFNULL((SELECT COLOR_KNM FROM TB_COLOR C WHERE COLOR_CD = IFNULL(NULLIF(O.OPT_CD1,'') , G.MAIN_COLOR_CD ) AND USE_YN  = 'Y'), O.OPT_CD1) AS COLOR_NM
+		             , C.GOODS_CD
+		             , C.GOODS_QTY
+		             , CD.ITEM_CD
+		             , CD.OPT_CD
+		             , CD.ITEM_QTY
+		             , CD.CART_DTL_SQ
+		             , IFNULL((SELECT COLOR_KNM FROM TB_COLOR C WHERE COLOR_CD = IFNULL(NULLIF(O.OPT_CD1,'') , G.MAIN_COLOR_CD ) AND USE_YN  = 'Y'), O.OPT_CD1) AS COLOR_NM
 		             , O.OPT_CD1
-					 , O.OPT_CD2
-					 , G.GOODS_TYPE
-					 , G.SUPPLY_COMP_CD
-					 , G.GOODS_NM
-					 , G.BRAND_CD
-					 , G.PNT_PRATE
-					 , G.PNT_MRATE
-					 , STOCK.SOLDOUT_YN
-					 , FN_GET_APPLY_CPN1_PRICE(C.GOODS_CD, #{frontGb}) AS CURR_PRICE
+		             , O.OPT_CD2
+		             , G.GOODS_TYPE
+		             , G.SUPPLY_COMP_CD
+		             , G.GOODS_NM
+		             , G.BRAND_CD
+		             , G.PNT_PRATE
+		             , G.PNT_MRATE
+		             , STOCK.SOLDOUT_YN
+		             , FN_GET_APPLY_CPN1_PRICE(C.GOODS_CD, #{frontGb}) AS CURR_PRICE
 		             , G.LIST_PRICE
-					 , IFNULL(O.ADD_PRICE, 0) AS OPT_ADD_PRICE
-					 , BR.BRAND_ENM
-					 , BR.BRAND_KNM
-					 , CT.CUST_GRADE
-					 , CASE WHEN GOG.CUST_GRADE IS NOT NULL AND GOG.CUST_GRADE = IFNULL(CT.CUST_GRADE, '') THEN GOG.CUST_GRADE
-							WHEN GOG.CUST_GRADE IS NOT NULL THEN 'NO'
-							ELSE CT.CUST_GRADE END AS ORDER_GRADE
-					 , (SELECT SUPPLY_COMP_NM FROM TB_SUPPLY_COMPANY WHERE SUPPLY_COMP_CD = G.SUPPLY_COMP_CD) AS SUPPLY_COMP_NM
-					 , (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD = CD.ITEM_CD) AS ITEM_NM
-					 , CASE WHEN G.SELF_GOODS_YN = 'Y' THEN 'WMS'
-							ELSE DFP.DELV_FEE_CD END AS DELV_FEE_CD
-					 , CASE WHEN GQDS.GOODS_CD IS NULL AND G.SELF_GOODS_YN = 'Y' THEN 'SHOT'
-							WHEN G.SELF_GOODS_YN = 'Y' THEN 'WMS'
-							ELSE DFP.DELV_FEE_CD END AS CART_DELV_FEE_CD
-					 , CASE WHEN C.CUST_NO > 0 AND (SELECT IFNULL(SUM(OD.ORD_QTY), 0)
-													FROM   TB_ORDER_DETAIL OD
-													INNER  JOIN TB_ORDER O
-													ON     OD.ORD_NO = O.ORD_NO
-													WHERE  O.CUST_NO = C.CUST_NO
-													AND    OD.ORD_EXCH_GB = 'O'
-													AND    OD.ORD_DTL_STAT <![CDATA[ <> ]]> 'G013_00'
-													AND    OD.ORD_DTL_STAT <![CDATA[ <> ]]> 'G013_98'
-													AND    OD.ORD_DTL_STAT <![CDATA[ <> ]]> 'G013_99'
-													AND    OD.GOODS_CD = C.GOODS_CD
-													AND    DATE(ORD_DT) = CURRENT_DATE) + C.GOODS_QTY > G.DAY_MAX_ORD_QTY THEN 1 ELSE 0 END CUST_TODAY_ORD
-					 , CASE WHEN C.CUST_NO = 0 AND C.GOODS_QTY > G.DAY_MAX_ORD_QTY THEN 1 ELSE 0 END AS NOCUST_TODAY_ORD
-					 /*, CASE WHEN G.GOODS_TYPE != 'G056_S' AND G.SELF_GOODS_YN = 'Y' THEN (SELECT SYS_IMG_NM FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = CD.OPT_CD1 AND DEFAULT_IMG_YN = 'Y' LIMIT 1)
-							ELSE (SELECT SYS_IMG_NM FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = G.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' LIMIT 1) END AS SYS_IMG_NM*/
-					 /* , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IFNULL(G.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y') AS SYS_IMG_NM */
-					 , CASE WHEN G.GOODS_TYPE != 'G056_S' AND G.SELF_GOODS_YN = 'Y' THEN (SELECT SYS_IMG_NM FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = CD.OPT_CD1 AND DEFAULT_IMG_YN = 'Y' LIMIT 1)
-							ELSE (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IFNULL(G.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y' LIMIT 1) END AS SYS_IMG_NM
-				FROM   TB_CART C
-				INNER  JOIN TB_CART_DETAIL CD
-				ON     C.CART_SQ = CD.CART_SQ
-				INNER  JOIN TB_GOODS G
-				ON     C.GOODS_CD = G.GOODS_CD
-				INNER  JOIN TB_BRAND BR 
-				ON     G.BRAND_CD = BR.BRAND_CD
-				INNER  JOIN TB_DELV_FEE_POLICY DFP
-				ON     G.DELV_FEE_CD = DFP.DELV_FEE_CD
-				INNER  JOIN TB_OPTION O
-				ON     CD.ITEM_CD = O.GOODS_CD
-				AND    CD.OPT_CD = O.OPT_CD
-				INNER  JOIN (   SELECT A.CART_SQ
-									 , MAX(A.SOLDOUT_YN) AS SOLDOUT_YN
-								FROM   (SELECT C.CART_SQ
-											 , CASE WHEN VS.SOLDOUT_YN = 'N' AND VS.CURR_STOCK_QTY >= C.GOODS_QTY * GC.QTY THEN 'N'
-													ELSE 'Y' END AS SOLDOUT_YN
-										FROM   TB_CART C
-										INNER  JOIN TB_CART_DETAIL CD
-										ON	 C.CART_SQ = CD.CART_SQ
-										INNER  JOIN TB_GOODS G
-										ON	 C.GOODS_CD = G.GOODS_CD
-										INNER  JOIN TB_GOODS_COMPOSE GC
-										ON	 C.GOODS_CD = GC.GOODS_CD
-										AND	CD.ITEM_CD = GC.COMPS_GOODS_CD
-										INNER  JOIN VW_STOCK VS
-										ON	 CD.ITEM_CD = VS.GOODS_CD
-										AND	CD.OPT_CD = VS.OPT_CD
-										WHERE  1=1
-										AND	C.CART_GB = 'G026_BC'
-										AND	G.GOODS_STAT = 'G008_90'
-										AND	G.SELF_MALL_YN = 'Y'
-										<if test="custNo == 0">
-											AND	C.CUST_NO = 0
-											AND	C.JSESSION_ID = #{jsessionId}
-										</if>
-										<if test="custNo != 0">
-											AND	C.CUST_NO = #{custNo}
-										</if>
-										UNION ALL
-										SELECT C.CART_SQ
-											 , CASE WHEN VS.SOLDOUT_YN = 'N' AND VS.CURR_STOCK_QTY >= C.GOODS_QTY THEN 'N'
-													ELSE 'Y' END AS SOLDOUT_YN
-										FROM   TB_CART C
-										INNER  JOIN TB_CART_DETAIL CD
-										ON	 C.CART_SQ = CD.CART_SQ
-										INNER  JOIN TB_GOODS G
-										ON	 C.GOODS_CD = G.GOODS_CD
-										INNER  JOIN VW_STOCK VS
-										ON	 C.GOODS_CD = VS.GOODS_CD
-										AND	CD.OPT_CD = VS.OPT_CD
-										WHERE  1=1
-										AND	C.CART_GB = 'G026_BC'
-										AND	G.GOODS_STAT = 'G008_90'
-										AND	G.SELF_MALL_YN = 'Y'
-										<if test="custNo == 0">
-											AND	C.CUST_NO = 0
-											AND	C.JSESSION_ID = #{jsessionId}
-										</if>
-										<if test="custNo != 0">
-											AND	C.CUST_NO = #{custNo}
-										</if>
-									   ) A
-								GROUP  BY  A.CART_SQ
+		             , IFNULL(O.ADD_PRICE, 0) AS OPT_ADD_PRICE
+		             , BR.BRAND_ENM
+		             , BR.BRAND_KNM
+		             , CT.CUST_GRADE
+		             , DFP.MIN_ORD_AMT
+		             , DFP.DELV_FEE
+		             , CASE WHEN GOG.CUST_GRADE IS NOT NULL AND GOG.CUST_GRADE = IFNULL(CT.CUST_GRADE, '') THEN GOG.CUST_GRADE
+		                    WHEN GOG.CUST_GRADE IS NOT NULL THEN 'NO'
+		                    ELSE CT.CUST_GRADE END AS ORDER_GRADE
+		             , (SELECT SUPPLY_COMP_NM FROM TB_SUPPLY_COMPANY WHERE SUPPLY_COMP_CD = G.SUPPLY_COMP_CD) AS SUPPLY_COMP_NM
+		             , (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD = CD.ITEM_CD) AS ITEM_NM
+		             , CASE WHEN G.SELF_GOODS_YN = 'Y' THEN 'WMS'
+		                    ELSE DFP.DELV_FEE_CD END AS DELV_FEE_CD
+		             , CASE WHEN GQDS.GOODS_CD IS NULL AND G.SELF_GOODS_YN = 'Y' THEN 'SHOT'
+		                    WHEN G.SELF_GOODS_YN = 'Y' THEN 'WMS'
+		                    ELSE DFP.DELV_FEE_CD END AS CART_DELV_FEE_CD
+		             , CASE WHEN C.CUST_NO > 0 AND (SELECT IFNULL(SUM(OD.ORD_QTY), 0)
+		                                            FROM   TB_ORDER_DETAIL OD
+		                                            INNER  JOIN TB_ORDER O
+		                                            ON     OD.ORD_NO = O.ORD_NO
+		                                            WHERE  O.CUST_NO = C.CUST_NO
+		                                            AND    OD.ORD_EXCH_GB = 'O'
+		                                            AND    OD.ORD_DTL_STAT <![CDATA[ <> ]]> 'G013_00'
+		                                            AND    OD.ORD_DTL_STAT <![CDATA[ <> ]]> 'G013_98'
+		                                            AND    OD.ORD_DTL_STAT <![CDATA[ <> ]]> 'G013_99'
+		                                            AND    OD.GOODS_CD = C.GOODS_CD
+		                                            AND    DATE(ORD_DT) = CURRENT_DATE) + C.GOODS_QTY > G.DAY_MAX_ORD_QTY THEN 1 ELSE 0 END CUST_TODAY_ORD
+		             , CASE WHEN C.CUST_NO = 0 AND C.GOODS_QTY > G.DAY_MAX_ORD_QTY THEN 1 ELSE 0 END AS NOCUST_TODAY_ORD
+		             /*, CASE WHEN G.GOODS_TYPE != 'G056_S' AND G.SELF_GOODS_YN = 'Y' THEN (SELECT SYS_IMG_NM FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = CD.OPT_CD1 AND DEFAULT_IMG_YN = 'Y' LIMIT 1)
+		            		ELSE (SELECT SYS_IMG_NM FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = G.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' LIMIT 1) END AS SYS_IMG_NM*/
+		             /* , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IFNULL(G.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y') AS SYS_IMG_NM */
+		             , CASE WHEN G.GOODS_TYPE != 'G056_S' AND G.SELF_GOODS_YN = 'Y' THEN (SELECT SYS_IMG_NM FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = CD.OPT_CD1 AND DEFAULT_IMG_YN = 'Y' LIMIT 1)
+		            		ELSE (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IFNULL(G.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y' LIMIT 1) END AS SYS_IMG_NM
+		        FROM   TB_CART C
+		        INNER  JOIN TB_CART_DETAIL CD
+		        ON     C.CART_SQ = CD.CART_SQ
+		        INNER  JOIN TB_GOODS G
+		        ON     C.GOODS_CD = G.GOODS_CD
+		        INNER  JOIN TB_BRAND BR
+		        ON     G.BRAND_CD = BR.BRAND_CD
+		        INNER  JOIN TB_DELV_FEE_POLICY DFP
+		        ON     G.DELV_FEE_CD = DFP.DELV_FEE_CD
+		        INNER  JOIN TB_OPTION O
+		        ON     CD.ITEM_CD = O.GOODS_CD
+		        AND    CD.OPT_CD = O.OPT_CD
+		        INNER  JOIN (   SELECT A.CART_SQ
+		                             , MAX(A.SOLDOUT_YN) AS SOLDOUT_YN
+		                        FROM   (SELECT C.CART_SQ
+		                                     , CASE WHEN VS.SOLDOUT_YN = 'N' AND VS.CURR_STOCK_QTY >= C.GOODS_QTY * GC.QTY THEN 'N'
+		                                            ELSE 'Y' END AS SOLDOUT_YN
+		                                FROM   TB_CART C
+		                                INNER  JOIN TB_CART_DETAIL CD
+		                                ON     C.CART_SQ = CD.CART_SQ
+		                                INNER  JOIN TB_GOODS G
+		                                ON     C.GOODS_CD = G.GOODS_CD
+		                                INNER  JOIN TB_GOODS_COMPOSE GC
+		                                ON     C.GOODS_CD = GC.GOODS_CD
+		                                AND    CD.ITEM_CD = GC.COMPS_GOODS_CD
+		                                INNER  JOIN VW_STOCK VS
+		                                ON     CD.ITEM_CD = VS.GOODS_CD
+		                                AND	CD.OPT_CD = VS.OPT_CD
+		                                WHERE  1=1
+		                                AND	C.CART_GB = 'G026_BC'
+		                                AND	G.GOODS_STAT = 'G008_90'
+		                                AND	G.SELF_MALL_YN = 'Y'
+		                                <if test="custNo == 0">
+		                                AND	C.CUST_NO = 0
+		                                AND	C.JSESSION_ID = #{jsessionId}
+		                                </if>
+		                                <if test="custNo != 0">
+		                                AND	C.CUST_NO = #{custNo}
+		                                </if>
+		                                UNION ALL
+		                                SELECT C.CART_SQ
+		                                     , CASE WHEN VS.SOLDOUT_YN = 'N' AND VS.CURR_STOCK_QTY >= C.GOODS_QTY THEN 'N'
+		                                            ELSE 'Y' END AS SOLDOUT_YN
+		                                FROM   TB_CART C
+		                                INNER  JOIN TB_CART_DETAIL CD
+		                                ON     C.CART_SQ = CD.CART_SQ
+		                                INNER  JOIN TB_GOODS G
+		                                ON     C.GOODS_CD = G.GOODS_CD
+		                                INNER  JOIN VW_STOCK VS
+		                                ON     C.GOODS_CD = VS.GOODS_CD
+		                                AND    CD.OPT_CD = VS.OPT_CD
+		                                WHERE  1=1
+		                                AND    C.CART_GB = 'G026_BC'
+		                                AND    G.GOODS_STAT = 'G008_90'
+		                                AND    G.SELF_MALL_YN = 'Y'
+		                                <if test="custNo == 0">
+		                                AND    C.CUST_NO = 0
+		                                AND    C.JSESSION_ID = #{jsessionId}
+		                                </if>
+		                                <if test="custNo != 0">
+		                                AND    C.CUST_NO = #{custNo}
+		                                 </if>
+		                               ) A
+		                        GROUP  BY  A.CART_SQ
 		               ) STOCK
 		        ON     C.CART_SQ = STOCK.CART_SQ
 		        LEFT   OUTER JOIN TB_CUSTOMER CT
@@ -676,6 +680,8 @@
 		     , Z.LIST_PRICE
 		     , Z.SUPPLY_COMP_NM
 		     , Z.DELV_FEE_CD
+		     , Z.MIN_ORD_AMT
+		     , Z.DELV_FEE
 		     , Z.CART_DELV_FEE_CD
 		     , Z.CURR_PRICE
 		     , Z.PNT_PRATE

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

@@ -38,6 +38,7 @@
 		     , CP.DC_WAY
 			 , CASE WHEN #{frontGb} = 'P' THEN CP.DC_PVAL
 					WHEN #{frontGb} = 'M' THEN CP.DC_MVAL
+			     	WHEN #{frontGb} = 'A' THEN CP.DC_AVAL
 					ELSE CP.DC_AVAL END AS DC_VAL
 			 , RC.RD_CPN_NM
 		     , RC.RD_CPN_ID

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

@@ -469,10 +469,10 @@
 							</p>
 						</div>
 						<p class="cp_date">
-							<span>2021.01.01</span>&nbsp;~&nbsp;<span>2021.12.30</span>
+							<span class="availStdt">2021.01.01</span>&nbsp;~&nbsp;<span class="availEddt">2021.12.30</span>
 						</p>
 					</div>
-					<button type="button" class="btn_underline" id="btn_couponInfo_pop">
+					<button type="button" class="btn_underline" id="btn_cartCouponInfo_pop">
 						<span>사용안내</span>
 					</button>
 				</div>
@@ -489,6 +489,49 @@
 	<!-- 즉시구매 form -->
 	<form id="cartInfoForm" method="post" action="/order/noMember"></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">aa</h5>
+				</div>
+				<div class="modal-body">
+					<div class="pop_cont">
+						<dl>
+							<div class="cartCpnCondition">
+								<dt>사용조건</dt>
+								<dd class="cpnCondition">
+									<span>9,999,999</span>원 이상 구매 시 최대 <span>9,999,999</span>원 할인
+								</dd>
+							</div>
+							<div>
+								<dt>발급수량</dt>
+								<dd>
+									1인 최대<span>9,999</span>매
+								</dd>
+							</div>
+							<div>
+								<dt>유효기간</dt>
+								<dd>
+									<span>2020.09.21 23:59</span>&nbsp;~&nbsp;<span>2020.09.21 23:59</span>
+								</dd>
+							</div>
+							<div>
+								<dt>대상조건</dt>
+								<dd>
+									카테고리명 / 브랜드명 / 상품명 등 (일부 품목 제외)
+								</dd>
+							</div>
+						</dl>
+					</div>
+				</div>
+			</div>
+		</div>
+		<a href="#close-modal" rel="modal:close" id="couponInfoPop_close" class="close-modal">Close</a>
+	</div>
+	<!-- //쿠폰사용안내 팝업 -->
+
 	<script th:inline="javascript">
 		let sumRealPayAmt = [[${order.sumRealPayAmt + order.totDelvFee}]];
 		let totDcAmt = [[${order.totDcAmt}]];
@@ -798,6 +841,14 @@
 						} else if (result.serialCpnInfo.dcWay == "G240_11") {
 							$("#cartListForm .area_salecoupon .cp_dc_val").html("<em>" + result.serialCpnInfo.dcVal + "%</em>");
 						}
+
+
+						$(".cartCpnInfoModal .modal-header").html('<h5 class="modal-title" id="couponInfoLabel">' + result.serialCpnInfo.cpnNm + '</h5>');
+						$(".cartCpnInfoModal .cartCpnCondition").html('<h5 class="modal-title" id="couponInfoLabel">' + result.serialCpnInfo.cpnNm + '</h5>');
+
+
+
+
 					} else {
 						mcxDialog.alert(result.serialCpnInfo.result);
 					}
@@ -886,12 +937,6 @@
 			});
 		}
 
-		//쿠폰사용안내 팝업열기
-		$(document).on('click','#btn_cpinfo_pop',function(e){
-			$("#cpinfoPop").modal("show");
-			return false;
-		});
-
 		$("input[name=cartSqArr]").on("change", function(e) {
 			let cartArr = [];
 
@@ -1056,7 +1101,7 @@
 						}
 
 						if(delv.delvFee == 0) {
-							$(".delvList").find(".delv_" + delv.delvFeeCd).html("<span class='dlvr_fee'>배송비 무료</span>");
+							$(".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);

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

@@ -23,7 +23,7 @@
 
     <!-- payment.js -->
     <script type="text/javascript" th:src="${@environment.getProperty('pg.kcp.js.url')}" src=""></script>
-    <script type="text/javascript" src="/ux/pc/js/payment.js"></script>
+    <script type="text/javascript" src="/biz/payment.js"></script>
 
 	<!--  container -->
 	<div id="container" class="container od">
@@ -257,24 +257,6 @@
 	</div>
 	<!-- // container -->
 
-<!-- 쿠폰사용안내 팝업 -->
-<div class="modal fade od_pop cpinfo_pop" id="cpinfoPop" tabindex="-1" role="dialog" aria-labelledby="cpinfoLabel" aria-hidden="true">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="cpinfoLabel">쿠폰사용안내</h5>
-            </div>
-            <div class="modal-body">
-                <div class="pop_cont">
-                    쿠폰사용안내 내용입니다.
-                </div>
-            </div>
-            <div class="modal-footer"></div>
-        </div>
-    </div>
-</div>
-<!-- //쿠폰사용안내 팝업 -->
-
 <script src="/ux/pc/js/swiper.min.js"></script>
 <link rel="stylesheet" type="text/css" href="/ux/pc/css/swiper.min.css" />
 
@@ -321,6 +303,15 @@
         return false;
     });
 
+	//팝업 - 쿠폰사용안내
+	$(document).on('click','#btn_cartCouponInfo_pop',function(e){
+		$(".cartCpnInfoModal").modal("show");
+		return false;
+	});
+	$("#couponInfoPop_close").click(function() {
+		$(".cartCpnInfoModal").modal("hide");
+	});
+
 	//수량조절 이벤트
 	$(document).on('click','.optModify_pop .number_count .minus',function(e){
 		var $input = $(this).parent().find('input');

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

@@ -23,7 +23,7 @@
 
     <!-- payment.js -->
     <script type="text/javascript" th:src="${@environment.getProperty('pg.kcp.js.url')}" src=""></script>
-    <script type="text/javascript" src="/ux/pc/js/payment.js"></script>
+    <script type="text/javascript" src="/biz/payment.js"></script>
 
     <!--  container -->
     <div id="container" class="container od">

src/main/webapp/WEB-INF/views/web/common/layout/MypageLayoutWeb.html

@@ -37,7 +37,7 @@
 <footer id="footer" th:replace="~{web/common/fragments/FooterWeb :: footer}"></footer>
 
 <th:block th:replace="~{web/common/fragments/ScriptsWeb :: scripts}"></th:block>
-<script th:src="@{'/ux/pc/js/mypage.js?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" src="/ux/pc/js/mypage.js"></script>
+<script th:src="@{'/ux/pc/js/mypage.js?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" src="/biz/mypage.js"></script>
 
 <script th:inline="javascript">
 /*<![CDATA[*/

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

@@ -23,7 +23,7 @@
 
 <!-- payment.js -->
 <script type="text/javascript" th:src="${@environment.getProperty('pg.kcp.js.url')}" src=""></script>
-<script type="text/javascript" src="/ux/pc/js/payment.js"></script>
+<script type="text/javascript" src="/biz/payment.js"></script>
 
 <form id="order_info" name="order_info" method="post" action="/order/pay/result/response" ></form>
 

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

@@ -23,7 +23,7 @@
 
 <!-- payment.js -->
 <script type="text/javascript" th:src="${@environment.getProperty('pg.kcp.js.url')}" src=""></script>
-<script type="text/javascript" src="/ux/pc/js/payment.js"></script>
+<script type="text/javascript" src="/biz/payment.js"></script>
 
 <form id="order_info" name="order_info" method="post" action="/order/pay/result/response" ></form>
 

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

@@ -23,7 +23,7 @@
 
 <!-- payment.js -->
 <script type="text/javascript" th:src="${@environment.getProperty('pg.kcp.js.url')}" src=""></script>
-<script type="text/javascript" src="/ux/pc/js/payment.js"></script>
+<script type="text/javascript" src="/biz/payment.js"></script>
 
 <form id="order_info" name="order_info" method="post" action="/order/pay/result/response" ></form>
 
@@ -1159,4 +1159,4 @@ $(document).ready( function() {
 
 </th:block>
 </body>
-</html>
+</html>

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

@@ -23,7 +23,7 @@
 
 <!-- payment.js -->
 <script type="text/javascript" th:src="${@environment.getProperty('pg.kcp.js.url')}" src=""></script>
-<script type="text/javascript" src="/ux/pc/js/payment.js"></script>
+<script type="text/javascript" src="/biz/payment.js"></script>
 
 <form id="order_info" name="order_info" method="post" action="/order/pay/result/response" ></form>