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

src/main/java/com/style24/batch/biz/job/delivery/TsbDeliveryOrderRsltJob.java

@@ -5,8 +5,10 @@ import java.util.Collection;
 
 import com.style24.batch.biz.service.TsbNaverPayService;
 import com.style24.batch.support.env.TsbConstants;
+import com.style24.core.biz.dao.TscOrderDao;
 import com.style24.core.biz.service.TscNaverPayService;
 import com.style24.persistence.domain.Order;
+import com.style24.persistence.domain.OrderChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -37,6 +39,9 @@ public class TsbDeliveryOrderRsltJob extends TsbAbstractJob<Delivery, Delivery,
 	@Autowired
 	private TscNaverPayService coreNaverPayService;
 
+	@Autowired
+	private TscOrderDao coreOrderDao;
+
 	private int succCnt = 0;
 	private int failCnt = 0;
 
@@ -70,13 +75,26 @@ public class TsbDeliveryOrderRsltJob extends TsbAbstractJob<Delivery, Delivery,
 		wmsDeliveryService.updateWmsIfDeliveryOrdRslt(list);
 		
 		// 4. 네이버페이 출고 정보 송신
-		Collection<Order> dtlList = new ArrayList<Order>();
+		Collection<Order> orderDelvDtlList = new ArrayList<Order>();
+		Collection<Order> orderExchDelvDtlList = new ArrayList<Order>();
 		for(Delivery delv : list) {
 			Order dtl = new Order();
-			dtl.setOrdDtlNo(delv.getOrdDtlNo());
-			dtlList.add(dtl);
+			dtl.setOrdDtlNo(delv.getOrderdtlno());
+			dtl = coreOrderDao.getOrdDtlInfo(dtl);
+			if("O".equals(dtl.getOrdExchGb())) {
+				orderDelvDtlList.add(dtl);
+			} else if ("E".equals(dtl.getOrdExchGb())) {
+				OrderChange change = new OrderChange();
+				change.setOrdDtlNo(dtl.getOrdDtlNo());
+				// 4-1. 네이버페이 교환 배송중 정보 송부
+				coreNaverPayService.sendNaverPayExchangeReDelivery(change, TsbConstants.REG_NO);
+			}
+		}
+
+		// 4-2. 네이버페이 배송 중 데이터 정보 송부
+		if(orderDelvDtlList != null && orderDelvDtlList.size() > 0) {
+			coreNaverPayService.sendNaverPayDeliveryStartOrder(orderDelvDtlList, statGb, TsbConstants.REG_NO);
 		}
-		coreNaverPayService.sendNaverPayDeliveryStartOrder(dtlList, statGb, TsbConstants.REG_NO);
 
 		succCnt = 1;
 		failCnt = 0;

src/main/java/com/style24/batch/biz/job/delivery/TsbWithdrawRsltJob.java

@@ -2,6 +2,9 @@ package com.style24.batch.biz.job.delivery;
 
 import java.util.Collection;
 
+import com.style24.batch.support.env.TsbConstants;
+import com.style24.core.biz.service.TscNaverPayService;
+import com.style24.persistence.domain.OrderChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -31,9 +34,11 @@ public class TsbWithdrawRsltJob extends TsbAbstractJob<Collection<Delivery>, Col
 	private TsbDeliveryService deliveryService;
 
 	@Autowired
-	private TsbWmsDeliveryService wmsDeliveryService
-	
-	;
+	private TsbWmsDeliveryService wmsDeliveryService;
+
+	@Autowired
+	private TscNaverPayService coreNaverPayService;
+
 	private int succCnt = 0;
 	private int failCnt = 0;
 
@@ -65,6 +70,15 @@ public class TsbWithdrawRsltJob extends TsbAbstractJob<Collection<Delivery>, Col
 				// 교환회수 ---> 교환완료, 교환결제완료
 				// 반품회수 ---> 반품진행중
 				deliveryService.saveWithdraw(data);
+
+				// 네이버페이 교환 회수완료 데이터 송부
+				if (OrderChangeGb.EXCHANGE.value().equals(data.getChgGb())) {  // 교환
+					log.info("<< 교환 회수 완료 네이버페이 송부 시작 >>");
+					OrderChange change = new OrderChange();
+					change.setOrdDtlNo(data.getOrderdtlno());
+					coreNaverPayService.sendNaverPayExchangeCollectComplete(change, TsbConstants.REG_NO);
+					log.info("<< 교환 회수 완료 네이버페이 송부 완료 >>");
+				}
 				
 				// WMS 회수정보 업데이트
 				wmsDeliveryService.updateWmsIfRecallDeliveryRslt(data);
