Merge remote-tracking branch 'origin/develop' into xodud1202

src/main/java/com/style24/batch/biz/job/delivery/TsbSoldoutCancelJob.java

@@ -50,6 +50,7 @@ public class TsbSoldoutCancelJob extends TsbAbstractJob<Delivery, Delivery, Deli
 		 * */
 		
 		// 1. (일반,예약) 품절취소대상 주문번호 목록 조회, 주문번호 단위  주문상세목록 조회 , 주문번호 단위 core 취소 서비스호출  
+		/*
 		Collection<Delivery> ordnoList = deliveryService.getSoldoutOrderNoList();
 		try {
 			for(Delivery data : ordnoList) {
@@ -59,6 +60,7 @@ public class TsbSoldoutCancelJob extends TsbAbstractJob<Delivery, Delivery, Deli
 		}catch(Exception E) {
 			failCnt++;
 		}
+		*/
 		
 		// 2. (출고예외 -- 재고부족)               품절 대상 조회     core 취소 서비스호출  처리완료 업데이트 
 		Collection<Delivery> excOrdnoList = deliveryService.getSoldoutOrderExcNoList();

src/main/java/com/style24/batch/biz/web/TsbWithdrawController.java

@@ -0,0 +1,126 @@
+package com.style24.batch.biz.web;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.style24.batch.biz.job.delivery.TsbCjWithdrawInvoiceJob;
+import com.style24.batch.biz.job.delivery.TsbCjWithdrawInvoiceStatJob;
+import com.style24.batch.biz.job.delivery.TsbWithdrawExcRcvJob;
+import com.style24.batch.biz.job.delivery.TsbWithdrawExcRsltJob;
+import com.style24.batch.biz.job.delivery.TsbWithdrawRequestJob;
+import com.style24.batch.biz.job.delivery.TsbWithdrawRsltJob;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 회수 Controller
+ * @author moon
+ * @since 2021. 06. 22
+ */
+@Controller
+@RequestMapping("/withdraw")
+@CrossOrigin(origins = "${domain.admin}")
+@Slf4j
+public class TsbWithdrawController {
+
+	@Autowired
+	private TsbWithdrawExcRcvJob withdrawExcRcvJob;
+
+	@Autowired
+	private TsbWithdrawExcRsltJob withdrawExcRsltJob;
+
+	@Autowired
+	private TsbWithdrawRsltJob withdrawRsltJob;
+
+	@Autowired
+	private TsbWithdrawRequestJob tsbWithdrawRequestJob;
+
+	@Autowired
+	private TsbCjWithdrawInvoiceJob tsbCjWithdrawInvoiceJob;
+
+	@Autowired
+	private TsbCjWithdrawInvoiceStatJob tsbCjWithdrawInvoiceStatJob;
+
+
+
+	/**
+	 * WMS 회수요청
+	 *
+	 * @throws Exception
+	 */
+	@GetMapping("/wms/request")
+	@ResponseBody
+	public String shotDeliveryZoneRefreshJob() throws Exception {
+		tsbWithdrawRequestJob.run("cron.withdraw.wms.request");
+		return "OK";
+	}
+	
+
+	/**
+	 * WMS 회수입고예외 수신
+	 *
+	 * @throws Exception
+	 */
+	@GetMapping("/wms/ingoing/exception/receive")
+	@ResponseBody
+	public String withdrawWmsIngoingExceptionReceiveJob() throws Exception {
+		withdrawExcRcvJob.run("cron.withdraw.wms.ingoing.exception.receive");
+		return "OK";
+	}
+
+	/**
+	 * WMS 회수입고예외결과 송신
+	 *
+	 * @throws Exception
+	 */
+	@GetMapping("/wms/ingoing/exception/result/receive")
+	@ResponseBody
+	public String withdrawWmsIngoingExceptionResultReceiveJob() throws Exception {
+		withdrawExcRsltJob.run("cron.withdraw.wms.ingoing.exception.result.receive");
+		return "OK";
+	}
+
+	/**
+	 * WMS 회수입고결과 수신
+	 *
+	 * @throws Exception
+	 */
+	@GetMapping("/wms/ingoing/result/receive")
+	@ResponseBody
+	public String withdrawWmsIngoingResultReceiveJob() throws Exception {
+		withdrawRsltJob.run("cron.withdraw.wms.ingoing.result.receive");
+		return "OK";
+	}
+
+	/**
+	 * CJ 회수송장번호 수신
+	 *
+	 * @throws Exception
+	 */
+	@GetMapping("/cj/invoice/receive")
+	@ResponseBody
+	public String withdrawCjInvoiceReceiveJob() throws Exception {
+		tsbCjWithdrawInvoiceJob.run("cron.withdraw.cj.invoice.receive");
+		return "OK";
+	}
+
+	/**
+	 * CJ 회수상태 수신
+	 *
+	 * @throws Exception
+	 */
+	@GetMapping("/cj/status/receive")
+	@ResponseBody
+	public String withdrawCjStatusJob() throws Exception {
+		tsbCjWithdrawInvoiceStatJob.run("cron.withdraw.cj.status.receive");
+		return "OK";
+	}
+
+}

