Merge branch 'develop' into jmh

iStyle24ProductFeed_NaverEP_Summary_new.txt

@@ -0,0 +1,10 @@
+id	title	price_pc	price_mobile	normal_price	link	mobile_link	image_link	add_image_link	category_name1	category_name2	category_name3	category_name4	naver_category	condition	import_flag	parallel_import	order_made	product_flag	adult	manufacture_define_number	brand	maker	origin	card_event	event_words	coupon	partner_coupon_download	interest_free_event	point	installation_costs	search_tag	minimum_purchase_quantity	review_count	shipping	delivery_grade	delivery_detail	age_group	gender	class	update_time
+B141JP570P	[BUCKAROO] 여성20수트윌가슴포켓가오리핏밀리터리셔켓 BE (B141JP570P)B141JP570P	20000	20000	129000	https://www.style24.com/goods/detail/form?goodsCd=B141JP570P&af=AF033	https://www.style24.com/goods/detail/form?goodsCd=B141JP570P&af=AF028	https://image.istyle24.com/Upload/ProductImage/0000004378/20161230/9341512_L.jpg		여성의류	자켓	캐주얼자켓		50000815		N	N	N		N	B141JP570P	BUCKAROO		베트남						스타일포인트^20000		B141JP570P;여성20수트윌가슴포켓가오리핏밀리터리셔켓BE(B141JP570P);BUCKAROO;버커루;BUCKAROO;2014;봄;여성;KH;BE;KHAKI;BEIGE;카키;	1	0	2500			성인	여성	I	2021-08-31 15:27:09
+B141SH540P	[BUCKAROO] 여성 면30수 트윌카치온 긴기장 밀리터리셔켓 BE (B141SH540P)B141SH540P	9000	9000	149000	https://www.style24.com/goods/detail/form?goodsCd=B141SH540P&af=AF033	https://www.style24.com/goods/detail/form?goodsCd=B141SH540P&af=AF028	https://image.istyle24.com/Upload/ProductImage/0000004378/20170102/9341545_L.jpg		여성의류	자켓	캐주얼자켓		50000815		N	N	N		N	B141SH540P	BUCKAROO		중국						스타일포인트^9000		B141SH540P;여성면30수트윌카치온긴기장밀리터리셔켓BE(B141SH540P);BUCKAROO;버커루;BUCKAROO;2014;봄;여성;KH;BE;KHAKI;BEIGE;카키;베	1	0	2500			성인	여성	I	2021-08-31 15:27:09
+O141JK510M	[ANDEW] 여성)싱글 면자켓 BL (O141JK510M)O141JK510M	10000	10000	149000	https://www.style24.com/goods/detail/form?goodsCd=O141JK510M&af=AF033	https://www.style24.com/goods/detail/form?goodsCd=O141JK510M&af=AF028	https://image.istyle24.com/Upload/ProductImage/0000004378/20161226/9336314_L.jpg		여성의류	자켓	캐주얼자켓		50000815		N	N	N		N	O141JK510M	ANDEW		중국						스타일포인트^10000		O141JK510M;여성)싱글면자켓BL(O141JK510M);ANDEW;앤듀;ANDEW;2014;봄;여성;BL;BLUE;블루여성의류;자켓;캐주얼자켓;	1	0	2500			성인	여성	I	2021-08-31 15:27:09
+T181JP670P	[TBJ] 여성 제기장 면트윌 오버핏 트러커자켓(T181JP670P)T181JP670P	14000	14000	69900	https://www.style24.com/goods/detail/form?goodsCd=T181JP670P&af=AF033	https://www.style24.com/goods/detail/form?goodsCd=T181JP670P&af=AF028	https://image.istyle24.com/Upload/ProductImage/0000004759/20210713/10997895_L.jpg	https://image.istyle24.com/Upload/ProductImage/0000004759/20210713/10997895_4_L.jpg|https://image.istyle24.com/Upload/ProductImage/0000004759/20210713/10997895_3_L.jpg|https://image.istyle24.com/Upload/ProductImage/0000004759/20210713/10997895_2_L.jpg|https://image.istyle24.com/Upload/ProductImage/0000004759/20210713/10997895_1_L.jpg	여성의류	자켓	캐주얼자켓		50000815	신상품	N	N	N		N	T181JP670P	TBJ	한세엠케이(주)	중국						스타일포인트^42000		T181JP670P;여성제기장면트윌오버핏트러커자켓(T181JP670P);TBJ;티비제이;TBJ;2018;봄;여성;WH;PI;WHITE;PINK;화이트;핑크여성의류;자켓;캐주얼자켓;	1	0	2500			성인	여성	I	2021-08-31 15:27:09
+T184CT810P	[TBJ] 여성 하프기장 체크 자켓형 코트(T184CT810P)T184CT810P	29000	29000	159000	https://www.style24.com/goods/detail/form?goodsCd=T184CT810P&af=AF033	https://www.style24.com/goods/detail/form?goodsCd=T184CT810P&af=AF028	https://image.istyle24.com/Upload/ProductImage/0000004574/20181109/11896700_L.JPG		여성의류	자켓	캐주얼자켓		50000815	신상품	N	N	N		N	T184CT810P	TBJ	한세엠케이㈜	베트남						스타일포인트^87000		T184CT810P;여성하프기장체크자켓형코트(T184CT810P);TBJ;티비제이;TBJ;2018;겨울;공통;NA;GN;NAVY;GREEN;네이비;그린여성의류;자켓;캐주얼자켓;	1	0	2500			성인	남여공용	I	2021-08-31 15:27:09
+VNM11QTS57	[LEVI`S Kids] [리바이스키즈] 배트윙티셔츠(반팔)L VNM11QTS57 (키즈)VNM11QTS57	19000	19000	25000	https://www.style24.com/goods/detail/form?goodsCd=VNM11QTS57&af=AF033	https://www.style24.com/goods/detail/form?goodsCd=VNM11QTS57&af=AF028	https://image.istyle24.com/Upload/ProductImage/0000004529/20180416/11161424_L.jpg		키즈공용	티셔츠	라운드티셔츠		50000535	신상품	N	N	N		N	VNM11QTS57	LEVI`S Kids	리바이스키즈/한세드림(주)	베트남						스타일포인트^57000		VNM11QTS57;[리바이스키즈]배트윙티셔츠(반팔)LVNM11QTS57(키즈);LEVI`S KIDS;리바이스 키즈;LEVI'S KIDS;2018;여름;공통;BK;GR;NA;BL;	1	5	2500			아동	남여공용	I	2021-08-31 15:27:09
+VNM13QTS57	[LEVI`S Kids] [리바이스키즈] 배트윙티셔츠(반팔)B VNM13QTS57 (주니어)VNM13QTS57	19000	19000	25000	https://www.style24.com/goods/detail/form?goodsCd=VNM13QTS57&af=AF033	https://www.style24.com/goods/detail/form?goodsCd=VNM13QTS57&af=AF028	https://image.istyle24.com/Upload/ProductImage/0000004529/20180416/11161533_L.jpg		주니어남아	티셔츠	라운드티셔츠		50000535	신상품	N	N	N		N	VNM13QTS57	LEVI`S Kids	리바이스키즈/한세드림(주)	베트남						스타일포인트^57000		VNM13QTS57;[리바이스키즈]배트윙티셔츠(반팔)BVNM13QTS57(주니어);LEVI`S KIDS;리바이스 키즈;LEVI'S KIDS;2018;여름;남성;BK;GR;WH;RE	1	21	2500			청소년	남성	I	2021-08-31 15:27:09
+VOM11QTS57	[LEVI`S Kids] [리바이스키즈] 배트윙 티셔츠(반팔)L VOM11QTS57 (키즈)VOM11QTS57	19000	19000	25000	https://www.style24.com/goods/detail/form?goodsCd=VOM11QTS57&af=AF033	https://www.style24.com/goods/detail/form?goodsCd=VOM11QTS57&af=AF028	https://image.istyle24.com/Upload/ProductImage/0000004633/20190709/12598397_L.jpg	https://image.istyle24.com/Upload/ProductImage/0000004633/20190709/12598397_1_L.jpg	키즈남아	티셔츠	라운드티셔츠		50000535	신상품	N	N	N		N	VOM11QTS57	LEVI`S Kids	리바이스키즈/한세드림(주)	이집트						스타일포인트^57000		VOM11QTS57;[리바이스키즈]배트윙티셔츠(반팔)LVOM11QTS57(키즈);LEVI`S KIDS;리바이스 키즈;LEVI'S KIDS;2019;여름;남성;BK;GR;RE;WH;	1	0	2500			아동	남성	I	2021-08-31 15:27:09
+VOM13QTS57	[LEVI`S Kids] [리바이스키즈] 배트윙 티셔츠(반팔)B VOM13QTS57 (주니어)VOM13QTS57	19000	19000	25000	https://www.style24.com/goods/detail/form?goodsCd=VOM13QTS57&af=AF033	https://www.style24.com/goods/detail/form?goodsCd=VOM13QTS57&af=AF028	https://image.istyle24.com/Upload/ProductImage/0000004777/20200309/12598431_L.jpg	https://image.istyle24.com/Upload/ProductImage/0000004777/20200309/12598431_1_L.jpg|https://image.istyle24.com/Upload/ProductImage/0000004777/20200309/12598431_2_L.jpg|https://image.istyle24.com/Upload/ProductImage/0000004777/20200309/12598431_3_L.jpg|https://image.istyle24.com/Upload/ProductImage/0000004777/20200309/12598431_4_L.jpg	주니어남아	티셔츠	라운드티셔츠		50000535	신상품	N	N	N		N	VOM13QTS57	LEVI`S Kids	리바이스키즈/한세드림(주)	이집트						스타일포인트^57000		VOM13QTS57;[리바이스키즈]배트윙티셔츠(반팔)BVOM13QTS57(주니어);LEVI`S KIDS;리바이스 키즈;LEVI'S KIDS;2019;여름;남성;BK;RE;WH;BL	1	1	2500			청소년	남성	I	2021-08-31 15:27:09

