From 1e1ee301d62f9cc2bb4da61bc09aa4d79bf082f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=8C=80=ED=99=98?= Date: Thu, 28 May 2026 17:53:15 +0900 Subject: [PATCH] =?UTF-8?q?ACI=20Express=20-=20ACI=20Key=20=EB=B0=9C?= =?UTF-8?q?=EA=B8=89=20API=20=EB=B0=B0=EC=86=A1=EC=A1=B0=ED=9A=8C(?= =?UTF-8?q?=EC=9A=B4=EC=86=A1=EC=9E=A5=EB=B2=88=ED=98=B8=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C)=20-=20aciExpress=20=ED=8C=9D=EC=97=85=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9=20>>=20=EC=87=BC=ED=95=91=EB=AA=B0=20=EC=A3=BC?= =?UTF-8?q?=EB=AC=B8/=EB=B0=B0=EC=86=A1=20>=20=EC=A3=BC=EB=AC=B8=20?= =?UTF-8?q?=EC=83=81=EC=84=B8,=20>>=20=EC=A3=BC=EB=AC=B8=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20>=20=EC=A0=84=EC=B2=B4=EC=A3=BC=EB=AC=B8=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20>=20=EC=A3=BC=EB=AC=B8=EC=83=81=EC=84=B8,=20>>=20?= =?UTF-8?q?=EC=A3=BC=EB=AC=B8=20=EA=B4=80=EB=A6=AC=20>=20=EC=B6=9C?= =?UTF-8?q?=EA=B3=A0=20=EC=A1=B0=ED=9A=8C=20>=20=EC=B6=9C=EA=B3=A0=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C,=20>>=20=EC=A3=BC?= =?UTF-8?q?=EB=AC=B8=20=EA=B4=80=EB=A6=AC=20>=20=EC=B6=9C=EA=B3=A0=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20>=20=EC=B6=9C=EA=B3=A0=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20=EC=A1=B0=ED=9A=8C,=20>>=20=EC=A3=BC=EB=AC=B8=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20>=20=EC=B6=9C=EA=B3=A0=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20>=20=EC=B6=9C=EA=B3=A0=20=EC=83=81=ED=83=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD,=20>>=20=EB=B0=98=ED=92=88=ED=99=98=EB=B6=88?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20>=20=EB=B0=98=ED=92=88=ED=99=98=EB=B6=88?= =?UTF-8?q?=20=EC=B2=98=EB=A6=AC=20>=20=EB=B0=98=ED=92=88/=ED=99=98?= =?UTF-8?q?=EB=B6=88=20=EC=83=81=EC=84=B8=20>=20=EC=9B=90=EC=A3=BC?= =?UTF-8?q?=EB=AC=B8=20=EC=A0=95=EB=B3=B4=20=ED=8E=BC=EC=B3=90=EB=B3=B4?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gcone/common/service/BOCommonService.java | 9 + .../ordr/dlivy/mapper/BODlivyMapper.java | 8 + .../ordr/dlivy/service/BODlivyService.java | 211 +++++++++++++++--- .../ordr/controller/MyOrdrController.java | 29 +-- src/main/resources/application-local.yml | 3 + .../mapper/gcone/ordr/dlivy/BODlivyMapper.xml | 14 ++ .../views/mngr/ordr/dlivy/DlivyDtlInqireR.jsp | 22 +- .../mngr/ordr/dlivy/DlivyListInqireRForm.jsp | 24 +- .../views/mngr/ordr/dlivy/DlivySttusChngU.jsp | 2 +- .../mngr/ordr/dlivy/OrdrDlivyPopupForm.jsp | 22 +- .../mngr/ordr/ordrmngr/OrdrDtlExprtR.jsp | 4 +- .../mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp | 16 +- .../mngr/ordr/refnd/RtngudRefndDtlInqireR.jsp | 16 +- .../views/sopmal/mpage/ordr/OrdrDtlR.jsp | 16 +- .../views/sopmal_m/mpage/ordr/OrdrDtlR.jsp | 18 +- 15 files changed, 274 insertions(+), 140 deletions(-) diff --git a/src/main/java/com/wb/domainserver/domain/gcone/common/service/BOCommonService.java b/src/main/java/com/wb/domainserver/domain/gcone/common/service/BOCommonService.java index 53e86438..0c8b2afa 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/common/service/BOCommonService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/common/service/BOCommonService.java @@ -46,6 +46,9 @@ public class BOCommonService { @Value("${secret.key}") private String secretKey; + + @Value("${aciexpress.apikey}") + private String aciApiKey; /** *

비밀번호를 암호화 한다

@@ -287,4 +290,10 @@ public class BOCommonService { return secretKey; } + /** + * aci Api키 조회 + * @return String + */ + public String selectAciApiKey() {return aciApiKey;} + } diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/dlivy/mapper/BODlivyMapper.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/dlivy/mapper/BODlivyMapper.java index 524141ff..b46614f0 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/dlivy/mapper/BODlivyMapper.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/dlivy/mapper/BODlivyMapper.java @@ -161,6 +161,14 @@ public interface BODlivyMapper { public List selectBOOrdrDlvyDtlsInqireGroupOrdr(BODlivyVO boDlivyVO); + /** + * 주문 배송 추적 조회 : 송장번호 조회 + * @param boDlivyVO + * @return + */ + public String selectBOOrdrInvcnb(BODlivyVO boDlivyVO); + + /** * 출고 상태 '상품 준비' or '배송중' 되돌리기 / 출고 상태 변경 단건 * @param dlivyVO 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 2364bec9..6daa9f39 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 @@ -1,59 +1,40 @@ package com.wb.domainserver.domain.gcone.ordr.dlivy.service; -import java.io.IOException; -import java.io.StringReader; -import java.io.StringWriter; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.nio.charset.StandardCharsets; -import java.util.*; -import java.util.stream.Collectors; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonNode; -import com.wb.domainserver.domain.admin.store.sopmal.vo.BOShopSetupVO; +import com.fasterxml.jackson.databind.ObjectMapper; +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.BOOrderLogVO; import com.wb.domainserver.domain.gcone.mbr.mlg.service.BOMlgService; import com.wb.domainserver.domain.gcone.mbr.mlg.vo.BOMlgVO; import com.wb.domainserver.domain.gcone.ntcn.mssage.service.BOMssageService; -import com.wb.domainserver.domain.gcone.ordr.atmcrcpmny.vo.BOAtmcRcpmnyCnfirmVO; +import com.wb.domainserver.domain.gcone.ordr.dlivy.mapper.BODlivyMapper; import com.wb.domainserver.domain.gcone.ordr.dlivy.vo.*; import com.wb.domainserver.domain.gcone.ordr.ordr.mapper.BOOrdrMapper; import com.wb.domainserver.domain.gcone.ordr.ordr.service.BOOrdrService; -import com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrLogVO; import com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrShippingVO; import com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrVO; import com.wb.domainserver.domain.gcone.ordr.pay.service.BOPayService; import com.wb.domainserver.domain.gcone.ordr.pay.vo.BOPayVO; import com.wb.domainserver.domain.gcone.ordr.rtngudrefnd.service.BORtngudrefndService; import com.wb.domainserver.exception.WnbtRestException; +import com.wb.domainserver.exception.code.ErrorCode; +import com.wb.domainserver.util.dataaccess.DataMap; import com.wb.domainserver.util.string.StringUtil; import io.micrometer.common.util.StringUtils; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.JAXBException; -import jakarta.xml.bind.Marshaller; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.wb.domainserver.domain.gcone.ordr.dlivy.mapper.BODlivyMapper; -import com.wb.domainserver.util.dataaccess.DataMap; - import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.*; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import org.springframework.util.ObjectUtils; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; +import org.springframework.web.client.RestTemplate; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; +import java.io.IOException; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.*; +import java.util.stream.Collectors; @Service @Slf4j @@ -83,6 +64,9 @@ public class BODlivyService { @Autowired BORtngudrefndService boRtngudrefndService; + @Autowired + private BOCommonService boCommonService; + /* #################################### 출고 리스트 서비스 시작 @@ -494,6 +478,167 @@ public class BODlivyService { return contents; } + /** + * ACI Key 발급 API + * @param + * @return List + */ + public DataMap selectBOAciKey() throws WnbtRestException { + String apiKey = boCommonService.selectAciApiKey(); + DataMap message = new DataMap(); + + try { + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_JSON); + headers.set("USERID", "UNIHAN"); + headers.set("APIKEY", apiKey); + + Map body = new HashMap<>(); + + HttpEntity apiRequest = + new HttpEntity<>("{}", headers); + + RestTemplate restTemplate = new RestTemplate(); + ResponseEntity response = restTemplate.exchange( + "https://acieshop.com/api/kr/pod/v1.5/", + HttpMethod.POST, + apiRequest, + String.class + ); + + ObjectMapper objectMapper = new ObjectMapper(); + JsonNode jsonNode = objectMapper.readTree(response.getBody()); + + message.put("status", jsonNode.get("Status").asText()); + message.put("aciKey", jsonNode.get("ACIKey").asText()); + message.put("errMsg", jsonNode.get("ErrMsg").asText()); + }catch (WnbtRestException wre){ + log.error(wre.getMessage()); + throw wre; + }catch (RuntimeException re){ + log.error(re.getMessage()); + throw new WnbtRestException(ErrorCode.INTERNAL_SERVER_ERROR); + }catch (Exception e) { + log.error(e.getMessage(), e); + throw new WnbtRestException(ErrorCode.INTERNAL_SERVER_ERROR); + } + + return message; + } + + /** + * 화물 추적 - 운송장 조회 API + * @param boDlivyVO + * @return List + */ + public DataMap updateBOAciDelivery(BODlivyVO boDlivyVO) throws WnbtRestException { + DataMap aciMap = selectBOAciKey(); + String aciKey = String.valueOf(aciMap.get("aciKey")); + DataMap message = new DataMap(); + + try { + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_JSON); + headers.set("USERID", "UNIHAN"); + headers.set("ACIKey", aciKey); + + Map body = new HashMap<>(); + body.put("BLNO", mapper.selectBOOrdrInvcnb(boDlivyVO)); + + HttpEntity> apiRequest = + new HttpEntity<>(body, headers); + + RestTemplate restTemplate = new RestTemplate(); + ResponseEntity response = restTemplate.exchange( + "ex", + HttpMethod.POST, + apiRequest, + String.class + ); + + ObjectMapper objectMapper = new ObjectMapper(); + JsonNode jsonNode = objectMapper.readTree(response.getBody()); + + message.put("status", jsonNode.get("Status").asText()); + JsonNode podInfoNode = jsonNode.get("PODInfo"); + if(!podInfoNode.isNull()) { + List podInfoList = new ArrayList<>(); + for(JsonNode podInfoItem : podInfoNode) { + DataMap PODInfo = new DataMap(); + PODInfo.put("blno", podInfoItem.get("BLNO").asText()); + PODInfo.put("dateLocalwhin", podInfoItem.get("DATE_LOCALWHIN").asText()); + PODInfo.put("dateLocaldeparture", podInfoItem.get("DATE_LOCALDEPARTURE").asText()); + PODInfo.put("dateIcnarrival", podInfoItem.get("DATE_ICNARRIVAL").asText()); + PODInfo.put("dateCustomes", podInfoItem.get("DATE_CUSTOMES").asText()); + PODInfo.put("dateDelivery", podInfoItem.get("DATE_DELIVERY").asText()); + PODInfo.put("recipient", podInfoItem.get("RECIPIENT").asText()); + PODInfo.put("wta", podInfoItem.get("WTA").asText()); + PODInfo.put("wtdan", podInfoItem.get("WTDAN").asText()); + + List volumeList = new ArrayList<>(); + for(JsonNode volumeItem : podInfoItem.get("VOLUME")) { + DataMap volume = new DataMap(); + volume.put("width", volumeItem.get("WIDTH").asText()); + volume.put("length", volumeItem.get("LENGTH").asText()); + volume.put("height", volumeItem.get("HEIGHT").asText()); + + volumeList.add(volume); + } + PODInfo.put("volume", volumeList); + + List customsList = new ArrayList<>(); + for(JsonNode customsItem : podInfoItem.get("CUSTOMS")) { + List customDetail = new ArrayList<>(); + for(JsonNode customItem : customsItem) { + DataMap Custom = new DataMap(); + Custom.put("dateEvent", customItem.get("DATE_EVENT").asText()); + Custom.put("traceStatus", customItem.get("TRACE_STATUS").asText()); + + customDetail.add(Custom); + } + customsList.add(customDetail); + } + PODInfo.put("customs", customsList); + + List localPodList = new ArrayList<>(); + for(JsonNode localPodItem : podInfoItem.get("LOCAL_POD")) { + DataMap localPod = new DataMap(); + localPod.put("traceStatus", localPodItem.get("TRACE_STATUS").asText()); + localPod.put("dateEvent", localPodItem.get("DATE_EVENT").asText()); + localPod.put("position", localPodItem.get("POSITION").asText()); + + localPodList.add(localPod); + } + PODInfo.put("localPod", localPodList); + + podInfoList.add(PODInfo); + } + message.put("podInfo", podInfoList); + } else { + message.put("errMsg", jsonNode.get("ErrMsg").asText()); + } + }catch (WnbtRestException wre){ + log.error(wre.getMessage()); + throw wre; + }catch (RuntimeException re){ + log.error(re.getMessage()); + throw new WnbtRestException(ErrorCode.INTERNAL_SERVER_ERROR); + }catch (Exception e) { + log.error(e.getMessage(), e); + throw new WnbtRestException(ErrorCode.INTERNAL_SERVER_ERROR); + } + + return message; + } + + /** + * 송장번호 조회 + * @param boDlivyVO + * @return List + */ + public String selectBOOrdrInvcnb(BODlivyVO boDlivyVO) throws WnbtRestException { + return mapper.selectBOOrdrInvcnb(boDlivyVO); + } /** 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 76dc6b42..32727b74 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 @@ -36,6 +36,7 @@ import com.wb.domainserver.domain.sopmal.mpage.ordr.vo.MyOrdrDlvyVO; import com.wb.domainserver.domain.sopmal.mpage.ordr.vo.MyOrdrShippingVO; import com.wb.domainserver.domain.sopmal.mpage.ordr.vo.MyRefundVO; import com.wb.domainserver.exception.WnbtRestException; +import com.wb.domainserver.response.ApiResponse; import com.wb.domainserver.response.WnbtResponse; import com.wb.domainserver.response.WnbtResponseBody; import com.wb.domainserver.response.WnbtWebClientResponseHandler; @@ -54,6 +55,7 @@ import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.apache.logging.log4j.util.Base64Util; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; @@ -65,6 +67,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import java.math.BigInteger; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -725,26 +728,26 @@ public class MyOrdrController { * @return */ @Policy(AuthPolicy.PUBLIC) - @RequestMapping(value="/selectDlvyInqire") - public String selectDlvyInqire(BODlivyVO boDlivyVO, ModelMap model, HttpServletRequest request){ +// @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){ // 작성자 정보 할당 AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); if("01".equals(user.getSysDvCd())){ boDlivyVO.setSopmalCd(user.getSopmalCd()); // 쇼핑몰 코드 } - Map content = new HashMap<>(); - content = dlivyService.selectBOOrdrDlvyDtlsInqire(boDlivyVO); +// model.addAttribute("resultMap", dlivyService.updateBOAciDelivery(boDlivyVO)); +// return Util.getDeviceType(request) + "/mpage/ordr/DlvyInqireR"; - model.addAttribute("resultMap", content); -// responseHandler.handleResponse( -// sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/ordr/dlivy/selectBOOrdrDlvyDtlsInqire", dlivyVO), -// model, -// "resultMap" -// ); - - // return "sopmal/mpage/ordr/DlvyInqireR"; - return Util.getDeviceType(request) + "/mpage/ordr/DlvyInqireR"; + DataMap content = new DataMap(); + content.put("invcnb", dlivyService.selectBOOrdrInvcnb(boDlivyVO)); + return ResponseEntity.ok( + WnbtResponse.builder() + .resBody(new WnbtResponseBody(content)) + .build() + ); } diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 1cc83816..d80b92d5 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -365,6 +365,9 @@ mngrfo: secret: key: 1df5be2f7e90ae36 +aciexpress: + apikey: DC94F29AFD5399F54AAE7FAA46045B65 + host: img: https://19d28cf7178139ad.kinxzone.com diff --git a/src/main/resources/mybatis/xml/mapper/gcone/ordr/dlivy/BODlivyMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/ordr/dlivy/BODlivyMapper.xml index 65095914..c8d675dc 100644 --- a/src/main/resources/mybatis/xml/mapper/gcone/ordr/dlivy/BODlivyMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/gcone/ordr/dlivy/BODlivyMapper.xml @@ -1332,6 +1332,20 @@ + + + + '; - tr += ' + diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/OrdrDlivyPopupForm.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/OrdrDlivyPopupForm.jsp index d645b6db..c773e100 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/OrdrDlivyPopupForm.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/OrdrDlivyPopupForm.jsp @@ -557,7 +557,7 @@ '' + '
' + '' + - '' + + '' + '
' + '' + '' + @@ -731,7 +731,7 @@ '' + '
' + '' + - '' + + '' + '
' + '' + '' + @@ -844,21 +844,9 @@ /********************************************************************* * 배송그룹 / 방법변경 모달 , 배송 조회 모달 * *******************************************************************/ - const fn_open_dlvy_sweettracker_modal = function (modalDivSltr, modalSlrt, url, dlivyInnb) { - - $.ajax({ - type: 'POST', - url: url, - data: { - dlivyInnb : dlivyInnb - }, - success: function (data) { - $(modalSlrt).remove(); - $(modalDivSltr).html(data); - $(modalSlrt).modal(); - - } - }); + const fn_open_dlvy_popup = function (invcnb) { + let url = 'https://www.acieshop.com/pod.php?OrderNo=' + invcnb; + window.open(url, 'acieView', 'width=605,height=700'); } diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlExprtR.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlExprtR.jsp index 3915474f..e4254230 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlExprtR.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlExprtR.jsp @@ -123,7 +123,7 @@ - 조회 + 조회 @@ -176,7 +176,7 @@ - 조회 + 조회 diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp index b0380dd1..8ebb6617 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp @@ -942,19 +942,9 @@ } /* 출고내역 주문배송 정보 조회 */ - const fn_open_dlvy_sweettracker_modal = function(dlivyInnb) { - $.ajax({ - type:'post', - url:'', - data:{ - 'dlivyInnb':dlivyInnb - }, - success:function (html) { - $('#modalDiv').html(html); - - $('#delivery-history-pop').remove().modal(); - } - }); + const fn_open_dlvy_popup = function(invcnb) { + let url = 'https://www.acieshop.com/pod.php?OrderNo=' + invcnb; + window.open(url, 'acieView', 'width=605,height=700'); } /* 배송그룹/방법 변경 정보 조회 */ diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/refnd/RtngudRefndDtlInqireR.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/refnd/RtngudRefndDtlInqireR.jsp index abdbf463..fccd822a 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/refnd/RtngudRefndDtlInqireR.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/refnd/RtngudRefndDtlInqireR.jsp @@ -1313,19 +1313,9 @@ } /* 출고내역 주문배송 정보 조회 */ - const fn_open_dlvy_sweettracker_modal = function(dlivyInnb) { - $.ajax({ - type:'post', - url:'', - data:{ - 'dlivyInnb':dlivyInnb - }, - success:function (html) { - $('#modalDiv').html(html); - - $('#delivery-history-pop').remove().modal(); - } - }); + const fn_open_dlvy_popup = function(invcnb) { + let url = 'https://www.acieshop.com/pod.php?OrderNo=' + invcnb; + window.open(url, 'acieView', 'width=605,height=700'); } /* 무효/취소/반품 내역 정보 조회 */ 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 a75b0bf6..e2455fdd 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,17 +731,21 @@ } /* 배송조회 팝업 화면 호출 */ - const fn_call_dlvy_sweettracker_pop = function (ordrInnb) { + const fn_open_dlvy_popup = function (ordrDlvyInnb) { $.ajax({ type:'post', url:'', data:{ - ordrInnb:ordrInnb + ordrDlvyInnb:ordrDlvyInnb }, success:function (data) { - $('#modalDiv').html(data); + // $('#modalDiv').html(data); + // + // $('#delivery-check-pop').remove().modal(); - $('#delivery-check-pop').remove().modal(); + 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'); } }); } @@ -1328,7 +1332,7 @@ - ');" id="inqireDlvy" class="btn-ordr-sttus btn outline sm full">배송조회 + ');" id="inqireDlvy" class="btn-ordr-sttus btn outline sm full">배송조회 ');">반품신청 @@ -1477,7 +1481,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/OrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp index 3d8528bf..cd506f55 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp @@ -425,17 +425,21 @@ /* 배송조회 팝업 화면 호출 */ - const fn_call_dlvy_sweettracker_pop = function (ordrInnb) { + const fn_call_dlvy_pop = function (ordrDlvyInnb) { $.ajax({ type: 'post', url: '/sopmal/mpage/ordr/selectDlvyInqire', data: { - ordrInnb: ordrInnb + ordrDlvyInnb:ordrDlvyInnb }, success: function (data) { - $('#deliveryInfoPop').remove(); - $('#modalDiv').html(data); - openModal2('deliveryInfoPop'); + // $('#modalDiv').html(data); + // + // $('#delivery-check-pop').remove().modal(); + + let invcnb = JSON.parse(data.resBody.result).invcnb; + let url = 'https://www.acieshop.com/pod.php?OrderNo=' + invcnb; + window.open(url, '_blank'); } }); } @@ -794,7 +798,7 @@ ');">반품신청 - 배송조회 + 배송조회 ');">반품신청 @@ -938,7 +942,7 @@ 결제취소 - 배송조회 + 배송조회 ');">반품신청