Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.scm into develop

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

@@ -2170,12 +2170,19 @@
 		   , REG_DT
 		    )
 		WITH TMP_GOODS AS (
-		    SELECT DISTINCT B.GOODS_CD
-		         -- , IFNULL(B.COMPS_GOODS_CD, A.GOODS_CD) AS COMPS_GOODS_CD
-		         , A.ITEMKIND_CD
-		    FROM  TB_GOODS_COMPOSE B
-		    LEFT JOIN TB_GOODS A ON B.COMPS_GOODS_CD = A.GOODS_CD
-		    WHERE B.GOODS_CD = #{goodsCd}
+		    SELECT DISTINCT Z.GOODS_CD
+		          , Y.ITEMKIND_CD
+		    FROM (
+		         SELECT A.GOODS_CD
+		              , A.GOODS_TYPE
+		              , IFNULL(B.COMPS_GOODS_CD, A.GOODS_CD) AS COMPS_GOODS_CD
+		              , IFNULL(B.DISP_ORD, 1)                AS DISP_ORD
+		              , A.SELF_GOODS_YN
+		         FROM TB_GOODS A
+		                  LEFT OUTER JOIN TB_GOODS_COMPOSE B ON A.GOODS_CD = B.GOODS_CD
+		         WHERE A.GOODS_CD = #{goodsCd}
+		         ) Z
+		    INNER  JOIN TB_GOODS Y ON Z.COMPS_GOODS_CD = Y.GOODS_CD
 		    )
 		 SELECT 0    /*BRAND_GROUP_NO*/ 
 		      , B.CATE_NO

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

@@ -475,7 +475,7 @@
 	
 	<!-- 입점업체미발주 주문목록 -->
 	<select id="getOrderSellerUnorderList" parameterType="Order" resultType="Order">
-		/* order.getOrderSellerUnorderList */
+		/* TssOrder.getOrderSellerUnorderList */
 		SELECT OD.SUPPLY_COMP_CD
 		     , (SELECT SC.SUPPLY_COMP_NM
 		        FROM   TB_SUPPLY_COMPANY SC
@@ -505,7 +505,7 @@
 		     , ODI.OPT_CD2
 		     , OD.ORD_QTY 
 		     , OD.ORD_AMT
-		     , OD.CPN1_DC_AMT + TMTB1_DC_AMT + TMTB2_DC_AMT +  GOODS_CPN_DC_AMT + CART_CPN_DC_AMT + PNT_DC_AMT + PRE_PNT_DC_AMT AS TOT_DC_AMT
+		     , OD.CPN1_DC_AMT + OD.TMTB1_DC_AMT + OD.TMTB2_DC_AMT + OD.GOODS_CPN_DC_AMT + OD.CART_CPN_DC_AMT + OD.PNT_DC_AMT + OD.PRE_PNT_DC_AMT AS TOT_DC_AMT
 		     , OD.REAL_ORD_AMT 
 		     , OD.INVOICE_NO 
 		     , OD.SHIP_COMP_CD