src/main/java/com/style24/batch/support/env/TsbConstants.java

@@ -10,7 +10,7 @@ package com.style24.batch.support.env;
 public class TsbConstants {
 
 	// 등록자번호
-	public static final Integer REG_NO = 0;
+	public static final Integer REG_NO = 99999;
 
 	public static final String COMPANY_CD_DR = "3"; // 한세드림
 	public static final String COMPANY_CD_MK = "5"; // 한세엠케이(주)

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

@@ -232,7 +232,7 @@
 	<update id="updateGoodTnmInit">
 		/* TsbGoods.updateGoodTnmInit */
 		UPDATE TB_GOODS A
-		SET A.UPD_NO = 0
+		SET A.UPD_NO = 99999
 		  , A.UPD_DT = NOW()
 		  , A.GOODS_TNM = (SELECT S.GOODS_TNM
 		                   FROM (
@@ -270,7 +270,7 @@
 		/* TsbGoods.updateGoodsTnmRes */
 		UPDATE TB_GOODS_TNM_RES
 		   SET APPLY_YN = 'Y'
-		     , UPD_NO = 0
+		     , UPD_NO = 99999
 		     , UPD_DT = NOW()
 		WHERE APPLY_EDDT <![CDATA[<]]> NOW()
 		AND APPLY_YN = 'N'
@@ -280,7 +280,7 @@
 	<update id="updateGoodsTnm">
 		/* TsbGoods.updateGoodsTnm */
 		UPDATE TB_GOODS A
-		SET A.UPD_NO = 0
+		SET A.UPD_NO = 99999
 		  , A.UPD_DT = NOW()
 		  , A.GOODS_TNM = (
 		                 SELECT S.GOODS_TNM
@@ -343,7 +343,7 @@
 		                         ) TS
 		                    WHERE P.GOODS_CD = TS.GOODS_CD
 		                    ) B
-		SET A.UPD_NO = 0
+		SET A.UPD_NO = 99999
 		  , A.UPD_DT = NOW()
 		  , A.CURR_PRICE = B.END_GOODS_PRICE
 		  , A.CURR_BPRICE = B.CURR_PRICE
@@ -358,7 +358,7 @@
 		/* TsbGoods.updateGoodsPriceRes */
 		UPDATE TB_GOODS_PRICE_RES
 		   SET APPLY_YN = 'Y'
-		     , UPD_NO = 0
+		     , UPD_NO = 99999
 		     , UPD_DT = NOW()
 		WHERE APPLY_EDDT <![CDATA[<]]> NOW()
 		AND APPLY_YN = 'N'
@@ -388,7 +388,7 @@
 		                    WHERE P.GOODS_CD = S.GOODS_CD
 		                    AND P.CURR_PRICE <![CDATA[<>]]> S.RES_GOODS_PRICE
 		                 ) B
-		SET A.UPD_NO = 0
+		SET A.UPD_NO = 99999
 		  , A.UPD_DT = NOW()
 		  , A.CURR_PRICE = B.RES_GOODS_PRICE
 		  , A.CURR_BPRICE = B.CURR_PRICE
@@ -791,7 +791,7 @@
 		     , GOODS_CD
 		     , PREV_GOODS_CD
 		     , RELATE_SCORE
-		     , 0
+		     , 99999
 		     , NOW()
 		FROM(
 		    SELECT REG_YMD
@@ -844,7 +844,7 @@
 		    FROM (
 		        SELECT GOODS_CD
 		              ,SUM(USAC_QTY *  (CASE USAC_GB WHEN '10' THEN 1 ELSE -1 END) ) AS COL_DATA
-		              , 0
+		              , 99999
 		              , NOW() 
 		        FROM TB_USAC
 		        WHERE MALL_GB = '10'
@@ -875,7 +875,7 @@
 		    FROM (
 		       SELECT GOODS_CD
 		             ,COUNT(GOODS_CD) AS COL_DATA
-		             ,0
+		             ,99999
 		             ,NOW()
 		       FROM TB_GOODS_VIEW_HST
 		       WHERE 1 = 1
@@ -904,7 +904,7 @@
 		    FROM (
 		       SELECT GOODS_CD
 		             ,COUNT(GOODS_CD) AS COL_DATA
-		             ,0
+		             ,99999
 		             ,NOW()
 		       FROM TB_REVIEW A
 		       WHERE DISP_YN = 'Y'
@@ -945,7 +945,7 @@
 		(
 		SELECT GOODS_CD
 		     , REVIEW_REG_CNT
-		     , 0
+		     , 99999
 		     , NOW()
 		FROM (
 		    SELECT GOODS_CD
@@ -983,7 +983,7 @@
 		(
 		    SELECT GOODS_CD
 		         , ROUND( COL_DATA /REVIEW_CNT,1)
-		         , 0
+		         , 99999
 		         , NOW()
 		    FROM (
 		       SELECT GOODS_CD
@@ -1018,7 +1018,7 @@
 		             ,IFNULL(SUM(CASE WHEN ${reviewColNm} = '1' THEN 1 ELSE 0 END),0) AS COL_DATA1
 		             ,IFNULL(SUM(CASE WHEN ${reviewColNm} = '2' THEN 1 ELSE 0 END),0) AS COL_DATA2
 		             ,IFNULL(SUM(CASE WHEN ${reviewColNm} = '3' THEN 1 ELSE 0 END),0) AS COL_DATA3
-		             ,0
+		             ,99999
 		             ,NOW()
 		       FROM TB_REVIEW
 		       WHERE DISP_YN = 'Y'
@@ -1055,7 +1055,7 @@
 		         , ROUND( COL_DATA1 /REVIEW_CNT,1)  AS COL_DATA1
 		         , ROUND( COL_DATA2 /REVIEW_CNT,1)  AS COL_DATA2
 		         , ROUND( COL_DATA3 /REVIEW_CNT,1)  AS COL_DATA3
-		         , 0
+		         , 99999
 		         , NOW()
 		    FROM (
 		       SELECT GOODS_CD
@@ -1096,7 +1096,7 @@
 		    FROM (
 		       SELECT REL_GOODS_CD
 		             ,COUNT(REL_GOODS_CD) AS COL_DATA
-		             ,0
+		             ,99999
 		             ,NOW()
 		       FROM TB_COUNSEL
 		       WHERE COUNSEL_TYPE = 'G'
@@ -1120,7 +1120,7 @@
 		(
 		SELECT GOODS_CD
 		     , GOODS_QNA_CNT
-		     , 0
+		     , 99999
 		     , NOW()
 		FROM (
 		    SELECT GOODS_CD
@@ -1180,7 +1180,7 @@
 		   , A.SCORE_BALL1         = IFNULL(GS.SCORE_BALL1,0)
 		   , A.SCORE_BALL2         = IFNULL(GS.SCORE_BALL2,0)
 		   , A.SCORE_BALL3         = IFNULL(GS.SCORE_BALL3,0)
-		   , A.UPD_NO              = 0
+		   , A.UPD_NO              = 99999
 		   , A.UPD_DT              = NOW()
 		WHERE A.GOODS_CD = GS.GOODS_CD
 	</insert>
@@ -1205,7 +1205,7 @@
 		FROM TEMP_GOODS_SAFE_NO
 		WHERE 1 = 1
 		AND NULLIF(CERT_NUM, '') IS NOT NULL
-		AND UPD_NO != 0
+		AND UPD_NO != 99999
 		-- AND REG_NO = 6
 		LIMIT 10000
 	</select>
@@ -1915,9 +1915,9 @@
 		     , DISP_ORD
 		     , 'Y' AS DISP_YN
 		     , ERP_STOCK_LINK_YN
-		     , 0 AS REG_NO
+		     , 99999 AS REG_NO
 		     , NOW() AS REG_DT
-		     , 0 AS UPD_NO
+		     , 99999 AS UPD_NO
 		     , NOW() AS UPD_DT
 		FROM (
 		      SELECT B.GOODS_CD
@@ -1989,9 +1989,9 @@
 		     , DISP_ORD
 		     , 'Y' AS DISP_YN
 		     , ERP_STOCK_LINK_YN
-		     , 0 AS REG_NO
+		     , 99999 AS REG_NO
 		     , NOW() AS REG_DT
-		     , 0 AS UPD_NO
+		     , 99999 AS UPD_NO
 		     , NOW() AS UPD_DT
 		FROM (
 		      SELECT E.GOODS_CD
@@ -2166,7 +2166,7 @@
 		                          ) B
 		SET A.CURR_STOCK_QTY = B.CURR_STOCK_QTY
 		  , A.STORE_STOCK_QTY = B.STORE_STOCK_QTY
-		  , A.UPD_NO = 0
+		  , A.UPD_NO = 99999
 		  , A.UPD_DT = NOW()
 		WHERE A.GOODS_CD = B.GOODS_CD
 		AND A.OPT_CD = B.OPT_CD
@@ -2201,7 +2201,7 @@
 		                               ) Y WHERE STORE_MAX_QTY > 0
 		                           ) B
 		SET A.STORE_MAX_QTY = B.STORE_MAX_QTY
-		  , A.UPD_NO = 0
+		  , A.UPD_NO = 99999
 		  , A.UPD_DT = NOW()
 		WHERE A.GOODS_CD = B.GOODS_CD
 		AND A.OPT_CD = B.OPT_CD
@@ -2223,7 +2223,7 @@
 		                      ) B
 		SET A.CURR_STOCK_QTY = B.CURR_STOCK_QTY
 		  , A.STORE_STOCK_QTY = B.STORE_STOCK_QTY
-		  , A.UPD_NO = 0
+		  , A.UPD_NO = 99999
 		  , A.UPD_DT = NOW()
 		WHERE A.GOODS_CD = B.GOODS_CD
 		AND A.OPT_CD = B.OPT_CD
@@ -2400,9 +2400,9 @@
 		     , IFNULL((SELECT (MAX(DISP_ORD) + 1)
 			        FROM TB_OPTION WHERE GOODS_CD = E.GOODS_CD) , ROW_NUMBER() OVER(PARTITION BY GOODS_CD ORDER BY OPT_CD)) AS DISP_ORD
 		     , 'Y' AS DISP_YN
-		     , 0 AS REG_NO
+		     , 99999 AS REG_NO
 		     , NOW() AS REG_DT
-		     , 0 AS UPD_NO
+		     , 99999 AS UPD_NO
 		     , NOW() AS UPD_DT
 		FROM (
 		      SELECT A.SKUCODE
@@ -2742,7 +2742,7 @@
 		SELECT DISTINCT
 		       GOODS_CD
 		     , BENEFIT_GB
-		     , 0          AS REG_NO
+		     , 99999      AS REG_NO
 		     , NOW()      AS REG_DT
 		FROM   (
 		        SELECT GOODS_CD
@@ -2799,7 +2799,7 @@
 		     INNER JOIN TB_WMS_COLOR_MAPPING M ON S.SUPPLY_COMP_CD = M.SUPPLY_COMP_CD
 		                                       AND S.CD_COLOR = M.WMS_COLOR_CD
 		                                       AND M.USE_YN = 'Y') A
-		INNER JOIN TB_OPTION E ON A.CD_STYLE = E.GOODS_CD
+		INNER JOIN TB_OPTION E USE INDEX(PRIMARY) ON A.CD_STYLE = E.GOODS_CD
 		                       AND A.OPT_CD1 = E.OPT_CD1
 		                       AND A.CD_SIZE = E.OPT_CD2
 		INNER JOIN TB_GOODS B ON A.CD_STYLE = B.GOODS_CD

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

@@ -504,6 +504,11 @@
 		AND    G.ADULT_YN = 'N' /*성인상품아닌넘만*/
 		    </otherwise>
 		</choose>
+		AND    NOT EXISTS (SELECT 1
+		                   FROM   TB_GOODS_EP_SKIP
+		                   WHERE  GOODS_CD = G.GOODS_CD
+		                   AND    NOW() BETWEEN APPLY_STDT AND APPLY_EDDT
+		                  )
 	</insert>
 	
 	<!-- 최종 EP네이버 생성 -->
@@ -1038,7 +1043,7 @@
 		                                DFP.DELV_FEE
 		                       END
 		              END,0)                                                                                       AS DELIV      /*배송료*/
-		     , 3                                                                                                   AS DELIVTERM  /*배송기간*/
+		     , CASE WHEN G.SELF_GOODS_YN = 'Y' THEN 1 ELSE 3 END                                                   AS DELIVTERM  /*배송기간(자사상품:1일,입점상품:3일)*/
 		     , CASE WHEN GS.SCORE IS NULL OR GS.SCORE = 0.0 THEN ''
 		            ELSE CONCAT(IFNULL(GS.SCORE,0),'/',5)
 		       END                                                                                                 AS RATING     /*상품평평점*/
@@ -1093,6 +1098,11 @@
 		AND    G.ADULT_YN = 'N' /*성인상품아닌넘만*/
 		    </otherwise>
 		</choose>
+		AND    NOT EXISTS (SELECT 1
+		                   FROM   TB_GOODS_EP_SKIP
+		                   WHERE  GOODS_CD = G.GOODS_CD
+		                   AND    NOW() BETWEEN APPLY_STDT AND APPLY_EDDT
+		                  )
 	</insert>
 	
 	<!-- 최종 EP다음 데이터 생성 -->

src/main/java/com/style24/persistence/mybatis/wms/TsbWmsDelivery.xml

@@ -49,7 +49,7 @@
 		WHERE 1=1
 		  AND IfStat = '0'
 		  AND StatusCd = '대기'
-		  AND DateCreated > CONVERT(datetime,'20210507'+' 00:00:00') -- 임시임 
+		  AND DateCreated > CONVERT(datetime,'20210620'+' 00:00:00') -- 임시임 
 	</select>
 	
 	<!-- WMS_IF 회수예외 목록 -D -->	
@@ -76,7 +76,7 @@
 		 WHERE A.RecallExceptionNo = B.RecallExceptionNo
 		   AND A.IfStat = 0
 		   AND B.StatusCd = '대기'
-		   AND B.DateCreated > CONVERT(datetime,'20210507'+' 00:00:00') -- 임시임 
+		   AND B.DateCreated > CONVERT(datetime,'20210620'+' 00:00:00') -- 임시임 
 	</select>
 	
 	
@@ -97,7 +97,7 @@
 		 WHERE A.RecallExceptionNo = B.RecallExceptionNo
 		   AND A.IfStat = 0
 		   AND B.StatusCd = '대기'
-		   AND B.DateCreated > CONVERT(datetime,'20210507'+' 00:00:00') -- 임시임
+		   AND B.DateCreated > CONVERT(datetime,'20210620'+' 00:00:00') -- 임시임
 	</select>
 	
 	
@@ -213,6 +213,7 @@
 		 WHERE B.IfYn     = 'N'
 		   AND B.StatusCd = '30'
 		   AND B.GiftYn   = 'N'
+		   AND B.IsCancel = 0
 	</select>				
 				 
 	<!-- 출고결과수신완료    -->
@@ -270,7 +271,7 @@
 			, B.InvoiceNo			-- 원운송장번호
 			, A.encloseFee          -- 동봉비 
 			, B.logisticscode
-			, CASE WHEN A.DateCreated > '20210615 00:00:00' THEN 'N' ELSE 'Y' END AS ASIS_YN 
+			, CASE WHEN A.DateCreated > '20210620 00:00:00' THEN 'N' ELSE 'Y' END AS ASIS_YN 
 			, A.CodFee
 		  FROM istyle24_Wmsif.dbo.TB_IF_RECALLDELIVERY A, istyle24_Wmsif.dbo.TB_IF_RECALLDELIVERYITEM B
 		 WHERE A.RecallNo  = B.RecallNo

src/main/java/com/style24/persistence/mybatis/wms/TsbWmsGoods.xml

@@ -205,7 +205,7 @@
 		  , SUPPLY_COMP_CD = #{supplyCompCd}
 		  , SYS_IMG_NM = #{sysImgNm}
 		  , DATElASTMODIFIED = GETDATE()
-		WHERE PRODUCTCODE = #{productcode}
+		WHERE PRODUCTNO = #{productno}
 	</update>
 	
 	<!-- WMS 재고 테이블 조회   -->