浏览代码

단위테스트 수정

tsit14 4 年之前
父节点
当前提交
b962fb5625

+ 7 - 2
src/main/java/com/style24/front/biz/service/TsfCartService.java

@@ -713,7 +713,7 @@ public class TsfCartService {
 						}
 					} else {                                                                // 할인 방식 할인율일 경우
 						tempAmt = resultAmt.getCurrPrice();
-						tempAmt = (int) (tempAmt - (tempAmt * (resultAmt.getQtyDcVal() / 100.0)));
+						tempAmt = (tempAmt - (int) (tempAmt * (resultAmt.getQtyDcVal() / 100.0)));
 						resultAmt.setTmtbDcAmt(tempAmt);
 
 						// 2021.04.29 다다익선할인금액수정
@@ -763,7 +763,7 @@ public class TsfCartService {
 						}
 					} else {                                                                // 할인 방식 할인율일 경우
 						tempAmt = resultAmt.getCurrPrice();
-						tempAmt = (int) (tempAmt - (tempAmt * (resultAmt.getAmtDcVal() / 100.0)));
+						tempAmt = (tempAmt - (int) (tempAmt * (resultAmt.getAmtDcVal() / 100.0)));
 						resultAmt.setTmtbDcAmt(tempAmt);
 
 						// 2021.04.29 다다익선할인금액수정
@@ -781,6 +781,11 @@ public class TsfCartService {
 						cart.setTmtb2DcAmt(apply.getTmtb2DcAmt());
 
 						cart.setTmtbDcAmt(apply.getTmtbDcAmt());
+						
+						log.info("cart.getTmtb1DcAmt() ::: {}", cart.getTmtb1DcAmt());
+						log.info("cart.getTmtb2DcAmt() ::: {}", cart.getTmtb2DcAmt());
+						log.info("cart.getTmtbDcAmt() ::: {}", cart.getTmtbDcAmt());
+						
 						cart.setApplyQtySectionYn(apply.getApplyQtySectionYn());
 						cart.setQtyTmtbNm(apply.getQtyTmtbNm());
 						cart.setQtyTmtbSq(apply.getQtyTmtbSq());

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

@@ -983,25 +983,25 @@ var paymentInfoSet = function() {
 					}
 					
 					if (displayTemp == false) {
-						$("#orderForm .area_paymentinfo .agree1").hide();
-						
 						if (delvCnt > 0) {
 							$("#orderForm .area_paymentinfo .paymentinfo").show();
 						} else {
 							$("#orderForm .area_paymentinfo .paymentinfo").hide();
 						}
+						$("#orderForm .area_paymentinfo .agree1").hide();
 					}
 				});
 
 				// 2021.05.16 초기값설정
 				$("#orderForm .area_paymethod .agree_insurance").hide();
-				$("#orderForm .area_paymentinfo .agree1").hide();
 				
 				if (delvCnt > 0) {
 					$("#orderForm .area_paymentinfo .paymentinfo").show();
 				} else {
 					$("#orderForm .area_paymentinfo .paymentinfo").hide();
 				}
+				
+				$("#orderForm .area_paymentinfo .agree1").hide();
 
 				// 결제하기
 				$("#btn_payment").on("click", function(){

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

@@ -508,7 +508,7 @@ $(document).ready( function() {
 	custemerInfoSet();
 	
 	// 999. 개발화면정보설정
-	var devTemp = false;
+	var devTemp = true;
 	var arr = []
 	arr[0] = "orderInfo";
 	arr[1] = "freegiftInfo";
@@ -956,24 +956,24 @@ var paymentInfoSet = function() {
 					}
 					
 					if (displayTemp == false) {
-						$("#orderForm .area_paymentinfo .agree1").hide();
-						
 						if (delvCnt > 0) {
 							$("#orderForm .area_paymentinfo .paymentinfo").show();
 						} else {
 							$("#orderForm .area_paymentinfo .paymentinfo").hide();
 						}
+						$("#orderForm .area_paymentinfo .agree1").hide();
 					}
 				});
 
-				// 2021.05.16 초기값설정
-				$("#orderForm .area_paymentinfo .agree1").hide();
 				if (delvCnt > 0) {
 					$("#orderForm .area_paymentinfo .paymentinfo").show();
 				} else {
 					$("#orderForm .area_paymentinfo .paymentinfo").hide();
 				}
 				
+				// 2021.05.16 초기값설정
+				$("#orderForm .area_paymentinfo .agree1").hide();
+				
 				// 결제하기
 				$("#btn_payment").on("click", function(){
 					// 사은품정보
@@ -1464,7 +1464,7 @@ var dcAmtInfoSet = function() {
 					}
 					
 					// 2021.04.23 추가
-					mcxDialog.alert("총 " + getZeroMinusDelAmt(pntDcAmt) + " P를 차감 결제 합니다.");
+					mcxDialog.alert("총 " + pntDcAmt + " P를 차감 결제 합니다.");
 					
 					// 포인트 적용
 					$("#orderAmtForm .pntDcSumAmt").text(pntDcAmt);