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 1e6958dd..65095914 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 @@ -683,6 +683,7 @@ ,FMG.MBR_GRAD_NM -- 회원 등급명 ,IFNULL(REGEXP_REPLACE(CAST(AES_DECRYPT(UNHEX(SH.RECPNT_MBTLNB) , '1df5be2f7e90ae36') AS CHAR(50)), '(.{3})(.{4})(.{4})', '$1-$2-$3'), '') AS RECPNT_MBTLNB ,IFNULL(REGEXP_REPLACE(CAST(AES_DECRYPT(UNHEX(O.ORDRR_MBTLNB) , '1df5be2f7e90ae36') AS CHAR(50)), '(.{3})(.{4})(.{4})', '$1-$2-$3'), '') AS ORDRR_MBTLNB + ,FN_GET_COMMCODE_NAME('ORDR_STTUS', SH.ORDR_STTUS_CD) AS ORDR_STTUS_NM ]]> 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 becbc289..bdf45617 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 @@ -580,6 +580,7 @@ END ) ) BLACK_DV -- 블랙리스트 구분 + , FO.SUBSVC_AT FROM GC_ORDER FO LEFT JOIN LATERAL ( SELECT FM.MBR_INNB diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyProcsPopupU.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyProcsPopupU.jsp index 711acfcf..b725c61f 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyProcsPopupU.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyProcsPopupU.jsp @@ -114,8 +114,7 @@
- ▶ - 님에게 1번째 +
[]

() diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyProcsPopupUForm.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyProcsPopupUForm.jsp index c188270c..3dbfde78 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyProcsPopupUForm.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyProcsPopupUForm.jsp @@ -179,6 +179,15 @@ + + +

'; header += '
'; header += '
'; @@ -755,7 +755,7 @@ /* header += ' '; */ } - if ('35' === data.ordrSttusCd) { + if ('35' === data.ordrSttusCd || '50' === data.ordrSttusCd) { header += ' '; /* header += ' '; */ } @@ -850,16 +850,13 @@ tr += ' ' + (rowNum - 1) + ''; tr += ' '; - if (!fn_is_empty(data.inflowCoursUrl)) { - tr += ' '; - tr += ' ' + (data.inflowCoursNm).substring(0, 1); + ''; - tr += ' '; - } else { - tr += ' ' + (data.inflowCoursNm).substring(0, 1); + ''; + /** 구독서비스 여부 (구독/일반)*/ + if (data.usbsvcAt == 'Y'){ + tr += '구독'; + }else{ + tr += '일반'; } - tr += ' '; - tr += ' ' + (data.sopmalNm).substring(0, 1) + ''; tr += ' ' + data.ordrRceptDt + ''; tr += ' ' + fn_nvl(data.sleEnvrnNm, '') + ''; tr += ' '; @@ -993,7 +990,7 @@ let detail = ''; detail += ''; - detail += ' '; + detail += ' '; detail += '
'; detail += '
주문상품
'; detail += '
'; @@ -1331,7 +1328,7 @@ let footer = ''; footer += ''; - footer += ' '; + footer += ' '; footer += '
'; footer += '
'; footer += '
'; @@ -1350,8 +1347,8 @@ /* footer += ' '; */ } - if ('35' === prevOrderSttusCd) { - footer += ' '; + if ('35' === prevOrderSttusCd || '50' === prevOrderSttusCd) { + footer += ' '; /* footer += ' '; */ } footer += ' '; @@ -2187,7 +2184,6 @@ - @@ -2204,8 +2200,7 @@ 선택 중요 번호 - 유입 - 마켓 + 주문구분 주문일시 환경 주문번호 @@ -2220,7 +2215,7 @@ - +
* 블랙리스트는 자사몰은 적색, 물류센터는 녹색으로 표시됩니다.