diff --git a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOOrderService.java b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOOrderService.java index f1fc514b..130a1319 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOOrderService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOOrderService.java @@ -27,6 +27,7 @@ import java.math.BigInteger; import java.math.RoundingMode; import java.text.DecimalFormat; import java.util.*; +import java.util.stream.Collectors; @Service @Slf4j @@ -100,6 +101,313 @@ public class BOOrderService { 0. 배송 정책에 따른 배송지 세팅 ***************************** */ +// /** 여러곳 배송 배송지 세팅 시작 */ +// LinkedHashMap multiOrdrDlvylcMap = new LinkedHashMap<>(); +// List> dlvylcListMulti = new ArrayList<>(); +// +// multiOrdrDlvylcMap = (LinkedHashMap) param.get("multiOrdrDlvylc"); +// log.debug("multiOrdrDlvylcMap : {}", multiOrdrDlvylcMap); +// +// // DlvyGroupList 조회 +// List DlvyGroupList = new ArrayList<>(); +// +// goodsList.forEach(goods -> { +// DataMap item = new DataMap(); +// +// item.put("goodsInnb", new BigInteger(String.valueOf(goods.get("goodsInnb")))); +// item.put("goodsOptnInnb", new BigInteger(String.valueOf(goods.get("goodsOptnInnb")))); +// item.put("dlvyGroupInnb", new BigInteger(String.valueOf(goods.get("dlvyGroupInnb")))); +// item.put("subSlepric", new BigDecimal(String.valueOf(( (int) goods.get("slepric") * (int) goods.get("qy")) - (int) goods.get("dscntAmt") ))); +// item.put("qy", new BigDecimal(String.valueOf((int) goods.get("qy")))); +// item.put("mbrInnb", String.valueOf(goods.get("mbrInnb"))); +// +// DlvyGroupList.add(item); +// }); +// +// DlvyGroupList.sort(Comparator.comparing((DataMap map) -> (BigInteger) map.get("goodsInnb")).thenComparing((DataMap map) -> (BigInteger) map.get("goodsOptnInnb")) .thenComparing((DataMap map) -> (BigInteger) map.get("dlvyGroupInnb"))); // 정렬 +// +// // 배송그룹고유번호별 상품목록 +// Map> goodsByDlvyGroupMap = DlvyGroupList.stream().collect(Collectors.groupingBy(m -> ((BigInteger) m.get("dlvyGroupInnb")), HashMap::new, Collectors.toList())); +// +// String dlvylcAreaCd = (String) shipping.get("dlvylcAreaCd"); +// String ordrAdressZip = StringUtil.isNullToString(shipping.get("dlvylcZip")); +// String prefcd = (String) shipping.get("prefcd"); +// String defaultAdressAt = "N"; +// String sopmalCode = sopmalCd; +// +// DataMap defaultAdressVO = new DataMap() {{ // +// put("sopmalCd", sopmalCode); // 쇼핑몰 코드 +// put("zip", ordrAdressZip); // 우편번호 +// put("prefcd", prefcd); // 도도부현코드 +// }}; +// +// if("KR".equals(dlvylcAreaCd)){ +// defaultAdressAt = boOrdrMapper.selectBODefaultAdressAtInqire(defaultAdressVO); +// } +// if("JP".equals(dlvylcAreaCd)){ +// defaultAdressAt = boOrdrMapper.selectBODefaultAdressAtInqire2(defaultAdressVO); +// } +// +// +// List dlvyAmtByDlvyGroupList = new ArrayList<>(); +// +// for (Map.Entry> dlvyGroupEtry : goodsByDlvyGroupMap.entrySet()) { +// int dlvyGroupInnb = dlvyGroupEtry.getKey().intValue(); +// List goodsByDlvyGroupList = dlvyGroupEtry.getValue(); +// +// DataMap shippingParam = new DataMap() {{ +// put("dlvyGroupInnb", dlvyGroupInnb); +// put("sopmalCd", sopmalCode); +// }}; +// +// DataMap shippingGrouping = mapper.selectShippingGrouping(shippingParam); +// +// // "KR".equals(dlvylcAreaCd)인 경우 +// String itemDlvyGroupDvCd = (String) shippingGrouping.get("dlvyGroupDvCd"); +// BigDecimal itemDftDlvyAmt = (BigDecimal) shippingGrouping.get("dftDlvyAmt"); // 기본배송비 +// BigDecimal itemDlvyAmt = itemDftDlvyAmt; // 배송비 +// String itemDlvyAreaAditAt = (String) shippingGrouping.get("dlvyAreaAditAt"); // 도서산간 추가 배송비 조건 +// BigDecimal itemAreaAditDlvyAmt = (BigDecimal) shippingGrouping.get("areaAditDlvyAmt"); // 도서산간 추가 배송비 +// String itemAmtCndUseAt = (String) shippingGrouping.get("amtCndUseAt"); // 금액조건 +// BigDecimal itemAmtCndAditAmt = (BigDecimal) shippingGrouping.get("amtCndAditAmt"); +// String itemCntCndUseAt = (String) shippingGrouping.get("cntCndUseAt"); // 수량조건 +// BigDecimal itemCntCndAditAmt = (BigDecimal) shippingGrouping.get("cntCndAditAmt"); // 수량 +// +// if("JP".equals(dlvylcAreaCd)){ +// itemDftDlvyAmt = (BigDecimal) shippingGrouping.get("dftDlvyAmt2"); // 기본배송비 +// itemDlvyAmt = itemDftDlvyAmt; // 배송비 +// itemDlvyAreaAditAt = (String) shippingGrouping.get("dlvyAreaAditAt2"); // 도서산간 추가 배송비 조건 +// itemAreaAditDlvyAmt = (BigDecimal) shippingGrouping.get("areaAditDlvyAmt2"); // 도서산간 추가 배송비 +// itemAmtCndUseAt = (String) shippingGrouping.get("amtCndUseAt2"); // 금액조건 +// itemAmtCndAditAmt = (BigDecimal) shippingGrouping.get("amtCndAditAmt"); +// itemCntCndUseAt = (String) shippingGrouping.get("cntCndUseAt2"); // 수량조건 +// itemCntCndAditAmt = (BigDecimal) shippingGrouping.get("cntCndAditAmt2"); // 수량 +// } +// +// if ("01".equals(ordrTyCd) || "03".equals(ordrTyCd) || "04".equals(ordrTyCd) || "06".equals(ordrTyCd)) { // 일반주문, 회원 개인결제, 정기배송 +// +// // 무료배송(조건부) +// if ("01".equals(itemDlvyGroupDvCd)) { +// +// // 추가배송비 계산 (MUL) +// if (!StringUtils.isEmpty(itemDlvyAreaAditAt) && "Y".equals(itemDlvyAreaAditAt)) { +// if (!StringUtils.isEmpty(defaultAdressAt) && "Y".equals(defaultAdressAt)) { +// itemDlvyAmt = itemDlvyAmt.add(itemAreaAditDlvyAmt); // 유료 배송 도서산간 추가 배송비 +// } +// } +// +// } else if ("02".equals(itemDlvyGroupDvCd)) { // 무료 배송일 경우 +// +// // 추가배송비 계산 (MUL) +// if (!StringUtils.isEmpty(itemDlvyAreaAditAt) && "Y".equals(itemDlvyAreaAditAt)) { +// if (!StringUtils.isEmpty(defaultAdressAt) && "Y".equals(defaultAdressAt)) { +// itemDlvyAmt = itemDlvyAmt.add(itemAreaAditDlvyAmt); // 유료 배송 도서산간 추가 배송비 +// } +// } +// +// } else if ("03".equals(itemDlvyGroupDvCd)) { // 유료배송 +// // 수량 조건 +// if ("Y".equals(itemCntCndUseAt) && itemCntCndAditAmt.compareTo(BigDecimal.ZERO) > 0) { +// +// for (DataMap goodsMap : goodsByDlvyGroupList) { +// +// BigDecimal qy = (BigDecimal) goodsMap.get("qy"); // 수량 +// BigDecimal unitQy = qy.divide(itemCntCndAditAmt, 0, RoundingMode.CEILING); // 단위수량 +// +// int goodsQy = unitQy.intValue(); +// +// // cntCndAditAmt(설정수량)보다 qy가 큰 경우 +// if (qy.compareTo(itemCntCndAditAmt) > 0) { +// +// } else { +// // 수량당 배송비가 1인경우 +// } +// } // for +// +// } else { +// +// for (DataMap goodsMap : goodsByDlvyGroupList) { +// BigDecimal qy = (BigDecimal) goodsMap.get("qy"); // 수량 +// +// } +// +// +// +// List itemGoodsList = new ArrayList<>(); +// itemGoodsList.add(goodsList.get(i)); +// for (LinkedHashMap itemGoodsMap : itemGoodsList) { +// itemGoodsMap.put("qy", qy.intValue()); +// } +// +// List itempPrsntList = new ArrayList<>(); +// if(!prsntList.isEmpty()){ +// itempPrsntList.add(prsntList.get(i)); +// for (LinkedHashMap itemPrsntMap : itempPrsntList) { +// itemPrsntMap.put("qy", qy.intValue()); +// } +// } +// +// LinkedHashMap dlvyMap = new LinkedHashMap<>(); +// +// dlvyMap.put("dftDlvyAmt", itemDftDlvyAmt.intValue()); +// dlvyMap.put("dlvyAmt", itemDlvyAmt.intValue()); +// dlvyMap.put("couponInnb", 0); +// dlvyMap.put("dwldCouponInnb", 0); +// dlvyMap.put("dplctDscntAt", ""); +// dlvyMap.put("otrCouponSmtmUseAt", ""); +// dlvyMap.put("mngrFreeDlvyUseAt", "N"); +// dlvyMap.put("dlvylcAreaCd", shipping.get("dlvylcAreaCd")); +// dlvyMap.put("cstmclerCd", shipping.get("cstmclerCd")); +// dlvyMap.put("dlvylcZip", shipping.get("dlvylcZip")); +// dlvyMap.put("prefcd", shipping.get("prefcd")); +// dlvyMap.put("recpntNm", shipping.get("recpntNm")); +// dlvyMap.put("recpntMbtlnb", shipping.get("recpntMbtlnb")); +// dlvyMap.put("dlvylcAdresDvCd", shipping.get("dlvylcAdresDvCd")); +// dlvyMap.put("dlvylcLnbAdres", shipping.get("dlvylcLnbAdres")); +// dlvyMap.put("dlvylcRnmAdres", shipping.get("dlvylcRnmAdres")); +// dlvyMap.put("dlvylcAdresDtl", shipping.get("dlvylcAdresDtl")); +// dlvyMap.put("dlvyMssageCn", shipping.get("dlvyMssageCn")); +// dlvyMap.put("goodsList", itemGoodsList); +// dlvyMap.put("prsntList", itempPrsntList); //prsntList.get(i)); +// +// dlvylcListMulti.add(dlvyMap); +// +// // 추가배송비 계산 (MUL) +// if (!StringUtils.isEmpty(itemDlvyAreaAditAt) && "Y".equals(itemDlvyAreaAditAt)) { +// if (!StringUtils.isEmpty(defaultAdressAt) && "Y".equals(defaultAdressAt)) { +// itemDlvyAmt = itemDlvyAmt.add(itemAreaAditDlvyAmt); // 유료 배송 도서산간 추가 배송비 +// } +// } +// } +// +// } +// +// +// for(DataMap goodsMap : goodsByDlvyGroupList) { +//// BigDecimal goodsQy = (int) goodsMap.get("qy"); // 수량 +// BigDecimal qy = (BigDecimal) goodsMap.get("qy"); // 수량 +// +// if ("03".equals(itemDlvyGroupDvCd) && "Y".equals(itemCntCndUseAt)) { +// +//// BigDecimal qy = (BigDecimal) goodsList.get(i).get("qy"); // 수량 +//// BigDecimal qy = new BigDecimal(String.valueOf(goodsList.get(i).get("qy"))); // 수량 +// BigDecimal unitQy = qy.divide(itemCntCndAditAmt, 0, RoundingMode.CEILING); // 단위수량 +// +// int goodsQy = unitQy.intValue(); +// +// for(int j=0;j itemGoodsList = new ArrayList<>(); +// itemGoodsList.add(goodsList.get(i)); +// for (LinkedHashMap itemGoodsMap : itemGoodsList) { +// if((goodsQy-j) > 1){ +// itemGoodsMap.put("qy", itemCntCndAditAmt.intValue()); +// } else { +// itemGoodsMap.put("qy", qy.intValue() - (itemCntCndAditAmt.intValue() * j)); +// } +// } +// +// List itempPrsntList = new ArrayList<>(); +// if(!prsntList.isEmpty()){ +// itempPrsntList.add(prsntList.get(i)); +// for (LinkedHashMap itemPrsntMap : itempPrsntList) { +// if((goodsQy-j) > 1){ +// itemPrsntMap.put("qy", itemCntCndAditAmt.intValue()); +// } else { +// itemPrsntMap.put("qy", qy.intValue() - (itemCntCndAditAmt.intValue() * j)); +// } +// } +// } +// +// LinkedHashMap dlvyMap = new LinkedHashMap<>(); +// +// dlvyMap.put("dftDlvyAmt", itemDftDlvyAmt.intValue()); +// dlvyMap.put("dlvyAmt", itemDlvyAmt.intValue()); +// dlvyMap.put("couponInnb", 0); +// dlvyMap.put("dwldCouponInnb", 0); +// dlvyMap.put("dplctDscntAt", ""); +// dlvyMap.put("otrCouponSmtmUseAt", ""); +// dlvyMap.put("mngrFreeDlvyUseAt", "N"); +// dlvyMap.put("dlvylcAreaCd", shipping.get("dlvylcAreaCd")); +// dlvyMap.put("cstmclerCd", shipping.get("cstmclerCd")); +// dlvyMap.put("dlvylcZip", shipping.get("dlvylcZip")); +// dlvyMap.put("prefcd", shipping.get("prefcd")); +// dlvyMap.put("recpntNm", shipping.get("recpntNm")); +// dlvyMap.put("recpntMbtlnb", shipping.get("recpntMbtlnb")); +// dlvyMap.put("dlvylcAdresDvCd", shipping.get("dlvylcAdresDvCd")); +// dlvyMap.put("dlvylcLnbAdres", shipping.get("dlvylcLnbAdres")); +// dlvyMap.put("dlvylcRnmAdres", shipping.get("dlvylcRnmAdres")); +// dlvyMap.put("dlvylcAdresDtl", shipping.get("dlvylcAdresDtl")); +// dlvyMap.put("dlvyMssageCn", shipping.get("dlvyMssageCn")); +// dlvyMap.put("goodsList", itemGoodsList); +// dlvyMap.put("prsntList", itempPrsntList); //prsntList.get(i)); +// +// dlvylcListMulti.add(dlvyMap); +// } +// } else { +// +// BigDecimal qy = new BigDecimal(String.valueOf(goodsList.get(i).get("qy"))); // 수량 +// +// List itemGoodsList = new ArrayList<>(); +// itemGoodsList.add(goodsList.get(i)); +// for (LinkedHashMap itemGoodsMap : itemGoodsList) { +// itemGoodsMap.put("qy", qy.intValue()); +// } +// +// List itempPrsntList = new ArrayList<>(); +// if(!prsntList.isEmpty()){ +// itempPrsntList.add(prsntList.get(i)); +// for (LinkedHashMap itemPrsntMap : itempPrsntList) { +// itemPrsntMap.put("qy", qy.intValue()); +// } +// } +// +// LinkedHashMap dlvyMap = new LinkedHashMap<>(); +// +// dlvyMap.put("dftDlvyAmt", itemDftDlvyAmt.intValue()); +// dlvyMap.put("dlvyAmt", itemDlvyAmt.intValue()); +// dlvyMap.put("couponInnb", 0); +// dlvyMap.put("dwldCouponInnb", 0); +// dlvyMap.put("dplctDscntAt", ""); +// dlvyMap.put("otrCouponSmtmUseAt", ""); +// dlvyMap.put("mngrFreeDlvyUseAt", "N"); +// dlvyMap.put("dlvylcAreaCd", shipping.get("dlvylcAreaCd")); +// dlvyMap.put("cstmclerCd", shipping.get("cstmclerCd")); +// dlvyMap.put("dlvylcZip", shipping.get("dlvylcZip")); +// dlvyMap.put("prefcd", shipping.get("prefcd")); +// dlvyMap.put("recpntNm", shipping.get("recpntNm")); +// dlvyMap.put("recpntMbtlnb", shipping.get("recpntMbtlnb")); +// dlvyMap.put("dlvylcAdresDvCd", shipping.get("dlvylcAdresDvCd")); +// dlvyMap.put("dlvylcLnbAdres", shipping.get("dlvylcLnbAdres")); +// dlvyMap.put("dlvylcRnmAdres", shipping.get("dlvylcRnmAdres")); +// dlvyMap.put("dlvylcAdresDtl", shipping.get("dlvylcAdresDtl")); +// dlvyMap.put("dlvyMssageCn", shipping.get("dlvyMssageCn")); +// dlvyMap.put("goodsList", itemGoodsList); +// dlvyMap.put("prsntList", itempPrsntList); //prsntList.get(i)); +// +// dlvylcListMulti.add(dlvyMap); +// } +// +// } // for +// +// // 배송지가 1개 이상이면 여러곳 배송으로 변경 +// if(dlvylcListMulti.size() > 1) { +// ordrTyCd = "05"; +// } +// +// } else if ("05".equals(ordrTyCd)) { // 여러곳 배송, 선물하기 +// if (!CollectionUtils.isEmpty(multiOrdrDlvylcMap)) { +// // 배송지 리스트 +// dlvylcListMulti = (List>) multiOrdrDlvylcMap.get("dlvylc"); +// log.debug("dlvylcListMulti : {}", dlvylcListMulti); +// } +// } +// /** 여러곳 배송 배송지 세팅 종료 */ +// +//// dlvyAmtByDlvyGroupList.add(dlvyGroupMap); // 배송그룹별 배송비 목록 +// } // for : dlvyGroupEtry + + /** 여러곳 배송 배송지 세팅 시작 */ LinkedHashMap multiOrdrDlvylcMap = new LinkedHashMap<>(); List> dlvylcListMulti = new ArrayList<>(); @@ -169,7 +477,6 @@ public class BOOrderService { } } - if ("03".equals(itemDlvyGroupDvCd) && "Y".equals(itemCntCndUseAt)) { // BigDecimal qy = (BigDecimal) goodsList.get(i).get("qy"); // 수량 @@ -271,7 +578,7 @@ public class BOOrderService { dlvylcListMulti.add(dlvyMap); } - } + } // for // 배송지가 1개 이상이면 여러곳 배송으로 변경 if(dlvylcListMulti.size() > 1) { @@ -1111,11 +1418,13 @@ public class BOOrderService { BOOrderSetleVO setleVO = new BOOrderSetleVO(); BigDecimal rlSetleAmt = new BigDecimal((String) setle.get("rlSetleAmt")); + BigDecimal wonRlSetleAmt = new BigDecimal((String) setle.get("wonRlSetleAmt")); setleVO.setSopmalCd(sopmalCd); setleVO.setOrdrInnb(ordrInnb); setleVO.setGoodsNm(goodsNm); setleVO.setSetleAmt(rlSetleAmt); + setleVO.setWonSetleAmt(wonRlSetleAmt); String pgCmpnyNm = (String) setle.get("pgCmpnyNm"); String setleTyCd = (String) setle.get("setleTyCd"); @@ -1679,6 +1988,17 @@ public class BOOrderService { orderVO.setRlSetleAmt(new BigDecimal(rlSetleAmt)); } + String wonRlSetleAmt = (String) setle.get("wonRlSetleAmt"); // 실결제금액(원화) + + if (StringUtils.hasText(wonRlSetleAmt)) { + orderVO.setWonRlSetleAmt(new BigDecimal(wonRlSetleAmt)); + } + + DataMap paramMap = new DataMap(); + paramMap.put("sopmalCd", orderVO.getSopmalCd()); + BigDecimal buyRate = boOrdrMapper.selectBuyRate(paramMap); // 살때환율 + orderVO.setBuyRate(buyRate); + String setleTyCd = (String) setle.get("setleTyCd"); if ("02".equals(setleTyCd)) { //|| "04".equals(setleTyCd) || "05".equals(setleTyCd)) { // KCP 무통장, 가상계좌, 가상계좌(에스크로) leeks diff --git a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderSetleVO.java b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderSetleVO.java index d0699c1e..3ad17dea 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderSetleVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderSetleVO.java @@ -20,6 +20,8 @@ public class BOOrderSetleVO extends AbstractVO { private BigDecimal setleAmt; + private BigDecimal wonSetleAmt; + private String pgCmpnyNm; private String setleTyCd; diff --git a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderVO.java b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderVO.java index b3492540..d2e91a22 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderVO.java @@ -40,7 +40,11 @@ public class BOOrderVO extends AbstractVO { private BigDecimal rlSetleAmt = new BigDecimal("0"); - private BigDecimal enuriAmt = new BigDecimal("0");; + private BigDecimal enuriAmt = new BigDecimal("0"); + + private BigDecimal wonRlSetleAmt = new BigDecimal("0"); + + private BigDecimal buyRate = new BigDecimal("0"); private String ordrrNm; diff --git a/src/main/resources/mybatis/xml/mapper/gcone/goods/purchs/BOPurchsMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/goods/purchs/BOPurchsMapper.xml index e8a16979..bea15bba 100644 --- a/src/main/resources/mybatis/xml/mapper/gcone/goods/purchs/BOPurchsMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/gcone/goods/purchs/BOPurchsMapper.xml @@ -24,6 +24,8 @@ , ORDR_TY_CD , RL_SETLE_AMT , ENURI_AMT + , WON_RL_SETLE_AMT + , BUY_RATE , ORDRR_NM , ORDRR_TELNB , ORDRR_MBTLNB @@ -84,6 +86,8 @@ , #{ordrTyCd} , #{rlSetleAmt} , #{enuriAmt} + , #{wonRlSetleAmt} + , #{buyRate} , #{ordrrNm} , HEX(AES_ENCRYPT(REPLACE(#{ordrrTelnb}, '-', ''), '1df5be2f7e90ae36')) , HEX(AES_ENCRYPT(REPLACE(#{ordrrMbtlnb}, '-', ''), '1df5be2f7e90ae36')) @@ -467,6 +471,7 @@ , SOPMAL_CD , ORDR_INNB , SETLE_AMT + , WON_SETLE_AMT , PG_CMPNY_NM , SETLE_TY_CD , PG_INNB @@ -491,6 +496,7 @@ , #{sopmalCd} , #{ordrInnb} , #{setleAmt} + , #{wonSetleAmt} , #{pgCmpnyNm} , #{setleTyCd} , #{pgInnb} 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 855a52d2..fed79f6c 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp @@ -6,7 +6,7 @@ <%@ taglib prefix="ui" uri="http://www.winbit.kr/ctl/ui"%> <%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld"%> - + <%-- Class Name : MbrPurchsC.jsp Description : 회원 구매하기 @@ -3291,16 +3291,18 @@ useMlgAmt = parseFloat(parsedUseMlg.useMlgAmt); } } - let goodsList = localStorage.getItem('goodsList'); - let parsedGoodsList = JSON.parse(goodsList); - let goodsDscntDtlsList = parsedGoodsList[0].goodsDscntDtlsList; + let parsedGoodsList = fn_is_empty(goodsList) ? '' : JSON.parse(goodsList); + let goodsDscntDtlsList = fn_is_empty(parsedGoodsList) ? '' : parsedGoodsList[0].goodsDscntDtlsList; + let totalDscntAmt = 0; - goodsDscntDtlsList.forEach(item => { - totalDscntAmt += item.dscntAmt; - }); + if(!fn_is_empty(goodsDscntDtlsList)){ + goodsDscntDtlsList.forEach(item => { + totalDscntAmt += item.dscntAmt; + }); + } let goodsDscntAmt = 0; @@ -4435,7 +4437,7 @@
- 0원 + 0${krUnit}
<%--광고 수신 동의 여부가 null 일 시 --%> diff --git a/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrComptR.jsp b/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrComptR.jsp index 8602ab98..849c1727 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrComptR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrComptR.jsp @@ -72,6 +72,7 @@ +
@@ -450,7 +451,7 @@ 결제금액 - ${curUnit} + ${curUnit} / ${krUnit} 결제일시 @@ -534,7 +535,7 @@
결제금액 - ${curUnit} + ${curUnit} / ${krUnit}
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 50e759fb..b7eadd3f 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/SpbkPtinR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/SpbkPtinR.jsp @@ -20,6 +20,7 @@ + @@ -1484,7 +1485,7 @@
- 0원 + 0${krUnit}
※ 쿠폰 적용가는 최종 결제창에서 확인 가능합니다. 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 50fd53bb..2f3b6f03 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 @@ -7,7 +7,7 @@ <%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld"%> - + @@ -2669,6 +2669,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)) { @@ -4117,6 +4118,7 @@
+ "> @@ -4511,7 +4513,7 @@
총 금액
-
${curUnit} / 원
+
${curUnit} / ${krUnit}
diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/ordr/OrdrComptR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/ordr/OrdrComptR.jsp index 8b0045d0..0b1b0f12 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/ordr/OrdrComptR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/ordr/OrdrComptR.jsp @@ -80,6 +80,7 @@
+
@@ -405,7 +406,7 @@ 총 결제금액 - ${curUnit} + ${curUnit} / ${krUnit} 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 4ee22f76..eb7ca980 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 @@ -20,6 +20,7 @@ + @@ -1442,7 +1443,7 @@
총 금액
-
0${curUnit} / 0원
+
0${curUnit} / 0${krUnit}