Merge remote-tracking branch '112.172.147.34/style' into ST24PRJ-4(회수상품정보,금액정보노출)

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

@@ -3194,7 +3194,8 @@ public class TscOrderChangeService {
 				// 4-6. 원주문배송비 환불 처리
 				int orgRefundDelvFee = refundInfo.getOrgRefundDelvFee();
 				if (orgRefundDelvFee > 0) {
-					rfDeliveryFee += orgRefundDelvFee;
+					// 2021.12.03 card007 배송비 처리 수정
+					// rfDeliveryFee += orgRefundDelvFee;
 
 					// 원주문 배송비 환불
 					OrderChange ordDelvFee = new OrderChange();
@@ -3685,7 +3686,9 @@ public class TscOrderChangeService {
 		chgRefund.setRfDelvGfcdUseAmt(refundInfo.getRfDelvGfcdUseAmt());
 
 		if(refundInfo.getOrgRefundDelvFee() > 0 || refundInfo.getRfDeliveryFee() != 0) {
-			int rfDeliveryFee = refundInfo.getOrgRefundDelvFee() + refundInfo.getRfDeliveryFee();
+			// 2021.12.03 card007 배송비 처리 수정
+			// int rfDeliveryFee = refundInfo.getOrgRefundDelvFee() + refundInfo.getRfDeliveryFee();
+			int rfDeliveryFee = refundInfo.getRfDeliveryFee();
 
 			// 원주문 배송비 환불
 			if (refundInfo.getOrgRefundDelvFee() > 0) {
@@ -5507,9 +5510,21 @@ public class TscOrderChangeService {
 				// 회사귀책사유
 				else {
 					// 배송비정책 단위 부분반품
-					if ("G688".equals(chgGb) && !"Y".equals(allDelvCanYn)) {
-						// 환불금액 = 취소/반품 상품 실결제 금액
-						refundAmt = spanRealCnclRtnAmt;
+					// 2021.12.03 card007 배송비 처리 수정
+					if ("G688".equals(chgGb)) {
+						if ("Y".equals(allDelvCanYn)) {
+							// 환불금액 = 취소/반품 상품 실결제 금액 + (원주문배송비 - 원주문배송비 쿠폰 사용 금액 - 원주문배송비 상품권 사용 금액)
+							refundAmt = spanRealCnclRtnAmt + spanSumDeliveryFee - spanRefundDelvCpnAmt - spanDelvGfcdUseAmt;
+
+							// 환불 원주문 배송비 = 원주문배송비 - 원주문배송비 쿠폰 사용 금액 - 원주문배송비 상품권 사용 금액
+							orgRefundDelvFee = spanSumDeliveryFee - spanRefundDelvCpnAmt - spanDelvGfcdUseAmt;
+
+							// 환불 배송비 상품권 = 원주문배송비 상품권 사용 금액
+							rfDelvGfcdUseAmt = spanDelvGfcdUseAmt;
+						} else {
+							// 환불금액 = 취소/반품 상품 실결제 금액
+							refundAmt = spanRealCnclRtnAmt;
+						}
 					}
 					// 배송비정책 단위 전체반품 및 취소
 					else {

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

@@ -61,15 +61,16 @@ public class TscWmsService {
 		String chk2 = "N";
 
 		WmsDelivery wmsRtn = getWmsRealStock(productNo, skuCode);
-
-		Collection<Erp> erpRtnList = hansaeErp.getErpRealStockList(HansaeErp.ErpGb.HANSAE_DR.value(), styleCd, colorCd, sizeCd);
+		
+		// 매장재고 체크는 주석 처리 (운영하지 않는데 불필요 리소스 낭비로 판단)
+		//Collection<Erp> erpRtnList = hansaeErp.getErpRealStockList(HansaeErp.ErpGb.HANSAE_DR.value(), styleCd, colorCd, sizeCd);
 
 		if (wmsRtn != null) {
 			list.add(wmsRtn);
 		} else {
 			chk1 = "Y";
 		}
-
+		/*
 		if (erpRtnList != null) {
 			for (Erp data : erpRtnList) {
 				WmsDelivery tmp = new WmsDelivery();
@@ -80,7 +81,9 @@ public class TscWmsService {
 		} else {
 			chk2 = "Y";
 		}
-
+		*/
+		chk2 = "Y";
+		
 		if ("Y".equals(chk1) && "Y".equals(chk2)) {
 			list = null;
 		}

src/main/java/com/style24/persistence/mybatis/wms/TscWmsDelivery.xml

@@ -8,7 +8,7 @@
 		SELECT 'ST0001' AS STOCK_LOC
 		     , A.PRODUCT_NO
 		     , A.SKU_CODE
-		     , MAX(A.LOC_QTY) - MAX(A.SLIP_CREATE_QTY) - MAX(A.CVS_QTY) - MAX(A.EOUT_CREATE_QTY)  - SUM(A.Qty) AS LOC_QTY
+		     , SUM(A.LOC_QTY) - MAX(A.SLIP_CREATE_QTY) - MAX(A.CVS_QTY) - MAX(A.EOUT_CREATE_QTY)  - SUM(A.Qty) AS LOC_QTY
 		  FROM (
 		    SELECT PRODUCT_NO
 		         , SKU_CODE