이태영 - 20210601 네이버페이 주문형 개발중

pom.xml

@@ -121,6 +121,56 @@
 			<scope>system</scope>
 			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/SimpleCryptLib-1.1.0.jar</systemPath>
 		</dependency>
+
+		<dependency>
+			<groupId>org.apache.commons.discovery</groupId>
+			<artifactId>common-discovery</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/commons-discovery-0.2.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons.logging</groupId>
+			<artifactId>common-logging</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/commons-logging.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.soap</groupId>
+			<artifactId>saaj</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/saaj.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>wsdl4j</groupId>
+			<artifactId>wsdl4j</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/wsdl4j.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>jsr173api</groupId>
+			<artifactId>jsr173api</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/jsr173_1.0_api.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>xalan</groupId>
+			<artifactId>xalan</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/xalan.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>xbean</groupId>
+			<artifactId>xbean</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/xbean.jar</systemPath>
+		</dependency>
 		<!-- \\\ WEB-INF lib -->
 	</dependencies>
 	

src/main/java/com/style24/batch/biz/checkout/base/ProductOrderChangeType.java

@@ -7,11 +7,18 @@
 
 package com.style24.batch.biz.checkout.base;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+@JsonSerialize
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ProductOrderChangeType implements java.io.Serializable {
     private String _value_;
     private static java.util.HashMap _table_ = new java.util.HashMap();
 
     // Constructor
+    public ProductOrderChangeType() {}
+
     protected ProductOrderChangeType(String value) {
         _value_ = value;
         _table_.put(_value_,this);

src/main/java/com/style24/batch/biz/job/order/TsbOrderDepositExpirationJob.java

@@ -37,8 +37,12 @@ public class TsbOrderDepositExpirationJob extends TsbAbstractJob<Collection<Orde
 	private int succCnt = 0;
 	private int failCnt = 0;
 
+	private static Order temp;
+
 	@Override
 	public Collection<Order> read() throws Exception {
+		temp = new Order();
+		temp.setOrdNo(11);
 		return orderService.getOrderDepositExpirationList();
 	}
 

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

@@ -1,6 +1,5 @@
 package com.style24.batch.biz.service;
 
-import com.gagaframework.web.parameter.GagaMap;
 import com.nhncorp.psinfra.toolkit.SimpleCryptLib;
 import com.style24.batch.biz.checkout.MallServiceLocator;
 import com.style24.batch.biz.checkout.MallServiceSOAP11BindingStub;
@@ -13,11 +12,9 @@ import com.style24.batch.biz.checkout.mall.GetChangedProductOrderListResponse;
 import com.style24.batch.biz.checkout.mall.GetProductOrderInfoListRequest;
 import com.style24.batch.biz.checkout.mall.GetProductOrderInfoListResponse;
 import com.style24.batch.biz.dao.TsbNaverPayDao;
-import com.style24.batch.biz.dao.TsbOrderDao;
 import com.style24.core.support.env.TscConstants;
 import com.style24.persistence.domain.Order;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.axis.AxisFault;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -28,7 +25,10 @@ import java.security.Security;
 import java.security.SignatureException;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 네이버페이 Service

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

@@ -233,7 +233,7 @@ public class TsbGoodsTask {
 	 * @throws Exception
 	 */
 	@Scheduled(cron = "${cron.goods.wms.stock.receive}")
-	@Scheduled(fixedDelay = 3500000)
+	//@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void wmsStockReceiveJob() throws Exception {
 		goodsWmsGoodsStockJob.runById("cron.goods.wms.stock.receive");

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

@@ -21,7 +21,7 @@ public class TsbHealthCheckTask {
 	/**
 	 * fixedDelay = 30000: 이전 수행이 종료되고, 30초 이후 해당 job을 수행함
 	 */
-	@Scheduled(fixedDelay = 30000)
+	//@Scheduled(fixedDelay = 30000)
 	@Async
 	public void printCurrentTime() throws Exception {
 		log.info("STYLE24 Batch is running. (now : {})", (new SimpleDateFormat("yyyy/MM/dd HH:mm:ss")).format(new Date()));

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

@@ -31,8 +31,9 @@ public class TsbNaverPayTask {
 	 * @since 2021. 05. 27
 	 */
 	@Scheduled(cron = "${cron.naverPay.order.batch}")
-	@Async
-	public void cartDeadlineExpireJob() throws Exception {
+	//@Scheduled(fixedDelay = 3500000)
+	//@Async
+	public void naverPayOrderCompleteJob() throws Exception {
 		recvOrderCompleteJob.runById("cron.naverpay.recv.order");
 	}
 }

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

@@ -38,6 +38,7 @@ public class TsbOrderTask {
 	 * @since 2021. 05. 03
 	 */
 	@Scheduled(cron = "${cron.order.cart.deadline.expire}")
+	// @Scheduled(fixedDelay = 3500000)
 	@Async
 	public void cartDeadlineExpireJob() throws Exception {
 		cartExpirationJob.runById("cron.order.cart.deadline.expire");

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

@@ -4,7 +4,7 @@
 
 	<!-- 네이버페이 조회 시간(최근 3시간) -->
 	<select id="getSelectDt" resultType="Order">
-		/* TsbNaverPay.getSelectDt : 무통장입금 입금기한 만료 주문 조회 */
+		/* TsbNaverPay.getSelectDt : 네이버페이 조회 시간(최근 3시간) */
 		SELECT CONCAT(DATE_FORMAT(NOW() + 'INTERVAL -3 HOUR', '%Y%m%d%H'), '0000') AS STDT
 			 , CONCAT(DATE_FORMAT(NOW() + 'INTERVAL -3 HOUR', '%Y%m%d%H'), '5959') AS STDT
 		FROM   DUAL