From 5aa87c25265db12d020fc7379f9112a47beb0cac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=8C=80=ED=99=98?= Date: Fri, 27 Mar 2026 11:49:32 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=87=BC=ED=95=91=EB=AA=B0=20?= =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EC=99=84=EB=A3=8C=20=ED=99=94=EB=A9=B4=20-?= =?UTF-8?q?=20=EA=B5=AC=EB=8F=85=EC=84=9C=EB=B9=84=EC=8A=A4=20=EC=A3=BC?= =?UTF-8?q?=EB=AC=B8=EC=99=84=EB=A3=8C=20=EB=B6=84=EA=B8=B0=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 --- .../gcone/ordr/ordr/mapper/BOOrdrMapper.java | 8 + .../ordr/ordr/service/BOOrdrService.java | 11 +- .../gcone/ordr/ordr/vo/BOOrdrDlvyVO.java | 2 + .../domain/gcone/ordr/ordr/vo/BOOrdrVO.java | 3 + .../ordr/controller/OrdrController.java | 11 +- .../mapper/gcone/ordr/ordr/BOOrdrMapper.xml | 45 +++++ .../WEB-INF/views/sopmal/ordr/OrdrComptR.jsp | 156 ++++++++++++++---- .../views/sopmal_m/ordr/OrdrComptR.jsp | 73 ++++---- 8 files changed, 238 insertions(+), 71 deletions(-) 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 ea6f6cc2..9afacc39 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 @@ -996,6 +996,14 @@ public interface BOOrdrMapper { public List selectMbrSubsvcOrdrList(BOOrdrDlvyVO ordrDlvyVO); + /** + * 사용자 > 주문완료 > 구독서비스 주문 목록 조회 + * @param ordrDlvyVO + * @return List + */ + public List selectOrdrSubsvcDtllList(BOOrdrDlvyVO ordrDlvyVO); + + /** * 사용자 > 구독서비스 결제 > 구독서비스 주문 상품 목록 조회 * @param subsvcVO 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 38f04039..03da28b9 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 @@ -1981,7 +1981,13 @@ public class BOOrdrService{ DataMap ordrDtl = mapper.selectOrdrDtl(ordrVO); - List goodsList = mapper.selectOrdrGoodsDtllList(ordrVO); + List goodsList = new ArrayList<>(); + if("Y".equals(ordrDlvyVO.getSubsvcAt())) { + int subsvcInnb = ((BigInteger) ordrDtl.get("subsvcInnb")).intValue(); + goodsList = mapper.selectOrdrSubsvcDtllList(ordrDlvyVO); + } else { + goodsList = mapper.selectOrdrGoodsDtllList(ordrVO); + } List dscntList = selectOrdrGoodsDtllDscntList(ordrVO); @@ -2025,7 +2031,7 @@ public class BOOrdrService{ content.put("refundList", refundList); content.put("total", total); content.put("mlgAccmlNtcList", mlgAccmlNtcList); - content.put("mlgAccmlAmt", goodsList.stream().mapToLong(obj -> (long) obj.get("mlgAmt")).sum()); + content.put("mlgAccmlAmt", goodsList.stream().mapToLong(obj -> ((Number) obj.get("mlgAmt")).longValue()).sum()); content.put("totalDscntAmt", dscntList.stream().mapToLong(obj -> ((BigDecimal) obj.get("dscntAmt")).longValue()).sum()); return content; @@ -6024,6 +6030,7 @@ public class BOOrdrService{ */ public Map selectOrdrCompt(BOOrdrVO ordrVO) { BOOrdrDlvyVO ordrDlvyVO = new BOOrdrDlvyVO(); + ordrVO.setSubsvcAt((String) mapper.selectOrdrDtl(ordrVO).get("subsvcAt")); BeanUtils.copyProperties(ordrVO, ordrDlvyVO); diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrDlvyVO.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrDlvyVO.java index 19e425ec..d717d484 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrDlvyVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrDlvyVO.java @@ -36,6 +36,8 @@ public class BOOrdrDlvyVO extends AbstractVO { private String sysDvCd; // 시스템 구분 코드 + private String subsvcAt; // 구독서비스 여부 + /** 현재 주문 상태 */ private String currOrdrSttusCd; diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrVO.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrVO.java index d26b4033..ad23ddfd 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrVO.java @@ -151,6 +151,9 @@ public class BOOrdrVO extends AbstractVO { /** 장바구니 고유번호 배열 */ private String[] cartInnbs; + /** 구독서비스 주문여부 */ + private String subsvcAt; + /** 구독서비스 고유번호 */ private String subsvcInnb; 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 24c7d08d..e1917dfa 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 @@ -791,7 +791,10 @@ public class OrdrController { }); LinkedHashMap goodsOne = ((List) paramData.get("goodsList")).get(0); - if(goodsOne.containsKey("subsvcInnb")) { + Boolean subsvcAt = goodsOne.containsKey("subsvcInnb"); + if(subsvcAt) { + model.addAttribute("subsvcInnb", goodsOne.get("subsvcInnb")); + BOSubsvcVO subsvcVO = new BOSubsvcVO(); subsvcVO.setSopmalCd((String) goodsOne.get("sopmalCd")); subsvcVO.setSubsvcInnb(goodsOne.get("subsvcInnb").toString()); @@ -1082,6 +1085,12 @@ public class OrdrController { log.debug("=================insertKcpSetle after "); model.addAttribute("paramVO", payVO); + if ("1".equals(content.get("status"))) { // 에러처리 + String subsvcInnb = request.getParameter("subsvc_innb"); + if(subsvcInnb != "") { + model.addAttribute("subsvcInnb", subsvcInnb); + } + } return "sopmal/ordr/OrdrRspnsKcpPayR"; } 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 dd924ce0..5a64efce 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 @@ -5594,6 +5594,51 @@ LIMIT #{recordCountPerPage} OFFSET #{firstIndex} + + + + + + + + ${curUnit} + + + + + (-) + + ${curUnit} + + + + + + ${curUnit} + + + + + + ${curUnit} + + + + + + + + + + + + + + + +
@@ -335,44 +422,45 @@ - +

배송지 정보

-
- - - - - - - - - - - - - - - - - - - - - - - - -
배송지 정보
받는분
주소 - - - -
휴대폰번호
배송 시 요청사항
-
- + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
배송지 정보
받는분
주소 + + + +
휴대폰번호
배송 시 요청사항
+
+ 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 0b1b0f12..5b6d718c 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 @@ -39,7 +39,10 @@ /* 주문/배송 목록 화면 이동 버튼 선택 이벤트 */ $('#btnOrdrList').on('click', function() { - location.href = ''; + const subsvcAt = '${data.order.subsvcAt}'; + location.href = subsvcAt === 'Y' + ? '' + : ''; }); /* 주문번호 복사 버튼 선택 이벤트 */ @@ -152,7 +155,7 @@
- +
@@ -164,38 +167,40 @@ -
- - - - - - - - - - - - - - - - - - - - - - - -
받는분
주소 - - - - - -
휴대폰번호
배송 시 요청사항
-
+ +
+ + + + + + + + + + + + + + + + + + + + + + + +
받는분
주소 + + + + + +
휴대폰번호
배송 시 요청사항
+
+