src/main/java/com/style24/batch/biz/job/goods/TsbNaverSummaryEp.java

@@ -137,7 +137,6 @@ public class TsbNaverSummaryEp extends TsbAbstractJob<String, String, String> {
 		sb.append(goodsEp.getCategoryName3()).append("\t");
 		sb.append(goodsEp.getCategoryName4()).append("\t");
 		sb.append(goodsEp.getNaverCategory()).append("\t");
-
 		sb.append(goodsEp.getGoodsGbNm()).append("\t");
 		sb.append(goodsEp.getImportFlag()).append("\t");
 		sb.append(goodsEp.getParallelImport()).append("\t");

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

@@ -901,15 +901,15 @@
 	<!-- 당일 매출문자 조회 -->
 	<select id="getCurrentDaySalesSms" resultType="SalesSms">
 		/* TsbStatistics.getCurrentDaySalesSms */
-		SELECT SUM(ODIH.SELL_AMT - (ODIH.CPN1_DC_AMT + ODIH.GOODS_CPN_DC_AMT))       AS TOT_NET_SALES_AMT  /*총순매출매금액(즉시할인쿠폰과 상품쿠폰만 차감)*/
-		     , - 1 * SUM(ODIH.CNCL_AMT - (ODIH.CPN1_DC_AMT + ODIH.GOODS_CPN_DC_AMT)) AS TOT_CNCL_AMT       /*총취소금액(즉시할인쿠폰과 상품쿠폰만 차감)*/
+		SELECT SUM(ODIH.SELL_AMT)       AS TOT_NET_SALES_AMT  /*총순매출매금액(즉시할인쿠폰과 상품쿠폰만 차감. 2021.8.31일 할인전금액으로 적용하기로 박중재팀장이 요청에 따라 제거)*/
+		     , - 1 * SUM(ODIH.CNCL_AMT) AS TOT_CNCL_AMT       /*총취소금액(즉시할인쿠폰과 상품쿠폰만 차감. 2021.8.31일 할인전금액으로 적용하기로 박중재팀장이 요청에 따라 제거)*/
 		     , SUM(CASE WHEN ODIH.SUPPLY_COMP_CD IN (5,4) /*한세MK, FRJ*/ THEN
-		                    ODIH.SELL_AMT - (ODIH.CPN1_DC_AMT + ODIH.GOODS_CPN_DC_AMT)
+		                    ODIH.SELL_AMT
 		                ELSE
 		                    0
 		           END)                                                              AS MK_NET_SALES_AMT   /*한세MK순매출금액*/
 		     , -1 * SUM(CASE WHEN ODIH.SUPPLY_COMP_CD = 3 THEN /*한세드림*/
-		                         ODIH.CNCL_AMT - (ODIH.CPN1_DC_AMT + ODIH.GOODS_CPN_DC_AMT)
+		                         ODIH.CNCL_AMT
 		                     ELSE
 		                         0
 		                END)                                                         AS DR_NET_SALES_AMT   /*한세드림순매출금액*/