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

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

@@ -56,7 +56,6 @@ public class SupplyCompany extends TscBaseDomain {
 	private String remarks;				// 비고
 	private String useYn;				// 사용여부
 	private String note;				// 배송안내정보(상품상세FRONT노출용)
-	private String authKey;				// 인증키
 
 	// 검색조건
 	private String searchGb;			// 검색구분

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

@@ -139,7 +139,6 @@
 		     , SC.ECONTRACT_YN                                         /*전자계약여부*/
 		     , SC.REMARKS                                              /*비고*/
 		     , SC.USE_YN                                               /*사용여부*/
-		     , SC.AUTH_KEY                                             /*인증키*/
 		     , SC.NOTE                                                 /*배송안내*/
 		FROM   TB_SUPPLY_COMPANY SC
 		     , TB_SUPPLY_VENDOR SV
@@ -193,10 +192,6 @@
 	<!-- 공급업체 생성 -->
 	<insert id="createSupplyCompany" parameterType="SupplyCompany">
 		/* TsaBusiness.createSupplyCompany */
-		<selectKey keyProperty="supplyCompCd" resultType="int" order="BEFORE">
-			SELECT IFNULL(MAX(SUPPLY_COMP_CD),0) + 1
-			FROM   TB_SUPPLY_COMPANY Z
-		</selectKey>
 		INSERT INTO TB_SUPPLY_COMPANY (
 		       SUPPLY_COMP_CD
 		     , SUPPLY_COMP_NM
@@ -220,14 +215,16 @@
 		     , REMARKS
 		     , USE_YN
 		     , NOTE
-		     , AUTH_KEY
 		     , REG_NO
 		     , REG_DT
 		     , UPD_NO
 		     , UPD_DT
 		)
 		VALUES (
-		       #{supplyCompCd}
+		        (
+		         SELECT IFNULL(MAX(SUPPLY_COMP_CD),0) + 1
+		         FROM   TB_SUPPLY_COMPANY Z
+		        )
 		     , #{supplyCompNm}
 		     , #{supplyVendorCd}
 		     , (SELECT CASE WHEN MAX(PROVIDER_NO) IS NULL THEN
@@ -256,7 +253,6 @@
 		     , #{remarks}
 		     , #{useYn}
 		     , #{note}
-		     , LOWER(FN_ENC_AES(#{supplyCompCd}))
 		     , #{regNo}
 		     , NOW()
 		     , #{updNo}

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

@@ -1943,39 +1943,46 @@
 		/* TsaDisplay.saveGnbTabPreview */
 		INSERT INTO TB_GNB_TAB_PREVIEW
 		(
-			 PRE_GTAB_SQ
-			, GTAB_GB
-			, GTAB_NM
-			, CONTENTS_TYPE
-			, CATE1_NO
-			, BRAND_GROUP_NO
-			, LINK_URL
-			, DISP_STDT
-			, DISP_EDDT
-			, DISP_ORD
-			, USE_YN
-			, REG_NO
-			, REG_DT
-			, UPD_NO
-			, UPD_DT
+		     PRE_GTAB_SQ
+		    , GTAB_GB
+		    , GTAB_NM
+		    , CONTENTS_TYPE
+		    , CATE1_NO
+		    , BRAND_GROUP_NO
+		    , LINK_URL
+		    , DISP_STDT
+		    , DISP_EDDT
+		    , DISP_ORD
+		    , USE_YN
+		    , REG_NO
+		    , REG_DT
+		    , UPD_NO
+		    , UPD_DT
 		)
 		VALUES
 		(
-			#{preGtabSq}
-			,#{gtabGb}
-			,#{gtabNm}
-			,#{contentsType}
-			,#{cate1No}
-			,#{brandGroupNo}
-			,#{linkUrl}
-			,DATE_FORMAT(#{dispStdt}, '%Y-%m-%d %H:%i:%S')
-			,DATE_FORMAT(#{dispEddt}, '%Y-%m-%d %H:%i:%S')
-			,(SELECT DISP_ORD FROM (SELECT IFNULL((MAX(DISP_ORD) + 1), 1) AS DISP_ORD FROM	TB_GNB_TAB_PREVIEW	WHERE GTAB_GB = #{gtabGb} AND USE_YN = 'Y') TMP)
-			,#{useYn}
-			,#{regNo}
-			,NOW()
-			,#{updNo}
-			,NOW()
+		    #{preGtabSq}
+		    ,#{gtabGb}
+		    ,#{gtabNm}
+		    ,#{contentsType}
+		    ,#{cate1No}
+		    ,#{brandGroupNo}
+		    ,#{linkUrl}
+		    ,DATE_FORMAT(#{dispStdt}, '%Y-%m-%d %H:%i:%S')
+		    ,DATE_FORMAT(#{dispEddt}, '%Y-%m-%d %H:%i:%S')
+		    ,(SELECT DISP_ORD FROM (SELECT IFNULL((MAX(DISP_ORD) + 1), 1) AS DISP_ORD
+		        FROM	TB_GNB_TAB_PREVIEW
+		       WHERE GTAB_GB = #{gtabGb}
+		         AND USE_YN = 'Y'
+		        <if test="brandGroupNo != null and brandGroupNo !=''">
+		         AND BRAND_GROUP_NO = #{brandGroupNo}
+		        </if>
+		        ) TMP)
+		    ,#{useYn}
+		    ,#{regNo}
+		    ,NOW()
+		    ,#{updNo}
+		    ,NOW()
 		)
 	</insert>