개발중

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

@@ -168,6 +168,7 @@ public class TsfOrderController extends TsfBaseController {
 		if (order.getShotDelvUseYn() == null || "".equals(order.getShotDelvUseYn())) {
 			order.setShotDelvUseYn("Y");
 		}
+		order.setShotDelvYn(order.getShotDelvUseYn());
 
 		// TODO 임시 장바구니
 		// 3. 장바구니상품시퀀스 상품목록조회		
@@ -210,6 +211,9 @@ public class TsfOrderController extends TsfBaseController {
 		mav.addObject("foreignBuyYn"		, delvOrderMap.get("foreignBuyYn"));		// 해외구매대행여부
 		mav.addObject("orderMadeYn"			, delvOrderMap.get("orderMadeYn"));			// 주문제작여부
 		
+		// 4.6 로그인여부
+		mav.addObject("isLogin"				, TsfSession.isLogin());					// 로그인여부
+		
 		mav.setViewName(super.getDeviceViewName("order/OrderForm"));
 		
 		return mav;
@@ -248,8 +252,9 @@ public class TsfOrderController extends TsfBaseController {
 		}
 		
 		ModelAndView mav = new ModelAndView();
-		mav.addObject("custemerInfo"	, custemerInfo); 	// 고객정보
-		mav.addObject("order"			, order);			// 파라미터
+		mav.addObject("custemerInfo"	, custemerInfo); 			// 고객정보
+		mav.addObject("order"			, order);					// 파라미터
+		mav.addObject("isLogin"			, TsfSession.isLogin());	// 로그인여부
 		mav.setViewName(super.getDeviceViewName("order/OrderCustemerInfo"));
 		
 		return mav;
@@ -359,6 +364,10 @@ public class TsfOrderController extends TsfBaseController {
 				
 		ModelAndView mav = new ModelAndView();
 		mav.addObject("delvAllCartList" 	, delvOrderMap.get("delvAllCartList"));		// 전체배송목록
+		mav.addObject("delvFeeCdCnt" 		, delvOrderMap.get("delvFeeCdCnt"));		// 자사총알배송상품건수
+		mav.addObject("shotCnt" 			, delvOrderMap.get("shotCnt"));				// 자사총알배송상품건수
+		mav.addObject("wmsCnt" 				, delvOrderMap.get("wmsCnt"));				// 자사일반상품건수
+		mav.addObject("isLogin"				, TsfSession.isLogin());					// 로그인여부
 		mav.setViewName(super.getDeviceViewName("order/OrderListInfo"));
 		
 		return mav;
@@ -396,6 +405,7 @@ public class TsfOrderController extends TsfBaseController {
 		mav.addObject("freegiftGoodsList"		, resultMap.get("freegiftGoodsList"));		// 사은품상품정보 목록
 		mav.addObject("freegiftList"			, resultMap.get("freegiftList"));			// 사은품정보 목록
 		mav.addObject("order"					, order);									// 파라미터
+		mav.addObject("isLogin"					, TsfSession.isLogin());					// 로그인여부
 		
 		mav.setViewName(super.getDeviceViewName("order/OrderFreegiftInfo"));
 		
@@ -486,6 +496,7 @@ public class TsfOrderController extends TsfBaseController {
 		mav.addObject("rmGfcdAmt"						, rmGfcdAmt);								// 고객상품권정보
 		mav.addObject("savePntSumAmt"					, goodsDcAmtMap.get("savePntSumAmt"));		// 적립예정포인트합계
 		mav.addObject("order"							, order);									// 파라미터
+		mav.addObject("isLogin"							, TsfSession.isLogin());					// 로그인여부
 		
 		mav.setViewName(super.getDeviceViewName("order/OrderDcAmtInfo"));
 		
@@ -517,7 +528,8 @@ public class TsfOrderController extends TsfBaseController {
 		} 
 
 		ModelAndView mav = new ModelAndView();
-		mav.addObject("order" , order);	// 파라미터
+		mav.addObject("order" 			, order);					// 파라미터
+		mav.addObject("isLogin"			, TsfSession.isLogin());	// 로그인여부
 		mav.setViewName(super.getDeviceViewName("order/OrderPaymentInfo"));
 		
 		return mav;

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

@@ -47,7 +47,12 @@
 																	</th:block>
 																</p>
 																<p class="discount">
-																	<span th:text="${#numbers.formatInteger(goodsCpn.cpnDcAmt, 1, 'COMMA')}"></span>원 할인
+																	<th:block th:if="${goodsCpn.dcWay} == 'G240_10'">
+																		<span th:text="${#numbers.formatInteger(goodsCpn.dcVal, 1, 'COMMA')}"></span>원 할인
+																	</th:block>
+																	<th:block th:if="${goodsCpn.dcWay} == 'G240_11'">
+																		<span th:text="${#numbers.formatInteger(goodsCpn.dcVal, 1, 'COMMA')}"></span>% 할인
+																	</th:block>
 																</p>
 															</div>
 														</li>
@@ -101,7 +106,14 @@
 													최대 <span th:text="${#numbers.formatInteger(cartCpn.maxDcAmt, 1, 'COMMA')}"></span>원 할인
 												</th:block>
 											</p>
-											<p class="discount"><span th:text="${#numbers.formatInteger(cartCpn.cpnDcAmt, 1, 'COMMA')}"></span>원 할인</p>
+											<p class="discount">
+												<th:block th:if="${cartCpn.dcWay} == 'G240_10'">
+													<span th:text="${#numbers.formatInteger(cartCpn.dcVal, 1, 'COMMA')}"></span>원 할인
+												</th:block>
+												<th:block th:if="${cartCpn.dcWay} == 'G240_11'">
+													<span th:text="${#numbers.formatInteger(cartCpn.dcVal, 1, 'COMMA')}"></span>% 할인
+												</th:block>
+											</p>
 										</div>
 									</label>
 						

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

@@ -42,9 +42,11 @@
 					<div class="sale_coupon_box">
 						<div>
 							<span class="maxdisc_amount">총&nbsp;<em class="goodsCartCpnDcAmt"></em>원 할인</span>
-							<button type="button" id="btn_couponModify_pop" class="btn btn_default btn_sm">
-								<span>쿠폰변경</span>
-							</button>
+							<th:block th:if="${goodsApplyCpnList.size() > 0} or ${cartCpnList.size() > 0}">
+								<button type="button" id="btn_couponModify_pop" class="btn btn_default btn_sm">
+									<span>쿠폰변경</span>
+								</button>
+							</th:block>
 						</div>
 						<div class="form_field">
 							<div class="input_wrap">
@@ -119,7 +121,7 @@
 								<div>
 									<input type="radio" name="rdi-beforpoint" id="rdi-beforpoint2" value="Y"> 
 									<label for="rdi-beforpoint2"><span>사용함</span></label> 
-									<span class="useable_point">(<em th:text="${#numbers.formatInteger(prePntDcAmt, 1, 'COMMA')"></em>&nbsp;사용 가능)</span>
+									<span class="useable_point">(<em th:text="${#numbers.formatInteger(prePntDcAmt, 1, 'COMMA')}"></em>&nbsp;사용 가능)</span>
 								</div>
 							</div>
 						</dd>
@@ -135,8 +137,8 @@
 								<!-- 스타일 포인트 3만원 이상 결제시 노출 -->
 								<th:block th:if="${orgGoodsSumAmt} >= 30000">
 									<div class="input_wrap">
-										<input type="text" name="pntDcAmtStr" class="form_control" maxlength="" placeholder="사용할 포인트를 입력해주세요.">
-										<button type="button" class="btn btn_dark btn_sm">
+										<input type="text" name="pntDcAmtStr" class="form_control" maxlength="11" placeholder="사용할 포인트를 입력해주세요.">
+										<button type="button" class="btn btn_dark btn_sm" id="btn_point_apply">
 											<span>적용</span>
 										</button>
 									</div>
@@ -153,7 +155,7 @@
 								
 								<p>
 									<span class="remain_point">보유:&nbsp;
-										<em class="rmPntAmt" th:text="${#numbers.formatInteger(rmPntAmt, 1, 'COMMA')"></em>P
+										<em class="rmPntAmt" th:text="${#numbers.formatInteger(rmPntAmt, 1, 'COMMA')}"></em>P
 									</span>(결제금액의 최대 40%까지 사용가능)
 								</p>
 							</div>
@@ -168,8 +170,8 @@
 							<div class="form_field">
 								<input type="hidden" name="rmGfcdAmt" th:value="${rmGfcdAmt}"/>
 								<div class="input_wrap">
-									<input type="text" name="gfcdUseAmtStr" class="form_control" maxlength="" placeholder="사용할 금액을 입력해주세요.">
-									<button type="button" class="btn btn_dark btn_sm">
+									<input type="text" name="gfcdUseAmtStr" class="form_control" maxlength="11" placeholder="사용할 금액을 입력해주세요.">
+									<button type="button" class="btn btn_dark btn_sm" id="btn_gfcd_apply">
 										<span>적용</span>
 									</button>
 								</div>
@@ -177,6 +179,7 @@
 									<span class="remain_point">보유:&nbsp;<em th:text="${#numbers.formatInteger(rmGfcdAmt, 1, 'COMMA')}"></em>원
 									</span>
 								</p>
+								<!-- 
 								<div class="agree_receipt">
 									<input id="chk-receipt" type="checkbox"> 
 									<label for="chk-receipt"><span>상품권 현금영수증 신청</span></label>
@@ -186,6 +189,7 @@
 										</div>
 									</div>
 								</div>
+								 -->
 							</div>
 						</dd>
 					</div>

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

@@ -46,9 +46,7 @@
 						<th:block th:if="${deliveryAddrInfo.defaultYn} == 'Y'">
 							<em class="tag gray">기본 배송지</em>
 						</th:block> 
-						<th:block th:if="${order.shotDelvUseYn} == 'Y'">
-							<em class="tag primary_line">총알배송</em>
-						</th:block>
+						<em class="tag primary_line shotDelv">총알배송</em>
 					</span>
 				</dd>
 			</div>

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

@@ -97,6 +97,7 @@ $(document).ready( function() {
 
 		$("#orderForm input[name=delvMemo]").val(rtnTxt);		// input 값에 설정
 		$("#delvMemo").text(rtnTxt);							// 메모 text 설정
+		$(".delvMemo").text(rtnTxt);							// 메모 text 설정
 		$(".close-modal").trigger("click");						// 팝업닫기
 	});
 });

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

@@ -35,6 +35,8 @@
 			<th>custNm</th>
 			<th>email</th>
 			<th>cellPhnno</th>
+			<th>recipNm</th>
+			<th>recipPhnno</th>
 			<th>recipZipcode</th>
 			<th>recipBaseAddr</th>
 			<th>recipDtlAddr</th>
@@ -46,6 +48,8 @@
 			<td class="custNm"></td>
 			<td class="email"></td>
 			<td class="cellPhnno"></td>
+			<td class="recipNm"></td>
+			<td class="recipPhnno"></td>
 			<td class="recipZipcode"></td>
 			<td class="recipBaseAddr"></td>
 			<td class="recipDtlAddr"></td>
@@ -253,12 +257,13 @@
 									</colgroup>
 									<tbody>
 										<tr>
-											<th>총 <span class="number" th:text="${delvFeeCdCnt}"></span> 건으로 나뉘어 배송 예정</th>
-											<td><span> 총알배송<em class="number" th:text="${shotCnt}" id="shotCnt"></em>건
-											</span> <span> STYLE24<em class="number" th:text="${wmsCnt}" id="wmsCnt"></em>건
-											</span> <span> 업체직배송<em class="number" th:text="${delvCnt}"></em>건
-											</span> <span> 예약배송<em class="number" th:text="${resCnt}"></em>건
-											</span></td>
+											<th>총 <span class="number" id="delvFeeCdCnt" th:text="${delvFeeCdCnt}"></span> 건으로 나뉘어 배송 예정</th>
+											<td>
+												<span> 총알배송<em class="number" th:text="${shotCnt}" id="shotCnt"></em>건</span> 
+												<span> STYLE24<em class="number" th:text="${wmsCnt}" id="wmsCnt"></em>건</span> 
+												<span> 업체직배송<em class="number" th:text="${delvCnt}"></em>건</span> 
+												<span> 예약배송<em class="number" th:text="${resCnt}"></em>건</span>
+											</td>
 										</tr>
 									</tbody>
 								</table>
@@ -370,37 +375,46 @@
 										<dd><span class="disc_amount" id="cpn1DcSumAmt" th:text="|${#numbers.formatInteger(cpn1DcSumAmt, 1, 'COMMA')} 원|"></span></dd>
 									</th:block>
 								</div>
-								<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>
-									</th:block>
-									<th:block th:if="${tmtbDcSumAmt} < 1">
-										<dd><span class="disc_amount" id="tmtbDcSumAmt" th:text="|${#numbers.formatInteger(tmtbDcSumAmt, 1, 'COMMA')} 원|"></span></dd>
-									</th:block>
-								</div>
-								<div>
-									<dt>쿠폰할인</dt>
-									<dd><span class="disc_amount" id="couponDcSumAmt"></span></dd>
-								</div>
-								<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>
-									</th:block>
-									<th:block th:if="${prePntDcAmt} < 1">
-										<dd><span class="disc_amount" id="prePntDcAmt" th:text="|${#numbers.formatInteger(prePntDcAmt, 1, 'COMMA')} 원|"></span></dd>
-									</th:block>
-								</div>
-								<div>
-									<dt>포인트 사용</dt>
-									<dd><span class="disc_amount" id="pntDcAmt"></span></dd>
-								</div>
-								<div>
-									<dt>상품권 사용</dt>
-									<dd><span class="disc_amount" id="gfcdUseAmt"></span></dd>
-								</div>
+								<!-- 회원인경우 노출 -->
+								<th:block th:if="${isLogin}">
+									<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>
+										</th:block>
+										<th:block th:if="${tmtbDcSumAmt} < 1">
+											<dd><span class="disc_amount" id="tmtbDcSumAmt" th:text="|${#numbers.formatInteger(tmtbDcSumAmt, 1, 'COMMA')} 원|"></span></dd>
+										</th:block>
+									</div>
+									<div>
+										<dt>쿠폰할인</dt>
+										<dd><span class="disc_amount" id="couponDcSumAmt"></span></dd>
+									</div>
+									<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>
+										</th:block>
+										<th:block th:if="${prePntDcAmt} < 1">
+											<dd><span class="disc_amount" id="prePntDcAmt" th:text="|${#numbers.formatInteger(prePntDcAmt, 1, 'COMMA')} 원|"></span></dd>
+										</th:block>
+									</div>
+									<div>
+										<dt>포인트 사용</dt>
+										<dd><span class="disc_amount" id="pntDcAmt"></span></dd>
+									</div>
+									<div>
+										<dt>상품권 사용</dt>
+										<dd><span class="disc_amount" id="gfcdUseAmt"></span></dd>
+									</div>
+								</th:block>
 							</dl>
+							<!-- 비회원인경우 노출 -->
+							<th:blcok th:if="!${isLogin}">
+								<div class="t_info">
+									<a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_CUSTOMER_JOIN_TYPE);" title="회원가입 하여 할인받기" class="btn_link">회원가입 하여 할인받기</a>
+								</div>
+							</th:blcok>
 						</div>
 						<div class="totalprice_box">
 							<dl>
@@ -408,7 +422,14 @@
 								<dd><span id="realOrdAmt"></span> 원</dd>
 							</dl>
 							<p class="info_point">
-								<span span class="save_point" id="savePntSumAmt" th:text="|${#numbers.formatInteger(savePntSumAmt, 1, 'COMMA')} P|"></span> 적립예정
+								<!-- 회원인경우 노출 -->
+								<th:blcok th:if="${isLogin}">
+									<span span class="save_point" id="savePntSumAmt" th:text="|${#numbers.formatInteger(savePntSumAmt, 1, 'COMMA')} P|"></span> 적립예정
+								</th:blcok>
+								<!-- 비회원인경우 노출 -->
+								<th:blcok th:if="!${isLogin}">
+									회원가입 후 구매하면&nbsp;&nbsp;<span span class="save_point" id="savePntSumAmt" th:text="|${#numbers.formatInteger(savePntSumAmt, 1, 'COMMA')} P|"></span> 적립예정
+								</th:blcok>
 							</p>
 						</div>
 					</div>
@@ -509,6 +530,7 @@ var shotDelvYn			= [[${order.shotDelvUseYn}]];	// 총알배송사용여부(장
 
 var foreignBuyYn		= [[${foreignBuyYn}]];			// 해외구매대행여부
 var orderMadeYn			= [[${orderMadeYn}]];			// 주문제작상품여부
+var isLogin				= [[${isLogin}]];				// 로그인여부
 
 var custCpnSq 			= 0;
 var cpnIndex			= 0;
@@ -534,6 +556,7 @@ $(document).ready( function() {
 		, "cartSqArr"		: cartSqArr
 		, "dispYn"			: "N"
 		, "shotDelvYn"		: shotDelvUseYn
+		, "shotDelvUseYn"	: shotDelvUseYn
 		, "foreignBuyYn"	: foreignBuyYn
 		, "orderMadeYn"		: orderMadeYn
 		, "custDelvAddrSq"	: 0
@@ -563,7 +586,6 @@ $(document).ready( function() {
 			}
 		});
 	}
-	
 });
 
 // 1. 함수기능 정의
