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 이대환 수정 --%> +