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 bf995d92..f014c552 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 c7f409b8..db6e5f28 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 @@ -1923,7 +1923,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); @@ -1967,7 +1973,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; @@ -5745,6 +5751,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 e130275f..f78bf6c1 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()); @@ -1084,6 +1087,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/java/com/wb/domainserver/domain/sopmal/ordr/vo/OrdrVO.java b/src/main/java/com/wb/domainserver/domain/sopmal/ordr/vo/OrdrVO.java index e676d820..42acb6bc 100644 --- a/src/main/java/com/wb/domainserver/domain/sopmal/ordr/vo/OrdrVO.java +++ b/src/main/java/com/wb/domainserver/domain/sopmal/ordr/vo/OrdrVO.java @@ -41,9 +41,12 @@ public class OrdrVO extends AbstractVO { /** 실패 메세지 */ private String message; - /*결제 플랫폼 타입 코드*/ + /** 결제 플랫폼 타입 코드*/ private String setlePltfomTyCd; - /*주문유형*/ + /** 주문유형*/ private String ordrTyCd; + + /** 구독서비스 고유번호*/ + private String subsvcInnb; } diff --git a/src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml index 1a693192..aa50408c 100644 --- a/src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml @@ -3671,9 +3671,11 @@ AND GMP.SOPMAL_CD = #{sopmalCd} LEFT JOIN GC_MEMBER_GRAD MG ON GMP.MBR_GRAD_INNB = MG.MBR_GRAD_INNB AND GMP.SOPMAL_CD = MG.SOPMAL_CD + AND MG.USE_AT = 'Y' LEFT JOIN GC_MEMBER_GRAD MG_NEXT ON MG.MBR_GRAD_ORDR + 1 = MG_NEXT.MBR_GRAD_ORDR AND MG.SOPMAL_CD = MG_NEXT.SOPMAL_CD + AND MG_NEXT.USE_AT = 'Y' LEFT JOIN GC_ORDER O ON MBR.MBR_DV_CD = O.MBR_DV_CD AND MBR.MBR_INNB = O.MBR_INNB AND O.USE_AT = 'Y' 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 168c6bb8..c7f77bc9 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} + + + diff --git a/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp b/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp index c70eae22..5d9dc3d1 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp @@ -2748,11 +2748,8 @@ const title = $(this).attr('title'); if (fn_is_empty(val) && (name === 'recpntNm' || name === 'recpntMbtlnb')) { - - alert(title + '을 입력해 주십시요'); - $('#dlvylcForm').find('input[name="' + name + '"]').focus(); - + alert(title + '을 입력해 주십시오'); isValid = false; return false; @@ -2763,9 +2760,14 @@ } else { // console.log("dlvylcDvCd : ",dlvylcDvCd); + const requiredMap = { + KR: 'cstmclerCd', + JP: 'prefcd' + }; + if ('New' === dlvylcDvCd) { - const dlvylcAreaCd2 = $('#dlvylcForm').find('input[name="dlvylcAreaCd"]').val(); - console.log("dlvylcAreaCd(new) : ",dlvylcAreaCd2); + const dlvylcAreaCdNew = $('#dlvylcForm').find('input[name="dlvylcAreaCd"]').val(); + // console.log("dlvylcAreaCd(new) : ",dlvylcAreaCdNew); $('#dlvylcForm').find('.rqrd').each(function () { @@ -2773,39 +2775,51 @@ if (fn_is_empty(val)) { const name = $(this).attr('name'); - - if('JP' !== dlvylcAreaCd2 || 'cstmclerCd' !== name ) { - const title = $(this).attr('title'); - - alert(title + '을 입력해 주십시요'); - - $('#dlvylcForm').find('input[name="' + name + '"]').focus(); - - isValid = false; - - return false; - } - } - }); - } else { - const dlvylcAreaCd = $('#dlvylcAreaCd').val(); - // console.log("dlvylcAreaCd(dft) : ",dlvylcAreaCd); - - if('KR' === dlvylcAreaCd){ - // console.log("KR"); - - const val = $('#cstmclerCd').val(); - - if (fn_is_empty(val)) { - - alert('개인통관번호를 입력해 주십시요'); + const title = $(this).attr('title'); $('#dlvylcForm').find('input[name="' + name + '"]').focus(); - + alert(title + '을 입력해 주십시오'); isValid = false; return false; } + }); + + const required = requiredMap[dlvylcAreaCdNew]; + if (required) { + const $input = $('input.new[name="' + required + '"]'); + const title = $input.attr('title'); + const value = $input.val(); + + if (fn_is_empty(value)) { + alert(title + '을 입력해 주십시오'); + isValid = false; + + return false; + } + } + + } else { + const dlvylcAreaCd = $('#dlvylcAreaCd').val(); + // console.log("dlvylcAreaCd(dft) : ",dlvylcAreaCd); + + const required = requiredMap[dlvylcAreaCd]; + if (required) { + const $input = $('input.new[name="' + required + '"]'); + const title = $input.attr('title'); + const value = $input.val(); + + if (fn_is_empty(value)) { + alert(title + '을 입력해 주십시오'); + isValid = false; + + return false; + } + } else { + alert('배송지역코드를 입력해 주십시오'); + isValid = false; + + return false; } } } @@ -3764,28 +3778,24 @@ - - - - 개인통관번호 - - "> - <%-- --%> + + + 개인통관번호 + + "> + - " placeholder="배송지 관리에서 입력하세요."> + - " placeholder="배송지 관리에서 입력하세요." readonly> + 배송지 관리에서 입력하세요. - - - - - "> - - + + + + @@ -3806,9 +3816,8 @@ - - - + + @@ -3821,7 +3830,7 @@ 개인통관번호 - + diff --git a/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrComptR.jsp b/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrComptR.jsp index 849c1727..c6f572e9 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrComptR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrComptR.jsp @@ -58,7 +58,10 @@ /* 주문/배송 목록 화면 이동 버튼 선택 이벤트 */ $('#btnOrdrList').on('click', function() { - location.href = ''; + const subsvcAt = '${data.order.subsvcAt}'; + location.href = subsvcAt === 'Y' + ? '' + : ''; }); } @@ -94,6 +97,90 @@

