From daf9770fbeedc3d48a9f4938ec818da5d0c4ca8a Mon Sep 17 00:00:00 2001 From: jazz Date: Tue, 10 Feb 2026 13:48:32 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix=20:=20=EA=B4=80=EB=A6=AC=EC=9E=90=20?= =?UTF-8?q?=EC=A3=BC=EB=AC=B8=20=EC=A0=84=EC=B2=B4=EC=A3=BC=EB=AC=B8?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C,=20=EC=B6=9C=EA=B3=A0=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EA=B5=AC=EB=8F=85=EC=84=9C=EB=B9=84?= =?UTF-8?q?=EC=8A=A4=20=EC=A0=9C=EC=99=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/gcone/ordr/atmcrcpmny/vo/BOAtmcRcpmnyCnfirmVO.java | 4 ++++ .../domain/gcone/setup/ordrmngr/vo/BOSetupOrdrVO.java | 2 ++ .../mybatis/xml/mapper/gcone/ordr/dlivy/BODlivyMapper.xml | 2 ++ .../mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml | 2 ++ src/main/webapp/WEB-INF/views/mngr/goods/subsvc/SubsvcU.jsp | 4 +--- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/atmcrcpmny/vo/BOAtmcRcpmnyCnfirmVO.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/atmcrcpmny/vo/BOAtmcRcpmnyCnfirmVO.java index 5a85663e..16d620f4 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/atmcrcpmny/vo/BOAtmcRcpmnyCnfirmVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/atmcrcpmny/vo/BOAtmcRcpmnyCnfirmVO.java @@ -206,7 +206,11 @@ public class BOAtmcRcpmnyCnfirmVO extends AbstractVO { /** 입금여부3 */ private String srchOrdrSttusCd3; + private String srchDatePick; + /** 회원 구분 코드 */ private String mbrDvCd; + + } diff --git a/src/main/java/com/wb/domainserver/domain/gcone/setup/ordrmngr/vo/BOSetupOrdrVO.java b/src/main/java/com/wb/domainserver/domain/gcone/setup/ordrmngr/vo/BOSetupOrdrVO.java index 4a221868..15d1aa61 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/setup/ordrmngr/vo/BOSetupOrdrVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/setup/ordrmngr/vo/BOSetupOrdrVO.java @@ -4,6 +4,7 @@ import java.util.List; import com.wb.domainserver.domain.comm.vo.AbstractVO; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 주문 설정 VO @@ -23,6 +24,7 @@ import lombok.Data; * */ @Data +@EqualsAndHashCode(callSuper=true) public class BOSetupOrdrVO extends AbstractVO { /** 쇼핑몰 코드 */ private String sopmalCd; 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 2380a8c6..3e5398ae 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 @@ -27,6 +27,7 @@ AND OI.GOODS_INNB = G.GOODS_INNB INNER JOIN GC_ORDER O ON EX.SOPMAL_CD = O.SOPMAL_CD AND EX.ORDR_INNB = O.ORDR_INNB + AND O.SUBSVC_AT = 'N' /*구독서비스 제외*/ INNER JOIN GC_ORDER_SHIPPING OSHIP ON EX.SOPMAL_CD = OSHIP.SOPMAL_CD AND EX.ORDR_INNB = OSHIP.ORDR_INNB AND EX.ORDR_DLVY_INNB = OSHIP.ORDR_DLVY_INNB @@ -405,6 +406,7 @@ AND OI.GOODS_INNB = G.GOODS_INNB INNER JOIN GC_ORDER O ON SH.SOPMAL_CD = O.SOPMAL_CD AND SH.ORDR_INNB = O.ORDR_INNB + AND O.SUBSVC_AT = 'N' /*구독서비스 제외*/ INNER JOIN GC_ORDER_SETLE ST ON SH.SOPMAL_CD = ST.SOPMAL_CD AND SH.ORDR_INNB = ST.ORDR_INNB LEFT JOIN GC_MEMBER MBR ON O.MBR_DV_CD = MBR.MBR_DV_CD 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 c3f1babf..ed26f57c 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 @@ -494,6 +494,7 @@ AND FOS.ORDR_INNB = FO.ORDR_INNB WHERE FO.USE_AT = 'Y' AND IFNULL(FOS.ORDR_INNB, '') != '' + AND FO.SUBSVC_AT = 'N' AND FO.SOPMAL_CD = #{sopmalCd} @@ -597,6 +598,7 @@ ON FOS.SOPMAL_CD = FO.SOPMAL_CD AND FOS.ORDR_INNB = FO.ORDR_INNB WHERE FO.USE_AT = 'Y' + AND FO.SUBSVC_AT = 'N' AND FOS.ORDR_INNB IS NOT NULL -- GC_ORDER_SETLE 에 데이터가 있을 때 조건 # AND IFNULL(FOS.ORDR_INNB, '') != '' -- 필터조건의 의미가 inner join 을 의미하므로, GC_ORDER_SETLE 테이블과 inner join 으로 변경하였음. AND FO.SOPMAL_CD = #{sopmalCd} diff --git a/src/main/webapp/WEB-INF/views/mngr/goods/subsvc/SubsvcU.jsp b/src/main/webapp/WEB-INF/views/mngr/goods/subsvc/SubsvcU.jsp index 10ded83e..f6fb8ad4 100644 --- a/src/main/webapp/WEB-INF/views/mngr/goods/subsvc/SubsvcU.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/goods/subsvc/SubsvcU.jsp @@ -464,9 +464,7 @@
-

- , 'sopmal')">구독서비스 수정 (상품번호 : ${resultMap.subsvcDtl.subsvcInnb}) -

+

구독서비스 수정 (상품번호 : ${resultMap.subsvcDtl.subsvcInnb})

From 55192f8ccc64fb0c80b543e1467cfb240ebbb8cb Mon Sep 17 00:00:00 2001 From: jazz Date: Tue, 10 Feb 2026 14:28:20 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4=EC=A7=80>=EC=9D=BC?= =?UTF-8?q?=EB=B0=98=20=EC=A3=BC=EB=AC=B8/=EB=B0=B0=EC=86=A1=20=EA=B5=AC?= =?UTF-8?q?=EB=8F=85=EC=84=9C=EB=B9=84=EC=8A=A4=20=EC=A0=9C=EC=99=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 ed26f57c..efb079a5 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 @@ -3817,6 +3817,7 @@ LEFT JOIN GC_ORDER_SETLE FOS ON FOS.SOPMAL_CD = FO.SOPMAL_CD AND FOS.ORDR_INNB = FO.ORDR_INNB WHERE FO.USE_AT = 'Y' + AND FO.SUBSVC_AT = 'N' /*구독서비스 제외*/ AND IFNULL(FOS.ORDR_INNB, '') != '' AND FO.SOPMAL_CD = #{sopmalCd} AND FO.MBR_DV_CD = #{mbrDvCd} @@ -3961,7 +3962,7 @@ LEFT JOIN GC_ORDER_SETLE FOS ON FOS.SOPMAL_CD = FO.SOPMAL_CD AND FOS.ORDR_INNB = FO.ORDR_INNB WHERE FO.USE_AT = 'Y' - AND FO.SUBSVC_INNB IS NULL /*구독서비스 제외*/ + AND FO.SUBSVC_AT = 'N' /*구독서비스 제외*/ AND ( ( FO.ORDR_STTUS_CD BETWEEN '15' AND '75' ) OR FO.ORDR_STTUS_CD = '95' ) AND FO.SOPMAL_CD = #{sopmalCd} AND FO.MBR_DV_CD = #{mbrDvCd}