Selaa lähdekoodia

포인트적용부분수정

tsit14 5 vuotta sitten
vanhempi
commit
cdcf952f22

+ 1 - 0
src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -287,6 +287,7 @@ public class TsfOrderController extends TsfBaseController {
 			}
 		}
 		mav.addObject("devTempYn"			, devTempYn);								// 개발자모드가능여부
+		mav.addObject("frontGb"				, TsfSession.getFrontGb());					// 프론트구분
 		mav.setViewName(super.getDeviceViewName("order/OrderForm"));
 		
 		return mav;

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

@@ -385,6 +385,8 @@ var foreignBuyYn		= [[${foreignBuyYn}]];			// 해외구매대행여부
 var orderMadeYn			= [[${orderMadeYn}]];			// 주문제작상품여부
 var isLogin				= [[${isLogin}]];				// 로그인여부
 var giftPackYn			= [[${giftPackYn}]];			// 선물받기여부
+var devTempYn			= [[${devTempYn}]];				// 개발자모드가능여부
+var frontGb				= [[${frontGb}]];				// 프론트구분
 
 var custCpnSq 			= 0;
 var cpnIndex			= 0;
@@ -404,7 +406,8 @@ $(document).ready( function() {
 	arr[3] = "delvFeeCdInfo";
 	arr[4] = "orderSumAmtInfo";
 	
-	if (devTemp) {
+	// 개발자모드실행
+	if (devTemp == true && devTempYn == true) {
 		$("table").each(function(){
 			var name = $(this).attr("name");
 			for (i=0 ; i<arr.length ; i++) {
@@ -2345,7 +2348,12 @@ var custCpnSumAmtCal = function() {
 		realOrdSumAmt		= realOrdSumAmt + realOrdAmt1;
 		
 		// 2021.05.11 최종할인금액으로 적립포인트 적용
-		savePntAmt1			= parseInt(realOrdAmt2 * (pntPrate/100));
+		if (frontGb == 'P') {
+			savePntAmt1			= parseInt(realOrdAmt2 * (pntPrate/100));
+		} else {
+			savePntAmt1			= parseInt(realOrdAmt2 * (pntMrate/100));
+		}
+		
 		
 		// 2021.05.27 적립포인트 설정
 		$("#orderForm #orderListInfo .orderListSavePntDcAmt").each(function(){

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

@@ -463,6 +463,7 @@ var foreignBuyYn		= [[${foreignBuyYn}]];			// 해외구매대행여부
 var orderMadeYn			= [[${orderMadeYn}]];			// 주문제작상품여부
 var isLogin				= [[${isLogin}]];				// 로그인여부
 var devTempYn			= [[${devTempYn}]];				// 개발자모드가능여부
+var frontGb				= [[${frontGb}]];				// 프론트구분
 
 var custCpnSq 			= 0;
 var cpnIndex			= 0;
@@ -2201,7 +2202,11 @@ var custCpnSumAmtCal = function() {
 		realOrdSumAmt		= realOrdSumAmt + realOrdAmt1;
 		
 		// 2021.05.11 최종할인금액으로 적립포인트 적용
-		savePntAmt1			= parseInt(realOrdAmt2 * (pntPrate/100));
+		if (frontGb == 'P') {
+			savePntAmt1			= parseInt(realOrdAmt2 * (pntPrate/100));
+		} else {
+			savePntAmt1			= parseInt(realOrdAmt2 * (pntMrate/100));
+		}
 		
 		// 선포인트사용여부 
 		if (prePntDcAmtYn == "Y") {