반품TO반품 임시 커밋

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

@@ -108,7 +108,7 @@
 		                 WHERE Z.SHIP_COMP_CD = OD.SHIP_COMP_CD)                        AS SHIP_COMP_NM
 		             , OD.INVOICE_NO
 		             , OD.SUPPLY_COMP_CD
-		             , OD.DELV_FEE_CD
+		             , IF(G.SELF_GOODS_YN = 'Y', 'WMS', OD.DELV_FEE_CD)                 AS DELV_FEE_CD
 		             , OD.SHOT_DELV_YN
 		             , OD.CHANGEABLE_YN
 		             , OD.RETURNABLE_YN

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

@@ -146,7 +146,14 @@
 			</otherwise>
 		</choose>
 		<if test="delvFeeCd != null and delvFeeCd != ''">
+			<choose>
+				<when test="delvFeeCd == 'WMS'">
+		           AND G.SELF_GOODS_YN = 'Y'
+				</when>
+				<otherwise>
 		           AND OD.DELV_FEE_CD = #{delvFeeCd}
+				</otherwise>
+			</choose>
 		</if>
 		           AND O.DISP_YN = 'Y'
 		           AND OD.ORD_QTY - OD.CNCL_RTN_QTY > 0
@@ -303,7 +310,14 @@
 		           AND O.ORD_NO = #{ordNo}
 		</if>
 		<if test="delvFeeCd != null and delvFeeCd != ''">
+			<choose>
+				<when test="delvFeeCd == 'WMS'">
+		           AND G.SELF_GOODS_YN = 'Y'
+				</when>
+				<otherwise>
 		           AND OD.DELV_FEE_CD = #{delvFeeCd}
+				</otherwise>
+			</choose>
 		</if>
 		<choose>
 			<when test="chgGb == 'G680_30'">

src/main/webapp/WEB-INF/views/mob/mypage/MypageReturnFormMob.html

@@ -596,7 +596,6 @@ var fnReturn = function() {
 	data.chgerRtnMemo 		= $('#returnForm input[name=chgerRtnMemo]').val();
 	data.ordDtlNoArr 		= ordDtlNoArr;
 	data.wdInvoiceNo 		= $('#returnForm input[name=wdInvoiceNo]').val();
-	data.delvFeeCd			= oneData.delvFeeCd;
 	data.addPayCost 		= addPayCost;
 	data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;
 
@@ -652,7 +651,6 @@ var fnChangeReturnQty = function(param) {
 
 		let data 				= {};
 		data.ordNo 				= oneData.ordNo;
-		data.delvFeeCd 			= oneData.delvFeeCd;
 		data.chgGb 				= 'G680_30';
 		data.ordDtlNoArr 		= ordDtlNoArr;
 		data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberReturnFormMob.html

@@ -601,7 +601,6 @@ var fnReturn = function() {
 	data.chgerRtnMemo 		= $('#returnForm input[name=chgerRtnMemo]').val();
 	data.ordDtlNoArr 		= ordDtlNoArr;
 	data.wdInvoiceNo 		= $('#returnForm input[name=wdInvoiceNo]').val();
-	data.delvFeeCd 			= oneData.delvFeeCd;
 	data.addPayCost 		= addPayCost;
 	data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;
 
@@ -657,7 +656,6 @@ var fnChangeReturnQty = function(param) {
 
 		let data 				= {};
 		data.ordNo 				= oneData.ordNo;
-		data.delvFeeCd 			= oneData.delvFeeCd;
 		data.chgGb 				= 'G680_30';
 		data.ordDtlNoArr 		= ordDtlNoArr;
 		data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;

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

@@ -450,7 +450,6 @@
 		data.chgerRtnMemo = $('#returnForm input[name=chgerRtnMemo]').val();
 		data.ordDtlNoArr = ordDtlNoArr;
 		data.wdInvoiceNo = $('#returnForm input[name=wdInvoiceNo]').val();
-		data.delvFeeCd = oneData.delvFeeCd;
 		data.addPayCost = addPayCost;
 		data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;
 
@@ -498,7 +497,6 @@
 
 			let data = {};
 			data.ordNo = oneData.ordNo;
-			data.delvFeeCd = oneData.delvFeeCd;
 			data.chgGb = 'G680_30';
 			data.ordDtlNoArr = ordDtlNoArr;
 			data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;

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

@@ -450,7 +450,6 @@
 		data.chgerRtnMemo = $('#returnForm input[name=chgerRtnMemo]').val();
 		data.ordDtlNoArr = ordDtlNoArr;
 		data.wdInvoiceNo = $('#returnForm input[name=wdInvoiceNo]').val();
-		data.delvFeeCd = oneData.delvFeeCd;
 		data.addPayCost = addPayCost;
 		data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;
 
@@ -501,7 +500,6 @@
 			data.ordNm = oneData.ordNm;
 			data.ordPhnno = oneData.ordPhnno;
 			data.chgGb = 'G680_30';
-			data.delvFeeCd = oneData.delvFeeCd;
 			data.ordDtlNoArr = ordDtlNoArr;
 			data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;