Merge branch 'develop' into jsshin

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

@@ -93,8 +93,6 @@ public class TsfOrderService {
 		int ordNo = 0;
 		int index = 0;
 		int ordReqChgQty = 0;
-		int count = 0;
-		Collection<Order> list = orderDao.getOrderListForMypage(order);
 
 		for (Order tmpOrder : orderDao.getOrderListForMypage(order)) {
 			// 세트상품 옵션별 배열로 담기
@@ -136,7 +134,8 @@ public class TsfOrderService {
 
 			// 전체 구매확정 가능 여부 설정
 			if ("Y".equals(allDecideYn)
-				&& !TscConstants.OrderDetailStat.DELIVERY_COMPLETE.value().equals(tmpOrder.getOrdDtlStat())) {
+				&& !TscConstants.OrderDetailStat.DELIVERY_COMPLETE.value().equals(tmpOrder.getOrdDtlStat())
+				&& ordReqChgQty > 0) {
 				allDecideYn = "N";
 			}
 
@@ -532,21 +531,29 @@ public class TsfOrderService {
 		
 		int orderDetailCurrPriceSum 	= 0;
 		int orderDetailRealOrdAmtSum 	= 0;
+		int cpn1DcAmtSum				= 0;
+		int tmtb1DcAmtSum				= 0;
+		int tmtb2DcAmtSum				= 0;
+		int goodsCpnDcAmtSum			= 0;
+		int cartCpnDcAmtSum				= 0;
+		
 		int cartCurrPriceSum 			= 0;
 		int cartRealOrdAmtSum 			= 0;
 		
+		// 주문서화면 금액정보 체크
 		for (Order orderDetail : orderDetailList) {
-			orderDetailCurrPriceSum = orderDetailCurrPriceSum + orderDetail.getCurrPrice();
-			orderDetailRealOrdAmtSum = orderDetailRealOrdAmtSum + orderDetail.getRealOrdAmt();
+			orderDetailCurrPriceSum 	= orderDetailCurrPriceSum + orderDetail.getCurrPrice();
+			orderDetailRealOrdAmtSum 	= orderDetailRealOrdAmtSum + orderDetail.getRealOrdAmt();
 		}
 		
+		// 장바구니 금액정보 체크
 		for (Order orderDetail : cartGoodsList) {
-			cartCurrPriceSum = orderDetailCurrPriceSum + orderDetail.getCurrPrice();
+			cartCurrPriceSum 			= cartCurrPriceSum + orderDetail.getCurrPrice();
 		}
 		
 		// 판매가비교
 		if (orderDetailCurrPriceSum != cartCurrPriceSum) {
-			resultStr = "보유하신 상품쿠폰이 존재하지 않습니다.";
+			resultStr = "금액정보가 잘못 되었습니다.";
 			return resultStr;
 		}
 

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

@@ -162,7 +162,7 @@ public class TsfDisplayController extends TsfBaseController {
 				mainLayout.setBrandPickList(displayService.getContentsForGoods(contents));
 			}
 
-			if (contentsLoc.equals("SMM009")) {
+			if (contentsLoc.equals("SMM009") || contentsLoc.equals("SMM012")) {
 				mainLayout.setMdPickList(displayService.getContentsForGoods(contents));
 			}
 

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

@@ -132,10 +132,7 @@ public class TsfOrderController extends TsfBaseController {
 	@RequestMapping(value = "/form")
 	public ModelAndView orderForm(HttpServletRequest request, Order order) {
 		ModelAndView mav = new ModelAndView();
-		
-		// TODO
-		// 1.비회주문, 회원 주문 판단 로직,  고객정보 세션 판단
-		// 세션고객정보가 존재하면 회원주문 없으면 비회원 주문
+
 		
 		// 1.1 referer 체크 (order/noMember)
 		String refererStr = "";
@@ -297,9 +294,9 @@ public class TsfOrderController extends TsfBaseController {
 		
 		// 1. 로그인체크 후 custNo 설정
 		if (TsfSession.isLogin()) {
-			order.setCustNo(TsfSession.getInfo().getCustNo()); // 고객번호등록
+			order.setCustNo(TsfSession.getInfo().getCustNo());
 		} else {
-			order.setCustNo(0); // 고객번호등록
+			order.setCustNo(0);
 			order.setJsessionId(TsfSession.getSessionId());
 		}
 		
@@ -341,9 +338,9 @@ public class TsfOrderController extends TsfBaseController {
 		
 		// 1. 로그인체크 후 custNo 설정
 		if (TsfSession.isLogin()) {
-			order.setCustNo(TsfSession.getInfo().getCustNo()); // 고객번호등록
+			order.setCustNo(TsfSession.getInfo().getCustNo());
 		} else {
-			order.setCustNo(0); // 고객번호등록
+			order.setCustNo(0);
 			order.setJsessionId(TsfSession.getSessionId());
 		}
 		
@@ -495,9 +492,9 @@ public class TsfOrderController extends TsfBaseController {
 		
 		// 1. 로그인체크 후 custNo 설정
 		if (TsfSession.isLogin()) {
-			order.setCustNo(TsfSession.getInfo().getCustNo()); // 고객번호등록
+			order.setCustNo(TsfSession.getInfo().getCustNo());
 		} else {
-			order.setCustNo(0); // 고객번호등록
+			order.setCustNo(0);
 			order.setJsessionId(TsfSession.getSessionId());
 		}
 		
@@ -551,9 +548,9 @@ public class TsfOrderController extends TsfBaseController {
 		
 		// 1. 로그인체크 후 custNo 설정
 		if (TsfSession.isLogin()) {
-			order.setCustNo(TsfSession.getInfo().getCustNo()); // 고객번호등록
+			order.setCustNo(TsfSession.getInfo().getCustNo());
 		} else {
-			order.setCustNo(0); // 고객번호등록
+			order.setCustNo(0);
 			order.setJsessionId(TsfSession.getSessionId());
 		}
 		
@@ -600,9 +597,9 @@ public class TsfOrderController extends TsfBaseController {
 		
 		// 1. 로그인체크 후 custNo 설정
 		if (TsfSession.isLogin()) {
-			order.setCustNo(TsfSession.getInfo().getCustNo()); // 고객번호등록
+			order.setCustNo(TsfSession.getInfo().getCustNo());
 		} else {
-			order.setCustNo(0); // 고객번호등록
+			order.setCustNo(0);
 			order.setJsessionId(TsfSession.getSessionId());
 		}
 		
@@ -686,13 +683,13 @@ public class TsfOrderController extends TsfBaseController {
 		
 		// 1. 로그인체크 후 custNo 설정
 		if (TsfSession.isLogin()) {
-			order.setCustNo(TsfSession.getInfo().getCustNo()); // 고객번호등록
+			order.setCustNo(TsfSession.getInfo().getCustNo());
 		} else {
-			order.setCustNo(0); // 고객번호등록
+			order.setCustNo(0);
 			order.setJsessionId(TsfSession.getSessionId());
 		}
 		
-		// 2. 로그인체크 후 정보 설정
+		// 2. TODO 로그인체크 후 정보 설정 자주사용하는 결제정보조회
 		if (TsfSession.isLogin()) {
 			
 		}
@@ -727,12 +724,11 @@ public class TsfOrderController extends TsfBaseController {
 		}
 		
 		order.setFrontGb(TsfSession.getFrontGb());
-		
-		// TODO
+
 		// 2. 주문정보유효성체크
 		String resultStr = orderService.orderValidationCheck(order);
 		
-		// 유효성체크 실패
+		// 주문정보 유효성체크 실패
 		if (!"SUCCESS".equals(resultStr)) {
 			mav.addObject("message", resultStr);
 			mav.setViewName(super.getDeviceViewName("order/OrderEmpty"));

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

@@ -1280,7 +1280,7 @@
 		                 , ROW_NUMBER() OVER(ORDER BY GS.SELL_WEEK_QTY DESC
 		                                            , G.GOODS_CD) AS NUMB
 		                     </when>
-		                     <when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007'"> <!-- md추천 -->
+		                     <when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012'"> <!-- md추천 -->
 		                 , ROW_NUMBER() OVER(ORDER BY CTG.DISP_ORD
 		                 , G.REG_DT DESC
 		                 , G.GOODS_CD) AS NUMB
@@ -1298,7 +1298,7 @@
 		                     </otherwise>
 		                 </choose>
 		            <choose>
-		                <when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007'"> <!-- md추천 -->
+		                <when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012'"> <!-- md추천 -->
 		                    FROM	TB_CONTENTS CT
 		                    , TMP_CONTENTS_GOODS CTG
 		                    , TB_GOODS G

src/main/resources/config/application-run.yml

@@ -27,31 +27,32 @@ spring:
 logging.config: classpath:log/logback-run.xml
 
 domain:
+    admin: //bos.style24.com
     front: //www.style24.com
     image: //image.style24.com
-    uximage: //image.istyle24.com/Upload
+    uximage: //www.style24.com/
 
 # SSL Server
 has-ssl: true
 
 upload:
     default:
-        target.path: /usr/local/data/style24
+        target.path: /files/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png|bmp|txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
         view: //image.istyle24.com
     goods:
-        target.path: /usr/local/data/style24/productimage
+        target.path: /files/data/style24/Upload/ProductImage
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
         view: //image.istyle24.com/Upload/ProductImage
     image:
-        target.path:  /usr/local/data/style24
+        target.path: /files/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
         view: //image.istyle24.com
 
-download.path: /usr/local/data
+download.path: /files/data
 
 # SMTP
 mail:

src/main/resources/config/application-style.yml

@@ -27,32 +27,32 @@ domain:
 
 upload:
     default:
-        target.path: /usr/local/data/style24
+        target.path: /files/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png|bmp|txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
         view: //image.istyle24.com
     goods:
-        target.path: /usr/local/data/style24/productimage
+        target.path: /files/data/style24/Upload/ProductImage
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
         view: //image.istyle24.com/Upload/ProductImage
     image:
-        target.path: /usr/local/data/style24
+        target.path: /files/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
         view: //image.istyle24.com
     excel:
-        target.path: /usr/local/data/style24/excel
+        target.path: /files/data/style24/excel
         max.size: 10
         allow.extension: xls|xlsx
         view: //image.istyle24.com/excel
     sample:
-        target.path: /usr/local/data/style24/sample
+        target.path: /files/data/style24/sample
         max.size: 10
         allow.extension: txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
         view: //image.style24.com/sample
 
-download.path: /usr/local/data
+download.path: /files/data
 
 # USAFE 보증보험 정보
 usafe.guarantee:

src/main/webapp/WEB-INF/views/mob/display/MallMainFormMob.html

@@ -278,7 +278,7 @@
 
 			<th:block th:if="${contentsLoc=='007'}">
 				<!-- 7. 브랜드픽 -->
-				<div class="inner">
+				<div class="inner" th:if="${mainData.ContentsList != null}">
 					<div class="main_pick" >
 						<div class="titWrap">
 							<h2 th:text="${contentsTitle}"></h2>
@@ -375,7 +375,7 @@
 				</div>
 			</th:block>
 
-			<th:block th:if="${contentsLoc=='009'}">
+			<th:block th:if="${contentsLoc=='012'}">
 				<!-- 9. MD추천 스타일 -->
 				<div class="inner">
 					<div class="main_recomm">

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

@@ -30,7 +30,7 @@
 <!-- 주문금액정보표현 -->
 <form id="orderAmtForm" name="orderAmtForm">
 	<!-- 고객정보 -->
-	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderInfo">
+	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderInfo" id="orderInfo">
 		<tbody>
 			<tr style="height:30px;">
 				<th>custNm</th>
@@ -65,7 +65,7 @@
 	<!-- //고객정보 -->
 	
 	<!-- 사은품정보 -->
-	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="freegiftInfo">
+	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="freegiftInfo" id="freegiftInfo">
 		<tr style="height:30px;">
 			<th>freegiftValArr</th>
 			<th>freegiftUsePointArr</th>
@@ -82,7 +82,7 @@
 	<!-- //사은품정보 -->
 	
 	<!-- 주문상세금액 -->
-	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderDetailInfo">
+	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderDetailInfo" id="orderDetailInfo">
 		<tr style="height:30px;">
 			<th>cartSq</th>
 			<th style="display:none">goodsNm</th>
@@ -175,7 +175,7 @@
 	<!-- //주문상세금액 -->
 	
 	<!-- 배송단위목록 -->
-	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="delvFeeCdInfo">
+	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="delvFeeCdInfo" id="delvFeeCdInfo">
 		<tr style="height:30px;">
 			<th>supplyCompCd</th>
 			<th>delvFeeCd</th>
@@ -196,7 +196,7 @@
 	<!-- //배송단위목록 -->
 	
 	<!-- 주문금액합계 -->
-	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="orderSumAmtInfo">
+	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="orderSumAmtInfo" id="orderSumAmtInfo">
 		<tr style="height:30px;">
 			<th>orgGoodsSumAmt</th>
 			<th>delvSumAmt</th>

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

@@ -49,7 +49,7 @@
 									<p th:unless="${order.giftPackYn == 'Y'}">주문일 <span th:text="${order.ordDt}"></span></p>
 									<p th:if="${order.giftPackYn == 'Y'}">선물일 <span th:text="${order.ordDt}"></span></p>
 									<li><a href="javascript:void(0)" th:if="${allCanYn == 'Y' and order.ordReqChgQty == 0}" onclick="fnAllCancel();">주문전체취소</a></li>
-									<li><a href="javascript:void(0)" th:if="${allDecideYn == 'Y'}"  th:attr="ordNo=${ordNo}" onclick="fnAllDecideOrder(this);">전체구매확정</a></li>
+									<li><a href="javascript:void(0)" th:if="${allDecideYn == 'Y' and order.ordReqChgQty == 0}"  th:attr="ordNo=${ordNo}" onclick="fnAllDecideOrder(this);">전체구매확정</a></li>
 								</div>
 								<div class="goods_cont">
 									<!-- 주문상품 -->
@@ -170,7 +170,7 @@
 														</th:block>
 	
 														<!-- 구매확정 버튼(배송완료) -->
-														<th:block th:if="${ordDtl.ordDtlStat == 'G013_60'}">
+														<th:block th:if="${ordDtl.ordDtlStat == 'G013_60' and ordDtl.ordReqChgQty == 0}">
 															<p><button type="button" class="btn btn_primary_line btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnDecideOrder(this);"><span>구매 확정</span></button></p>
 														</th:block>
 	

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

@@ -542,7 +542,7 @@
 						}
 
 						// 구매확정 버튼(배송완료)
-						if (ordDtl.ordDtlStat == 'G013_60') {
+						if (ordDtl.ordDtlStat == 'G013_60' && ordDtl.ordReqChgQty == 0) {
 							tag += '											<p><button type="button" class="btn btn_primary_line btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" onclick="fnDecideOrder(this);"><span>구매 확정</span></button></p>\n';
 						}
 

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

@@ -32,7 +32,7 @@
 <!-- 주문금액정보표현 -->
 <form id="orderAmtForm" name="orderAmtForm">
 	<!-- 주문자정보 -->
-	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderInfo">
+	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderInfo" id="orderInfo">
 		<tbody>
 			<tr style="height:30px;">
 				<th>custNm</th>
@@ -65,7 +65,7 @@
 	<!-- //주문자정보 -->
 	
 	<!-- 사은품정보 -->
-	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="freegiftInfo">
+	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="freegiftInfo" id="freegiftInfo">
 		<tr style="height:30px;">
 			<th>freegiftValArr</th>
 			<th>freegiftUsePointArr</th>
@@ -82,7 +82,7 @@
 	<!-- //사은품정보 -->
 	
 	<!-- 주문상세금액 -->
-	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderDetailInfo">
+	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderDetailInfo" id="orderDetailInfo">
 		<tr style="height:30px;">
 			<th>cartSq</th>
 			<th style="display:none">goodsNm</th>
@@ -175,7 +175,7 @@
 	<!-- //주문상세금액 -->
 	
 	<!-- 배송단위목록 -->
-	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="delvFeeCdInfo">
+	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="delvFeeCdInfo" id="delvFeeCdInfo">
 		<tr style="height:30px;">
 			<th>supplyCompCd</th>
 			<th>delvFeeCd</th>
@@ -1111,6 +1111,7 @@ var paymentInfoSet = function() {
 
 					// 주문상세데이타 생성
 					$("#orderDetailInfo .cartSq").each(function(){
+						
 						// 주문상세단위 총알배송여부 변경
 						var orderDetailShotDelvYn = $(this).parent().find(".shotDelvYn").text();
 						if (orderDetailShotDelvYn == "Y") {