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 3e5398ae..18de9cac 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,7 +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' /*구독서비스 제외*/ + /*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 @@ -406,7 +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' /*구독서비스 제외*/ + /*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 cdcf1f73..ef93c24c 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,7 +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.SUBSVC_AT = 'N'*/ AND FO.SOPMAL_CD = #{sopmalCd} @@ -598,7 +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 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/ordr/subsvc/SubsvcOrderMbrInfoListPop.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/subsvc/SubsvcOrderMbrInfoListPop.jsp index 2090f5c6..29c63ca4 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/subsvc/SubsvcOrderMbrInfoListPop.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/subsvc/SubsvcOrderMbrInfoListPop.jsp @@ -67,7 +67,7 @@ 순번 - 주문일자 + 주문번호 구독자 최종차수 최종처리일