1. 마이페이지 임시 커밋

src/main/java/com/style24/core/biz/dao/TscOrderDao.java

@@ -422,4 +422,13 @@ public interface TscOrderDao {
 	 * @since 2021. 02. 02
 	 */	
 	int getDailyDeliveryZoneInfo(Order order);
+
+	/**
+	 * 마이페이지 주문 정보 조회
+	 *
+	 * @param Order
+	 * @author card007
+	 * @since 2021. 02. 04
+	 */
+	Collection<Order> getOrderListForMypage(Order order);
 }

src/main/java/com/style24/core/biz/service/TscOrderService.java

@@ -655,4 +655,13 @@ public class TscOrderService {
 		return orderDao.getDailyDeliveryZoneInfo(order);
 	}
 
+	/**
+	 * 마이페이지 주문 정보 조회
+	 * 
+	 * @param Order
+	 * @author card007
+	 * @since 2021. 02. 04
+	 */
+	public Collection<Order> getOrderListForMypage(Order order) { return orderDao.getOrderListForMypage(order); }
+
 }

src/main/java/com/style24/persistence/mybatis/shop/TscOrder.xml

@@ -1706,7 +1706,7 @@
 	<!-- 상품권정보 조회 -->
 	<select id="getGiftcardInfo" parameterType="Order" resultType="int">
 		/* TsfOrder.getGiftcardInfo */
-		SELECT IFNULL(SUM(CG.RM_GFCD_AMT)) AS RM_GFCD_AMT
+		SELECT IFNULL(SUM(CG.RM_GFCD_AMT), 0) AS RM_GFCD_AMT
 		  FROM TB_CUST_GIFTCARD CG
 		 WHERE 1=1
 		   AND CG.CUST_NO = #{custNo}
@@ -2001,6 +2001,35 @@
 		AND    CP.DOWN_EDDT > CURRENT_TIMESTAMP
 	</select>
 
+	<!-- 마이페이지 주문 목록 조회 -->
+	<select id="getOrderListForMypage" parameterType="Order" resultType="Order">
+		SELECT O.ORD_NO
+			 , OD.ORD_DTL_NO
+			 , OD.ORD_EXCH_GB
+			 , OD.GOODS_CD
+			 , ODI.OPT_CD
+			 , ODI.OPT_CD1
+			 , ODI.OPT_CD2
+			 , OD.ORD_DTL_STAT
+			 , OD.ORD_QTY
+			 , OD.ORD_AMT
+			 , OD.SAVE_PNT_AMT
+			 , OD.SHIP_COMP_CD
+			 , OD.INVOICE_NO
+			 , OD.SUPPLY_COMP_CD
+			 , OD.DELV_FEE_CD
+		  FROM TB_ORDER O
+		 INNER JOIN TB_ORDER_DETAIL OD
+		    ON O.ORD_NO = OD.ORD_NO
+		   AND OD.ORD_DTL_STAT <![CDATA[<>]]> 'G013_97'
+		 INNER JOIN TB_ORDER_DETAIL_ITEM ODI
+		    ON OD.ORD_NO = ODI.ORD_NO
+		   AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
+		 WHERE O.CUST_NO = #{custNo}
+		 ORDER BY OD.SUPPLY_COMP_CD
+				, OD.DELV_FEE_CD
+				, OD.ORD_NO DESC
+	</select>
 </mapper>