Merge branch 'develop' into jmh

src/main/java/com/style24/batch/biz/dao/TsbStatisticsDao.java

@@ -42,6 +42,15 @@ public interface TsbStatisticsDao {
 	 */
 	SalesSms getCurrentDaySalesSms();
 
+	/**
+	 * 매출반영I/F번호 조회
+	 * @param erpGb - ERP구분(hsmk:한세MK, hsdr:한세드림)
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 8. 27
+	 */
+	String getSalesUploadInterfaceNo(String erpGb);
+
 	/**
 	 * 어제일자 매출반영목록 생성
 	 * @param erpGb - ERP구분(hsmk:한세MK, hsdr:한세드림)

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

@@ -111,7 +111,7 @@ public class TsbNaverAllEp extends TsbAbstractJob<String, String, String> {
 		sb.append("brand\t").append("maker\t").append("origin\t");
 		sb.append("card_event\t").append("event_words\t").append("coupon\t").append("partner_coupon_download\t");
 		sb.append("interest_free_event\t").append("point\t").append("installation_costs\t").append("search_tag\t").append("minimum_purchase_quantity\t");
-		sb.append("review_count\t").append("shipping\t").append("delivery_grade\t").append("delivery_detail\n").append("age_group\t").append("gender\n");
+		sb.append("review_count\t").append("shipping\t").append("delivery_grade\t").append("delivery_detail\t").append("age_group\t").append("gender\n");
 //		sb.append("class\t").append("update_time\n");	// 전체EP에서는 제외
 		return sb.toString();
 	}
@@ -136,6 +136,7 @@ public class TsbNaverAllEp extends TsbAbstractJob<String, String, String> {
 		sb.append(goodsEp.getCategoryName2()).append("\t");
 		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/batch/biz/job/goods/TsbNaverSummaryEp.java

@@ -111,7 +111,7 @@ public class TsbNaverSummaryEp extends TsbAbstractJob<String, String, String> {
 		sb.append("brand\t").append("maker\t").append("origin\t");
 		sb.append("card_event\t").append("event_words\t").append("coupon\t").append("partner_coupon_download\t");
 		sb.append("interest_free_event\t").append("point\t").append("installation_costs\t").append("search_tag\t").append("minimum_purchase_quantity\t");
-		sb.append("review_count\t").append("shipping\t").append("delivery_grade\t").append("delivery_detail\n").append("age_group\t").append("gender\t");
+		sb.append("review_count\t").append("shipping\t").append("delivery_grade\t").append("delivery_detail\t").append("age_group\t").append("gender\t");
 		sb.append("class\t").append("update_time\n");
 		return sb.toString();
 	}
@@ -136,6 +136,8 @@ public class TsbNaverSummaryEp extends TsbAbstractJob<String, String, String> {
 		sb.append(goodsEp.getCategoryName2()).append("\t");
 		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");
@@ -159,10 +161,6 @@ public class TsbNaverSummaryEp extends TsbAbstractJob<String, String, String> {
 		sb.append(goodsEp.getShipping()).append("\t");
 		sb.append("").append("\t");
 		sb.append("").append("\t");
-		sb.append(goodsEp.getSearchTag()).append("\t");
-		sb.append(goodsEp.getMinimumPurchaseQuantity()).append("\t");
-		sb.append(goodsEp.getReviewCount()).append("\t");
-		sb.append(goodsEp.getShipping()).append("\t");
 		sb.append(goodsEp.getAgeGroup()).append("\t");
 		sb.append(goodsEp.getGender()).append("\t");
 		sb.append(goodsEp.getUpdGb()).append("\t");

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

@@ -35,19 +35,19 @@ public class TsbSalesUploadJob extends TsbAbstractJob<String, String, String> {
 //		// 어제일자 매출반영목록 생성 (한세드림)
 //		statisticsService.createYesterdaySalesUploadList(HansaeErp.ErpGb.HANSAE_DR.value());
 
-//		// 어제일자 매출반영목록 생성 (한세드림)
-//		statisticsService.createYesterdaySalesUploadList(HansaeErp.ErpGb.HANSAE_MK.value());
+		// 어제일자 매출반영목록 생성 (한세드림)
+		statisticsService.createYesterdaySalesUploadList(HansaeErp.ErpGb.HANSAE_MK.value());
 
 		return "OK";
 	}
 
 	@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());
+		// 한세MK 매출반영
+		this.uploadSales(HansaeErp.ErpGb.HANSAE_MK.value());
 
 		return "OK";
 	}
@@ -97,7 +97,7 @@ public class TsbSalesUploadJob extends TsbAbstractJob<String, String, String> {
 				log.error("매출반영결과 데이터가 없습니다. 한세 ERP 시스템담당자에게 문의해 주세요.");
 				continue;
 			}
-			
+
 			// 매출반영결과 처리
 			statisticsService.updateSalesUploadResult(erpGb, salesMap);
 

src/main/java/com/style24/batch/biz/service/TsbStatisticsService.java

@@ -72,6 +72,17 @@ public class TsbStatisticsService {
 		return statisticsDao.getCurrentDaySalesSms();
 	}
 
+	/**
+	 * 매출반영I/F번호 조회
+	 * @param erpGb - ERP구분(hsmk:한세MK, hsdr:한세드림)
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 8. 27
+	 */
+	public String getSalesUploadInterfaceNo(String erpGb) {
+		return statisticsDao.getSalesUploadInterfaceNo(erpGb);
+	}
+
 	/**
 	 * 어제일자 매출반영목록 생성
 	 * @param erpGb - ERP구분(hsmk:한세MK, hsdr:한세드림)

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

@@ -1434,6 +1434,7 @@
 			   AND A.SWT_TRC_SEND_YN = 'N'
 			   AND A.WD_GB           = 'W'
 			   AND B.CHG_STAT IN('G685_30') --  회수요청
+			   AND A.REG_DT >= DATE_ADD(STR_TO_DATE(REPLACE( '2021-09-01','-','')+ 1, '%Y%m%d%H%i%s'), INTERVAL 0 DAY) 
 			 GROUP BY A.WD_INVOICE_NO, A.SHIP_COMP_CD, A.ORD_CHG_SQ 
 		 ) A WHERE SWT_SHIP_COMP_CD IS NOT NULL AND SWT_SHIP_COMP_CD != ''
 	</select>
@@ -1487,7 +1488,7 @@
 			   AND C.SELF_GOODS_YN = 'Y'       -- 자사 상품
 			   AND B.ORD_EXCH_GB = 'O'
 			   AND 2 <= FN_GET_BIZDAYS(DATE_FORMAT(A.ORD_DT, '%Y%m%d') , DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -1 DAY ), '%Y%m%d'))
-			   AND A.ORD_DT >= DATE_ADD(DATE_FORMAT('20210831','%Y%m%d%H%i%S') , INTERVAL 0 DAY)   -- 오픈 시점 날짜 세팅 후 주석풀기
+			   AND A.ORD_DT >= DATE_ADD(DATE_FORMAT('20210831160000','%Y%m%d%H%i%S') , INTERVAL 0 DAY)   -- 오픈 시점 날짜 세팅 후 주석풀기
 	
 			UNION ALL  
 			 
@@ -1502,7 +1503,7 @@
 			   AND B.ORD_EXCH_GB = 'O'
 			   AND D.DELV_RES_DT  < NOW()
 			   AND 2 <= FN_GET_BIZDAYS(DATE_FORMAT(CASE WHEN  A.ORD_DT < D.DELV_RES_DT THEN D.DELV_RES_DT ELSE A.ORD_DT END, '%Y%m%d') , DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -1 DAY ), '%Y%m%d'))
-			   AND A.ORD_DT >= DATE_ADD(DATE_FORMAT('20210831','%Y%m%d%H%i%S') , INTERVAL 0 DAY)   -- 오픈 시점 날짜 세팅 후 주석풀기 
+			   AND CASE WHEN  A.ORD_DT < D.DELV_RES_DT THEN D.DELV_RES_DT ELSE A.ORD_DT END  >= DATE_ADD(DATE_FORMAT('20210831160000','%Y%m%d%H%i%S') , INTERVAL 0 DAY)   -- 오픈 시점 날짜 세팅 후 주석풀기 
 		) A 
 		GROUP BY A.ORD_NO
 		ORDER BY ORD_NO
@@ -1543,12 +1544,15 @@
 	<!-- 품절대상 출고예외 주문 목록 조회         -->	
 	<select id="getSoldoutOrderExcNoList" resultType="Delivery" timeout="600">
 		/*TsbDelivery.getSoldoutOrderExcNoList*/
+		<![CDATA[
 		SELECT A.ORD_NO 
 		  FROM TB_ORDER_DELIVERY_EXCEPTION A 
 		  JOIN TB_ORDER_DELIVERY_EXCEPTION_ITEM B ON A.DELIVERY_EXCEPTION_SQ = B.DELIVERY_EXCEPTION_SQ 
 		 WHERE A.COMPLTED_YN = 'N'
 		   AND B.GIFT_YN     = 'N'
+		   AND A.REG_DT >= DATE_ADD(DATE_FORMAT('20210901','%Y%m%d%H%i%S') , INTERVAL 0 DAY)
 		 GROUP BY A.ORD_NO 
+		 ]]>
 	</select>
 	
 	<!-- 품절대상 출고예외 주문상세 목록 조회         -->
@@ -1608,6 +1612,7 @@
 		  FROM TB_ORDER_RECALL_EXCEPTION A 
 		  JOIN TB_ORDER_RECALL_EXCEPTION_ITEM B ON A.RECALL_EXCEPTION_NO = B.RECALL_EXCEPTION_NO 
 		  JOIN TB_ORDER                         C ON A.ORDER_NO = C.ORD_NO 
+		  JOIN TB_ORDER_DETAIL                 OD ON A.ORDER_NO = OD.ORD_NO AND B.ORDER_DTL_NO = OD.ORD_DTL_NO AND OD.ORD_DTL_STAT NOT IN('G013_99')
 		  JOIN TB_PAYMENT                       D ON A.ORDER_NO = D.ORD_NO   AND D.PAY_STAT = 'G016_30'
 		  LEFT OUTER JOIN TB_CUST_ACCOUNT       E ON C.CUST_NO = E.CUST_NO   AND E.DEL_YN = 'N' AND E.CUST_NO NOT IN(0)
 		 WHERE B.REASON_CODE IN ('08','10')

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

@@ -2471,6 +2471,7 @@
 	<!-- TB_SELL_QTY 테이블 생성 -->
 	<insert id="createTtbSellQty"  timeout="300">
 		/* TsbGoods.createTtbSellQty */
+		<![CDATA[
 		INSERT INTO TB_SELL_QTY (
 		      GOODS_CD
 		    , OPT_CD
@@ -2503,12 +2504,15 @@
 		                     AND OD.ORD_DTL_STAT IN ('G013_10','G013_20','G013_25','G013_30','G013_35','G013_40') -- 입금대기, 결제완료, 교환대기, 상품준비중,출고처지정,배송준비중
 		                     AND OD.GOODS_CD = G.GOODS_CD
 		                     AND G.SELF_GOODS_YN ='Y'
+		                     AND OD.REG_DT >= DATE_ADD(DATE_FORMAT('20210831','%Y%m%d%H%i%S') , INTERVAL 0 DAY) 
 		                    )
+		]]>
 	</insert>
 
 	<!-- TB_SELL_QTY 테이블 생성 -->
 	<insert id="createTtbSellQtyByOrderDetail"  timeout="300">
 		/* TsbGoods.createTtbSellQtyByOrderDetail */
+		<![CDATA[
 		INSERT INTO TB_SELL_QTY (
 		      GOODS_CD
 		    , OPT_CD
@@ -2542,6 +2546,7 @@
 		      WHERE OD.ORD_DTL_NO = ODI.ORD_DTL_NO
 		      AND OD.ORD_DTL_STAT IN ('G013_10','G013_20','G013_25','G013_30','G013_35','G013_40') -- 입금대기, 결제완료, 교환대기, 상품준비중,출고처지정,배송준비중
 		      AND EXISTS (SELECT 1 FROM TB_OPTION X WHERE X.GOODS_CD = ODI.ITEM_CD AND X.OPT_CD = ODI.OPT_CD)
+		      AND OD.REG_DT >= DATE_ADD(DATE_FORMAT('20210831','%Y%m%d%H%i%S') , INTERVAL 0 DAY) 
 		      GROUP BY ODI.ITEM_CD, ODI.OPT_CD, OD.ORD_DTL_NO, OD.AGENT_ORDER_ID, OD.EXTMALL_ORDER_ID
 		     ) A
 		WHERE NOT EXISTS (SELECT 1
@@ -2551,6 +2556,7 @@
 		                  AND Y.SELL_GB = A.SELL_GB
 		                  AND Y.ORD_DTL_NO = A.ORD_DTL_NO
 		                  )
+		]]>
 	</insert>
 
 	<!-- 입고상품중 온라인 옵션이 없는 상품옵션 추가  -->

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

@@ -944,6 +944,18 @@
 		       ) ODIH
 	</select>
 	
