전체 반품 배송비 오류 처리 임시 커밋

src/main/java/com/style24/front/biz/dao/TsfOrderChangeDao.java

@@ -97,14 +97,4 @@ public interface TsfOrderChangeDao {
 	 */
 	Collection<OrderChange> getPagingCreList(OrderChange orderChange);
 
-	/**
-	 * 마이페이지 반품 주문 정보 조회
-	 *
-	 * @param Order
-	 * @return Collection<Order>
-	 * @author card007
-	 * @since 2021. 09. 07
-	 */
-	Collection<Order> getReturnOrderInfo(Order order);
-
 }

src/main/java/com/style24/front/biz/service/TsfOrderChangeService.java

@@ -120,7 +120,7 @@ public class TsfOrderChangeService {
 		Order oneData = result.iterator().next();
 		oneData.setOrdDtlNoArr(ordDtlNoList.stream().mapToInt(Integer::intValue).toArray());
 
-		Collection<Order> returnOrderInfo = orderChangeDao.getReturnOrderInfo(order);
+		Collection<Order> returnOrderInfo = coreOrderChangeDao.getReturnOrderInfo(order);
 
 		map.set("oneData", oneData);
 		map.set("returnList", result);

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

@@ -813,34 +813,4 @@
 		 GROUP BY OCD.ORD_CHG_SQ
 		<include refid="selectForPagingFooter"/>
 	</select>
-	
-	<!-- 마이페이지 반품 주문 정보 조회 -->
-	<select id="getReturnOrderInfo" parameterType="Order" resultType="Order">
-		/* TsfOrderChange.getReturnOrderInfo */
-		SELECT OD.ORD_DTL_NO
-		     , OD.ORD_QTY
-		     , DF.DELV_FEE
-		     , DF.DELV_CPN_DC_AMT
-		     , DF.DELV_GFCD_USE_AMT
-		     , DF.REAL_DELV_AMT
-		     , DFP.DELV_FEE                        AS ORG_DELV_FEE
-		  FROM TB_ORDER O
-		 INNER JOIN TB_ORDER_DETAIL OD
-		    ON O.ORD_NO = OD.ORD_NO
-		 INNER JOIN (SELECT ORD_NO
-		                  , SUM(DELV_FEE)          AS DELV_FEE
-		                  , SUM(DELV_CPN_DC_AMT)   AS DELV_CPN_DC_AMT
-		                  , SUM(DELV_GFCD_USE_AMT) AS DELV_GFCD_USE_AMT
-		                  , SUM(REAL_DELV_AMT)     AS REAL_DELV_AMT
-		               FROM TB_DELIVERY_FEE
-		              WHERE ORD_NO = #{ordNo}
-		                AND DELV_FEE_GB = 'G018_10'
-		              GROUP BY ORD_NO
-		            ) DF
-		    ON O.ORD_NO = DF.ORD_NO
-		 INNER JOIN TB_DELV_FEE_POLICY DFP
-		    ON OD.DELV_FEE_CD = DFP.DELV_FEE_CD
-		 WHERE O.ORD_NO = #{ordNo}
-		   AND OD.DELV_FEE_CD = #{delvFeeCd}
-	</select>
 </mapper>

src/main/webapp/WEB-INF/views/web/mypage/MypageReturnFormWeb.html

@@ -515,6 +515,10 @@
 				let chgQty = $(item).val();
 				let ordDtlNo = $(item).attr('ordDtlNo');
 				let ordCanChgQty = $(item).attr('ordCanChgQty');
+				
+				//$.each(returnOrderInfo, function (index, orderInfo) {
+				//	
+				//});
 
 				cnclRtnReqQtyArr.push(Number(chgQty));
 				ordDtlNoArr.push(Number(ordDtlNo));
@@ -522,27 +526,28 @@
 			});
 
 			// 2021.09.07 card007 전체반품 원배송비 무료 해택 차감 처리
-			let delvFee;
-			let delvCpnDcAmt;
 			let delvGfcdUseAmt;
 			let realDelvAmt;
 			let orgDelvFee;
 			
 			if (returnOrderInfo != null && returnOrderInfo.length > 0) {
 				allDelvCanYn 	= 'Y';
-				delvFee 		= returnOrderInfo[0].delvFee;
-				delvCpnDcAmt 	= returnOrderInfo[0].delvCpnDcAmt;
 				delvGfcdUseAmt 	= returnOrderInfo[0].delvGfcdUseAmt;
 				realDelvAmt 	= returnOrderInfo[0].realDelvAmt;
 				orgDelvFee 		= returnOrderInfo[0].orgDelvFee;
 
 				$.each(returnOrderInfo, function (index, orderInfo) {
-					if (!ordDtlNoArr.includes(orderInfo.ordDtlNo)) {
+					let cnt = -1;
+					$.each(ordDtlNoArr, function (idx, ordDtlNo) {
+						if (orderInfo.ordDtlNo == ordDtlNo) {
+							cnt = idx;
+						}
+					});
+
+					if (cnt == -1) {
 						allDelvCanYn = 'N';
 					} else {
-						let idx = ordDtlNoArr.findIndex(orderInfo.ordDtlNo);
-						
-						if (orderInfo.ordQty != cnclRtnReqQtyArr[idx]) {
+						if (orderInfo.ordQty != cnclRtnReqQtyArr[cnt]) {
 							allDelvCanYn = 'N';
 						}
 					}
@@ -585,7 +590,9 @@
 
 				// 2021.09.07 card007 전체반품 원배송비 무료 해택 차감 처리
 				// 배송비정책 기준 전체 반품이고 귀책사유일때
+				console.log(allDelvCanYn);
 				if (allDelvCanYn == 'Y' && isCustomer) {
+					
 					// 기 결제한 배송비 금액이 없을때
 					if (delvGfcdUseAmt + realDelvAmt == 0) {
 						// 원주문배송비 추가