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

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

@@ -560,12 +560,11 @@ public class TsfOrderService {
 		int realOrdSumAmt 			= 0;
 		
 		int cartOrgGoodsSumAmt 		= 0;
-		int cartRealOrdSumAmt 		= 0;
 		
 		// 주문서화면 금액정보 체크
 		for (Order orderDetail : orderDetailList) {
-			orgGoodsSumAmt 				= orgGoodsSumAmt 	+ orderDetail.getCurrPrice();
-			cpn1DcSumAmt 				= cpn1DcSumAmt 		+ orderDetail.getCpn1DcAmt();
+			orgGoodsSumAmt 				= orgGoodsSumAmt 	+ ((orderDetail.getCurrPrice() + orderDetail.getOptAddPrice()) * orderDetail.getGoodsQty());
+			cpn1DcSumAmt 				= cpn1DcSumAmt 		+ (orderDetail.getCpn1DcAmt() * orderDetail.getGoodsQty());
 			tmtb1DcSumAmt 				= tmtb1DcSumAmt 	+ orderDetail.getTmtb1DcAmt();
 			tmtb2DcSumAmt 				= tmtb2DcSumAmt 	+ orderDetail.getTmtb2DcAmt();
 			goodsCpnDcSumAmt			= goodsCpnDcSumAmt 	+ orderDetail.getGoodsCpnDcAmt();
@@ -622,19 +621,14 @@ public class TsfOrderService {
 			resultStr = "상품권 사용 금액정보가 잘못 되었습니다.";
 			return resultStr;
 		}
-		
-		
-		
+
 		if (realOrdSumAmt != order.getRealOrdSumAmt()) {
 			resultStr = "실결제 금액정보가 잘못 되었습니다.";
 			return resultStr;
 		}
-		
-		
-
 		// 장바구니 금액정보 체크
 		for (Order orderDetail : cartGoodsList) {
-			cartOrgGoodsSumAmt 			= cartOrgGoodsSumAmt + orderDetail.getOrgCurrPrice();
+			cartOrgGoodsSumAmt 			= cartOrgGoodsSumAmt + ((orderDetail.getOrgCurrPrice() + orderDetail.getOptAddPrice()) * orderDetail.getGoodsQty());
 		}
 		
 		// 판매가비교

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

@@ -268,7 +268,7 @@ public class TsfOrderController extends TsfBaseController {
 		// 2021.05.07 jsh77b id만 개발자모드허용
 		boolean devTempYn = false;
 		if (TsfSession.isLogin()) {
-			if ("jsh77b".equals(TsfSession.getInfo().getCustId())) {
+			if ("jsh77b".equals(TsfSession.getInfo().getCustId()) || "xodud1202".equals(TsfSession.getInfo().getCustId())) {
 				devTempYn = true;
 			}
 		}

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

@@ -2196,8 +2196,8 @@ var custCpnSumAmtCal = function() {
 		var dcSumAmt		= 0;
 		
 		// 주문금액 = ((판매가 - 즉시할인가) + 옵션추가금액) * 장바구니수량
-		//orgGoodsSumAmt		= orgGoodsSumAmt + (orgCurrPrice + optAddPrice) * goodsQty;
-		orgGoodsSumAmt		= orgGoodsSumAmt + orgCurrPrice;
+		orgGoodsSumAmt		= orgGoodsSumAmt + (orgCurrPrice + optAddPrice) * goodsQty;
+		//orgGoodsSumAmt		= orgGoodsSumAmt + orgCurrPrice;
 		cpn1DcSumAmt		= cpn1DcSumAmt + (cpn1DcAmt * goodsQty);
 		tmtb1DcSumAmt		= tmtb1DcSumAmt + tmtb1DcAmt;
 		tmtb2DcSumAmt		= tmtb2DcSumAmt + tmtb2DcAmt;
@@ -2248,10 +2248,11 @@ var custCpnSumAmtCal = function() {
 		}
 		
 		var realOrdAmt1		= ordAmt - dcSumAmt - pntDcAmt1 - gfcdUseAmt1;
+		var realOrdAmt2		= ordAmt - dcSumAmt - pntDcAmt1;
 		realOrdSumAmt		= realOrdSumAmt + realOrdAmt1;
 		
 		// 2021.05.11 최종할인금액으로 적립포인트 적용
-		savePntAmt1			= parseInt(realOrdAmt1 * (pntPrate/100));
+		savePntAmt1			= parseInt(realOrdAmt2 * (pntPrate/100));
 		
 		// 선포인트사용여부 
 		if (prePntDcAmtYn == "Y") {

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

@@ -138,25 +138,6 @@
 	
 	<!-- 주문금액합계 -->
 	<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>
-			<th>freegiftUsePnt</th>
-			<th>cpn1DcSumAmt</th>
-			<th>ordSumAmt</th>
-			<th>tmtb1DcSumAmt</th>
-			<th>tmtb2DcSumAmt</th>
-			<th>tmtbDcSumAmt</th>
-			<th>goodsCpnDcSumAmt</th>
-			<th>cartCpnDcSumAmt</th>
-			<th>delvCpnDcSumAmt</th>
-			<th>cpnDcSumAmt</th>
-			<th>prePntDcAmt</th>
-			<th>pntDcSumAmt</th>
-			<th>gfcdUseSumAmt</th>
-			<th>realOrdSumAmt</th>
-			<th>savePntSumAmt</th>
-		</tr>
 		<tr style="height:30px;">
 			<td class="orgGoodsSumAmt">0</td>
 			<td class="delvSumAmt" th:text="${sumDelvFee}"></td>
@@ -2115,8 +2096,8 @@ var custCpnSumAmtCal = function() {
 		var dcSumAmt		= 0;
 		
 		// 주문금액 = ((판매가 - 즉시할인가) + 옵션추가금액) * 장바구니수량
-		//orgGoodsSumAmt		= orgGoodsSumAmt + (orgCurrPrice + optAddPrice) * goodsQty;
-		orgGoodsSumAmt		= orgGoodsSumAmt + orgCurrPrice;
+		orgGoodsSumAmt		= orgGoodsSumAmt + (orgCurrPrice + optAddPrice) * goodsQty;
+		//orgGoodsSumAmt		= orgGoodsSumAmt + orgCurrPrice;
 		cpn1DcSumAmt		= cpn1DcSumAmt + (cpn1DcAmt * goodsQty);
 		tmtb1DcSumAmt		= tmtb1DcSumAmt + tmtb1DcAmt;
 		tmtb2DcSumAmt		= tmtb2DcSumAmt + tmtb2DcAmt;
@@ -2165,10 +2146,11 @@ var custCpnSumAmtCal = function() {
 		}
 		
 		var realOrdAmt1		= ordAmt - dcSumAmt - pntDcAmt1 - gfcdUseAmt1;
+		var realOrdAmt2		= ordAmt - dcSumAmt - pntDcAmt1;
 		realOrdSumAmt		= realOrdSumAmt + realOrdAmt1;
 		
 		// 2021.05.11 최종할인금액으로 적립포인트 적용
-		savePntAmt1			= parseInt(realOrdAmt1 * (pntPrate/100));
+		savePntAmt1			= parseInt(realOrdAmt2 * (pntPrate/100));
 		
 		// 선포인트사용여부 
 		if (prePntDcAmtYn == "Y") {