@@ -75,6 +89,7 @@ public class TsbWithdrawRsltJob extends TsbAbstractJob<Collection<Delivery>, Col
 				failCnt++;
 			}
 		}
+
 		return delvList;
 	}
 

src/main/java/com/style24/batch/biz/job/naverpay/TsbNaverPaySendReadyDeliveryJob.java

@@ -7,6 +7,7 @@ import com.style24.batch.biz.job.TsbAbstractJob;
 import com.style24.batch.biz.service.TsbNaverPayService;
 import com.style24.core.biz.service.TscNaverPayService;
 import com.style24.persistence.domain.Order;
+import com.style24.persistence.domain.OrderChange;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -35,11 +36,21 @@ public class TsbNaverPaySendReadyDeliveryJob extends TsbAbstractJob<Collection<O
 	public Collection<Order> read() throws Exception {
 		// 배송중 테스트
 		/*Collection<Order> testList = new ArrayList<>();
-		Order tmp = new Order(); tmp.setOrdDtlNo(7196);
+		Order tmp = new Order(); tmp.setOrdDtlNo(7259);
 		Order tmp2 = new Order(); tmp2.setOrdDtlNo(7197);
 		testList.add(tmp);testList.add(tmp2);
 		coreNaverPayService.sendNaverPayDeliveryStartOrder(testList, "SHIPPING", TsbConstants.REG_NO);*/
 
+		// 교환 WMS 예외(불량, 품절) 반품처리 > 완료까지.
+		/*Order order = new Order(); order.setOrdDtlNo(7254);
+		OrderChange change = new OrderChange(); change.setOrdChgSq(1064);
+		coreNaverPayService.sendNaverPayRejectExchange(change, TsbConstants.REG_NO);
+		coreNaverPayService.sendNaverPaySoldoutReturnReq(order, TsbConstants.REG_NO);
+		coreNaverPayService.sendNaverPayReturnComplete(change, TsbConstants.REG_NO);*/
+
+		Order order = new Order(); order.setOrdDtlNo(7298);
+		coreNaverPayService.sendNaverPaySoldoutCancel(order, TsbConstants.REG_NO);
+
 		log.info("<<<< 배송준비중 송신 시작 >>>>");
 		Order time = naverPayService.setInitData();
 		return naverPayService.getReadyDeliveryList(time); // 변경 상품주문 조회;

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

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import com.style24.core.biz.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.http.HttpEntity;
@@ -24,11 +25,6 @@ import com.style24.batch.biz.dao.TsbDeliveryDao;
 import com.style24.batch.support.env.TsbConstants;
 import com.style24.core.biz.dao.TscOrderChangeDao;
 import com.style24.core.biz.dao.TscOrderDao;
-import com.style24.core.biz.service.TscDeliveryService;
-import com.style24.core.biz.service.TscErpService;
-import com.style24.core.biz.service.TscOrderChangeService;
-import com.style24.core.biz.service.TscOrderRefundService;
-import com.style24.core.biz.service.TscWmsService;
 import com.style24.core.biz.thirdparty.HansaeErp;
 import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.env.TscConstants.OrderChangeGb;
@@ -81,6 +77,9 @@ public class TsbDeliveryService {
 	
 	@Autowired
 	private TscOrderRefundService orderRefundService;
+
+	@Autowired
+	private TscNaverPayService coreNaverPayService;
 	
 	@Autowired
 	private HansaeErp hansaeErp;
@@ -1197,42 +1196,59 @@ public class TsbDeliveryService {
 			list = deliveryDao.getSoldoutOrderRecallDtlNoList(data);
 		}
 
-		Collection<Order> ordSoldoutList = new ArrayList<Order>();
-		for (Delivery item : list) {
-
-			Order param = new Order();
-			param.setOrdNo(item.getOrdNo());
-			param.setOrdDtlNo(item.getOrdDtlNo());
-			param.setCustNo(item.getCustNo());
-			param.setOrdNm(item.getOrdNm());
-			param.setOrdPhnno(item.getOrdPhnno());
-			param.setPgGb(item.getPgGb());
-			param.setPayMeans(item.getPayMeans());
-			param.setBankCd(item.getBankCd());
-			param.setAccountNm(item.getAccountNm());
-			param.setAccountNo(item.getAccountNo());
-			param.setCnclRtnQty(item.getSaleQty());
-			ordSoldoutList.add(param);
+		try {
+			Collection<Order> ordSoldoutList = new ArrayList<Order>();
+			for (Delivery item : list) {
+
+				Order param = new Order();
+				param.setOrdNo(item.getOrdNo());
+				param.setOrdDtlNo(item.getOrdDtlNo());
+				param.setCustNo(item.getCustNo());
+				param.setOrdNm(item.getOrdNm());
+				param.setOrdPhnno(item.getOrdPhnno());
+				param.setPgGb(item.getPgGb());
+				param.setPayMeans(item.getPayMeans());
+				param.setBankCd(item.getBankCd());
+				param.setAccountNm(item.getAccountNm());
+				param.setAccountNo(item.getAccountNo());
+				param.setCnclRtnQty(item.getSaleQty());
+				ordSoldoutList.add(param);
 
-		}
-		coreDeliveryService.cancelSoldout(ordSoldoutList, userNo, "Y");
+			}
+			coreDeliveryService.cancelSoldout(ordSoldoutList, userNo, "Y");
+
+			for(Order order : ordSoldoutList) {
+				order = orderDao.getOrdDtlInfo(order);
+				if("O".equals(order.getOrdExchGb())) {
+					coreNaverPayService.sendNaverPaySoldoutCancel(order, TsbConstants.REG_NO);
+				} else {
+					OrderChange change = new OrderChange();
+					change.setOrdChgSq(order.getOrdChgSq());
+
+					coreNaverPayService.sendNaverPayRejectExchange(change, TsbConstants.REG_NO);
+					coreNaverPayService.sendNaverPaySoldoutReturnReq(order, TsbConstants.REG_NO);
+					coreNaverPayService.sendNaverPayReturnComplete(change, TsbConstants.REG_NO);
+				}
+			}
 
-		// TB_ORDER_DETAIL 결품여부 Y
-		for(Delivery delv : list) {
-			delv.setUpdNo(userNo);
-			delv.setSoldoutMemo("자동 품절처리");
-			deliveryDao.updateSoldOut(delv);
-		}
-		
-		if ("E".equals(gubun)) {
-			// 처리완료 업데이트 
-			data.setUpdNo(userNo);
-			deliveryDao.updateTbOrderDeliveryException(data);
-		} else if ("R".equals(gubun)) {
-			// 처리완료 업데이트  
-			deliveryDao.updateTbRecallException(data);
-		}
+			// TB_ORDER_DETAIL 결품여부 Y
+			for(Delivery delv : list) {
+				delv.setUpdNo(userNo);
+				delv.setSoldoutMemo("자동 품절처리");
+				deliveryDao.updateSoldOut(delv);
+			}
 
+			if ("E".equals(gubun)) {
+				// 처리완료 업데이트
+				data.setUpdNo(userNo);
+				deliveryDao.updateTbOrderDeliveryException(data);
+			} else if ("R".equals(gubun)) {
+				// 처리완료 업데이트
+				deliveryDao.updateTbRecallException(data);
+			}
+		} catch(Exception e) {
+			e.printStackTrace();
+		}
 	}
 
 	/**

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

@@ -91,8 +91,8 @@ public class TsbNaverPayService {
 		String eddt = time.getEddt();
 
 		if("locd".equals(env.getProperty("spring.profiles.active"))) {
-			stdt = "20210629000000";
-			eddt = "20210629235959";
+			stdt = "20210701000000";
+			eddt = "20210701235959";
 
 			log.info("stdt : eddt ---> " + stdt + " : " + eddt);
 		}
@@ -638,15 +638,26 @@ public class TsbNaverPayService {
 			}
 
 			// 직접 반송일 경우 회수지정보 (네이버페이 주문형은 배송지도 동일 적용 (배송지 주소 작성란 없음))
-			/*log.info("CHECK orderInfo.getExchangeInfo().getCollectDeliveryMethod() :::: {}", orderInfo.getExchangeInfo().getCollectDeliveryMethod());
-			if("RETURN_INDIVIDUAL".equals(orderInfo.getExchangeInfo().getCollectDeliveryMethod().toString())) {
+			// 회수 지시에 대한 내용은 모든 금액을 네이버페이에서 처리하기로(21/06/28 - 정지혜K 확인) 하였으나, 회수지시 불가 상품이 있는 경우에 대비하여 처리
+			// 교환 요청시
+			if(orderInfo.getExchangeInfo().getCollectDeliveryMethod() == null) {
 				change.setWdGb("D");
 				change.setWdTargetYn("N");
+
 				// 회수자명, 휴대폰번호, 우편번호, 기본주소, 상세주소
-				change.setRecipDtlAddr(new String(SimpleCryptLib.decrypt(encryptKey, orderInfo.getExchangeInfo().getCollectAddress().getDetailedAddress()), StandardCharsets.UTF_8));
-				if(StringUtils.isNotBlank(orderInfo.getExchangeInfo().getCollectAddress().getZipCode())) {
-					change.setRecipZipcode(orderInfo.getExchangeInfo().getCollectAddress().getZipCode().replaceAll("-", ""));
+				change.setRecipZipcode(orderInfo.getProductOrder().getShippingAddress().getZipCode().replaceAll("-", ""));
+				change.setRecipNm(new String(SimpleCryptLib.decrypt(encryptKey, orderInfo.getProductOrder().getShippingAddress().getName()), StandardCharsets.UTF_8));
+				change.setRecipPhnno(new String(SimpleCryptLib.decrypt(encryptKey, orderInfo.getProductOrder().getShippingAddress().getTel1()), StandardCharsets.UTF_8));
+				change.setRecipBaseAddr(new String(SimpleCryptLib.decrypt(encryptKey, orderInfo.getProductOrder().getShippingAddress().getBaseAddress()), StandardCharsets.UTF_8));
+				if(StringUtils.isNotBlank(orderInfo.getProductOrder().getShippingAddress().getZipCode())) {
+					change.setRecipZipcode(orderInfo.getProductOrder().getShippingAddress().getZipCode().replaceAll("-", ""));
+				}
+				if(StringUtils.isNotBlank(orderInfo.getProductOrder().getShippingAddress().getDetailedAddress())) {
+					change.setRecipDtlAddr(new String(SimpleCryptLib.decrypt(encryptKey, orderInfo.getProductOrder().getShippingAddress().getDetailedAddress()), StandardCharsets.UTF_8));
 				}
+			} else if("RETURN_INDIVIDUAL".equals(orderInfo.getExchangeInfo().getCollectDeliveryMethod().toString())) {
+				change.setWdGb("D");
+				change.setWdTargetYn("N");
 
 				// 회수자명, 휴대폰번호, 우편번호, 기본주소, 상세주소
 				change.setRecipNm(new String(SimpleCryptLib.decrypt(encryptKey, orderInfo.getProductOrder().getShippingAddress().getName()), StandardCharsets.UTF_8));
@@ -660,7 +671,8 @@ public class TsbNaverPayService {
 				}
 			} else {			// 수거 요청일 경우
 				change.setWdGb("W");
-				change.setWdTargetYn("Y");
+				change.setWdTargetYn("N");
+
 				// 회수자명, 휴대폰번호, 우편번호, 기본주소, 상세주소
 				change.setRecipNm(new String(SimpleCryptLib.decrypt(encryptKey, orderInfo.getExchangeInfo().getCollectAddress().getName()), StandardCharsets.UTF_8));
 				change.setRecipPhnno(new String(SimpleCryptLib.decrypt(encryptKey, orderInfo.getExchangeInfo().getCollectAddress().getTel1()), StandardCharsets.UTF_8));
@@ -669,7 +681,7 @@ public class TsbNaverPayService {
 				if(StringUtils.isNotBlank(orderInfo.getExchangeInfo().getCollectAddress().getZipCode())) {
 					change.setRecipZipcode(orderInfo.getExchangeInfo().getCollectAddress().getZipCode().replaceAll("-", ""));
 				}
-			}*/
+			}
 
 			// 배송지 정보 (네이버페이 주문형 배송지는 회수지와 동일 적용 (배송지 주소 작성란 없음))
 			change.setChgerNm(change.getRecipNm());
