From 4074ace97dd2f24b81f2a8011babc73c6420d643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=8C=80=ED=99=98?= Date: Wed, 8 Jul 2026 10:36:59 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=EC=86=A1=EC=A1=B0=ED=9A=8C(=EC=9A=B4?= =?UTF-8?q?=EC=86=A1=EC=9E=A5=EB=B2=88=ED=98=B8=20=EC=A1=B0=ED=9A=8C)=20-?= =?UTF-8?q?=20aciExpress=20=ED=8C=9D=EC=97=85=20=EC=A0=81=EC=9A=A9=20>>=20?= =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=20=EC=A3=BC=EB=AC=B8/=EB=B0=B0?= =?UTF-8?q?=EC=86=A1=20>=20=EC=A3=BC=EB=AC=B8=20=EC=83=81=EC=84=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ordr/dlivy/service/BODlivyService.java | 6 +- .../ordr/controller/MyOrdrController.java | 22 +- .../views/sopmal/mpage/ordr/DlvyInqireR.jsp | 320 ++++++++++++------ .../views/sopmal/mpage/ordr/OrdrDtlR.jsp | 15 +- .../views/sopmal_m/mpage/ordr/DlvyInqireR.jsp | 252 +++++++++----- .../views/sopmal_m/mpage/ordr/OrdrDtlR.jsp | 17 +- 6 files changed, 410 insertions(+), 222 deletions(-) diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/dlivy/service/BODlivyService.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/dlivy/service/BODlivyService.java index 6daa9f39..b9245e43 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/dlivy/service/BODlivyService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/dlivy/service/BODlivyService.java @@ -500,7 +500,7 @@ public class BODlivyService { RestTemplate restTemplate = new RestTemplate(); ResponseEntity response = restTemplate.exchange( - "https://acieshop.com/api/kr/pod/v1.5/", + "https://acieshop.com/api/kr/token/", HttpMethod.POST, apiRequest, String.class @@ -543,14 +543,14 @@ public class BODlivyService { headers.set("ACIKey", aciKey); Map body = new HashMap<>(); - body.put("BLNO", mapper.selectBOOrdrInvcnb(boDlivyVO)); + body.put("BLNO", List.of(mapper.selectBOOrdrInvcnb(boDlivyVO))); HttpEntity> apiRequest = new HttpEntity<>(body, headers); RestTemplate restTemplate = new RestTemplate(); ResponseEntity response = restTemplate.exchange( - "ex", + "https://acieshop.com/api/kr/pod/v1.5/", HttpMethod.POST, apiRequest, String.class diff --git a/src/main/java/com/wb/domainserver/domain/sopmal/mpage/ordr/controller/MyOrdrController.java b/src/main/java/com/wb/domainserver/domain/sopmal/mpage/ordr/controller/MyOrdrController.java index 32727b74..5eaaba3c 100644 --- a/src/main/java/com/wb/domainserver/domain/sopmal/mpage/ordr/controller/MyOrdrController.java +++ b/src/main/java/com/wb/domainserver/domain/sopmal/mpage/ordr/controller/MyOrdrController.java @@ -728,26 +728,22 @@ public class MyOrdrController { * @return */ @Policy(AuthPolicy.PUBLIC) -// @RequestMapping(value="/selectDlvyInqire") -// public String selectDlvyInqire(BODlivyVO boDlivyVO, ModelMap model, HttpServletRequest request){ - @RequestMapping(value="/selectDlvyInqire", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity selectDlvyInqire(BODlivyVO boDlivyVO){ + @RequestMapping(value="/selectDlvyInqire") + public String selectDlvyInqire(BODlivyVO boDlivyVO, ModelMap model, HttpServletRequest request){ // 작성자 정보 할당 AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); if("01".equals(user.getSysDvCd())){ boDlivyVO.setSopmalCd(user.getSopmalCd()); // 쇼핑몰 코드 } -// model.addAttribute("resultMap", dlivyService.updateBOAciDelivery(boDlivyVO)); -// return Util.getDeviceType(request) + "/mpage/ordr/DlvyInqireR"; + BOOrdrDlvyVO ordrDlvyVO = new BOOrdrDlvyVO(); + ordrDlvyVO.setSopmalCd(boDlivyVO.getSopmalCd()); + ordrDlvyVO.setOrdrInnb(boDlivyVO.getOrdrInnb()); - DataMap content = new DataMap(); - content.put("invcnb", dlivyService.selectBOOrdrInvcnb(boDlivyVO)); - return ResponseEntity.ok( - WnbtResponse.builder() - .resBody(new WnbtResponseBody(content)) - .build() - ); + model.addAttribute("ordrInfo", boOrdrService.selectMbrOrdrDtlInqire(ordrDlvyVO)); + model.addAttribute("resultMap", dlivyService.updateBOAciDelivery(boDlivyVO)); + + return Util.getDeviceType(request) + "/mpage/ordr/DlvyInqireR"; } diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/DlvyInqireR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/DlvyInqireR.jsp index f2b18c91..926bf480 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/DlvyInqireR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/DlvyInqireR.jsp @@ -8,124 +8,222 @@ <%-- - Class Name : WslistInqireR.jsp - Description : 마이페이지 위시리스트 + Class Name : DlvyInqireR.jsp + Description : 배송 조회 팝업 모달 Modification Information 수정일 수정자 수정내용 ------- -------- --------------------------- 2024-03-27 추지훈 최초 생성 + 2026-07-06 이대환 수정 --%> + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp index e2455fdd..eae3ed56 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp @@ -731,21 +731,18 @@ } /* 배송조회 팝업 화면 호출 */ - const fn_open_dlvy_popup = function (ordrDlvyInnb) { + const fn_open_dlvy_popup = function (ordrInnb, ordrDlvyInnb) { $.ajax({ type:'post', url:'', data:{ + ordrInnb:ordrInnb, ordrDlvyInnb:ordrDlvyInnb }, success:function (data) { - // $('#modalDiv').html(data); - // - // $('#delivery-check-pop').remove().modal(); + $('#modalDiv').html(data); - let invcnb = JSON.parse(data.resBody.result).invcnb; - let url = 'https://www.acieshop.com/pod.php?OrderNo=' + invcnb; - window.open(url, 'acieView', 'width=605,height=700'); + $('#delivery-check-pop').remove().modal(); } }); } @@ -1332,7 +1329,7 @@ - ');" id="inqireDlvy" class="btn-ordr-sttus btn outline sm full">배송조회 + ', '');" id="inqireDlvy" class="btn-ordr-sttus btn outline sm full">배송조회 ');">반품신청 @@ -1481,7 +1478,7 @@ ');">반품신청 - ');" id="inqireDlvy" class="btn-ordr-sttus btn outline sm full">배송조회 + ', '');" id="inqireDlvy" class="btn-ordr-sttus btn outline sm full">배송조회 ');">반품신청 diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/DlvyInqireR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/DlvyInqireR.jsp index 225801b0..6bf66a75 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/DlvyInqireR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/DlvyInqireR.jsp @@ -8,15 +8,26 @@ <%-- - Class Name : WslistInqireR.jsp + Class Name : DlvyInqireR.jsp Description : 배송 추적 Modification Information 수정일 수정자 수정내용 ------- -------- --------------------------- 2024-03-27 추지훈 최초 생성 + 2026-07-06 이대환 수정 --%> +