itfirst/sake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
이경숙
2026-04-15 18:02:10 +09:00
parent 920ba7de31 9722f2135f
commit 7bfcae2f99
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BODwldItmVO.java
View File

@@ -82,7 +82,8 @@ public class BODwldItmVO extends AbstractVO {
item51("ordr_ty_nm", "주문유형"), item51("ordr_ty_nm", "주문유형"),
item52("optn_cd_1", "상품코드"), item52("optn_cd_1", "상품코드"),
item53("dlvy_mssage_cn", "배송메시지"), item53("dlvy_mssage_cn", "배송메시지"),
item54("shipping_sttus_nm", "출고상태"); item54("shipping_sttus_nm", "출고상태"),
item55("subsvc_at", "주문구분");
private final String key; private final String key;
private final String value; private final String value;

15
src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml
View File

@@ -1073,7 +1073,7 @@
, FOI.ORDR_GOODS_INNB AS ordr_goods_innb , FOI.ORDR_GOODS_INNB AS ordr_goods_innb
, FO.SMRT_SHOPNG_ORDRNB AS npay_goods_ordrnb , FO.SMRT_SHOPNG_ORDRNB AS npay_goods_ordrnb
, CASE , 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 ELSE FOI.GOODS_NM
END AS goods_nm END AS goods_nm
, FOI.INVNTRY_QY AS invntry_qy , FOI.INVNTRY_QY AS invntry_qy
@@ -1108,6 +1108,10 @@
, FOI.optn_cd_1 , FOI.optn_cd_1
, FOSH.dlvy_mssage_cn , FOSH.dlvy_mssage_cn
, FN_GET_COMMCODE_NAME('ORDR_STTUS', FOSH.ORDR_STTUS_CD) AS shipping_sttus_nm , 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 FROM GC_ORDER FO
INNER JOIN LATERAL ( INNER JOIN LATERAL (
SELECT GOI.SOPMAL_CD 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.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.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.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 ( FROM (
SELECT FOI.ORDR_DLVY_INNB AS EXPORT_GROUP_INNB SELECT FOI.ORDR_DLVY_INNB AS EXPORT_GROUP_INNB
, CONCAT(FO.ORDR_INNB, '-', FOI.ORDR_DLVY_INNB) AS ORDR_INNB_WITH_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 , FOI.ORDR_GOODS_INNB
, FO.SMRT_SHOPNG_ORDRNB AS NPAY_GOODS_ORDRNB , FO.SMRT_SHOPNG_ORDRNB AS NPAY_GOODS_ORDRNB
, CASE , 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 ELSE FOI.GOODS_NM
END AS GOODS_NM END AS GOODS_NM
, FOI.INVNTRY_QY , FOI.INVNTRY_QY
@@ -1310,6 +1316,11 @@
, FN_GET_COMMCODE_NAME('ORDR_TY', FO.ORDR_TY_CD) AS ORDR_TY_NM , FN_GET_COMMCODE_NAME('ORDR_TY', FO.ORDR_TY_CD) AS ORDR_TY_NM
, FOI.OPTN_CD_1 , FOI.OPTN_CD_1
, FOSH.DLVY_MSSAGE_CN , 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 FROM GC_ORDER FO
INNER JOIN LATERAL ( INNER JOIN LATERAL (
SELECT GOI.SOPMAL_CD SELECT GOI.SOPMAL_CD