diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/mapper/BOOrdrMapper.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/mapper/BOOrdrMapper.java index 82796ade..e70b8444 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/mapper/BOOrdrMapper.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/mapper/BOOrdrMapper.java @@ -671,6 +671,8 @@ public interface BOOrdrMapper { */ public DataMap selectBOSpbkGiftMultiDlvyAt(BOSpbkVO spbkVO); + public BigDecimal selectBuyRate(DataMap param); + /** * 사용자 > 상품 > 장바구니 > 장바구니 상품 삭제 * @param goodsVO diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/service/BOOrdrService.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/service/BOOrdrService.java index 0613f5c9..f630eaad 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/service/BOOrdrService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/service/BOOrdrService.java @@ -3047,6 +3047,7 @@ public class BOOrdrService{ put("useCashMlgAmt", 0); put("dscntAmt", 0); put("setleAmt", 0); + put("setleAmtKr", 0); put("accmlMlgAmt", 0); }}; @@ -3069,6 +3070,7 @@ public class BOOrdrService{ BigDecimal dftDlvyAmt = new BigDecimal(0); BigDecimal setleAmt = new BigDecimal(0); + BigDecimal setleAmtKr = new BigDecimal(0); BigDecimal stdrGoodsSetleAmt = new BigDecimal(0); // 상품 금액만 계산한 기준 금액 BigDecimal lmttUseMlg = new BigDecimal(0); // 사용 한도 마일리지 BigDecimal lmttUseCashMlg = new BigDecimal(0); // 사용 한도 충전형 마일리지 @@ -3082,6 +3084,8 @@ public class BOOrdrService{ BigDecimal enuriStdrAmt = new BigDecimal(0); // 애누리 적용 기준 금액 BigDecimal cashMlgStdrAmt = new BigDecimal(0); // 캐쉬 적용 기준 금액 + BigDecimal buyRate = mapper.selectBuyRate(param); + String mlgMxmmUseDv = ""; // 마일리지 사용한도 최대 조건 BigDecimal mlgAccmlAmtSum = new BigDecimal(0); // 최종 구매 확정시 적립 마일리지 @@ -3803,6 +3807,9 @@ public class BOOrdrService{ rlDscntAmt = evtDscntAmt.add(goodsCouponDscntAmt).add(dlvyCouponDscntAmt).add(cartCouponDscntAmt).add(enuriAmt).add(useMlgAmt).add(useCashMlgAmt); log.debug(" 마일리지 먹이기 전 : {}", setleAmt); setleAmt = setleAmt.add(dlvyAmt).subtract(dlvyCouponDscntAmt).subtract(enuriAmt).subtract(useMlgAmt).subtract(useCashMlgAmt).compareTo(BigDecimal.ZERO) > 0 ? setleAmt.add(dlvyAmt).subtract(dlvyCouponDscntAmt).subtract(enuriAmt).subtract(useMlgAmt).subtract(useCashMlgAmt) : BigDecimal.ZERO; + // 환율계산 + setleAmtKr = setleAmt.multiply(buyRate); + setleAmtKr = setleAmtKr.setScale(0,RoundingMode.HALF_UP); lmttUseMlg = goodsAmt.subtract(dscntAmt.add(cartCouponDscntAmt)); log.debug(" 결제 예정 금액 : {}", setleAmt); @@ -3821,6 +3828,7 @@ public class BOOrdrService{ setleExpectAmtMap.put("dscntAmt", rlDscntAmt.intValue()); setleExpectAmtMap.put("viewCartDscntAmt", dscntAmt.intValue()); setleExpectAmtMap.put("setleAmt", setleAmt.intValue()); + setleExpectAmtMap.put("setleAmtKr", setleAmtKr.intValue()); setleExpectAmtMap.put("stdrGoodsSetleAmt", stdrGoodsSetleAmt.intValue()); setleExpectAmtMap.put("lmttUseMlg", lmttUseMlg.intValue()); setleExpectAmtMap.put("lmttUseCashMlg", lmttUseCashMlg.intValue()); diff --git a/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml index bbf0e351..e60ba71e 100644 --- a/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml @@ -4276,6 +4276,7 @@ AND FC.CART_DV_CD = #{cartDvCd} ORDER BY FC.REGIST_DT DESC + + + + UPDATE diff --git a/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp b/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp index 8de3bb39..855a52d2 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp @@ -2572,6 +2572,7 @@ $('#accmlMlgAmtSapn').text((data.accmlMlgAmt).toLocaleString()); $('#setleAmtSapn').text((data.setleAmt).toLocaleString()); + $('#setleAmtKrSapn').text((data.setleAmtKr).toLocaleString()); let li = ''; @@ -2654,6 +2655,7 @@ $('#enuriForm').find('#stdrGoodsSetleAmt').val(data.stdrGoodsSetleAmt); $('#enuriForm').find('#cartCoupondlvyAmt').val(data.dlvyAmt); $('#setleForm').find('#rlSetleAmt').val(data.setleAmt); + $('#setleForm').find('#wonRlSetleAmt').val(data.setleAmtKr); } if (!fn_is_empty(data.lmttUseMlg)) { @@ -4054,6 +4056,7 @@
+ "> @@ -4426,9 +4429,13 @@ (-)0${curUnit} -
+
총 결제금액 - 0${curUnit} + 0${curUnit} +
+
+ + 0원
<%--광고 수신 동의 여부가 null 일 시 --%> diff --git a/src/main/webapp/WEB-INF/views/sopmal/ordr/SpbkPtinR.jsp b/src/main/webapp/WEB-INF/views/sopmal/ordr/SpbkPtinR.jsp index 58a2b846..50e759fb 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/SpbkPtinR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/SpbkPtinR.jsp @@ -465,6 +465,7 @@ $(ul).find('#dscntAmtSapn').text((data.dscntAmt).toLocaleString()); $('#setleAmtSapn').text((data.setleAmt).toLocaleString()); + $('#setleAmtKrSapn').text((data.setleAmtKr).toLocaleString()); let li = ''; @@ -1477,9 +1478,13 @@ (-)0${curUnit} -
+
결제예정금액 - 0${curUnit} + 0${curUnit} +
+
+ + 0원
※ 쿠폰 적용가는 최종 결제창에서 확인 가능합니다. diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp index 0cff260d..50fd53bb 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp @@ -2587,6 +2587,7 @@ $('#accmlMlgAmtSapn').text((data.accmlMlgAmt).toLocaleString() + curUnit); $('.setleAmtSapn').text((data.setleAmt).toLocaleString()); + $('.setleAmtKrSapn').text((data.setleAmtKr).toLocaleString()); let tr = ''; @@ -4510,7 +4511,7 @@
총 금액
-
${curUnit}
+
${curUnit} / 원
diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/ordr/SpbkPtinR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/ordr/SpbkPtinR.jsp index ecdea819..4ee22f76 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/ordr/SpbkPtinR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/ordr/SpbkPtinR.jsp @@ -442,6 +442,9 @@ $(ul).find('#dscntAmtSapn').text((data.dscntAmt).toLocaleString()); $('#setleAmtSapn, #totalAmtSapn').text((data.setleAmt).toLocaleString()); + // $('#setleAmtKrSapn, #totalAmtKrSapn').text((data.setleAmtKr).toLocaleString()); + $('#totalAmtKrSapn').text((data.setleAmtKr).toLocaleString()); + let li = ''; @@ -1439,7 +1442,7 @@
총 금액
-
0${curUnit}
+
0${curUnit} / 0원