Просмотр исходного кода

주문서 금액 유효성 체크 추가

tsit14 5 лет назад
Родитель
Сommit
d19872e011

+ 5 - 0
src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -571,6 +571,8 @@ public class TsfOrderService {
 			realOrdSumAmt 				= realOrdSumAmt 	+ orderDetail.getRealOrdAmt();
 			realOrdSumAmt 				= realOrdSumAmt 	+ orderDetail.getRealOrdAmt();
 		}
 		}
 		
 		
+		realOrdSumAmt = realOrdSumAmt + order.getDelvSumAmt();
+		
 		if (orgGoodsSumAmt != order.getOrgGoodsSumAmt()) {
 		if (orgGoodsSumAmt != order.getOrgGoodsSumAmt()) {
 			resultStr = "판매가 금액정보가 잘못 되었습니다.";
 			resultStr = "판매가 금액정보가 잘못 되었습니다.";
 			return resultStr;
 			return resultStr;
@@ -616,12 +618,15 @@ public class TsfOrderService {
 			return resultStr;
 			return resultStr;
 		}
 		}
 		
 		
+		
+		
 		if (realOrdSumAmt != order.getRealOrdSumAmt()) {
 		if (realOrdSumAmt != order.getRealOrdSumAmt()) {
 			resultStr = "실결제 금액정보가 잘못 되었습니다.";
 			resultStr = "실결제 금액정보가 잘못 되었습니다.";
 			return resultStr;
 			return resultStr;
 		}
 		}
 		
 		
 		
 		
+
 		// 장바구니 금액정보 체크
 		// 장바구니 금액정보 체크
 		for (Order orderDetail : cartGoodsList) {
 		for (Order orderDetail : cartGoodsList) {
 			cartOrgGoodsSumAmt 			= cartOrgGoodsSumAmt + orderDetail.getOrgCurrPrice();
 			cartOrgGoodsSumAmt 			= cartOrgGoodsSumAmt + orderDetail.getOrgCurrPrice();

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

@@ -1257,6 +1257,7 @@ var paymentInfoSet = function() {
 						,"pntDcSumAmt"			: $("#orderAmtForm .pntDcSumAmt").text()
 						,"pntDcSumAmt"			: $("#orderAmtForm .pntDcSumAmt").text()
 						,"gfcdUseSumAmt"		: $("#orderAmtForm .gfcdUseSumAmt").text()
 						,"gfcdUseSumAmt"		: $("#orderAmtForm .gfcdUseSumAmt").text()
 						,"realOrdSumAmt"		: $("#orderAmtForm .realOrdSumAmt").text()
 						,"realOrdSumAmt"		: $("#orderAmtForm .realOrdSumAmt").text()
+						,"delvSumAmt"			: $("#orderAmtForm .delvSumAmt").text()
 					};
 					};
 					
 					
 					$.ajax( {
 					$.ajax( {

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

@@ -154,7 +154,7 @@
 								<div>
 								<div>
 									<input type="radio" name="rdi-beforpoint" id="rdi-beforpoint2" value="Y" checked> 
 									<input type="radio" name="rdi-beforpoint" id="rdi-beforpoint2" value="Y" checked> 
 									<label for="rdi-beforpoint2"><span>사용함</span></label> 
 									<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>
 							</div>
 							</div>
 						</dd>
 						</dd>
@@ -186,7 +186,7 @@
 								<!-- 스타일 포인트 3만원 미만 결제시 노출 -->
 								<!-- 스타일 포인트 3만원 미만 결제시 노출 -->
 								<th:block th:if="${orgGoodsSumAmt} < ${pointUseEnvset.pointUseOrdMinAmt}">
 								<th:block th:if="${orgGoodsSumAmt} < ${pointUseEnvset.pointUseOrdMinAmt}">
 									<div class="input_wrap">
 									<div class="input_wrap">
-										<input type="text" class="form_control" maxlength="" th:placeholder="|${#numbers.formatInteger(pointUseEnvset.pointUseOrdMinAmt, 1, 'COMMA')} 이상 결제시에만 포인트 사용이 가능합니다.|" disabled="">
+										<input type="text" class="form_control" maxlength="" th:placeholder="|${#numbers.formatInteger(pointUseEnvset.pointUseOrdMinAmt, 1, 'COMMA')} 이상 결제시에만 포인트 사용이 가능합니다.|" disabled="">
 									</div>
 									</div>
 								</th:block>
 								</th:block>
 								<!-- //스타일 포인트 3만원 미만 결제시 노출 -->
 								<!-- //스타일 포인트 3만원 미만 결제시 노출 -->

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

@@ -1239,6 +1239,7 @@ var paymentInfoSet = function() {
 						,"pntDcSumAmt"			: $("#orderAmtForm .pntDcSumAmt").text()
 						,"pntDcSumAmt"			: $("#orderAmtForm .pntDcSumAmt").text()
 						,"gfcdUseSumAmt"		: $("#orderAmtForm .gfcdUseSumAmt").text()
 						,"gfcdUseSumAmt"		: $("#orderAmtForm .gfcdUseSumAmt").text()
 						,"realOrdSumAmt"		: $("#orderAmtForm .realOrdSumAmt").text()
 						,"realOrdSumAmt"		: $("#orderAmtForm .realOrdSumAmt").text()
+						,"delvSumAmt"			: $("#orderAmtForm .delvSumAmt").text()
 					};
 					};
 					
 					
 					$.ajax( {
 					$.ajax( {