WMS 업데이터 PG 처리 후로 이동 커밋

src/main/java/com/style24/core/biz/service/TscOrderChangeService.java

@@ -691,27 +691,7 @@ public class TscOrderChangeService {
 			}
 		}
 
-		// 7. WMS 취소 처리
-		List<Order> wmsList = new ArrayList<>();
-		for (Order cancelOrderRefund : cancelOrderRefundList) {
-			int ordDtlNo = cancelOrderRefund.getOrdDtlNo();
-			int chgQty = cancelOrderRefund.getOrdCanChgQty();
-
-			Order wms = new Order();
-			wms.setOrdNo(ordNo);
-			wms.setOrdDtlNo(ordDtlNo);
-			wms.setChgQty(chgQty);
-
-			if (chgQty > 0) {
-				wmsList.add(wms);
-			}
-		}
-
-		if (wmsList.size() > 0) {
-			wmsService.updateWmsCancel(wmsList);
-		}
-
-		// 8. PG 취소 처리
+		// 7. PG 취소 처리
 		for (Payment pg : pgList) {
 			
 			// 2021.09.02 (PAY_STAT = 'G016_30' AND PG_TID IS NULL AND PG_GB <> 'ISTYLE') 체크 후 없으면 제휴몰로 판단 로직
@@ -747,7 +727,7 @@ public class TscOrderChangeService {
 				kakaoPayService.cancelKakaoPayment(pg);
 			}
 
-			// 9. 환불정보 수정
+			// 8. 환불정보 수정
 			Order refundOrder = new Order();
 			refundOrder.setOrdNo(ordNo);
 			refundOrder.setPaySq(pg.getPaySq());
@@ -757,11 +737,32 @@ public class TscOrderChangeService {
 			orderChangeDao.updateRefundInfo(refundOrder);
 		}
 
-		// 10. 현금영수증 취소 처리
+		// 9. 현금영수증 취소 처리
 		for (GiftCard cashReceipts : cashReceiptsList) {
 			kcpService.kcpCashReceiptCancel(cashReceipts);
 		}
 
+		// 10. WMS 취소 처리
+		// 2021.10.14 card007 트랜잭션 처리 안되는듯 하여 PG처리 후 WMS처리 하는걸로 변경
+		List<Order> wmsList = new ArrayList<>();
+		for (Order cancelOrderRefund : cancelOrderRefundList) {
+			int ordDtlNo = cancelOrderRefund.getOrdDtlNo();
+			int chgQty = cancelOrderRefund.getOrdCanChgQty();
+
+			Order wms = new Order();
+			wms.setOrdNo(ordNo);
+			wms.setOrdDtlNo(ordDtlNo);
+			wms.setChgQty(chgQty);
+
+			if (chgQty > 0) {
+				wmsList.add(wms);
+			}
+		}
+
+		if (wmsList.size() > 0) {
+			wmsService.updateWmsCancel(wmsList);
+		}
+
 		return map;
 	}
 
@@ -2220,24 +2221,7 @@ public class TscOrderChangeService {
 		
 		orderChangeDao.updateOrderDetailItemForAllCancel(orderDetail);
 		
-		// 10. WMS 취소 처리
-		List<Order> wmsList = new ArrayList<>();
-		if(orderChange.getOrdDtlNoArr() != null && orderChange.getOrdDtlNoArr().length > 0) {
-			for (int i = 0; i < orderChange.getOrdDtlNoArr().length; i++) {
-				Order wms = new Order();
-				wms.setOrdNo(ordNo);
-				wms.setOrdDtlNo(orderChange.getOrdDtlNoArr()[i]);
-				wms.setChgQty(orderChange.getCnclRtnReqQtyArr()[i]);
-
-				wmsList.add(wms);
-			}
-
-			if(wmsList.size() > 0) {
-				wmsService.updateWmsCancel(wmsList);
-			}
-		}
-		
-		// 11. 배송비 취소 처리
+		// 10. 배송비 취소 처리
 		OrderChange deliveryFee = new OrderChange();
 		deliveryFee.setOrdNo(ordNo);
 		deliveryFee.setOrdChgSq(ordChgSq);
@@ -2245,7 +2229,7 @@ public class TscOrderChangeService {
 		deliveryFee.setUpdNo(updNo);
 		orderChangeDao.createDeliveryFeeForAllCancel(deliveryFee);
 
-		// 12. PG 연동
+		// 11. PG 연동
 		Payment pg = new Payment();
 		pg.setOrdNo(ordNo);
 		pg.setOrdChgSq(ordChgSq);
@@ -2292,12 +2276,12 @@ public class TscOrderChangeService {
 			kakaoPayService.cancelKakaoPayment(pg);
 		}
 
-		// 11. 환불금액 정보 수정
+		// 12. 환불금액 정보 수정
 		refundOrder.setPaySq(pg.getPaySq());
 
 		orderChangeDao.updateRefundInfo(refundOrder);
 
-		// 12. 보증보험 취소 처리 (무통장입금 전 전체취소 시 처리)
+		// 13. 보증보험 취소 처리 (무통장입금 전 전체취소 시 처리)
 		if (TscConstants.OrderChangeStat.PAYMENT_BEFORE_CANCEL.value().equals(chgStat)) {
 			Order guarantee = new Order();
 			guarantee.setOrdNo(ordNo);
@@ -2305,7 +2289,7 @@ public class TscOrderChangeService {
 			orderService.uSafeGuaranteePayedBeforeCancel(guarantee);
 		}
 
-		// 13. 상품권 현금영수증 취소 처리
+		// 14. 상품권 현금영수증 취소 처리
 		GiftCard giftCardCashReceipts = orderDao.getGiftCardReceiptInfo(ordNo);
 
 		if (giftCardCashReceipts != null && StringUtils.isNotBlank(giftCardCashReceipts.getTradeNo())) {
@@ -2314,6 +2298,24 @@ public class TscOrderChangeService {
 
 			kcpService.kcpCashReceiptCancel(giftCardCashReceipts);
 		}
+
+		// 15. WMS 취소 처리
+		// 2021.10.14 card007 트랜잭션 처리 안되는듯 하여 PG처리 후 WMS처리 하는걸로 변경
+		List<Order> wmsList = new ArrayList<>();
+		if(orderChange.getOrdDtlNoArr() != null && orderChange.getOrdDtlNoArr().length > 0) {
+			for (int i = 0; i < orderChange.getOrdDtlNoArr().length; i++) {
+				Order wms = new Order();
+				wms.setOrdNo(ordNo);
+				wms.setOrdDtlNo(orderChange.getOrdDtlNoArr()[i]);
+				wms.setChgQty(orderChange.getCnclRtnReqQtyArr()[i]);
+
+				wmsList.add(wms);
+			}
+
+			if(wmsList.size() > 0) {
+				wmsService.updateWmsCancel(wmsList);
+			}
+		}
 		
 		return ordChgSq;
 	}