Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.batch into develop

src/main/java/com/style24/batch/biz/task/TsbDeliveryTask.java

@@ -76,7 +76,7 @@ public class TsbDeliveryTask {
 	// @Scheduled(fixedDelay = 3500000)
 	@Async
 	public void shotDeliveryZoneRefreshJob() throws Exception {
-		dailyDeliveryZoneJob.run("cron.delivery.shot.deliveryzone.refresh");
+		dailyDeliveryZoneJob.runById("cron.delivery.shot.deliveryzone.refresh");
 	}
 
 	/**
@@ -88,7 +88,7 @@ public class TsbDeliveryTask {
 	//@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void deliveryLocAssignJob() throws Exception {
-		deliveryOrderJob.run("cron.delivery.loc.assign");
+		deliveryOrderJob.runById("cron.delivery.loc.assign");
 	}
 
 	/**
@@ -100,7 +100,7 @@ public class TsbDeliveryTask {
 	//@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void wmsOutgoingExceptionReceiveJob() throws Exception {
-		deliveryExcRcvJob.run("cron.delivery.wms.outgoing.exception.receive");
+		deliveryExcRcvJob.runById("cron.delivery.wms.outgoing.exception.receive");
 	}
 
 	/**
@@ -112,7 +112,7 @@ public class TsbDeliveryTask {
 	//@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void wmsInvoiceReceiveJob() throws Exception {
-		tsbInvoiceNoRcvJob.run("cron.delivery.wms.invoice.receive");
+		tsbInvoiceNoRcvJob.runById("cron.delivery.wms.invoice.receive");
 	}
 	
 	/**
@@ -124,7 +124,7 @@ public class TsbDeliveryTask {
 	//@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void wmsOutgoingResultReceiveJob() throws Exception {
-		deliveryOrderRsltJob.run("cron.delivery.wms.outgoing.result.receive");
+		deliveryOrderRsltJob.runById("cron.delivery.wms.outgoing.result.receive");
 	}
 
 	/**
@@ -136,7 +136,7 @@ public class TsbDeliveryTask {
 	//@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void sweettrackerInvoiceRetrieveJob() throws Exception {
-		tsbSweetTrackerJob.run("cron.delivery.sweettracker.invoice.retrieve");
+		tsbSweetTrackerJob.runById("cron.delivery.sweettracker.invoice.retrieve");
 	}
 
 	/**
@@ -148,7 +148,7 @@ public class TsbDeliveryTask {
 	//@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void autoSoldoutCancelJob() throws Exception {
-		tsbSoldoutCancelJob.run("cron.delivery.auto.soldout.cancel");
+		tsbSoldoutCancelJob.runById("cron.delivery.auto.soldout.cancel");
 	}
 
 }

src/main/java/com/style24/batch/biz/task/TsbGoodsTask.java

@@ -348,7 +348,7 @@ public class TsbGoodsTask {
 	@Scheduled(cron = "${cron.goods.shop.stock.receive}")
 	@Async
 	public void shopGoodsStockReceiveJob() throws Exception {
-		tsbShopGoodsStockJob.run("cron.goods.shop.stock.receive");
+		tsbShopGoodsStockJob.runById("cron.goods.shop.stock.receive");
 	}
 
 	/**

src/main/java/com/style24/batch/biz/task/TsbWithdrawTask.java

@@ -72,7 +72,7 @@ public class TsbWithdrawTask {
 	//@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void withdrawWmsRequestJob() throws Exception {
-		tsbWithdrawRequestJob.run("cron.withdraw.wms.request");
+		tsbWithdrawRequestJob.runById("cron.withdraw.wms.request");
 	}
 
 	/**
@@ -84,7 +84,7 @@ public class TsbWithdrawTask {
 	//@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void withdrawWmsIngoingExceptionReceiveJob() throws Exception {
-		withdrawExcRcvJob.run("cron.withdraw.wms.ingoing.exception.receive");
+		withdrawExcRcvJob.runById("cron.withdraw.wms.ingoing.exception.receive");
 	}
 
 	/**
@@ -96,7 +96,7 @@ public class TsbWithdrawTask {
 	//@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void withdrawWmsIngoingExceptionResultReceiveJob() throws Exception {
-		withdrawExcRsltJob.run("cron.withdraw.wms.ingoing.exception.result.receive");
+		withdrawExcRsltJob.runById("cron.withdraw.wms.ingoing.exception.result.receive");
 	}
 
 	/**
@@ -108,7 +108,7 @@ public class TsbWithdrawTask {
 	//@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void withdrawWmsIngoingResultReceiveJob() throws Exception {
-		withdrawRsltJob.run("cron.withdraw.wms.ingoing.result.receive");
+		withdrawRsltJob.runById("cron.withdraw.wms.ingoing.result.receive");
 	}
 
 	/**
@@ -120,7 +120,7 @@ public class TsbWithdrawTask {
 	//@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void withdrawCjInvoiceReceiveJob() throws Exception {
-		tsbCjWithdrawInvoiceJob.run("cron.withdraw.cj.invoice.receive");
+		tsbCjWithdrawInvoiceJob.runById("cron.withdraw.cj.invoice.receive");
 	}
 
 	/**
@@ -132,7 +132,7 @@ public class TsbWithdrawTask {
 	//@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void withdrawCjStatusJob() throws Exception {
-		tsbCjWithdrawInvoiceStatJob.run("cron.withdraw.cj.status.receive");
+		tsbCjWithdrawInvoiceStatJob.runById("cron.withdraw.cj.status.receive");
 	}
 
 }