관리자수정

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

@@ -117,6 +117,8 @@
 			<th>foreignYn</th>
 			<th>orderMadeYn</th>
 			<th>delvFeeCd</th>
+			<th>pntPrate</th>
+			<th>pntMrate</th>
 		</tr>
 		<th:block th:each="delvAllCart, index : ${delvAllCartList}">
 			<th:block th:if="${delvAllCart != null and #lists.size(delvAllCart) > 0}">
@@ -162,11 +164,13 @@
 						<td class="pntDcAmt1">0</td>
 						<td class="gfcdUseAmt1">0</td>
 						<td class="realOrdAmt1">0</td>
-						<td class="savePntAmt1" 	th:text="${goods.savePntAmt}"></td>
+						<td class="savePntAmt1">0</td>
 						<td class="shotDelvYn" 		th:text="${goods.shotDelvYn}"></td>
 						<td class="foreignBuyYn" 	th:text="${goods.foreignBuyYn}"></td>
 						<td class="orderMadeYn" 	th:text="${goods.orderMadeYn}"></td>
 						<td class="delvFeeCd" 		th:text="${goods.delvFeeCd}"></td>
+						<td class="pntPrate" 		th:text="${goods.pntPrate}"></td>
+						<td class="pntMrate" 		th:text="${goods.pntMrate}"></td>
 					</tr>
 				</th:block>
 			</th:block>
