Prechádzať zdrojové kódy

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

xodud lee 5 rokov pred
rodič
commit
a485b1b7e1

+ 1 - 1
pom.xml

@@ -134,7 +134,7 @@
 			<artifactId>common-logging</artifactId>
 			<version>1.0</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/commons-logging.jar</systemPath>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/commons-logging-1.2.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>javax.xml.soap</groupId>

+ 0 - 3
src/main/java/com/style24/batch/biz/checkout/base/ProductOrderChangeType.java

@@ -16,9 +16,6 @@ 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);

+ 19 - 1
src/main/java/com/style24/batch/biz/service/TsbNaverPayService.java

@@ -15,6 +15,7 @@ import com.style24.batch.biz.dao.TsbNaverPayDao;
 import com.style24.core.support.env.TscConstants;
 import com.style24.persistence.domain.Order;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -194,7 +195,6 @@ public class TsbNaverPayService {
 		byte[] encryptKey = null;
 		encryptKey = SimpleCryptLib.generateKey(timeStamp, env.getProperty("naver.pay.secret.key"));
 
-		// SMS 주문번호 보내기 ??
 		List<Order> naverPayList = new ArrayList<Order>();
 
 		String rcpDtlAddr 	= "";
@@ -217,6 +217,7 @@ public class TsbNaverPayService {
 					naverParams.setSiteCd(productOrderInfo[i].getProductOrder().getMallID());
 
 					// 이어서 추가 >> 주문 데이터 확인하는데 세트상품 확인 방법 체크할것.
+					Order orderDtlList = updateNpayOrderDtlNo(productOrderInfo[i], encryptKey, orderNo);
 				}
 			}
 		}
@@ -224,6 +225,23 @@ public class TsbNaverPayService {
 		return null;
 	}
 
+	public Order updateNpayOrderDtlNo(ProductOrderInfo productOrderInfo, byte[] encryptKey, String orderNo) {
+		String goodsCd = productOrderInfo.getProductOrder().getProductID();				// 네이버페이 상품코드
+		String npayOrdDtlNo = productOrderInfo.getProductOrder().getProductOrderID();	// 네이버페이 상품주문번호
+		String optCd = productOrderInfo.getProductOrder().getOptionManageCode();		// 고유 상품 옵션 번호 (optCd)
+
+		// 옵션정보 존재하지 않으면 return null;
+		if(StringUtils.isNotBlank(optCd)) return null;
+
+		// 주문정보 조회 (상품타입, 주문상품들 조회)  >>>>   후에 세트와 일반 상품 구분하여 NPAY_ORD_DTL_NO UPDATE 와 결제완료처리.
+
+
+
+		// Order result = getOrderDtlListSize(naverParams);
+
+		return null;
+	}
+
 	/**
 	 * 주문상세 정보 조회
 	 * @param productOrderIdList

+ 2 - 2
src/main/java/com/style24/batch/biz/task/TsbNaverPayTask.java

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

BIN
src/main/webapp/WEB-INF/lib/commons-logging-1.2.jar


BIN
src/main/webapp/WEB-INF/lib/commons-logging.jar