@@ -726,7 +748,7 @@ var fnGetDailyDeliveryCheck = function (temp) {
 				if (parseInt(result) > 0) {
 					tempShotDelvYn = "Y";
 				}
-				
+
 				// json 값 설정
 				var orderListObj 		= {"cartSqArr":cartSqArr, "shotDelvYn":tempShotDelvYn};
 				var orderListJsonData 	= JSON.stringify(orderListObj);
@@ -762,6 +784,18 @@ var orderListInfoSet = function(orderListJsonData, temp) {
 			if (result != null) {
 				$("#orderListInfo").css("display", "block");
 				$("#orderListInfo").html(result);
+				
+				$("#delvFeeCdCnt").text($("#orderForm input[name=delvFeeCdCnt]").val());
+				$("#shotCnt").text($("#orderForm input[name=shotCnt]").val());
+				$("#wmsCnt").text($("#orderForm input[name=wmsCnt]").val());
+				
+				// 총알배송건수가 있으면 총알배송 태그 표시
+				if (parseInt($("#orderForm input[name=shotCnt]").val()) > 0 ) {
+					$(".shotDelv").show();
+				} else {
+					$(".shotDelv").hide();
+				}
+				
 			}
 			
 			// 1.5 사은품정보로드
@@ -941,7 +975,8 @@ var paymentInfoSet = function() {
 					var orderData = {
 						"custNm"				: $(".custNm").text()
 						,"email"				: $(".email").text()
-						,"recipPhnno"			: $(".cellPhnno").text()
+						,"recipNm"				: $(".recipNm").text()
+						,"recipPhnno"			: $(".recipPhnno").text()
 						,"recipZipcode"			: $(".recipZipcode").text()
 						,"recipBaseAddr"		: $(".recipBaseAddr").text()
 						,"recipDtlAddr"			: $(".recipDtlAddr").text()
@@ -992,8 +1027,13 @@ var paymentInfoSet = function() {
 					});
 				});
 
-				// 1.8 할인영역 설정
-				dcAmtInfoSet(jsonData);
+				// 1.8 할인영역 설정 (로그인여부일때 동작)
+				if (isLogin == true) {
+					dcAmtInfoSet(jsonData);
+				} else {
+					// 금액계산초기화
+					custCpnSumAmtCal();
+				}
 			}
 		}
 	});
