Sfoglia il codice sorgente

구매확정 수정 중

yujung 4 anni fa
parent
commit
f235312cce

+ 10 - 10
src/main/java/com/style24/batch/biz/dao/TsbOrderDao.java

@@ -89,43 +89,43 @@ public interface TsbOrderDao {
 	int createTempBuyConfirmData();
 
 	/**
-	 * 테이블명 DataBak -> Data 변경
+	 * 주문상세 상태 구매확정
 	 * @param Order
 	 * @author yujung
 	 * @since 2021. 10. 01
 	 */
-	void renameBuyConfirmDataBakToData();
+	int updateOrderDetailStatBuyConfirm();
 
 	/**
-	 * 테이블명 Data -> DataTmp 변경
+	 * 구매확정 주문상세이력 생성
 	 * @param Order
 	 * @author yujung
 	 * @since 2021. 10. 01
 	 */
-	void renameBuyConfirmDataToTmp();
+	int createOrderDetailHstBuyConfirm();
 
 	/**
-	 * 주문상세 상태 구매확정
+	 * 주문상세단품 구매확정
 	 * @param Order
 	 * @author yujung
 	 * @since 2021. 10. 01
 	 */
-	int updateOrderDetailStatBuyConfirm();
+	int updateOrderDetailItemStatBuyConfirm();
 
 	/**
-	 * 구매확정 주문상세이력 생성
+	 * 테이블명 DataBak -> Data 변경
 	 * @param Order
 	 * @author yujung
 	 * @since 2021. 10. 01
 	 */
-	int createOrderDetailHstBuyConfirm();
+	void renameBuyConfirmDataBakToData();
 
 	/**
-	 * 주문상세단품 구매확정
+	 * 테이블명 Data -> DataTmp 변경
 	 * @param Order
 	 * @author yujung
 	 * @since 2021. 10. 01
 	 */
-	int updateOrderDetailItemStatBuyConfirm();
+	void renameBuyConfirmDataToTmp();
 
 }

+ 4 - 1
src/main/java/com/style24/batch/biz/job/marketing/TsbAutoBuyConfirmJob.java

@@ -52,7 +52,7 @@ public class TsbAutoBuyConfirmJob extends TsbAbstractJob<Collection<Point>, Gaga
 
 	@Override
 	public GagaMap process(Collection<Point> readItem) throws Exception {
-		// 1. 구매확정 임시 테이블 생성
+		// 1. 구매확정 임시 테이블 생성 / 데이터 생성
 		int confirmCnt = orderService.createTempBuyConfirmData();
 		log.info("1. 구매확정 임시테이블 생성 건 : {}", confirmCnt);
 
@@ -81,6 +81,9 @@ public class TsbAutoBuyConfirmJob extends TsbAbstractJob<Collection<Point>, Gaga
 				}
 
 			}
+
+			// 4. 임시테이블 명 변경
+			orderService.renameTempBuyConfirmData();
 		}
 
 		return null;

+ 17 - 4
src/main/java/com/style24/batch/biz/service/TsbOrderService.java

@@ -83,18 +83,31 @@ public class TsbOrderService {
 	 */
 	@Transactional("shopTxnManager")
 	public int createTempBuyConfirmData() {
+		// drop 테이블
 		orderDao.deleteTempBuyConfirmData();
 
+		// create tmp 테이블
 		orderDao.createTableBuyConfirmDataTmp();
 
+		// tmp 테이블 테이터 생성
 		int result = orderDao.createTempBuyConfirmData();
-		log.info("데이터 생성 : {}", result);
 
-		orderDao.renameTable1();
+		return result;
+	}
 
-		orderDao.renameTable2();
+	/**
+	 * 구매확정 임시테이블 명 변경
+	 * @return Collection<Order>
+	 * @author yujung
+	 * @since 2021. 10. 01
+	 */
+	@Transactional("shopTxnManager")
+	public void renameTempBuyConfirmData() {
+		// 테이블명 DataBak -> Data 변경
+		orderDao.renameBuyConfirmDataBakToData();
 
-		return 0;
+		// 테이블명 Data -> DataTmp 변경
+		orderDao.renameBuyConfirmDataToTmp();
 	}
 
 	/**

+ 3 - 3
src/main/java/com/style24/persistence/mybatis/shop/TsbOrder.xml

@@ -164,7 +164,7 @@
 		     , UPD_DT = NOW()
 		WHERE  ORD_DTL_NO IN (
 		                      SELECT ORD_DTL_NO
-		                      FROM   TEMP_BUY_CONFIRM_DATA
+		                      FROM   TEMP_BUY_CONFIRM_DATA_TMP
 		                     )
 	</update>
 
@@ -322,7 +322,7 @@
 		FROM   TB_ORDER_DETAIL
 		WHERE  ORD_DTL_NO IN (
 			                  SELECT ORD_DTL_NO
-			                  FROM   TEMP_BUY_CONFIRM_DATA
+			                  FROM   TEMP_BUY_CONFIRM_DATA_TMP
 		                     )
 	</insert>
 
@@ -335,7 +335,7 @@
 		     , UPD_DT = NOW()
 		WHERE  ORD_DTL_NO IN (
 			                  SELECT ORD_DTL_NO
-			                  FROM   TEMP_BUY_CONFIRM_DATA
+			                  FROM   TEMP_BUY_CONFIRM_DATA_TMP
 		                     )
 	</update>
 

+ 1 - 1
src/main/java/com/style24/persistence/mybatis/shop/TsbPoint.xml

@@ -18,7 +18,7 @@
 		AND   CPH.PNT_UPLOAD_STAT = 'G070_10'
 		AND   CPH.ORD_DTL_NO IN (
 		                         SELECT ORD_DTL_NO
-		                         FROM   TEMP_BUY_CONFIRM_DATA
+		                         FROM   TEMP_BUY_CONFIRM_DATA_TMP
 		                         )
 		GROUP BY CPH.ORD_NO, CPH.ORD_DTL_NO , CPH.CUST_NO
 		HAVING SUM(PNT_AMT) > 0