From 3fc2d38980492ca260b3bd4c3f6a10a51af2b0b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=8C=80=ED=99=98?= Date: Wed, 15 Apr 2026 17:07:06 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=A3=BC=EB=AC=B8=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=20>=20=EC=A0=84=EC=B2=B4=EC=A3=BC=EB=AC=B8=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=20>=20=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20=ED=95=AD?= =?UTF-8?q?=EB=AA=A9=EC=84=A4=EC=A0=95=20-=20=EC=A3=BC=EB=AC=B8=EA=B5=AC?= =?UTF-8?q?=EB=B6=84(subsvc=5Fat)=20=ED=95=AD=EB=AA=A9=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80,=20=EC=83=81=ED=92=88=EB=AA=85=20=ED=95=AD=EB=AA=A9?= =?UTF-8?q?=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 9722f2135fa887c87c83577ab5926f4cf31402e0) --- .../domain/gcone/ordr/ordr/vo/BODwldItmVO.java | 3 ++- .../xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BODwldItmVO.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BODwldItmVO.java index afa60bbc..0edace95 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BODwldItmVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BODwldItmVO.java @@ -82,7 +82,8 @@ public class BODwldItmVO extends AbstractVO { item51("ordr_ty_nm", "주문유형"), item52("optn_cd_1", "상품코드"), item53("dlvy_mssage_cn", "배송메시지"), - item54("shipping_sttus_nm", "출고상태"); + item54("shipping_sttus_nm", "출고상태"), + item55("subsvc_at", "주문구분"); private final String key; private final String value; 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 bfca364e..a9745a7b 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 @@ -1073,7 +1073,7 @@ , FOI.ORDR_GOODS_INNB AS ordr_goods_innb , FO.SMRT_SHOPNG_ORDRNB AS npay_goods_ordrnb , CASE - WHEN FOI.OPTN_NM IS NOT NULL THEN FOI.OPTN_NM + WHEN FOI.OPTN_NM IS NOT NULL THEN CONCAT(FOI.GOODS_NM, ' ', FOI.OPTN_NM) ELSE FOI.GOODS_NM END AS goods_nm , FOI.INVNTRY_QY AS invntry_qy @@ -1108,6 +1108,10 @@ , FOI.optn_cd_1 , FOSH.dlvy_mssage_cn , FN_GET_COMMCODE_NAME('ORDR_STTUS', FOSH.ORDR_STTUS_CD) AS shipping_sttus_nm + , CASE WHEN FO.SUBSVC_AT = 'Y' + THEN '구독' + ELSE '일반' + END AS subsvc_at FROM GC_ORDER FO INNER JOIN LATERAL ( SELECT GOI.SOPMAL_CD @@ -1244,6 +1248,8 @@ , GROUP_CONCAT(A.ORDR_TY_NM ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS ORDR_TY_NM , GROUP_CONCAT(A.OPTN_CD_1 ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS OPTN_CD_1 , GROUP_CONCAT(A.DLVY_MSSAGE_CN ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS DLVY_MSSAGE_CN + , GROUP_CONCAT(A.SHIPPING_STTUS_NM ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS SHIPPING_STTUS_NM + , GROUP_CONCAT(A.SUBSVC_AT ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS SUBSVC_AT FROM ( SELECT FOI.ORDR_DLVY_INNB AS EXPORT_GROUP_INNB , CONCAT(FO.ORDR_INNB, '-', FOI.ORDR_DLVY_INNB) AS ORDR_INNB_WITH_EXPORT_GROUP_INNB @@ -1276,7 +1282,7 @@ , FOI.ORDR_GOODS_INNB , FO.SMRT_SHOPNG_ORDRNB AS NPAY_GOODS_ORDRNB , CASE - WHEN FOI.OPTN_NM IS NOT NULL THEN FOI.OPTN_NM + WHEN FOI.OPTN_NM IS NOT NULL THEN CONCAT(FOI.GOODS_NM, ' ', FOI.OPTN_NM) ELSE FOI.GOODS_NM END AS GOODS_NM , FOI.INVNTRY_QY @@ -1310,6 +1316,11 @@ , FN_GET_COMMCODE_NAME('ORDR_TY', FO.ORDR_TY_CD) AS ORDR_TY_NM , FOI.OPTN_CD_1 , FOSH.DLVY_MSSAGE_CN + , FN_GET_COMMCODE_NAME('ORDR_STTUS', FOSH.ORDR_STTUS_CD) AS SHIPPING_STTUS_NM + , CASE WHEN FO.SUBSVC_AT = 'Y' + THEN '구독' + ELSE '일반' + END AS SUBSVC_AT FROM GC_ORDER FO INNER JOIN LATERAL ( SELECT GOI.SOPMAL_CD