@@ -733,7 +745,7 @@ public class TsbNaverPayService {
 			change.setWdTargetYn("N");
 			log.info("CHECK CHG_MEMO :::: {}", change.getChgMemo());
 
-			//GagaMap result = coreOrderChangeService.exchReq(change);
+			GagaMap result = coreOrderChangeService.exchReq(change);
 
 			// 추가배송비 결제 이력 있으면 TB_PAYMENT 넣고 deliveryFee에 PAY_SQ UPDATE
 			if(orderInfo.getExchangeInfo().getClaimDeliveryFeeDemandAmount() != null && orderInfo.getExchangeInfo().getClaimDeliveryFeeDemandAmount() > 0) {
@@ -748,7 +760,7 @@ public class TsbNaverPayService {
 						payment.setPgGb(TscConstants.PgGb.NAVER_ORDER.value());
 						payment.setPgTid(orderInfo.getOrder().getPaymentNumber());
 						payment.setPgShopId(env.getProperty("naverPay.shop.id"));
-						payment.setOrdChgSq(1);
+						payment.setOrdChgSq(result.getInt("ordChgSq"));
 						payment.setCardPcableYn("Y");
 						payment.setEscrowYn("N");
 						payment.setRegNo(TsbConstants.REG_NO);
@@ -1056,8 +1068,8 @@ public class TsbNaverPayService {
 				log.info("CHECK NPAY_ORD_DTL_NO ::::: {}", order.getNpayOrdDtlNo());
 
 				// ClaimDeliveryFeeProductOrderIds > 네이버 상품주문번호 반품묶음.
-				if(StringUtils.isNotBlank(orderInfo.getExchangeInfo().getClaimDeliveryFeeProductOrderIds())) {
-					order.setClaimNpayOrdDtlNos(orderInfo.getExchangeInfo().getClaimDeliveryFeeProductOrderIds().replaceAll(" ", "").split(","));
+				if(orderInfo.getReturnInfo() != null && StringUtils.isNotBlank(orderInfo.getReturnInfo().getClaimDeliveryFeeProductOrderIds())) {
+					order.setClaimNpayOrdDtlNos(orderInfo.getReturnInfo().getClaimDeliveryFeeProductOrderIds().replaceAll(" ", "").split(","));
 				} else {
 					String[] npayOrdDtlNos = {orderInfo.getProductOrder().getProductOrderID()};
 					order.setClaimNpayOrdDtlNos(npayOrdDtlNos);
@@ -1066,6 +1078,7 @@ public class TsbNaverPayService {
 				Collection<Order> list = naverPayDao.getNotReturnOrderInfoList(order);
 
 				int[] ordDtlNoArr, cnclRtnReqQtyArr;
+				int custNo = 0;
 				String ordNm = "", ordPhnno = "";
 				if(list != null && list.size() > 0) {
 					ordDtlNoArr = new int[list.size()];
@@ -1077,6 +1090,7 @@ public class TsbNaverPayService {
 						cnclRtnReqQtyArr[i] = item.getOrdQty();
 						ordNm = item.getOrdNm();
 						ordPhnno = item.getOrdPhnno();
+						custNo = item.getCustNo();
 					}
 				} else {
 					continue;
@@ -1084,24 +1098,44 @@ public class TsbNaverPayService {
 
 				OrderChange change = new OrderChange();
 				String changeReasonCode 		= orderInfo.getReturnInfo().getReturnReason().getValue();
-				String collectDeliveryMethod	= orderInfo.getReturnInfo().getCollectDeliveryMethod().toString();
+				String collectDeliveryMethod;		// 직접반송
+				if(orderInfo.getReturnInfo().getCollectDeliveryMethod() != null && !"RETURN_INDIVIDUAL".equals(orderInfo.getReturnInfo().getCollectDeliveryMethod().toString())) {
+					collectDeliveryMethod = orderInfo.getReturnInfo().getCollectDeliveryMethod().toString();
+					change.setChgerNm(new String(SimpleCryptLib.decrypt(encryptKey, orderInfo.getReturnInfo().getCollectAddress().getName()), StandardCharsets.UTF_8));
+					change.setChgerBaseAddr(new String(SimpleCryptLib.decrypt(encryptKey, orderInfo.getReturnInfo().getCollectAddress().getBaseAddress()), StandardCharsets.UTF_8));
+					change.setChgerPhnno(new String(SimpleCryptLib.decrypt(encryptKey, orderInfo.getReturnInfo().getCollectAddress().getTel1()), StandardCharsets.UTF_8));
+					if (orderInfo.getReturnInfo().getCollectAddress().getZipCode() != null) {
+						change.setChgerZipcode(orderInfo.getReturnInfo().getCollectAddress().getZipCode().replaceAll("-", ""));
+					}
+					if (orderInfo.getReturnInfo().getCollectAddress().getDetailedAddress() != null) {
+						change.setChgerDtlAddr(new String(SimpleCryptLib.decrypt(encryptKey, orderInfo.getReturnInfo().getCollectAddress().getDetailedAddress()), StandardCharsets.UTF_8));
+					}
+				} else {
+					collectDeliveryMethod	= "RETURN_INDIVIDUAL";		// 직접반송
+					change.setChgerNm(new String(SimpleCryptLib.decrypt(encryptKey, orderInfo.getProductOrder().getShippingAddress().getName()), StandardCharsets.UTF_8));
+					change.setChgerBaseAddr(new String(SimpleCryptLib.decrypt(encryptKey, orderInfo.getProductOrder().getShippingAddress().getBaseAddress()), StandardCharsets.UTF_8));
+					change.setChgerPhnno(new String(SimpleCryptLib.decrypt(encryptKey, orderInfo.getProductOrder().getShippingAddress().getTel1()), StandardCharsets.UTF_8));
+					if (orderInfo.getProductOrder().getShippingAddress().getZipCode() != null) {
+						change.setChgerZipcode(orderInfo.getProductOrder().getShippingAddress().getZipCode().replaceAll("-", ""));
+					}
+					if(StringUtils.isNotBlank(orderInfo.getProductOrder().getShippingAddress().getDetailedAddress())) {
+						change.setChgerDtlAddr(new String(SimpleCryptLib.decrypt(encryptKey, orderInfo.getProductOrder().getShippingAddress().getDetailedAddress()), StandardCharsets.UTF_8));
+					}
+				}
+
 				change.setOrdNo(order.getOrdNo());
+				change.setCustNo(custNo);
 				change.setOrdNm(ordNm);
 				change.setOrdPhnno(ordPhnno);
+				change.setRegNo(TsbConstants.REG_NO);
+				change.setUpdNo(TsbConstants.REG_NO);
+				change.setPgGb(TscConstants.PgGb.NAVER_ORDER.value());
 				change.setChgMemo(orderInfo.getReturnInfo().getReturnDetailedReason());
-				change.setChgerNm(new String(SimpleCryptLib.decrypt(encryptKey, orderInfo.getReturnInfo().getCollectAddress().getName()), StandardCharsets.UTF_8));
-				change.setChgerZipcode(orderInfo.getReturnInfo().getCollectAddress().getZipCode().replaceAll("-", ""));
-				change.setChgerBaseAddr(new String(SimpleCryptLib.decrypt(encryptKey, orderInfo.getReturnInfo().getCollectAddress().getBaseAddress()), StandardCharsets.UTF_8));
-				change.setChgerPhnno(new String(SimpleCryptLib.decrypt(encryptKey, orderInfo.getReturnInfo().getCollectAddress().getTel1()), StandardCharsets.UTF_8));
 				change.setWdInvoiceNo(orderInfo.getReturnInfo().getCollectTrackingNumber());
 				change.setOrdDtlNoArr(ordDtlNoArr);
 				change.setCnclRtnReqQtyArr(cnclRtnReqQtyArr);
 				change.setWdTargetYn("N");			// 네이버페이 자체 회수 지시함
 
-				if (orderInfo.getReturnInfo().getCollectAddress().getDetailedAddress() != null) {
-					change.setChgerDtlAddr(new String(SimpleCryptLib.decrypt(encryptKey, orderInfo.getReturnInfo().getCollectAddress().getDetailedAddress()), StandardCharsets.UTF_8));
-				}
-
 				if(orderInfo.getReturnInfo().getClaimDeliveryFeeDemandAmount() != null) {
 					change.setAddPayCost(orderInfo.getReturnInfo().getClaimDeliveryFeeDemandAmount());
 				}

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

@@ -77,22 +77,22 @@ public class TsbNaverPayTask {
 		// 네이버페이 회수송장번호 수신	> 회수지시는 네이버페이에서 처리.
 		recvWdInvoiceNoJob.runById("cron.naverpay.recv.wd.invoice.no");
 
-		// // 취소 완료 주문 정보 송신	> 관리자 취소승인 버튼 클릭시 송부로 변경 (완료)
+		// // 취소 완료 주문 정보 송신	> 관리자 취소승인 버튼 클릭시 송부 (완료)
 
 		// 품절 취소 주문 정보 송신					> tscNaverPayService.sendNaverPaySoldoutCancel(Order, userNo) 호출 후 테스트
 
 		// 배송준비중 주문 정보 송신
 		sendReadyDeliveryJob.runById("cron.naverpay.send.ready.delivery");
 
-		// // 배송중 주문 정보 송신	> 송장 등록 결과(배치), SCM 입점발주확정대상목록 에서 확정시 송신 처리 (완료)
+		// // 배송중 주문 정보 송신	> 송장 등록 결과(배치 TsbDeliveryOrderRsltJob), SCM 입점발주확정대상목록 에서 확정시 송신 처리 (완료)
 
-		// 반품 완료 주문 정보 송신					> tscNaverPayService.sendNaverPayReturnComplete(OrderChange, userNo) 호출 후 테스트
+		// // 반품 완료 주문 정보 송신	> tscNaverPayService.sendNaverPayReturnComplete(OrderChange, userNo) 호출 후 테스트
 
-		// 반품 반려 주문 정보 송신					> tscNaverPayService.sendNaverPayRejectReturn(OrderChange, userNo) 호출 후 테스트
+		// // 반품 반려 주문 정보 송신	> 관리자 반품반려 버튼 클릭시 송부 (완료)
 
-		// 교환 상품 수거 완료 주문 정보 송신		> tscNaverPayService.sendNaverPayExchangeCollectComplete(OrderChange, userNo) 호출 후 테스트
+		// // 교환 상품 수거 완료 주문 정보 송신			> 입고완료 TsbWithdrawRsltJob 동작시 호출되도록 수정 완료
 
-		// 교환 상품 재발송 처리 주문 정보 송신		> tscNaverPayService.sendNaverPayExchangeReDelivery(OrderChange, userNo) 호출 후 테스트.
+		// // 교환 상품 재발송 처리 주문 정보 송신		> 송장 등록 결과(배치 TsbDeliveryOrderRsltJob) 동작시 호출되도록 수정 완료
 
 		// // 교환 반려 주문 정보 송신 > 관리자 교환반려 버튼 클릭시 송부로 변경 (완료)
 	}

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

@@ -207,6 +207,7 @@
 		ON     OCD.ORD_DTL_NO = OD.ORD_DTL_NO
 		AND    OCD.CHG_STAT IN ('G685_20', 'G685_30', 'G685_31', 'G685_32', 'G685_34')
 		WHERE  OCD.ORD_DTL_NO IS NULL
+		AND    OD.ORD_DTL_STAT <![CDATA[ <> ]]> 'G013_97'
 		<if test="claimNpayOrdDtlNos != null and claimNpayOrdDtlNos != ''">
 		AND    OD.NPAY_ORD_DTL_NO IN
 			<foreach collection="claimNpayOrdDtlNos" item="item" index="index"  open="(" close=")" separator=",">
@@ -215,11 +216,12 @@
 		</if>
 	</select>
 
-	<!-- 교환 접수 대상 상품 정보 조회(교환진행중인 주문 제외) -->
+	<!-- 반품 접수 대상 상품 정보 조회(반품진행중인 주문 제외) -->
 	<select id="getNotReturnOrderInfoList" parameterType="Order" resultType="Order">
-		/* TsbNaverPay.getNotExchangeOrderInfoList : 교환 접수 대상 상품 정보 조회(교환진행중인 주문 제외) */
+		/* TsbNaverPay.getNotReturnOrderInfoList : 반품 접수 대상 상품 정보 조회(반품진행중인 주문 제외) */
 		SELECT O.CUST_NO
 		     , O.ORD_NM
+		     , O.CUST_NO
 		     , O.ORD_PHNNO
 		     , OD.ORD_DTL_NO
 		     , OD.ORD_QTY
@@ -241,6 +243,7 @@
 		ON     OCD.ORD_DTL_NO = OD.ORD_DTL_NO
 		AND    OCD.CHG_STAT IN ('G685_50', 'G685_51', 'G685_60')
 		WHERE  OCD.ORD_DTL_NO IS NULL
+		AND    OD.ORD_DTL_STAT <![CDATA[ <> ]]> 'G013_97'
 		<if test="claimNpayOrdDtlNos != null and claimNpayOrdDtlNos != ''">
 		AND    OD.NPAY_ORD_DTL_NO IN
 			<foreach collection="claimNpayOrdDtlNos" item="item" index="index"  open="(" close=")" separator=",">