From 9b91679ec64b8c3a2e49ff89371b4cd9474ac0e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=9A=B1?= Date: Wed, 25 Feb 2026 18:04:09 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=EC=86=A1=EA=B7=B8=EB=A3=B9=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EB=B0=B0?= =?UTF-8?q?=EC=86=A1=20=EC=B2=98=EB=A6=AC=20=EB=A1=9C=EC=A7=81=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mtng/controller/BOMaMtngController.java | 1 + .../mtng/service/BOMaMtngService.java | 2 + .../goods/purchs/service/BOOrderService.java | 211 +++++++++++++++++- .../goods/purchs/service/BOPurchsService.java | 10 +- .../goods/purchs/vo/BOOrderShippingVO.java | 4 + .../gcone/ordr/ordr/mapper/BOOrdrMapper.java | 2 + .../ordr/ordr/service/BOOrdrService.java | 29 ++- .../ordr/controller/OrdrController.java | 2 + .../gcone/goods/purchs/BOPurchsMapper.xml | 4 + .../mapper/gcone/ordr/ordr/BOOrdrMapper.xml | 65 ++++++ .../views/sopmal/mpage/ordr/OrdrDtlR.jsp | 2 + .../WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp | 12 + .../views/sopmal_m/mpage/ordr/OrdrDtlR.jsp | 2 + .../views/sopmal_m/ordr/MbrPurchsC.jsp | 10 + 14 files changed, 331 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/wb/domainserver/domain/admin/instcSle/mtng/controller/BOMaMtngController.java b/src/main/java/com/wb/domainserver/domain/admin/instcSle/mtng/controller/BOMaMtngController.java index 66400034..82ade294 100644 --- a/src/main/java/com/wb/domainserver/domain/admin/instcSle/mtng/controller/BOMaMtngController.java +++ b/src/main/java/com/wb/domainserver/domain/admin/instcSle/mtng/controller/BOMaMtngController.java @@ -286,6 +286,7 @@ public class BOMaMtngController { return ApiResponse.of(content).ifPresentOrElse(HttpStatus.OK, HttpStatus.NOT_FOUND); } } else { + // 여러곳배송처럼 처리하더라도 주소는 하나이므로 shipping 체크 if (CollectionUtils.isEmpty(shipping)) { log.info("배송지 정보를 찾을 수 없습니다."); content.put("result","Y"); diff --git a/src/main/java/com/wb/domainserver/domain/admin/instcSle/mtng/service/BOMaMtngService.java b/src/main/java/com/wb/domainserver/domain/admin/instcSle/mtng/service/BOMaMtngService.java index 252746f9..e4654da1 100644 --- a/src/main/java/com/wb/domainserver/domain/admin/instcSle/mtng/service/BOMaMtngService.java +++ b/src/main/java/com/wb/domainserver/domain/admin/instcSle/mtng/service/BOMaMtngService.java @@ -406,6 +406,8 @@ public class BOMaMtngService { List goodsList = (List) param.get("goodsList"); // 상품정보 LinkedHashMap enuri = (LinkedHashMap) param.get("enuri"); // 할인정보 + log.debug("selectBOPreOrderValidationList-goodsList: {}",goodsList); + //사용한 장바구니 쿠폰 //비회원의 경우 enuri 자체가 없어서 isEmpty 확인 List usedCartCouponList = new ArrayList<>(); 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 73d42a8a..8d96c33f 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 @@ -8,6 +8,7 @@ import com.wb.domainserver.domain.gcone.bbs.cnslt.vo.BOCnsltVO; import com.wb.domainserver.domain.gcone.common.service.BOCommonService; import com.wb.domainserver.domain.gcone.goods.purchs.mapper.BOPurchsMapper; import com.wb.domainserver.domain.gcone.goods.purchs.vo.*; +import com.wb.domainserver.domain.gcone.ordr.ordr.mapper.BOOrdrMapper; import com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrderRestAmtVO; import com.wb.domainserver.exception.WnbtRestException; import com.wb.domainserver.security.authentication.AnonymousUser; @@ -33,6 +34,9 @@ public class BOOrderService { @Autowired private BOPurchsMapper mapper; + @Autowired + private BOOrdrMapper boOrdrMapper; + @Autowired private BOMaMtngService maMtngService; @@ -81,27 +85,207 @@ public class BOOrderService { log.debug("결제정보 => {} ", new Gson().toJson(setle)); log.debug("사은품 => {} ", new Gson().toJson(prsntList)); + String sopmalCd = ""; + if("01".equals(user.getSysDvCd())){ + sopmalCd = user.getSopmalCd(); + }else{ + sopmalCd = param.get("sopmalCd").toString(); + } + + String ordrTyCd = (String) param.get("ordrTyCd"); + + log.debug("insertMngrOrdrRegist-param : {}", param); + + /* ***************************** + 0. 배송 정책에 따른 배송지 세팅 + ***************************** */ + /** 여러곳 배송 배송지 세팅 시작 */ LinkedHashMap multiOrdrDlvylcMap = new LinkedHashMap<>(); List> dlvylcListMulti = new ArrayList<>(); multiOrdrDlvylcMap = (LinkedHashMap) param.get("multiOrdrDlvylc"); log.debug("multiOrdrDlvylcMap : {}", multiOrdrDlvylcMap); - if (!CollectionUtils.isEmpty(multiOrdrDlvylcMap)) { - // 배송지 리스트 - dlvylcListMulti = (List>) multiOrdrDlvylcMap.get("dlvylc"); - log.debug("dlvylcListMulti : {}", dlvylcListMulti); + + String dlvylcAreaCd = (String) shipping.get("dlvylcAreaCd"); + String ordrAdressZip = StringUtil.isNullToString(shipping.get("dlvylcZip")); + String prefcd = (String) shipping.get("prefcd"); + String defaultAdressAt = "N"; + String finalSopmalCd = sopmalCd; + DataMap defaultAdressVO = new DataMap() {{ // + put("sopmalCd", finalSopmalCd); // 쇼핑몰 코드 + put("zip", ordrAdressZip); // 우편번호 + put("prefcd", prefcd); // 도도부현코드 + }}; + + if("KR".equals(dlvylcAreaCd)){ + defaultAdressAt = boOrdrMapper.selectBODefaultAdressAtInqire(defaultAdressVO); + } + if("JP".equals(dlvylcAreaCd)){ + defaultAdressAt = boOrdrMapper.selectBODefaultAdressAtInqire2(defaultAdressVO); + } + + + if ("01".equals(ordrTyCd) || "03".equals(ordrTyCd) || "04".equals(ordrTyCd) || "06".equals(ordrTyCd)) { // 일반주문, 회원 개인결제, 정기배송 + + for(int i=0;i 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("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("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); + } + + } + + // 배송지가 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); + } } /** 여러곳 배송 배송지 세팅 종료 */ - String sopmalCd = ""; - if("01".equals(user.getSysDvCd())){ - sopmalCd = user.getSopmalCd(); - }else{ - sopmalCd = param.get("sopmalCd").toString(); - } - String ordrTyCd = (String) param.get("ordrTyCd"); /* ***************************** 1. 주문등록(GC_ORDER) @@ -128,6 +312,7 @@ public class BOOrderService { BOOrderShippingVO shippingEscrowVO = new BOOrderShippingVO(); if ("01".equals(ordrTyCd) || "03".equals(ordrTyCd) || "04".equals(ordrTyCd) || "06".equals(ordrTyCd)) { // 일반주문, 회원 개인결제, 정기배송 + BOOrderShippingVO shippingVO = new BOOrderShippingVO(); shippingVO.setSopmalCd(sopmalCd); @@ -1223,6 +1408,8 @@ public class BOOrderService { shippingVO.setRecpntTelnb((String) shipping.get("recpntTelnb")); shippingVO.setRecpntMbtlnb((String) shipping.get("recpntMbtlnb")); + shippingVO.setDlvylcAreaCd((String) shipping.get("dlvylcAreaCd")); + shippingVO.setPrefcd((String) shipping.get("prefcd")); shippingVO.setDlvylcZip((String) shipping.get("dlvylcZip")); shippingVO.setDlvylcAdresDvCd((String) shipping.get("dlvylcAdresDvCd")); shippingVO.setDlvylcLnbAdres((String) shipping.get("dlvylcLnbAdres")); @@ -1261,6 +1448,8 @@ public class BOOrderService { shippingVO.setRecpntTelnb(StringUtil.isNullToString(shipping.get("recpntTelnb"))); shippingVO.setRecpntMbtlnb(StringUtil.isNullToString(shipping.get("recpntMbtlnb"))); + shippingVO.setDlvylcAreaCd(StringUtil.isNullToString(shipping.get("dlvylcAreaCd"))); + shippingVO.setPrefcd(StringUtil.isNullToString(shipping.get("prefcd"))); shippingVO.setDlvylcZip(StringUtil.isNullToString(shipping.get("dlvylcZip"))); shippingVO.setDlvylcAdresDvCd(StringUtil.isNullToString(shipping.get("dlvylcAdresDvCd"))); shippingVO.setDlvylcLnbAdres(StringUtil.isNullToString(shipping.get("dlvylcLnbAdres"))); diff --git a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOPurchsService.java b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOPurchsService.java index 529601b5..51d64720 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOPurchsService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOPurchsService.java @@ -1837,6 +1837,8 @@ public class BOPurchsService { public Map selectSetleExpectAmt(DataMap param) { Map content = new HashMap<>(); + log.debug("BOPurchsService.selectSetleExpectAmt-param : {}", param); + String sopmalCd = (String) param.get("sopmalCd"); LinkedHashMap setleExpectAmtMap = new LinkedHashMap(){{ @@ -1925,7 +1927,7 @@ public class BOPurchsService { if (dlvylc.get("dlvyAmt") != null) { dlvyAmtBydlvylc = dlvyAmtBydlvylc + castAmt(dlvylc, "dlvyAmt"); } else { - dlvyAmtMap = getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd, prefcd); + dlvyAmtMap = getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd); if (!CollectionUtils.isEmpty(dlvyAmtMap)) { dlvyAmtBydlvylc = ((BigDecimal) dlvyAmtMap.get("dlvyAmt")).intValue(); @@ -1950,7 +1952,7 @@ public class BOPurchsService { if (dlvylcMap.get("dlvyAmt") != null) { dlvyAmtBydlvylc = dlvyAmtBydlvylc + castAmt(dlvylcMap, "dlvyAmt"); } else { - dlvyAmtMap = getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd, prefcd); + dlvyAmtMap = getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd); if (!CollectionUtils.isEmpty(dlvyAmtMap)) { dlvyAmtBydlvylc = ((BigDecimal) dlvyAmtMap.get("dlvyAmt")).intValue(); @@ -1961,7 +1963,7 @@ public class BOPurchsService { dlvyAmt = new BigDecimal(dlvyAmtBydlvylc); } } else { - dlvyAmtMap = getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd, prefcd); + dlvyAmtMap = getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd); if (!CollectionUtils.isEmpty(dlvyAmtMap)) { dlvyAmt = (BigDecimal) dlvyAmtMap.get("dlvyAmt"); @@ -2107,7 +2109,7 @@ public class BOPurchsService { * @param goodsList * @return List */ - public DataMap getDlvyAmt(List goodsList, String sopmalCd, String defaultAdressAt, String dlvylcAreaCd, String prefcd) { + public DataMap getDlvyAmt(List goodsList, String sopmalCd, String defaultAdressAt, String dlvylcAreaCd) { DataMap dlvyAmtMap = null; log.debug("우편번호 확인 : {}", defaultAdressAt); log.debug("getDlvyAmt-goodsList : {}", goodsList); diff --git a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderShippingVO.java b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderShippingVO.java index f58a7122..6a642617 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderShippingVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderShippingVO.java @@ -26,8 +26,12 @@ public class BOOrderShippingVO extends AbstractVO { private String recpntMbtlnb; + private String dlvylcAreaCd; + private String dlvylcZip; + private String prefcd; + private String dlvylcAdresDvCd; private String dlvylcLnbAdres; 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 56e34d2a..82796ade 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 @@ -335,6 +335,8 @@ public interface BOOrdrMapper { */ public List selectOrderShippingList(BOOrdrShippingVO ordrShippingVO); + public List selectOrderShippingListGrp(BOOrdrShippingVO ordrShippingVO); + /** * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문상세 > 배송지정보 상품 목록 조회 * @param paramMap 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 816658c5..8f0a3c38 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 @@ -1988,6 +1988,8 @@ public class BOOrdrService{ List shippingList = mapper.selectOrderShippingList(shippingVO); +// List shippingListGrp = mapper.selectOrderShippingListGrp(shippingVO); + if (!CollectionUtils.isEmpty(shippingList)) { for (int i = 0; i < shippingList.size(); i++) { DataMap param = shippingList.get(i); @@ -2014,6 +2016,7 @@ public class BOOrdrService{ content.put("order", ordrDtl); content.put("goodsList", goodsList); content.put("shippingList", shippingList); +// content.put("shippingListGrp", shippingListGrp); content.put("dscntList", dscntList); content.put("setleList", setleList); content.put("refundList", refundList); @@ -3018,7 +3021,7 @@ public class BOOrdrService{ public Map selectSetleExpectAmt(DataMap param) throws Exception { Map content = new HashMap<>(); - log.debug("selectSetleExpectAmt-param : {}", param); + log.debug("BOOrdrService.selectSetleExpectAmt-param : {}", param); LinkedHashMap setleExpectAmtMap = new LinkedHashMap() {{ put("goodsAmt", 0); @@ -3393,9 +3396,15 @@ public class BOOrdrService{ // ############################################## 배송지별 배송비 계산 START ############################################## - String ordrAdressZip = StringUtil.isNullToString(param.get("dlvylcZip")); - String dlvylcAreaCd = (String) param.get("dlvylcAreaCd"); - String prefcd = (String) param.get("prefcd"); + LinkedHashMap shippingMap = (LinkedHashMap) param.get("shipping"); + +// String ordrAdressZip = StringUtil.isNullToString(param.get("dlvylcZip")); +// String dlvylcAreaCd = (String) param.get("dlvylcAreaCd"); +// String prefcd = (String) param.get("prefcd"); + + String ordrAdressZip = StringUtil.isNullToString(shippingMap != null ? shippingMap.get("dlvylcZip") : ""); + String dlvylcAreaCd = StringUtil.isNullToString(shippingMap != null ? shippingMap.get("dlvylcAreaCd") : ""); + String prefcd = StringUtil.isNullToString(shippingMap != null ? shippingMap.get("prefcd") : ""); DataMap defaultAdressVO = new DataMap() {{ // put("sopmalCd", sopmalCd); // 쇼핑몰 코드 put("zip", ordrAdressZip); // 우편번호 @@ -3445,7 +3454,7 @@ public class BOOrdrService{ List goodsListMulti = (List) dlvylcMapMulti.get("goodsList"); log.debug("goodsListMulti : {}", goodsListMulti); if (!CollectionUtils.isEmpty(goodsListMulti)) { - dlvyAmtMapMulti = purchsService.getDlvyAmt(goodsListMulti, sopmalCd, defaultAdressAt, dlvylcAreaCd, prefcd); + dlvyAmtMapMulti = purchsService.getDlvyAmt(goodsListMulti, sopmalCd, defaultAdressAt, dlvylcAreaCd); if (!CollectionUtils.isEmpty(dlvyAmtMapMulti)) { if (dlvylcMapMulti.get("mngrFreeDlvyUseAt") != null && "Y".equals(dlvylcMapMulti.get("mngrFreeDlvyUseAt").toString())) { @@ -3500,7 +3509,7 @@ public class BOOrdrService{ // List goodsListMulti = (List) dlvylcMapMulti.get("goodsList"); // log.debug("goodsListMulti : {}", goodsListMulti); // if (!CollectionUtils.isEmpty(goodsListMulti)) { -// dlvyAmtMapMulti = purchsService.getDlvyAmt(goodsListMulti, sopmalCd, defaultAdressAt, dlvylcAreaCd, prefcd); +// dlvyAmtMapMulti = purchsService.getDlvyAmt(goodsListMulti, sopmalCd, defaultAdressAt, dlvylcAreaCd); // // if (!CollectionUtils.isEmpty(dlvyAmtMapMulti)) { // if (dlvylcMapMulti.get("mngrFreeDlvyUseAt") != null && "Y".equals(dlvylcMapMulti.get("mngrFreeDlvyUseAt").toString())) { @@ -3558,18 +3567,18 @@ public class BOOrdrService{ if (dlvylcMap.get("dlvyAmt") != null) { log.debug("배송비 객체 : {}", dlvylcMap); if (dlvylcMap.get("mngrFreeDlvyUseAt") != null && "N".equals(dlvylcMap.get("mngrFreeDlvyUseAt").toString())) { - dlvyAmtMap = purchsService.getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd, prefcd); + dlvyAmtMap = purchsService.getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd); } else if (dlvylcMap.get("mngrFreeDlvyUseAt") != null && "Y".equals(dlvylcMap.get("mngrFreeDlvyUseAt").toString())) { log.debug("관리자 무료배송 체크 'Y'"); } else { - dlvyAmtMap = purchsService.getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd, prefcd); + dlvyAmtMap = purchsService.getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd); } if (!CollectionUtils.isEmpty(dlvyAmtMap)) { dlvyAmtBydlvylc = ((BigDecimal) dlvyAmtMap.get("dlvyAmt")).intValue(); } } else { - dlvyAmtMap = purchsService.getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd, prefcd); + dlvyAmtMap = purchsService.getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd); if (!CollectionUtils.isEmpty(dlvyAmtMap)) { dlvyAmtBydlvylc = ((BigDecimal) dlvyAmtMap.get("dlvyAmt")).intValue(); @@ -3578,7 +3587,7 @@ public class BOOrdrService{ dlvyAmt = new BigDecimal(dlvyAmtBydlvylc); } else { - dlvyAmtMap = purchsService.getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd, prefcd); + dlvyAmtMap = purchsService.getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd); if (!CollectionUtils.isEmpty(dlvyAmtMap)) { dlvyAmt = (BigDecimal) dlvyAmtMap.get("dlvyAmt"); diff --git a/src/main/java/com/wb/domainserver/domain/sopmal/ordr/controller/OrdrController.java b/src/main/java/com/wb/domainserver/domain/sopmal/ordr/controller/OrdrController.java index 2d2ce22b..0cd7a349 100644 --- a/src/main/java/com/wb/domainserver/domain/sopmal/ordr/controller/OrdrController.java +++ b/src/main/java/com/wb/domainserver/domain/sopmal/ordr/controller/OrdrController.java @@ -362,6 +362,7 @@ public class OrdrController { param.put("mbrDvCd", user.getMbrDvCd()); param.put("mbrInnb", user.getUserInnb()); } + log.debug("CONselectSetleExpectAmt-param : {}", param); Map content = new HashMap<>(); try { DataMap datamap = new DataMap(); @@ -3069,6 +3070,7 @@ public class OrdrController { return content; } } else { + // 여러곳배송처럼 처리하더라도 주소는 하나이므로 shipping 체크 if (CollectionUtils.isEmpty(shipping)) { log.info("배송지 정보를 찾을 수 없습니다."); content.put("result","Y"); 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 4406d321..4a73cba2 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 @@ -386,7 +386,9 @@ , ORDR_STTUS_CD , RECPNT_NM , RECPNT_MBTLNB + , DLVYLC_AREA_CD , DLVYLC_ZIP + , PREFCD , DLVYLC_ADRES_DV_CD , DLVYLC_LNB_ADRES , DLVYLC_RNM_ADRES @@ -422,7 +424,9 @@ , #{ordrSttusCd} , #{recpntNm} , HEX(AES_ENCRYPT(REPLACE(#{recpntMbtlnb}, '-', ''), '1df5be2f7e90ae36')) + , #{dlvylcAreaCd} , #{dlvylcZip} + , #{prefcd} , #{dlvylcAdresDvCd} , #{dlvylcLnbAdres} , #{dlvylcRnmAdres} 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 c2bea70c..9362958d 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 @@ -2000,6 +2000,71 @@ ORDER BY FOS.ORDR_DLVY_INNB ASC + + +