@@ -2272,7 +2276,6 @@ var custCpnSumAmtCal = function() {
 		var goodsCpnDcAmt	= parseInt($(this).parent().find(".goodsCpnDcAmt").text());
 		var cartCpnDcAmt	= parseInt($(this).parent().find(".cartCpnDcAmt").text());
 		var prePntDcAmt1	= parseInt($(this).parent().find(".prePntDcAmt1").text());
-		var savePntAmt1		= parseInt($(this).parent().find(".savePntAmt1").text());
 		var dcSumAmt		= 0;
 		
 		// 주문금액 = ((판매가 - 즉시할인가) + 옵션추가금액) * 장바구니수량
@@ -2293,14 +2296,8 @@ var custCpnSumAmtCal = function() {
 		// 할인금액합계 = 다다익선수량금액 + 다다익선금액금액 + 상품쿠폰금액 + 장바구니금액 + 선포인트금액
 		if (prePntDcAmtYn == "Y") {
 			dcSumAmt		= tmtb1DcAmt + tmtb2DcAmt + goodsCpnDcAmt + cartCpnDcAmt + prePntDcAmt1;
-			
-			// 2021.04.29 선포인트사용포인트 적립포인트금액 0원처리
-			if (prePntDcAmt1 < 1) {
-				savePntSumAmt	= savePntSumAmt + savePntAmt1;
-			}
 		} else {
 			dcSumAmt		= tmtb1DcAmt + tmtb2DcAmt + goodsCpnDcAmt + cartCpnDcAmt;
-			savePntSumAmt	= savePntSumAmt + savePntAmt1;
 		}
 		
 		totDcSumAmt			= totDcSumAmt + dcSumAmt;
@@ -2308,17 +2305,19 @@ var custCpnSumAmtCal = function() {
 		// 주문금액설정
 		$(this).parent().find(".ordAmt").text(ordAmt);
 		$(this).parent().find(".dcSumAmt").text(dcSumAmt);
-		
-		//savePntSumAmt		= savePntSumAmt + savePntAmt1;
 	});
 	
 	// 포인트, 상품권 금액 분배
 	$("#orderAmtForm .cartSq").each(function(){
+		var pntPrate		= parseInt($(this).parent().find(".pntPrate").text());
+		var pntMrate		= parseInt($(this).parent().find(".pntMrate").text());
 		var ordAmt 			= parseInt($(this).parent().find(".ordAmt").text());
 		var dcSumAmt		= parseInt($(this).parent().find(".dcSumAmt").text()); 
+		var prePntDcAmt1	= parseInt($(this).parent().find(".prePntDcAmt1").text());
 		var tempDiv 		= parseInt((ordAmt / ordSumAmt) * 100);
 		var pntDcAmt1 		= 0;
 		var gfcdUseAmt1		= 0;
+		var savePntAmt1		= 0;
 		
 		if (index == cartSqLenght) {
 			pntDcAmt1 		= leftPntAmt;
@@ -2333,9 +2332,22 @@ var custCpnSumAmtCal = function() {
 		var realOrdAmt1		= ordAmt - dcSumAmt - pntDcAmt1 - gfcdUseAmt1;
 		realOrdSumAmt		= realOrdSumAmt + realOrdAmt1;
 		
+		// 2021.05.11 최종할인금액으로 적립포인트 적용
+		savePntAmt1			= parseInt(realOrdAmt1 * (pntPrate/100));
+		
+		// 선포인트사용여부 
+		if (prePntDcAmtYn == "Y") {
+			if (prePntDcAmt1 < 1) {
+				savePntSumAmt	= savePntSumAmt + savePntAmt1;
+			}
+		} else {
+			savePntSumAmt	= savePntSumAmt + savePntAmt1;
+		}
+		
 		$(this).parent().find(".pntDcAmt1").text(pntDcAmt1);
 		$(this).parent().find(".gfcdUseAmt1").text(gfcdUseAmt1);
 		$(this).parent().find(".realOrdAmt1").text(realOrdAmt1);
+		$(this).parent().find(".savePntAmt1").text(savePntAmt1);
 		
 		index++;
 	});

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

@@ -117,6 +117,8 @@
 			<th>foreignYn</th>
 			<th>orderMadeYn</th>
 			<th>delvFeeCd</th>
+			<th>pntPrate</th>
+			<th>pntMrate</th>
 		</tr>
 		<th:block th:each="delvAllCart, index : ${delvAllCartList}">
 			<th:block th:if="${delvAllCart != null and #lists.size(delvAllCart) > 0}">
@@ -162,11 +164,13 @@
 						<td class="pntDcAmt1">0</td>
 						<td class="gfcdUseAmt1">0</td>
 						<td class="realOrdAmt1">0</td>
-						<td class="savePntAmt1" 	th:text="${goods.savePntAmt}"></td>
+						<td class="savePntAmt1">0</td>
 						<td class="shotDelvYn" 		th:text="${goods.shotDelvYn}"></td>
 						<td class="foreignBuyYn" 	th:text="${goods.foreignBuyYn}"></td>
 						<td class="orderMadeYn" 	th:text="${goods.orderMadeYn}"></td>
 						<td class="delvFeeCd" 		th:text="${goods.delvFeeCd}"></td>
+						<td class="pntPrate" 		th:text="${goods.pntPrate}"></td>
+						<td class="pntMrate" 		th:text="${goods.pntMrate}"></td>
 					</tr>
 				</th:block>
 			</th:block>
@@ -2172,7 +2176,6 @@ var custCpnSumAmtCal = function() {
 		var cartCpnDcAmt	= parseInt($(this).parent().find(".cartCpnDcAmt").text());
 		var prePntDcAmt1	= parseInt($(this).parent().find(".prePntDcAmt1").text());
 		var dcSumAmt		= 0;
-		var savePntAmt1		= parseInt($(this).parent().find(".savePntAmt1").text());
 		
 		// 주문금액 = ((판매가 - 즉시할인가) + 옵션추가금액) * 장바구니수량
 		orgGoodsSumAmt		= orgGoodsSumAmt + (orgCurrPrice + optAddPrice) * goodsQty;
@@ -2192,14 +2195,8 @@ var custCpnSumAmtCal = function() {
 		// 할인금액합계 = 다다익선수량금액 + 다다익선금액금액 + 상품쿠폰금액 + 장바구니금액 + 선포인트금액
 		if (prePntDcAmtYn == "Y") {
 			dcSumAmt		= tmtb1DcAmt + tmtb2DcAmt + goodsCpnDcAmt + cartCpnDcAmt + prePntDcAmt1;
-			
-			// 2021.04.29 선포인트사용포인트 적립포인트금액 0원처리
-			if (prePntDcAmt1 < 1) {
-				savePntSumAmt	= savePntSumAmt + savePntAmt1;
-			}
 		} else {
 			dcSumAmt		= tmtb1DcAmt + tmtb2DcAmt + goodsCpnDcAmt + cartCpnDcAmt;
-			savePntSumAmt	= savePntSumAmt + savePntAmt1;
 		}
 		
 		// 주문금액설정
@@ -2209,11 +2206,15 @@ var custCpnSumAmtCal = function() {
 	
 	// 포인트, 상품권 금액 분배
 	$("#orderAmtForm .cartSq").each(function(){
+		var pntPrate		= parseInt($(this).parent().find(".pntPrate").text());
+		var pntMrate		= parseInt($(this).parent().find(".pntMrate").text());
 		var ordAmt 			= parseInt($(this).parent().find(".ordAmt").text());
-		var dcSumAmt		= parseInt($(this).parent().find(".dcSumAmt").text()); 
+		var dcSumAmt		= parseInt($(this).parent().find(".dcSumAmt").text());
+		var prePntDcAmt1	= parseInt($(this).parent().find(".prePntDcAmt1").text());
 		var tempDiv 		= parseInt((ordAmt / ordSumAmt) * 100);
 		var pntDcAmt1 		= 0;
 		var gfcdUseAmt1		= 0;
+		var savePntAmt1		= 0;
 		
 		if (index == cartSqLenght) {
 			pntDcAmt1 		= leftPntAmt;
@@ -2228,9 +2229,22 @@ var custCpnSumAmtCal = function() {
 		var realOrdAmt1		= ordAmt - dcSumAmt - pntDcAmt1 - gfcdUseAmt1;
 		realOrdSumAmt		= realOrdSumAmt + realOrdAmt1;
 		
+		// 2021.05.11 최종할인금액으로 적립포인트 적용
+		savePntAmt1			= parseInt(realOrdAmt1 * (pntPrate/100));
+		
+		// 선포인트사용여부 
+		if (prePntDcAmtYn == "Y") {
+			if (prePntDcAmt1 < 1) {
+				savePntSumAmt	= savePntSumAmt + savePntAmt1;
+			}
+		} else {
+			savePntSumAmt	= savePntSumAmt + savePntAmt1;
+		}
+		
 		$(this).parent().find(".pntDcAmt1").text(pntDcAmt1);
 		$(this).parent().find(".gfcdUseAmt1").text(gfcdUseAmt1);
 		$(this).parent().find(".realOrdAmt1").text(realOrdAmt1);
+		$(this).parent().find(".savePntAmt1").text(savePntAmt1);
 		
 		index++;
 	});