+	<!-- 매출반영I/F번호 조회 -->
+	<select id="getSalesUploadInterfaceNo" parameterType="String" resultType="String">
+		/* TsbStatistics.getSalesUploadInterfaceNo */
+		SELECT CONCAT(DATE_FORMAT(NOW(),'%Y%m%d%H%i%S'),
+		              LPAD(IFNULL((SELECT CAST(MAX(SUBSTRING(NO_IF,15)) AS UNSIGNED)
+		                           FROM   TB_HANSAE_SALES
+		                           WHERE  ERP_GB = #{erpGb}
+		                           AND    NO_IF LIKE CONCAT(DATE_FORMAT(NOW(),'%Y%m%d'),'%')
+		                          ),0) + 1,4,'0')) AS NO_IF
+		FROM   DUAL
+	</select>
+	
 	<!-- 어제일자 매출반영목록 생성 -->
 	<insert id="createYesterdaySalesUploadList" parameterType="String">
 		/* TsbStatistics.createYesterdaySalesUploadList */
@@ -962,11 +974,13 @@
 		)
 		SELECT #{erpGb}            AS ERP_GB
 		     , CONCAT(DATE_FORMAT(NOW(),'%Y%m%d%H%i%S'),
-		              LPAD(ROW_NUMBER() OVER(ORDER BY DT_SALE
-		                                            , CD_STYLE
-		                                            , CD_COLOR
-		                                            , CD_SIZE),4,'0')
-		             )             AS NO_IF
+		              (SELECT LPAD(IFNULL((SELECT CAST(MAX(SUBSTRING(NO_IF,15)) AS UNSIGNED)
+		                                   FROM   TB_HANSAE_SALES
+		                                   WHERE  ERP_GB = #{erpGb}
+		                                   AND    NO_IF LIKE CONCAT(DATE_FORMAT(NOW(),'%Y%m%d'),'%')
+		                                  ),0) + 1,4,'0')
+		               FROM   DUAL)
+		              )            AS NO_IF
 		     , DT_SALE
 		     , TP_SALE
 		     , CD_STYLE
@@ -1081,7 +1095,6 @@
 		     , UPD_DT = NOW()
 		WHERE  ERP_GB = #{ERP_GB}
 		AND    NO_IF = #{NO_IF}
-		AND    DT_SALE = #{DT_SALE}
 		AND    CD_STYLE = #{CD_STYLE}
 		AND    CD_COLOR = #{CD_COLOR}
 		AND    CD_SIZE = #{CD_SIZE}