From 40dc7f7c856fb3c4f56caeffba7404527dc83bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=8C=80=ED=99=98?= Date: Fri, 13 Feb 2026 17:48:33 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EA=B5=AC=EB=8F=85=EC=84=9C=EB=B9=84?= =?UTF-8?q?=EC=8A=A4=20=EC=A3=BC=EB=AC=B8/=EB=B0=B0=EC=86=A1=20-=20?= =?UTF-8?q?=EC=A0=81=EB=A6=BD=EA=B8=88=20=EA=B4=80=EB=A0=A8=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=20=EC=A0=9C=EA=B1=B0=20fix=20:=20=EC=A3=BC=EB=AC=B8?= =?UTF-8?q?=EA=B2=B0=EC=A0=9C=20>=20=EB=B0=B0=EC=86=A1=EC=A7=80=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=84=B8=ED=8C=85=20-=20=EB=B0=B0?= =?UTF-8?q?=EC=86=A1=EC=A7=80=EC=97=AD=EC=BD=94=EB=93=9C=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gcone/ordr/ordr/mapper/BOOrdrMapper.java | 7 + .../ordr/ordr/service/BOOrdrService.java | 16 ++- .../gcone/ordr/ordr/vo/BOOrdrShippingVO.java | 3 + .../mapper/gcone/ordr/ordr/BOOrdrMapper.xml | 11 ++ .../sopmal/mpage/ordr/SubsvcOrdrDlvyListR.jsp | 10 +- .../sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp | 21 +-- .../mpage/ordr/SubsvcOrdrDlvyListRForm.jsp | 3 +- .../sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp | 129 ++++++++++-------- 8 files changed, 124 insertions(+), 76 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 4a2a8cd6..56e34d2a 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 @@ -349,6 +349,13 @@ public interface BOOrdrMapper { */ public List selectRefundShippingGoodsList(DataMap paramMap); + /** + * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문상세 > 배송지정보 수정 > 배송지정보 일치여부 확인 + * @param ordrShippingVO + * @return Integer + */ + public Integer selectDlvylcAreaCdInfo(BOOrdrShippingVO ordrShippingVO); + /** * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문상세 > 배송지정보 수정 * @param ordrShippingVO 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 dbfc1f07..8f7896f0 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 @@ -2036,6 +2036,7 @@ public class BOOrdrService{ log.debug("param{}",param); paramVO.setRecpntNm((String) param.get("recpntNm")); paramVO.setRecpntMbtlnb((String) param.get("recpntMbtlnb")); + paramVO.setDlvylcAreaCd((String) param.get("dlvylcAreaCd")); paramVO.setDlvylcZip((String) param.get("dlvylcZip")); paramVO.setDlvylcAdresDvCd((String) param.get("dlvylcAdresDvCd")); paramVO.setDlvylcLnbAdres((String) param.get("dlvylcLnbAdres")); @@ -2050,11 +2051,20 @@ public class BOOrdrService{ AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); paramVO.setUpdusr(user.getUserInnb()); - int cnt = mapper.updateDlvylcInfo(paramVO); - + /* 배송지정보 일치여부 확인 이후 업데이트 */ + int cnt = mapper.selectDlvylcAreaCdInfo(paramVO); if (cnt == 0) { message.put("status", "1"); - message.put("message", "배송지 수정을 실패하였습니다"); + message.put("message", "배송지 국가는 변경할 수 없습니다."); + } + + if(cnt > 0) { + cnt = mapper.updateDlvylcInfo(paramVO); + + if (cnt == 0) { + message.put("status", "1"); + message.put("message", "배송지 수정을 실패하였습니다"); + } } return message; diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrShippingVO.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrShippingVO.java index af490554..e780f90b 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrShippingVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrShippingVO.java @@ -40,6 +40,9 @@ public class BOOrdrShippingVO extends AbstractVO { /** 받는자휴대폰번호 */ private String recpntMbtlnb; + /** 배송지역코드 */ + private String dlvylcAreaCd; + /** 배송지우편번호 */ private String dlvylcZip; 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 bdf45617..6491d7a5 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 @@ -2234,6 +2234,16 @@ ]]> + + + UPDATE GC_ORDER_SHIPPING FOS @@ -2265,6 +2275,7 @@ WHERE FOS.SOPMAL_CD = #{sopmalCd} AND FOS.ORDR_INNB = #{ordrInnb} AND FOS.ORDR_DLVY_INNB = #{ordrDlvyInnb} + AND FOS.DLVYLC_AREA_CD = #{dlvylcAreaCd} diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListR.jsp index 799977aa..82ff3fab 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDlvyListR.jsp @@ -33,11 +33,11 @@
${curUnit}
-
- - 예상적립 점 - -
+<%--
--%> +<%-- --%> +<%-- 예상적립 점--%> +<%-- --%> +<%--
--%>
diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp index f92a8dbd..fe6d75ef 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp @@ -576,6 +576,7 @@ dlvylc['recpntNm'] = data.recpntNm; dlvylc['recpntMbtlnb'] = data.mbtlnb; + dlvylc['dlvylcAreaCd'] = data.dlvylcAreaCd; dlvylc['dlvylcZip'] = data.postcode; dlvylc['dlvylcAdresDvCd'] = data.addressType; dlvylc['dlvylcLnbAdres'] = data.jibunAddress; @@ -589,10 +590,14 @@ data:JSON.stringify(dlvylc), dataType:'json', success:function(data) { - if (data.resBody != null) { - alert(''); - - location.reload(); + let result = JSON.parse(data.resBody.result); + if (result != null) { + if(result.status == 0) { + alert(''); + location.reload(); + } else { + alert(result.message); + } } }, error:function(request, status, error) { @@ -1212,7 +1217,7 @@ - +<%-- --%> @@ -1222,7 +1227,7 @@ 상품금액 할인금액 할인적용금액 - 적립금 +<%-- 적립금--%> 처리상태 @@ -1264,12 +1269,12 @@ ${curUnit} - + <%-- 점 - + --%> diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp index 109b264e..bb11b223 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDlvyListRForm.jsp @@ -163,7 +163,8 @@ if (row.optnNm != null) { div += '

' + row.optnNm + '

'; } - div += '

' + row.orderCnt + '개·' + (row.setleAmt).toLocaleString() + '' + '${curUnit}'; + <%--div += '

' + row.orderCnt + '개·' + (row.setleAmt).toLocaleString() + '' + '${curUnit}';--%> + div += '

' + (row.setleAmt).toLocaleString() + '' + '${curUnit}'; div += '

'; div += '
'; div += ' '; diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp index 19c1df4a..7d592cc5 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp @@ -271,6 +271,7 @@ dlvylc['recpntNm'] = data.recpntNm; dlvylc['recpntMbtlnb'] = data.mbtlnb; + dlvylc['dlvylcAreaCd'] = data.dlvylcAreaCd; dlvylc['dlvylcZip'] = data.postcode; dlvylc['dlvylcAdresDvCd'] = data.addressType; dlvylc['dlvylcLnbAdres'] = data.jibunAddress; @@ -289,7 +290,16 @@ data: JSON.stringify(dlvylc), dataType: 'json', success: function (data) { - onSuccess(); + let result = JSON.parse(data.resBody.result); + if (result != null) { + if(result.status == 0) { + onSuccess(); + } else { + $("#customAlertCn").text(result.message); + closeModal('confirm_updt_alert'); + openModal2("custom_alert"); + } + } }, error: function (request, status, error) { let message = JSON.parse(JSON.parse(request.responseText).resBody.message); @@ -815,64 +825,65 @@ <%--주문취소, 결제취소시 미노출--%> - -
-
-
- - 적립금<%--(최대 390원)--%> - - -
-
-
-
- - - - - - - - - - - - - - - -
구매확정 시 적립예정마일리지 점
리뷰작성 시 적립예정 - - - - - 일반리뷰 점 적립 - - -
포토리뷰 점 적립 - - - -
한달리뷰 점 적립 - - - - - - - - -
( ~ 까지 점 추가 적립) - - -
-
-
-
-
-
- + <%--적립금 표시 제거--%> +<%-- --%> +<%--
--%> +<%--
--%> +<%--
--%> +<%-- --%> +<%-- 적립금<%–(최대 390원)–%>--%> +<%-- --%> +<%-- --%> +<%--
--%> +<%--
--%> +<%--
--%> +<%--
--%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%--
구매확정 시 적립예정마일리지 점
리뷰작성 시 적립예정--%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- 일반리뷰 점 적립--%> +<%-- --%> +<%-- --%> +<%--
포토리뷰 점 적립--%> +<%-- --%> +<%-- --%> +<%-- --%> +<%--
한달리뷰 점 적립--%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%--
( ~ 까지 점 추가 적립)--%> +<%-- --%> +<%-- --%> +<%--
--%> +<%--
--%> +<%--
--%> +<%--
--%> +<%--
--%> +<%--
--%> +<%-- --%>