이태영 - 20210608 장바구니 수정사항 수정

src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -1115,9 +1115,15 @@ public class TsfOrderService {
 		// 로그인 정보 조회
 		if(TsfSession.isLogin()) {
 			param.setCustNo(TsfSession.getInfo().getCustNo());
+			param.setOrdNm(TsfSession.getInfo().getCustNm());
+			param.setOrdPhnno(TsfSession.getInfo().getCellPhnno());
+			param.setEmail(TsfSession.getInfo().getEmail());
 		} else {
 			param.setCustNo(0);
 			param.setJsessionId(TsfSession.getSessionId());
+			param.setOrdNm("비회원");
+			param.setOrdPhnno("000-0000-0000");
+			param.setEmail("naverpay@naverpay.com");
 		}
 
 		try {

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

@@ -948,7 +948,7 @@
 		             , G.MAIN_COLOR_CD
 		             , G.SELF_GOODS_YN
 		             , MAX(CD.CART_DTL_SQ) AS CART_DTL_SQ
-		             , MAX(ST.DISP_ORD) AS DISP_ORD
+		             , MIN(ST.DISP_ORD) AS DISP_ORD
 		             , MAX(CD.OPT_CD1) AS CART_OPT_CD1
 		             , MAX(CD.OPT_CD2) AS CART_OPT_CD2
 		             , MAX(CD.OPT_CD) AS CART_OPT_CD
@@ -972,7 +972,7 @@
 		LEFT   OUTER JOIN TB_COLOR C
 		ON     A.CART_OPT_CD1 = C.COLOR_CD
 		AND    C.USE_YN = 'Y'
-		ORDER  BY NULLIF(C.COLOR_KNM, A.CART_OPT_CD1)
+		ORDER  BY A.DISP_ORD, A.COLOR_NM
 	</select>
 
 	<!-- 장바구니 상품 사이즈 정보 조회 -->

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

@@ -287,6 +287,7 @@
 		                      WHEN VS.CURR_STOCK_QTY - G.MIN_ORD_QTY >= 0 THEN VS.CURR_STOCK_QTY
 		                      ELSE 0 END) AS STOCK_QTY
 		           , IFNULL(GC.QTY , 1) AS QTY
+		           , MIN(O.DISP_ORD) AS DISP_ORD
 		      FROM TB_GOODS G
 		      INNER JOIN TB_OPTION O ON G.GOODS_CD = O.GOODS_CD
 		                             AND O.DISP_YN = 'Y'
@@ -305,7 +306,7 @@
 		<if test='optionSoldoutSkip != null and optionSoldoutSkip == "Y" '>
 		AND A.STOCK_QTY > 0
 		</if>
-		ORDER BY A.GOODS_CD, NULLIF(C.COLOR_KNM, A.OPT_CD1)
+		ORDER BY A.GOODS_CD, A.DISP_ORD, IFNULL(C.COLOR_KNM, A.OPT_CD1)
 	</select>
 		
 	<!-- 상품 옵션2 목록  - 자사용-->