Merge remote-tracking branch 'origin/xodud1202' into jsh77b

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

@@ -131,6 +131,7 @@ public class Order extends TscBaseDomain {
 	private String imgPath1;
 	private String sysImgNm;
 	private String brandCd;
+	private String optCd;
 	private String optCd1;
 	private String optCd2;
 	private String goodsTypeNm;
@@ -402,9 +403,12 @@ public class Order extends TscBaseDomain {
 
 	// 장바구니
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
-	private int[] cartSqArr;		// 장바구니 일련번호 배열
+	private int[] cartSqArr;		// 장바구니 일련번호 배열 (일시품절제외 조회)
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private int[] cartSqs;			// 장바구니 일련번호 배열 (일시품절포함 조회)
 	private int cartSq;				// 장바구니 일련번호
 	private int pcCurrPrice;		// PC 즉시할인 적용가
+	private int goodsQty;			// 장바구니 등록 수량
 	private String jsessionId;		// SessionId
 	private List<Integer> applyMoreBetterAmtList;	// 다다익선 금액 적용상품 리스트
 	private List<Integer> applyMoreBetterQtyList;	// 다다익선 수량 적용상품 리스트

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

@@ -1633,6 +1633,8 @@
 				 , GRS.DELV_RES_DT
 				 , DFP.MIN_ORD_AMT
 				 , DFP.DELV_FEE
+				 , VS.CURR_STOCK_QTY
+				 , FN_GET_APPLY_CPN1_PRICE(CA.GOODS_CD, 'P') AS PC_CURR_PRICE
 			  FROM TB_CART CA
 			 INNER JOIN TB_CART_DETAIL CD
 				ON CA.CART_SQ = CD.CART_SQ
@@ -1640,12 +1642,14 @@
 				ON CA.GOODS_CD = G.GOODS_CD
 			 INNER JOIN TB_OPTION OP
 				ON CD.ITEM_CD = OP.GOODS_CD
-			   AND CD.OPT_CD1 = OP.OPT_CD1
-			   AND CD.OPT_CD2 = OP.OPT_CD2
+			   AND CD.OPT_CD = OP.OPT_CD
 			 INNER JOIN TB_DELV_FEE_POLICY DFP
 				ON G.DELV_FEE_CD = DFP.DELV_FEE_CD
 			 INNER JOIN TB_BRAND BR
 				ON G.BRAND_CD = BR.BRAND_CD
+			 INNER JOIN VW_STOCK VS
+				ON CD.ITEM_CD = VS.GOODS_CD
+			   AND CD.OPT_CD = VS.OPT_CD
 			  LEFT OUTER JOIN TB_GOODS_RES_SELL GRS
 				ON CA.GOODS_CD = GRS.GOODS_CD
 			 WHERE 1 = 1