1. 마이페이지 임시 커밋

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

@@ -2,6 +2,7 @@ package com.style24.core.biz.service;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -744,7 +745,7 @@ public class TscOrderService {
 	 */
 	public Collection<GagaMap> getOrderListForMypage(Order order) {
 		Collection<GagaMap> mapList = new ArrayList<>();
-		Collection<Order> orderList = new ArrayList<>();
+		List<Order> orderList = new ArrayList<>();
 		int ordNo = 0;
 		String ordDt = "";
 		String delvFeeCd = "";
@@ -755,10 +756,10 @@ public class TscOrderService {
 		String invoiceNo = "";
 		int reviewSq = 0;
 		int index = 0;
+		int ordDtlStatCnt = 0;
 
 		for (Order tmpOrder : orderDao.getOrderListForMypage(order)) {
-			
-			if (ordNo != tmpOrder.getOrdNo() || !delvFeeCd.equals(tmpOrder.getDelvFeeCd()) || !ordDtlStat.equals(tmpOrder.getOrdDtlStat()) || !shotDelvYn.equals(tmpOrder.getShotDelvYn())) {
+			if (ordNo != tmpOrder.getOrdNo() || !selfGoodsYn.equals(tmpOrder.getSelfGoodsYn()) || ("N".equals(tmpOrder.getSelfGoodsYn()) && !delvFeeCd.equals(tmpOrder.getDelvFeeCd())) || !shotDelvYn.equals(tmpOrder.getShotDelvYn())) {
 				if (index > 0) {
 					GagaMap map = new GagaMap();
 					map.set("ordDt", ordDt);
@@ -768,6 +769,7 @@ public class TscOrderService {
 					map.set("shipCompNm", shipCompNm);
 					map.set("invoiceNo", invoiceNo);
 					map.set("reviewSq", reviewSq);
+					orderList.get(orderList.size() - 1).setOrdDtlStatBanner("Y");
 					map.set("orderList", orderList);
 					mapList.add(map);
 				}
@@ -782,11 +784,15 @@ public class TscOrderService {
 				invoiceNo = tmpOrder.getInvoiceNo();
 				reviewSq = tmpOrder.getReviewSq();
 				orderList = new ArrayList<>();
+				ordDtlStatCnt = 0;
+			} else if (index > 0 && !ordDtlStat.equals(tmpOrder.getOrdDtlStat())) {
+				orderList.get(ordDtlStatCnt).setOrdDtlStatBanner("Y");
 			}
 
 			orderList.add(tmpOrder);
 
 			index++;
+			ordDtlStatCnt++;
 		}
 
 		GagaMap map = new GagaMap();
@@ -797,6 +803,7 @@ public class TscOrderService {
 		map.set("shipCompNm", shipCompNm);
 		map.set("invoiceNo", invoiceNo);
 		map.set("reviewSq", reviewSq);
+		orderList.get(orderList.size() - 1).setOrdDtlStatBanner("Y");
 		map.set("orderList", orderList);
 		mapList.add(map);
 

src/main/java/com/style24/persistence/domain/Order.java

@@ -443,4 +443,5 @@ public class Order extends TscBaseDomain {
 	private int reviewSq;
 	private String selfGoodsYn;
 	private String brandNm;
+	private String ordDtlStatBanner;
 }

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

@@ -1901,6 +1901,7 @@
 			 , OD.INVOICE_NO
 			 , OD.SUPPLY_COMP_CD
 			 , OD.DELV_FEE_CD
+			 , OD.SHOT_DELV_YN
 			 , G.SELF_GOODS_YN
 			 , CONCAT(B.BRAND_ENM, ' ', B.BRAND_KNM) AS BRAND_NM
 			 , FN_GET_CODE_NM('G013', OD.ORD_DTL_STAT) AS ORD_DTL_STAT_NM