ST24PRJ-654 취소접수 로직 수정

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

@@ -1279,6 +1279,7 @@ public class TsbDeliveryService {
 					param.setAccountNm(item.getAccountNm());
 					param.setAccountNo(item.getAccountNo());
 					param.setCnclRtnQty(item.getSaleQty());
+					param.setCardPcableYn(item.getCardPcableYn());
 					ordSoldoutList.add(param);
 	
 				}

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

@@ -85,7 +85,7 @@ public class TsbDeliveryTask {
 	 * @throws Exception
 	 */
 	@Scheduled(cron = "${cron.delivery.loc.assign}")
-	//@Scheduled(fixedDelay = 3500000)
+	// @Scheduled(fixedDelay = 3500000)
 	@Async
 	public void deliveryLocAssignJob() throws Exception {
 		deliveryOrderJob.runById("cron.delivery.loc.assign");
@@ -97,7 +97,7 @@ public class TsbDeliveryTask {
 	 * @throws Exception
 	 */
 	@Scheduled(cron = "${cron.delivery.wms.outgoing.exception.receive}")
-	//@Scheduled(fixedDelay = 3500000)
+	// @Scheduled(fixedDelay = 3500000)
 	@Async
 	public void wmsOutgoingExceptionReceiveJob() throws Exception {
 		deliveryExcRcvJob.runById("cron.delivery.wms.outgoing.exception.receive");
@@ -109,7 +109,7 @@ public class TsbDeliveryTask {
 	 * @throws Exception
 	 */
 	@Scheduled(cron = "${cron.delivery.wms.invoice.receive}")
-	//@Scheduled(fixedDelay = 3500000)
+	// @Scheduled(fixedDelay = 3500000)
 	@Async
 	public void wmsInvoiceReceiveJob() throws Exception {
 		tsbInvoiceNoRcvJob.runById("cron.delivery.wms.invoice.receive");
@@ -121,7 +121,7 @@ public class TsbDeliveryTask {
 	 * @throws Exception
 	 */
 	@Scheduled(cron = "${cron.delivery.wms.outgoing.result.receive}")
-	//@Scheduled(fixedDelay = 3500000)
+	// @Scheduled(fixedDelay = 3500000)
 	@Async
 	public void wmsOutgoingResultReceiveJob() throws Exception {
 		deliveryOrderRsltJob.runById("cron.delivery.wms.outgoing.result.receive");
@@ -133,7 +133,7 @@ public class TsbDeliveryTask {
 	 * @throws Exception
 	 */
 	@Scheduled(cron = "${cron.delivery.sweettracker.invoice.retrieve}")
-	//@Scheduled(fixedDelay = 3500000)
+	// @Scheduled(fixedDelay = 3500000)
 	@Async
 	public void sweettrackerInvoiceRetrieveJob() throws Exception {
 		tsbSweetTrackerJob.runById("cron.delivery.sweettracker.invoice.retrieve");
@@ -145,7 +145,7 @@ public class TsbDeliveryTask {
 	 * @throws Exception
 	 */
 	@Scheduled(cron = "${cron.delivery.auto.soldout.cancel}")
-	//@Scheduled(fixedDelay = 3500000)
+	// @Scheduled(fixedDelay = 3500000)
 	@Async
 	public void autoSoldoutCancelJob() throws Exception {
 		tsbSoldoutCancelJob.runById("cron.delivery.auto.soldout.cancel");

src/main/java/com/style24/persistence/domain/Delivery.java

@@ -1,9 +1,6 @@
 package com.style24.persistence.domain;
 
-import java.util.Collection;
-import java.util.List;
 import com.fasterxml.jackson.annotation.JsonFormat;
-
 import com.style24.persistence.TscBaseDomain;
 
 import lombok.Data;
@@ -141,6 +138,7 @@ public class Delivery extends TscBaseDomain {
 	private String ordNm;
 	private String pgGb;
 	private String payMeans;
+	private String cardPcableYn;
 	private String bankCd;
 	private String accountNm;
 	private String accountNo;

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

@@ -1604,6 +1604,8 @@
 				, A.ORD_PHNNO
 				, D.PAY_GB 
 				, D.PAY_MEANS
+				, D.CARD_PCABLE_YN
+				, D.PG_GB
 				, E.BANK_CD 
 				, E.ACCOUNT_NM 
 				, E.ACCOUNT_NO 
@@ -1648,7 +1650,8 @@
 			, C.ORD_NM 
 			, C.ORD_PHNNO
 			, D.PG_GB 
-			, D.PAY_MEANS 
+			, D.PAY_MEANS
+			, D.CARD_PCABLE_YN
 			, E.BANK_CD
 			, E.ACCOUNT_NM 
 			, E.ACCOUNT_NO 
@@ -1690,7 +1693,8 @@
 			, C.ORD_NM 
 			, C.ORD_PHNNO
 			, D.PG_GB 
-			, D.PAY_MEANS 
+			, D.PAY_MEANS
+			, D.CARD_PCABLE_YN
 			, E.BANK_CD
 			, E.ACCOUNT_NM 
 			, E.ACCOUNT_NO