112233 태

src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java

@@ -262,42 +262,50 @@ public class TsaOrderChangeController extends TsaBaseController {
 		// 취소완료
 		else {
 			result = coreOrderChangeService.partialCancel(map, userNo);
+			
 			String pgGb = map.getString("pgGb");
+			
 			if (TscConstants.PgGb.NAVER_ORDER.value().equals(pgGb)) {
 				List<Order> cancelOrderRefundList 	= (List<Order>) map.get("cancelOrderRefundList");
 
 				for(Order vo : cancelOrderRefundList) {
+					
 					try {
-						Order order = coreNaverPayService.getOrderDetailInfoFromOrdDtlNo(vo);
-						if ("O".equals(order.getOrdExchGb())) {
-							// 취소 완료
-							if ("scm".equals(env.getProperty("server.site.name"))) {
-								order.setRegNo(userNo);
-								coreNaverPayService.sendNaverPayOrderCancelConfirm(order);        // 취소 완료 데이터 송부
-							} else {
-								String addUrl = "/naverpay/send/cancel/complete?ordNo=" + order.getOrdNo() + "&ordDtlNo=" + order.getOrdDtlNo() + "&npayOrdDtlNo=" + order.getNpayOrdDtlNo() + "&userNo=" + userNo;
-								coreNaverPayService.sendScmServerForNaverpay(addUrl);        // 취소 완료 데이터 송부
-							}
-						} else {
-							// 반품 품절 취소
-							if ("scm".equals(env.getProperty("server.site.name"))) {
-								coreNaverPayService.sendNaverPayRejectExchange(order, userNo);			// 교환반려
-								coreNaverPayService.sendNaverPaySoldoutReturnReq(order, userNo);		// 품절반품접수
-								coreNaverPayService.sendNaverPayReturnComplete(order, userNo);			// 반품완료
+						// 2021.07.30 수정
+						int leftQty = vo.getOrdQty() - vo.getCnclRtnQty() - vo.getOrdCanChgQty();
+						if (leftQty < 1) {
+							Order order = coreNaverPayService.getOrderDetailInfoFromOrdDtlNo(vo);
+							
+							if ("O".equals(order.getOrdExchGb())) {
+								// 취소 완료
+								if ("scm".equals(env.getProperty("server.site.name"))) {
+									order.setRegNo(userNo);
+									coreNaverPayService.sendNaverPayOrderCancelConfirm(order);        // 취소 완료 데이터 송부
+								} else {
+									String addUrl = "/naverpay/send/cancel/complete?ordNo=" + order.getOrdNo() + "&ordDtlNo=" + order.getOrdDtlNo() + "&npayOrdDtlNo=" + order.getNpayOrdDtlNo() + "&userNo=" + userNo;
+									coreNaverPayService.sendScmServerForNaverpay(addUrl);        // 취소 완료 데이터 송부
+								}
 							} else {
-								String addUrl = "";
-								// 네이버페이는 SCM을 통해서 송부
-								// coreNaverPayService.sendNaverPayRejectExchange(exception, userNo);        // 교환반려
-								addUrl = "/naverpay/send/reject/exchange?ordDtlNo=" + order.getOrdDtlNo() + "&userNo=" + userNo;
-								coreNaverPayService.sendScmServerForNaverpay(addUrl);                        // 교환 반려
-
-								// coreNaverPayService.sendNaverPaySoldoutReturnReq(param, userNo);				// 품절반품접수
-								addUrl = "/naverpay/send/soldout/return/req?ordDtlNo=" + order.getOrdDtlNo() + "&userNo=" + userNo;
-								coreNaverPayService.sendScmServerForNaverpay(addUrl);                            // 품절반품접수
-
-								// coreNaverPayService.sendNaverPayReturnComplete(exception, userNo);		// 반품완료
-								addUrl = "/naverpay/send/return/complete?ordDtlNo=" + order.getOrdDtlNo() + "&userNo=" + userNo;
-								coreNaverPayService.sendScmServerForNaverpay(addUrl);                        // 반품완료
+								// 반품 품절 취소
+								if ("scm".equals(env.getProperty("server.site.name"))) {
+									coreNaverPayService.sendNaverPayRejectExchange(order, userNo);			// 교환반려
+									coreNaverPayService.sendNaverPaySoldoutReturnReq(order, userNo);		// 품절반품접수
+									coreNaverPayService.sendNaverPayReturnComplete(order, userNo);			// 반품완료
+								} else {
+									String addUrl = "";
+									// 네이버페이는 SCM을 통해서 송부
+									// coreNaverPayService.sendNaverPayRejectExchange(exception, userNo);        // 교환반려
+									addUrl = "/naverpay/send/reject/exchange?ordDtlNo=" + order.getOrdDtlNo() + "&userNo=" + userNo;
+									coreNaverPayService.sendScmServerForNaverpay(addUrl);                        // 교환 반려
+	
+									// coreNaverPayService.sendNaverPaySoldoutReturnReq(param, userNo);				// 품절반품접수
+									addUrl = "/naverpay/send/soldout/return/req?ordDtlNo=" + order.getOrdDtlNo() + "&userNo=" + userNo;
+									coreNaverPayService.sendScmServerForNaverpay(addUrl);                            // 품절반품접수
+	
+									// coreNaverPayService.sendNaverPayReturnComplete(exception, userNo);		// 반품완료
+									addUrl = "/naverpay/send/return/complete?ordDtlNo=" + order.getOrdDtlNo() + "&userNo=" + userNo;
+									coreNaverPayService.sendScmServerForNaverpay(addUrl);                        // 반품완료
+								}
 							}
 						}
 					} catch (Exception e) {