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

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

@@ -1580,55 +1580,66 @@
 	<select id="getCartGoodsList" parameterType="Order" resultType="Order">
 		/* TsfOrder.getCartGoodsList */
 		SELECT CA.CART_SQ
-     		 , CD.CART_DTL_SQ
-		     , BR.BRAND_ENM 
-		     , G.GOODS_NM
-		     , OP.OPT_CD
-		     , OP.OPT_CD1
-		     , OP.OPT_CD2
-		     , CA.GOODS_QTY
-		     , G.LIST_PRICE
-		     , G.CURR_PRICE
-		     , G.GOODS_GB
-		     , G.PRE_PPNT_USABLE_YN
-		     , G.PRE_MPNT_USABLE_YN
-		     , G.MIN_ORD_AMT
-		     , G.MAX_ORD_QTY
-		     , G.DAY_MAX_ORD_QTY
-		     , G.GIFT_PACK_YN 
-		     , G.NEW_CUST_ORD_YN
-		     , DFP.SUPPLY_COMP_CD
-		     , CASE WHEN G.SELF_GOODS_YN='Y' THEN 'WMS'
-		            ELSE DFP.DELV_FEE_CD
-		            END  DELV_FEE_CD
-		     , GRS.DELV_RES_DT
-		     , DFP.MIN_ORD_AMT 
-		     , DFP.DELV_FEE
-		FROM   TB_CART CA
-		INNER  JOIN TB_CART_DETAIL CD
-		ON     CA.CART_SQ = CD.CART_SQ
-		INNER  JOIN TB_GOODS G
-		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 
-		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
-		LEFT   OUTER JOIN TB_GOODS_RES_SELL GRS
-		ON     CA.GOODS_CD = GRS.GOODS_CD 
-		WHERE  1=1
-		AND    CA.CUST_NO = 0
+			 , CD.CART_DTL_SQ
+			 , BR.BRAND_ENM
+			 , G.GOODS_NM
+			 , CA.GOODS_CD
+			 , CD.ITEM_CD
+			 , OP.OPT_CD
+			 , OP.OPT_CD1
+			 , OP.OPT_CD2
+			 , CA.GOODS_QTY
+			 , G.GOODS_TYPE
+			 , G.LIST_PRICE
+			 , G.CURR_PRICE
+			 , G.GOODS_GB
+			 , G.PRE_PPNT_USABLE_YN
+			 , G.PRE_MPNT_USABLE_YN
+			 , G.MIN_ORD_AMT
+			 , G.MAX_ORD_QTY
+			 , G.DAY_MAX_ORD_QTY
+			 , G.GIFT_PACK_YN
+			 , G.NEW_CUST_ORD_YN
+			 , DFP.SUPPLY_COMP_CD
+			 , CASE WHEN G.SELF_GOODS_YN = 'Y' THEN 'WMS'
+					ELSE DFP.DELV_FEE_CD END AS DELV_FEE_CD
+			 , GRS.DELV_RES_DT
+			 , DFP.MIN_ORD_AMT
+			 , DFP.DELV_FEE
+		  FROM TB_CART CA
+		 INNER JOIN TB_CART_DETAIL CD
+			ON CA.CART_SQ = CD.CART_SQ
+		 INNER JOIN TB_GOODS G
+			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
+		 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
+		  LEFT OUTER JOIN TB_GOODS_RES_SELL GRS
+			ON CA.GOODS_CD = GRS.GOODS_CD
+		 WHERE 1 = 1
+		   AND G.GOODS_STAT = 'G008_90'
+		<if test="custNo == 0">
+		   AND CA.CUST_NO = 0
+		   AND CA.JSESSION_ID = #{jsessionId}
+		</if>
+		<if test="custNo != 0">
+		   AND CA.CUST_NO = #{custNo}
+		</if>
 		<if test="cartSqArr != null and cartSqArr ==''">
-		AND    CA.CART_SQ IN 
+		   AND    CA.CART_SQ IN
 			<foreach collection="cartSqArr" item="item" index="index"  open="(" close=")" separator=",">
 				#{item}
 			</foreach>
 		</if>
-		ORDER  BY DFP.SUPPLY_COMP_CD
-		     , DFP.DELV_FEE_CD
+		 ORDER BY DFP.SUPPLY_COMP_CD
+				, DFP.DELV_FEE_CD
+				, CD.CART_SQ
+				, CD.CART_DTL_SQ
 	</select>
 	
 	<!-- 고객정보 조회 -->
@@ -1639,7 +1650,7 @@
 		     , CU.CELL_PHNNO
 		FROM   TB_CUSTOMER CU
 		WHERE  1=1
-		ADN    CU.CUST_NO = #{custNo}
+		AND    CU.CUST_NO = #{custNo}
 	</select>
 	
 	<!-- 배송지정보 조회 -->