moon 5 anni fa
parent
commit
98892f41bd

+ 9 - 9
src/main/java/com/style24/batch/biz/job/delivery/TsbSweetTrackerJob.java

@@ -48,15 +48,15 @@ public class TsbSweetTrackerJob extends TsbAbstractJob<Collection<Delivery>, Col
 		 * 
 		 * */
 		
-		for(Delivery data : invcList) {
-			GagaMap rtn = deliveryService.sweetTrackerInvcSend(data);
-			if("S".equals(rtn.getString("success"))) {
-				deliveryService.updateOrdInvcSendYn(data);
-			}
-		}
-		
-//		GagaMap rtn = deliveryService.sweetTrackerInvcSendTest();
-//		log.info(""+rtn.getString("success"));
+//		for(Delivery data : invcList) {
+//			GagaMap rtn = deliveryService.sweetTrackerInvcSend(data);
+//			if("S".equals(rtn.getString("success"))) {
+//				deliveryService.updateOrdInvcSendYn(data);
+//			}
+//		}
+//		
+		GagaMap rtn = deliveryService.sweetTrackerInvcSendTest();
+		log.info(""+rtn.getString("success"));
 		 succCnt = 1;
 		 failCnt = 0;
 		

+ 5 - 5
src/main/java/com/style24/batch/biz/service/TsbDeliveryService.java

@@ -764,7 +764,7 @@ public class TsbDeliveryService {
 		GagaMap result = new GagaMap();
 		
 		String swtTrurl = env.getProperty("sweet.api.url");
-		String root     = env.getProperty("domain.scm"); 
+		String root     = env.getProperty("sweet.api.domain.front");
 		String subUrl   = "/delivery/sweettracker/response";
 		String tier     = env.getProperty("sweet.api.tier"); 
 		String key      = env.getProperty("sweet.api.key"); 
@@ -836,7 +836,7 @@ public class TsbDeliveryService {
 		GagaMap result = new GagaMap();
 		
 		String swtTrurl = env.getProperty("sweet.api.url");
-		String root     = env.getProperty("sweet.api.domain.scm"); 
+		String root     = env.getProperty("sweet.api.domain.front"); 
 		String subUrl   = "/delivery/sweettracker/response";
 		String tier     = env.getProperty("sweet.api.tier"); 
 		String key      = env.getProperty("sweet.api.key"); 
@@ -851,9 +851,9 @@ public class TsbDeliveryService {
 		
 		
 		MultiValueMap<String, String> params = new LinkedMultiValueMap<String, String>();
-		params.add("num",          "354043625751");
-		params.add("code",         "04");
-		params.add("fid",          "04354043625751");
+		params.add("num",          "237407773945");
+		params.add("code",         "08");
+		params.add("fid",          "20210425000001");
 		params.add("callback_url", callBackUrl);
 		params.add("callback_type","json");
 		params.add("tier",         tier);

+ 12 - 7
src/main/java/com/style24/batch/biz/task/TsbDeliveryTask.java

@@ -2,21 +2,26 @@ package com.style24.batch.biz.task;
 
 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 com.style24.batch.biz.job.delivery.TsbCjWithdrawInvoiceJob;
-import com.style24.batch.biz.job.delivery.TsbCjWithdrawInvoiceStatJob;
 import com.style24.batch.biz.job.delivery.TsbDailyDeliveryZoneJob;
 import com.style24.batch.biz.job.delivery.TsbDeliveryExcRcvJob;
 import com.style24.batch.biz.job.delivery.TsbDeliveryOrderJob;
 import com.style24.batch.biz.job.delivery.TsbDeliveryOrderRsltJob;
-import com.style24.batch.biz.job.delivery.TsbInvoiceNoRcvJob;
-import com.style24.batch.biz.job.delivery.TsbShopGoodsStockJob;
-import com.style24.batch.biz.job.delivery.TsbSweetTrackerJob;
 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 com.style24.batch.biz.job.delivery.TsbInvoiceNoRcvJob;
+import com.style24.batch.biz.job.delivery.TsbShopGoodsStockJob;
+import com.style24.batch.biz.job.delivery.TsbWithdrawRequestJob;
+import com.style24.batch.biz.job.delivery.TsbCjWithdrawInvoiceJob;
+import com.style24.batch.biz.job.delivery.TsbCjWithdrawInvoiceStatJob;
+import com.style24.batch.biz.job.delivery.TsbSweetTrackerJob;
+
+
+
+
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -111,7 +116,7 @@ public class TsbDeliveryTask {
 	 * @throws Exception
 	 */
 	//@Scheduled(cron = "${cron.delivery.tsbDeliveryOrderJob}")
-	// @Scheduled(fixedDelay = 3500000)
+	//@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void tsbDeliveryOrderJob() throws Exception {
 		deliveryOrderJob.run("cron.delivery.tsbDeliveryOrderJob");

+ 1 - 1
src/main/resources/config/application-locd.yml

@@ -47,7 +47,7 @@ sweet:
           url: http://trace-api-dev.sweettracker.net:8102/add_invoice # 개발
          # url: http://trace-api.sweettracker.net/add_invoice # 운영
           domain:
-                 scm: http://ts5000.ipdisk.co.kr
+                 front: http://ts5000.ipdisk.co.kr
 
 
 # Schedule