Merge branch 'develop' into eskim

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

@@ -386,11 +386,11 @@
 			, G.BRAND_CD
 			, B.BRAND_KNM
 			, DL.DELV_LOC_NM
-			, (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = DBG.GOODS_CD AND COLOR_CD = DBG.COLOR_CD AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM
+			, (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = DBG.GOODS_CD AND COLOR_CD = DBG.OPT_CD1 AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM
 			, G.GOODS_NM
 			, DBG.GOODS_CD
-			, DBG.COLOR_CD			
-			, DBG.SIZE_CD
+			, DBG.OPT_CD1			
+			, DBG.OPT_CD2
 			, FN_GET_CODE_NM('G008', G.GOODS_STAT) AS GOODS_STAT
 			, DBG.DELV_BAN_STDT 
 			, DBG.DELV_BAN_EDDT	
@@ -434,8 +434,8 @@
 			, UPD_DT = NOW()
 		WHERE DELV_BAN_GOODS_SQ = #{delvBanGoodsSq}
 		  AND GOODS_CD          = #{goodsCd}
-		  AND COLOR_CD          = #{colorCd}
-		  AND SIZE_CD           = #{sizeCd}
+		  AND OPT_CD1           = #{optCd1}
+		  AND OPT_CD2           = #{optCd2}
 	</update>
 
 	<!-- 출고금지상품 등록 대상목록 -->
@@ -447,8 +447,8 @@
 			, (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = S.GOODS_CD AND COLOR_CD = S.OPT_CD1 AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM	
 			, G.GOODS_NM
 			, G.GOODS_CD
-			, S.OPT_CD1 AS COLOR_CD 
-			, S.OPT_CD2 AS SIZE_CD
+			, S.OPT_CD1 
+			, S.OPT_CD2 
 			, G.GOODS_STAT
 			, (SELECT CD_NM FROM TB_COMMON_CODE WHERE CD_GB = 'G008' AND CD =G.GOODS_STAT) AS GOODS_STAT_NM
 		FROM  TB_GOODS G
@@ -481,7 +481,8 @@
 		  FROM TB_DELIVERY_BAN_GOODS
 		 WHERE DELV_LOC_CD = #{delvLocCd}
 		   AND GOODS_CD    = #{goodsCd}
-		   AND SIZE_CD     = #{sizeCd}
+		   AND OPT_CD1     = #{optCd1}
+		   AND OPT_CD2     = #{optCd2}
 		   AND DEL_YN      = 'N'
 	</select>
 
@@ -491,8 +492,8 @@
 		INSERT INTO TB_DELIVERY_BAN_GOODS (
 			  DELV_LOC_CD
 			, GOODS_CD
-			, COLOR_CD
-			, SIZE_CD
+			, OPT_CD1
+			, OPT_CD2
 			, DELV_BAN_STDT
 			, DELV_BAN_EDDT
 			, DEL_YN
@@ -504,8 +505,8 @@
 		VALUES (
 			  #{delvLocCd}
 			, #{goodsCd}
-			, #{colorCd}
-			, #{sizeCd}
+			, #{optCd1}
+			, #{optCd2}
 			, replace(#{delvBanStdt},'-','')
 			, replace(#{delvBanEddt},'-','')
 			, 'N'

src/main/resources/config/application-locd.yml

@@ -65,3 +65,9 @@ mail:
     wivis.url: https://ldfront.style24.com
     image.url: http://ldfront.style24.com/image/mailing
     template.path: /WIDE/workspace/webapps/style24/STYLE24/style24.admin/src/main/webapp/WEB-INF/mail
+
+# ERP (한세드림)
+erp:
+   api:
+       stock.url: http://erp.hansaemk.com:96/api/hsdr/Shop/GoodsInfo
+       goods.url: http://erp.hansaemk.com:96/api/hsdr/Shop

src/main/resources/config/application.yml

@@ -53,6 +53,7 @@ kakao:
   javascriptKey : f435c12d89ddb9cc6337f4cf0a05fd30
   adminKey : 567e9476b15d2149c714aaecd0fee740
   addressApiRequestUrl : https://dapi.kakao.com/v2/local/search/address.json?page=1&query=
+
   
 # CJ대한통운
 cj:
@@ -62,3 +63,9 @@ cj:
         tel1: 02
         tel2: 1544
         tel3: 4097
+
+# ERP (한세드림)
+erp:
+   api:
+       stock.url: http://erp.hansaemk.com:96/api/hsdr/Shop/GoodsInfo
+       goods.url: http://erp.hansaemk.com:96/api/hsdr/Shop