Merge remote-tracking branch 'origin/master'

src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml

@@ -514,7 +514,10 @@
         			, DATE_FORMAT(FO.ORDR_RCEPT_DT, '%Y-%m-%d %H:%i') AS ORDR_RCEPT_DT -- 주문접수일
         			, FO.SLE_ENVRN_CD -- 판매환경코드
         			, FN_GET_COMMCODE_NAME('SLE_ENVRN', FO.SLE_ENVRN_CD) AS SLE_ENVRN_NM
-        			, FN_GET_ORDER_GOODS_NAME(FO.SOPMAL_CD, FO.ORDR_INNB) AS GOODS_NM -- 상품명
+        			, CASE
+        			        WHEN FO.SUBSVC_AT = 'Y' THEN CONCAT(GS.SUBSVC_NM,'(', GS.SUBSVC_GNR_NM, ')')
+        			        ELSE FN_GET_ORDER_GOODS_NAME(FO.SOPMAL_CD, FO.ORDR_INNB)
+        			  END AS GOODS_NM -- 상품명
         			, FN_GET_ORDER_COUNT(FO.SOPMAL_CD, FO.ORDR_INNB, 'ITEM') AS ITEM_CNT -- 상품 개수
         			, FN_GET_ORDER_COUNT(FO.SOPMAL_CD, FO.ORDR_INNB, 'ORDER') AS ORDER_CNT -- 상품 종수
         			, (
@@ -598,9 +601,12 @@
         			  AND FMGM.SOPMAL_CD = FO.SOPMAL_CD    -- 주문의 회원번호만 등급을 조회하면 되므로 조건을 추가함.
         			  WHERE FM.USE_AT = 'Y'
         				  ) MBR ON 1=1
-        		LEFT JOIN GC_ORDER_SETLE FOS  -- LEFT 로 다시 변경
+                LEFT JOIN GC_ORDER_SETLE FOS  -- LEFT 로 다시 변경
-        		ON FOS.SOPMAL_CD = FO.SOPMAL_CD
+                ON FOS.SOPMAL_CD = FO.SOPMAL_CD
                 AND FOS.ORDR_INNB = FO.ORDR_INNB
+                LEFT JOIN GC_SUBSVC GS
+                ON GS.SOPMAL_CD = FO.SOPMAL_CD
+                AND GS.SUBSVC_INNB = FO.SUBSVC_INNB
         			WHERE FO.USE_AT = 'Y'
                     /*AND FO.SUBSVC_AT = 'N'*/
         			AND   FOS.ORDR_INNB IS NOT NULL   -- GC_ORDER_SETLE 에 데이터가 있을 때 조건
@@ -1491,6 +1497,7 @@
                  AND GOR.ORDR_INNB = FO.ORDR_INNB
                  AND GOR.USE_AT = 'Y'
                  AND GOR.REFUND_PROCS_STTUS_CD = '03'	/*처리상태:환불완료*/) AS ORDER_RE_INNB
+            , FO.SUBSVC_AT
           FROM GC_ORDER FO
     INNER JOIN (
                SELECT FOI.SOPMAL_CD

src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp

@@ -1784,10 +1784,7 @@
                             </c:choose>
                             <button type="button" class="btn-ordr-sttus-35 btn gray">상품 준비</button>
                         </c:if>
-                        <c:if test="${'35' eq dtl.ordrSttusCd && dtl.sknEnvrnCd ne 'POS'}"> <!-- 상품준비 -->
+                        <c:if test="${'35' <= dtl.ordrSttusCd && '85' gt dtl.ordrSttusCd && dtl.sknEnvrnCd ne 'POS'}"> <!-- 상품준비 or 출고후 -->
-                            <a href="javascript:void(0);" id="canclPayment" class="btn outline">결제 취소</a>
-                        </c:if>
-                        <c:if test="${'35' lt dtl.ordrSttusCd && '85' gt dtl.ordrSttusCd && dtl.sknEnvrnCd ne 'POS'}"> <!-- 출고후 -->
                             <button type="button" class="btn outline" onclick="fn_refund_regist_popup('#modalDiv', '#setleCanclRefndRegistPopupC', '<c:url value="/mngr/ordr/ordrmngr/selectRtngudRegistPopupForm"/>', '${dtl.ordrInnb}', '${dtl.setleTyCd}', '${dtl.ordrSttusCd}');">반품 신청</button>
                         </c:if>
                     </div>
@@ -1822,7 +1819,6 @@
                             <caption>주문정보</caption>
                             <!-- 각 열 width 설정 -->
                             <colgroup>
-                                <col style="width: 60px;">
                                 <col style="width: 60px;">
                                 <col style="width: 10%;">
                                 <col style="width: 120px;">
@@ -1836,8 +1832,7 @@
                             </colgroup>
                             <thead>
                             <tr>
-                                <th>유입</th>
+                                <th>일반/구독</th>
-                                <th>마켓</th>
                                 <th>주문일시</th>
                                 <th>환경</th>
                                 <th>주문번호</th>
@@ -1851,8 +1846,10 @@
                             </thead>
                             <tbody>
                             <tr>
-                                <td><span class="blue-8 fw-500" title="${dtl.inflowCoursNm}">${fn:substring(dtl.inflowCoursNm, 0, 1)}</span></td>
+                                <td><c:choose>
-                                <td><span class="blue-8 fw-500" title="${dtl.sopmalNm}">${fn:substring(dtl.sopmalNm, 0, 1)}</span></td>
+                                    <c:when test="${dtl.subsvcAt eq 'Y'}">구독</c:when>
+                                    <c:otherwise>일반</c:otherwise>
+                                </c:choose></td>
                                 <td>${dtl.ordrRceptDt}</td>
                                 <td>${dtl.sleEnvrnNm}</td>
                                 <td>