주문완료

+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
주문상세내역
상품명수량상품금액할인금액할인적용금액적립금
+
+
+ " onerror="this.src='/pc/images/image_placeholder.png'" alt=""> +
+
+ + 옵션 + + + +
+
+ 		+ + + + + + ${curUnit} + + + + (-) + + ${curUnit} + + + + + ${curUnit} + + + + + ${curUnit} + +
+
+
+
+
+
@@ -335,44 +422,45 @@ - +

배송지 정보

-
- - - - - - - - - - - - - - - - - - - - - - - - -
배송지 정보
받는분
주소 - - - -
휴대폰번호
배송 시 요청사항
-
- + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
배송지 정보
받는분
주소 + + + +
휴대폰번호
배송 시 요청사항
+
+ diff --git a/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrFailrR.jsp b/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrFailrR.jsp index 073dbe71..9a947266 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrFailrR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrFailrR.jsp @@ -58,6 +58,17 @@ history.replaceState(null, '', '/sopmal/ordr/selectMbrPurchsForm'); } + const subsvcInnb = $('#subsvcInnb').val(); + if (!fn_is_empty(subsvcInnb)) { + $(form).attr('action', ''); + $('', { + type: 'hidden', + name: 'subsvcInnb', + value: subsvcInnb + }).appendTo(form); + history.replaceState(null, '', '/sopmal/ordr/selectSubsvcPurchsForm'); + } + $(form).submit(); } @@ -77,6 +88,7 @@ "/> + "/>
diff --git a/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrReqstKcpPayR.jsp b/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrReqstKcpPayR.jsp index ec4dbf14..e54c3a0a 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrReqstKcpPayR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrReqstKcpPayR.jsp @@ -118,6 +118,7 @@ + diff --git a/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrRspnsKcpPayR.jsp b/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrRspnsKcpPayR.jsp index 37312dc9..433bcabd 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrRspnsKcpPayR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrRspnsKcpPayR.jsp @@ -52,6 +52,7 @@ $(form).append($('', {type:'hidden', name:'mbrId', value:$('#mbrId').val()})); $(form).append($('', {type:'hidden', name:'sesionId', value:$('#sesionId').val()})); $(form).append($('', {type:'hidden', name:'message', value:$('#message').val()})); + $(form).append($('', {type:'hidden', name:'subsvcInnb', value:$('#subsvcInnb').val()})); $(form).attr('method', 'post'); $(form).attr('action', ''); @@ -73,6 +74,7 @@ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrRspnsPayR.jsp b/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrRspnsPayR.jsp index e9c67793..50f511ab 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrRspnsPayR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/OrdrRspnsPayR.jsp @@ -53,6 +53,7 @@ $(form).append($('', {type:'hidden', name:'sesionId', value:$('#sesionId').val()})); $(form).append($('', {type:'hidden', name:'message', value:$('#message').val()})); $(form).append($('', {type:'hidden', name:'ordrTyCd', value:$('#ordrTyCd').val()})); + $(form).append($('', {type:'hidden', name:'subsvcInnb', value:$('#subsvcInnb').val()})); $(form).attr('method', 'post'); $(form).attr('action', ''); @@ -75,6 +76,7 @@ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/sopmal/ordr/SubsvcPurchsC.jsp b/src/main/webapp/WEB-INF/views/sopmal/ordr/SubsvcPurchsC.jsp index f4bd5d49..cd618134 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/SubsvcPurchsC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/SubsvcPurchsC.jsp @@ -2719,11 +2719,8 @@ const title = $(this).attr('title'); if (fn_is_empty(val) && (name === 'recpntNm' || name === 'recpntMbtlnb')) { - - alert(title + '을 입력해 주십시요'); - $('#dlvylcForm').find('input[name="' + name + '"]').focus(); - + alert(title + '을 입력해 주십시오'); isValid = false; return false; @@ -2734,49 +2731,65 @@ } else { // console.log("dlvylcDvCd : ",dlvylcDvCd); - if ('New' === dlvylcDvCd) { - const dlvylcAreaCd2 = $('#dlvylcForm').find('input[name="dlvylcAreaCd"]').val(); - console.log("dlvylcAreaCd(new) : ",dlvylcAreaCd2); + const requiredMap = { + KR: 'cstmclerCd', + JP: 'prefcd' + }; + if ('New' === dlvylcDvCd) { + const dlvylcAreaCdNew = $('#dlvylcForm').find('input[name="dlvylcAreaCd"]').val(); + // console.log("dlvylcAreaCd(new) : ",dlvylcAreaCdNew); $('#dlvylcForm').find('.rqrd').each(function () { const val = $(this).val(); if (fn_is_empty(val)) { const name = $(this).attr('name'); - - if('JP' !== dlvylcAreaCd2 || 'cstmclerCd' !== name ) { - const title = $(this).attr('title'); - - alert(title + '을 입력해 주십시요'); - - $('#dlvylcForm').find('input[name="' + name + '"]').focus(); - - isValid = false; - - return false; - } - } - }); - } else { - const dlvylcAreaCd = $('#dlvylcAreaCd').val(); - // console.log("dlvylcAreaCd(dft) : ",dlvylcAreaCd); - - if('KR' === dlvylcAreaCd){ - // console.log("KR"); - - const val = $('#cstmclerCd').val(); - - if (fn_is_empty(val)) { - - alert('개인통관번호를 입력해 주십시오'); + const title = $(this).attr('title'); $('#dlvylcForm').find('input[name="' + name + '"]').focus(); - + alert(title + '을 입력해 주십시오'); isValid = false; return false; } + }); + + const required = requiredMap[dlvylcAreaCdNew]; + if (required) { + const $input = $('input.new[name="' + required + '"]'); + const title = $input.attr('title'); + const value = $input.val(); + + if (fn_is_empty(value)) { + alert(title + '을 입력해 주십시오'); + isValid = false; + + return false; + } + } + + } else { + const dlvylcAreaCd = $('#dlvylcAreaCd').val(); + // console.log("dlvylcAreaCd(dft) : ",dlvylcAreaCd); + + const required = requiredMap[dlvylcAreaCd]; + if (required) { + const $input = $('input.new[name="' + required + '"]'); + const title = $input.attr('title'); + const value = $input.val(); + + if (fn_is_empty(value)) { + alert(title + '을 입력해 주십시오'); + isValid = false; + + return false; + } + } else { + alert('배송지역코드를 입력해 주십시오'); + isValid = false; + + return false; } } } @@ -2823,7 +2836,7 @@ let name = $(this).attr('name'); let title = $(this).attr('title'); - alert(title + '을 입력해 주십시요'); + alert(title + '을 입력해 주십시오'); $(form).find('input[name="' + name + '"]').focus(); @@ -2898,7 +2911,7 @@ const id = $(this).attr('id'); const title = $(this).attr('title'); - alert(title + ' 항목을 입력해 주십시요'); + alert(title + ' 항목을 입력해 주십시오'); $('#' + id).focus(); @@ -2950,7 +2963,7 @@ if (fn_is_empty(pgCmpnyNm)) { - alert('결제유형을 선택해 주십시요.'); + alert('결제유형을 선택해 주십시오.'); return false; } @@ -2959,7 +2972,7 @@ const div = $('#setleForm').find('.order-method-normal'); if (!$(div).find('.order-method-normal__btn-container button').hasClass('active')) { - alert('결제방법을 선택해 주십시요.'); + alert('결제방법을 선택해 주십시오.'); isValid = false; @@ -2971,7 +2984,7 @@ const input = $(div).find('#rcpmnyerNm'); if (fn_is_empty($(input).val())) { - alert($(input).attr('title') + ' 항목을 입력해 주십시요'); + alert($(input).attr('title') + ' 항목을 입력해 주십시오'); $('#' + $(input).attr('id')).focus(); @@ -2983,7 +2996,7 @@ const rcpmnyAcntnb = $(div).find('#rcpmnyAcntnb option:selected'); if (fn_is_empty($(rcpmnyAcntnb).val())) { - alert($(div).find('#rcpmnyAcntnb').attr('title') + ' 항목을 선택해 주십시요'); + alert($(div).find('#rcpmnyAcntnb').attr('title') + ' 항목을 선택해 주십시오'); return false; } @@ -3007,7 +3020,7 @@ const input = $(div).find('#' + id); if (fn_is_empty($(input).val())) { - alert($(div).find('#' + id).attr('title') + ' 항목을 입력해 주십시요'); + alert($(div).find('#' + id).attr('title') + ' 항목을 입력해 주십시오'); $(div).find('#' + id).focus(); @@ -3028,7 +3041,7 @@ const input = $(content).find('#' + id); if (fn_is_empty($(input).val())) { - alert($(content).find('#' + id).attr('title') + ' 항목을 입력해 주십시요'); + alert($(content).find('#' + id).attr('title') + ' 항목을 입력해 주십시오'); $(content).find('#' + id).focus(); @@ -3087,7 +3100,7 @@ const input = $(content).find('#' + id); if (fn_is_empty($(input).val())) { - alert($(content).find('#' + id).attr('title') + ' 항목을 입력해 주십시요'); + alert($(content).find('#' + id).attr('title') + ' 항목을 입력해 주십시오'); $(content).find('#' + id).focus(); @@ -3653,28 +3666,24 @@ - - - - 개인통관번호 - - "> - <%-- --%> + + + 개인통관번호 + + "> + - - " placeholder="배송지 관리에서 입력하세요."> - - - " placeholder="배송지 관리에서 입력하세요." readonly> - + + + + + 배송지 관리에서 입력하세요. + - + - - - "> - - + + @@ -3695,9 +3704,8 @@ - - - + +
@@ -3710,7 +3718,7 @@ 개인통관번호 - + 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 @@ -
- - - - - - - - - - - - - - - - - - - - - - - -
받는분
주소 - - - - - -
휴대폰번호
배송 시 요청사항
-
+ +
+ + + + + + + + + + + + + + + + + + + + + + + +
받는분
주소 + + + + + +
휴대폰번호
배송 시 요청사항
+
+ diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/ordr/OrdrFailrR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/ordr/OrdrFailrR.jsp index d1ffcd9b..4427ea29 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/ordr/OrdrFailrR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/ordr/OrdrFailrR.jsp @@ -51,6 +51,17 @@ history.replaceState(null, '', '/sopmal/ordr/selectMbrPurchsForm'); } + const subsvcInnb = $('#subsvcInnb').val(); + if (!fn_is_empty(subsvcInnb)) { + $(form).attr('action', ''); + $('', { + type: 'hidden', + name: 'subsvcInnb', + value: subsvcInnb + }).appendTo(form); + history.replaceState(null, '', '/sopmal/ordr/selectSubsvcPurchsForm'); + } + $(form).submit(); } @@ -74,6 +85,7 @@ "/> + "/>