Merge branch 'develop' into bin2107

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

@@ -1562,6 +1562,8 @@
 		  , COST_PRICE
 		  , DC_RATE
 		  , GOODS_STAT
+		  , SELL_STDT
+		  , SELL_EDDT
 		  , SELF_MALL_YN
 		  , GOODS_GB
 		  , DISTRIBUTION_GB
@@ -1604,6 +1606,8 @@
 		  , #{currPrice}
 		  , #{costPrice}
 		  , #{dcRate}
+		  , STR_TO_DATE(#{sellStdt}},'%Y%m%d%H%i%S')
+		  , STR_TO_DATE(#{sellEddt}},'%Y%m%d%H%i%S')
 		  , #{goodsStat}
 		  , IFNULL(#{selfMallYn},'Y') 
 		  , #{goodsGb}
@@ -4038,13 +4042,21 @@
 		   , REG_NO
 		   , 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 0    /*BRAND_GROUP_NO*/ 
 		      , B.CATE_NO
 		      , A.GOODS_CD
 		      , 9999
 		      , #{regNo}
 		      , NOW()
-		FROM TB_GOODS A
+		FROM TMP_GOODS A
 		INNER JOIN TB_ITEMKIND_CATE  B ON A.ITEMKIND_CD = B.ITEMKIND_CD
 		INNER JOIN TB_CATE_4SRCH C ON B.CATE_NO = C.LEAF_CATE_NO
 		                   AND C.SITE_CD = 'G000_10'