@@ -1155,7 +1195,7 @@ var dcAmtInfoSet = function() {
 					
 					// 포인트 적용
 					$(".pntDcSumAmt").text(pntDcAmt);
-					$("#pntDcAmt").text("-"+pntDcAmt.addComma()+"원");
+					$("#pntDcAmt").text("-"+pntDcAmt.addComma()+" 원");
 					
 					// 상품권리렛기능
 					gfcdUseAmtReset();
@@ -1193,7 +1233,7 @@ var dcAmtInfoSet = function() {
 					
 					// 상품권 적용
 					$(".gfcdUseSumAmt").text(gfcdUseAmt);
-					$("#gfcdUseAmt").text("-"+gfcdUseAmt.addComma()+"원");
+					$("#gfcdUseAmt").text("-"+gfcdUseAmt.addComma()+" 원");
 					
 					// 금액전체계산
 					custCpnSumAmtCal();
@@ -1201,7 +1241,6 @@ var dcAmtInfoSet = function() {
 				
 				// 금액계산초기화
 				custCpnSumAmtCal();
-				
 			}
 		}
 	});
@@ -1852,7 +1891,7 @@ var custCpnSumAmtCal = function() {
 	var rmPntAmt 			= parseInt($("input[name='rmPntAmt']").val());
 	var freegiftUsePnt 		= parseInt($(".freegiftUsePnt").text());
 	rmPntAmt 				= rmPntAmt - freegiftUsePnt; 
-	$(".rmPntAmt").text("보유 : " + rmPntAmt.addComma() + " P");
+	$(".rmPntAmt").text(rmPntAmt.addComma());
 	
 	// 걸제영역
 	//$("#btn_payment").text("동의 후 "+realOrdSumAmt.addComma()+" 원 결제하기");

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

@@ -13,6 +13,10 @@
  * 1.0  2021.02.01   jsh77b     최초 작성
  *******************************************************************************
  -->
+<input type="hidden" name="delvFeeCdCnt" th:value="${delvFeeCdCnt}"/>
+<input type="hidden" name="shotCnt" th:value="${shotCnt}"/>
+<input type="hidden" name="wmsCnt" 	th:value="${wmsCnt}"/>
+
 <div class="od_item_box">
 	<th:block th:each="delvAllCart, i : ${delvAllCartList}">
 		<th:block th:if="${delvAllCart != null and #lists.size(delvAllCart) > 0}">

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

@@ -143,7 +143,7 @@
 						<span class="jointit1">STYLE24의 많은 혜택들이 기다리고 있습니다!</span>
 						<span class="jointit2">STYLE24에 회원가입을 하시면 더 많은 혜택을 받아보세요!</span>
 					</p>
-					<a href="#none" target="_blank" class="btn_gojoin" id="btn_join_member">회원가입</a>
+					<a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_CUSTOMER_JOIN_TYPE);" title="회원가입" class="btn_gojoin" id="btn_join_member">회원가입</a>
 				</div>
 			</div>
 		</div>		

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

@@ -21,7 +21,7 @@
 				<span>결제수단 선택</span>
 			</div>
 			<div class="data payTypeNm">
-				<span>신용카드</span>
+				<span>선택없음</span>
 			</div>
 		</div>
 	</a>