Merge branch 'develop' into jmh

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

@@ -54,6 +54,7 @@ public class TsbGoodsWmsIncomelotJob extends TsbAbstractJob<GoodsIfIncomelotitem
 	public GoodsIfIncomelotitem write(GoodsIfIncomelotitem goodsIfIncomelotitem) throws Exception {
 
 		jobdate = GagaDateUtil.getOffsetDate(-1);	//전일자
+		//jobdate = "20210829";	//전일자 
 
 		//wms 입고 정보 처리
 		goodsService.saveGoodsWmsIncomelot(jobdate);

src/main/java/com/style24/batch/biz/job/statistics/TsbSalesUploadJob.java

@@ -34,8 +34,8 @@ public class TsbSalesUploadJob extends TsbAbstractJob<String, String, String> {
 
 	@Override
 	public String read() throws Exception {
-//		// 어제일자 매출반영목록 생성 (한세드림)
-//		statisticsService.createYesterdaySalesUploadList(HansaeErp.ErpGb.HANSAE_DR.value());
+		// 어제일자 매출반영목록 생성 (한세드림)
+		statisticsService.createYesterdaySalesUploadList(HansaeErp.ErpGb.HANSAE_DR.value());
 
 		// 어제일자 매출반영목록 생성 (한세MK)
 		statisticsService.createYesterdaySalesUploadList(HansaeErp.ErpGb.HANSAE_MK.value());
@@ -45,8 +45,8 @@ public class TsbSalesUploadJob extends TsbAbstractJob<String, String, String> {
 
 	@Override
 	public String process(String result) throws Exception {
-//		// 한세드림 매출반영
-//		this.uploadSales(HansaeErp.ErpGb.HANSAE_DR.value());
+		// 한세드림 매출반영
+		this.uploadSales(HansaeErp.ErpGb.HANSAE_DR.value());
 
 		// 한세MK 매출반영
 		this.uploadSales(HansaeErp.ErpGb.HANSAE_MK.value());

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

@@ -335,7 +335,7 @@
 		     , '4'                           AS FMSGTYPE
 		     , #{fmessage}                   AS FMESSAGE
 		     , CASE WHEN DATE_FORMAT(NOW(), '%H') <![CDATA[<=]]> 8 THEN STR_TO_DATE(CONCAT(DATE_FORMAT(NOW(), '%Y-%M-%D'), ' 9'), '%Y-%M-%D %H')
-		            WHEN DATE_FORMAT(NOW(), '%H') BETWEEN 9 AND 20 THEN NOW()
+		            WHEN DATE_FORMAT(NOW(), '%H') BETWEEN 9 AND 19 THEN NOW()
 		            ELSE STR_TO_DATE(CONCAT(DATE_FORMAT(ADDDATE(NOW(), INTERVAL 1 DAY), '%Y-%M-%D'), ' 9'), '%Y-%M-%D %H')
 		       END                           AS FSENDDATE
 		     , #{fkkoresendtype}             AS FKKORESENDTYPE
@@ -385,7 +385,7 @@
 		     , '4'                           AS FMSGTYPE
 		     , #{fmessage}                   AS FMESSAGE
 		     , CASE WHEN DATE_FORMAT(NOW(), '%H') <![CDATA[<=]]> 8 THEN STR_TO_DATE(CONCAT(DATE_FORMAT(NOW(), '%Y-%M-%D'), ' 9'), '%Y-%M-%D %H')
-		            WHEN DATE_FORMAT(NOW(), '%H') BETWEEN 9 AND 20 THEN NOW()
+		            WHEN DATE_FORMAT(NOW(), '%H') BETWEEN 9 AND 19 THEN NOW()
 		            ELSE STR_TO_DATE(CONCAT(DATE_FORMAT(ADDDATE(NOW(), INTERVAL 1 DAY), '%Y-%M-%D'), ' 9'), '%Y-%M-%D %H')
 		       END                           AS FSENDDATE
 		     , #{fkkoresendtype}             AS FKKORESENDTYPE

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

@@ -22,7 +22,8 @@
 		FROM   TB_ORDER O
 		     , TB_ORDER_DETAIL OD
 		WHERE  O.ORD_NO = OD.ORD_NO
-		AND    O.ORD_DT <![CDATA[>=]]> DATE_ADD(NOW(), INTERVAL -1 * #{expireDays} DAY) /*구매일로부터 90일 이내*/
+		AND    O.PAY_DT <![CDATA[>=]]> DATE_ADD(NOW(), INTERVAL -1 * #{expireDays} DAY) /*구매일로부터 90일 이내*/
+		AND    O.PAY_DT <![CDATA[>=]]> STR_TO_DATE('20210901','%Y%m%d') /*9/1일 오픈일로부터 구매한 건만*/
 		AND    OD.ORD_DTL_STAT = 'G013_70' /*구매확정*/
 		AND    NOT EXISTS (SELECT 1
 		                   FROM   TB_REVIEW_GUIDE

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

@@ -987,16 +987,16 @@
 		     , ''         AS DS_REMARK
 		     , NOW()      AS REG_DT
 		FROM   (
-		        SELECT DATE_FORMAT(O.PAY_DT,'%Y%m%d')    AS DT_SALE  /*판매일자*/
+		        SELECT DATE_FORMAT(ODIH.REG_DT,'%Y%m%d')       AS DT_SALE  /*판매일자(=발생일자)*/
 		             , CASE WHEN ODIH.ORD_DTL_STAT = 'G720_20' THEN '1'
 		                    ELSE '2'
-		               END                               AS TP_SALE  /*판매구분(1:판매, 2:환불)*/
-		             , ODIH.ITEM_CD                      AS CD_STYLE /*스타일코드*/
-		             , ODIH.OPT_CD1                      AS CD_COLOR /*색상코드*/
-		             , ODIH.OPT_CD2                      AS CD_SIZE  /*사이즈코드*/
+		               END                                     AS TP_SALE  /*판매구분(1:판매, 2:환불)*/
+		             , SUBSTRING(ODIH.SKU_MODEL_NO,1,10)       AS CD_STYLE /*ERP스타일코드*/
+		             , SUBSTRING(ODIH.SKU_MODEL_NO,11,2)       AS CD_COLOR /*ERP색상코드*/
+		             , TRIM(SUBSTRING(ODIH.SKU_MODEL_NO,13,3)) AS CD_SIZE  /*ERP사이즈코드*/
 		             , SUM(CAST(CASE WHEN ODIH.ORD_DTL_STAT = 'G720_20' THEN ODIH.ORD_QTY - ODIH.CNCL_RTN_QTY /*판매-배송중*/
 		                             ELSE ODIH.CNCL_RTN_QTY /*환입-반품완료,환입-교환완료*/
-		                        END AS SIGNED INT))      AS QT_SALE  /*판매수량*/
+		                        END AS SIGNED INT))            AS QT_SALE  /*판매수량*/
 		             , SUM(CAST(CASE WHEN ODIH.ORD_DTL_STAT = 'G720_20' /*판매-배송중*/ THEN
 		                                 ((ODIH.ORD_QTY - ODIH.CNCL_RTN_QTY) * (CASE WHEN O.MALL_GB = 'G011_20' /*제휴몰*/ THEN
 		                                                                                 IFNULL(EUP.USAC_PRICE,ODIH.ITEM_PRICE)
@@ -1009,7 +1009,7 @@
 		                                                            ELSE
 		                                                                ODIH.ITEM_PRICE
 		                                                       END))
-		                        END AS SIGNED INT))      AS AM_ACSALE /*실판매금액*/
+		                        END AS SIGNED INT))            AS AM_ACSALE /*실판매금액*/
 		        FROM   TB_ORDER_DETAIL_ITEM_HST ODIH
 		        INNER JOIN TB_ORDER_DETAIL OD ON ODIH.ORD_DTL_NO = OD.ORD_DTL_NO
 		        INNER JOIN TB_ORDER O ON ODIH.ORD_NO = O.ORD_NO
@@ -1026,13 +1026,13 @@
 		        AND    OD.SUPPLY_COMP_CD = 3 /*한세드림*/
 		        </if>
 		        AND    SC.DISTRIBUTION_GB IN ('G065_10','G065_11','G065_12') /*자사*/
-		        GROUP  BY DATE_FORMAT(O.PAY_DT,'%Y%m%d')
+		        GROUP  BY DATE_FORMAT(ODIH.REG_DT,'%Y%m%d')
 		                , CASE WHEN ODIH.ORD_DTL_STAT = 'G720_20' THEN '1'
 		                       ELSE '2'
 		                  END
-		                , ODIH.ITEM_CD
-		                , ODIH.OPT_CD1
-		                , ODIH.OPT_CD2
+		                , SUBSTRING(ODIH.SKU_MODEL_NO,1,10)
+		                , SUBSTRING(ODIH.SKU_MODEL_NO,11,2)
+		                , TRIM(SUBSTRING(ODIH.SKU_MODEL_NO,13,3))
 		       ) ODIH
 		WHERE  QT_SALE <![CDATA[<>]]> 0
 		AND    NOT EXISTS (SELECT 1