마이페이지 교환 임시 커밋

src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -455,7 +455,9 @@ public class TsfMypageController extends TsfBaseController {
 
 		// 처리 결과 코드에 따른 메세지 설정
 		if (result.get("status").equals(GagaResponseStatus.SUCCESS.getCode())) {
-			result.set("message", message.getMessage("EXCHANGE_0001"));
+			if (orderChange.getAddPayCost() == 0) {
+				result.set("message", message.getMessage("EXCHANGE_0001"));
+			}
 		} else {
 			result.set("message", message.getMessage("FAIL_0004"));
 		}
@@ -624,6 +626,7 @@ public class TsfMypageController extends TsfBaseController {
 		GagaMap refundPreInfo = orderChangeService.getRefundPreInfo(orderChange);
 		List<Order> returnReqList = (List<Order>)refundPreInfo.get("cnclReqList");
 		String allLastCanYn = refundPreInfo.getString("allLastCanYn");
+		String supplyCompCd = refundPreInfo.getString("supplyCompCd");
 
 		// 3. 환불금액계산
 		GagaMap result = coreOrderRefundService.cnclRtnRefundAmt(returnReqList);

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

@@ -192,6 +192,7 @@
 		     , Z.BANK_CD
 		     , Z.ACCOUNT_NO
 		     , Z.ACCOUNT_NM
+		     , Z.DELV_FEE
 		     , Z.RTN_DELV_FEE
 		     , Z.EXC_DELV_FEE
 		  FROM (SELECT O.ORD_NO
@@ -237,6 +238,7 @@
 		             , CA.BANK_CD
 		             , CA.ACCOUNT_NO
 		             , IFNULL(CA.ACCOUNT_NM, O.ORD_NM)                                        AS ACCOUNT_NM
+		             , DFP.DELV_FEE
 		             , DFP.RTN_DELV_FEE
 		             , DFP.DELV_FEE + DFP.RTN_DELV_FEE                                        AS EXC_DELV_FEE
 		          FROM TB_ORDER O
@@ -290,7 +292,7 @@
 		        , Z.ORD_DTL_STAT, Z.ORD_QTY, Z.CNCL_RTN_QTY, Z.ORD_AMT, Z.REAL_ORD_AMT, Z.SAVE_PNT_AMT, Z.CNCL_RTN_AMT, Z.PNT_DC_AMT
 		        , Z.GFCD_USE_AMT, Z.SHIP_COMP_CD, Z.GIFT_PACK_YN, Z.SHIP_COMP_NM, Z.INVOICE_NO, Z.SUPPLY_COMP_CD, Z.DELV_FEE_CD
 		        , Z.SHOT_DELV_YN, Z.CHANGEABLE_YN, Z.SELF_GOODS_YN, Z.BRAND_NM, Z.ORD_REQ_CHG_QTY, Z.ORD_CAN_CHG_QTY, Z.BANK_CD
-		        , Z.ACCOUNT_NO, Z.ACCOUNT_NM, Z.RTN_DELV_FEE, Z.EXC_DELV_FEE
+		        , Z.ACCOUNT_NO, Z.ACCOUNT_NM, Z.DELV_FEE, Z.RTN_DELV_FEE, Z.EXC_DELV_FEE
 		ORDER BY Z.ORD_DTL_NO
 	</select>
 	
@@ -680,7 +682,7 @@
 		<if test="stDate != null and stDate != '' and edDate != null and edDate != ''">
 		           AND OCD.REG_DT BETWEEN CONCAT(#{stDate}, ' 00:00:00') AND CONCAT(#{edDate}, ' 23:59:59')
 		</if>
-		<if test="ordDtlStat != null and ordDtlStat != ''">
+		<if test="chgStat != null and chgStat != ''">
 		           AND OCD.CHG_STAT = #{chgStat}
 		</if>
 		         GROUP BY OCD.ORD_CHG_SQ
@@ -720,7 +722,7 @@
 		<if test="stDate != null and stDate != '' and edDate != null and edDate != ''">
 		   AND OCD.REG_DT BETWEEN CONCAT(#{stDate}, ' 00:00:00') AND CONCAT(#{edDate}, ' 23:59:59')
 		</if>
-		<if test="ordDtlStat != null and ordDtlStat != ''">
+		<if test="chgStat != null and chgStat != ''">
 		   AND OCD.CHG_STAT = #{chgStat}
 		</if>
 		 GROUP BY OCD.ORD_CHG_SQ
@@ -909,7 +911,7 @@
 		         INNER JOIN TB_PAYMENT P
 		            ON P.ORD_NO = O.ORD_NO
 		           AND P.PAY_GB = 'O'
-		           AND P.PAY_STAT = 'G016_30'
+		           AND P.PAY_STAT IN ('G016_00', 'G016_30')
 		         WHERE OCD.DEL_YN = 'N'
 		           AND O.DISP_YN = 'Y'
 		<choose>
@@ -1117,7 +1119,7 @@
 
 	<!-- 마이페이지 교환 상세 정보 조회 -->
 	<select id="getCreExchangeDetailInfo" parameterType="OrderChange" resultType="OrderChange">
-		/* TsfOrderChange.getCreCancelDetailInfo */
+		/* TsfOrderChange.getCreExchangeDetailInfo */
 		SELECT GROUP_CONCAT(Z.ITEM_NM ORDER BY Z.ORD_DTL_ITEM_SQ SEPARATOR '!@!')       AS ITEM_NM
 		     , GROUP_CONCAT(Z.COLOR_NM ORDER BY Z.ORD_DTL_ITEM_SQ)                      AS COLOR_NM
 		     , GROUP_CONCAT(Z.OPT_CD1 ORDER BY Z.ORD_DTL_ITEM_SQ)                       AS OPT_CD1

src/main/resources/i18n/messages/message_ko_KR.properties

@@ -96,6 +96,7 @@ COUPON_0002=\uC774\uBBF8 \uB2E4\uC6B4\uB85C\uB4DC\uB97C \uC644\uB8CC \uD558\uC16
 #\uAD50\uD658
 EXCHANGE_0001=\uAD50\uD658 \uC2E0\uCCAD\uC774 \uC811\uC218\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
 EXCHANGE_0002=\uAD50\uD658 \uC2E0\uCCAD\uC774 \uCDE8\uC18C\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+EXCHANGE_0003=\uC7AC\uACE0\uAC00 \uBD80\uC871\uD558\uC5EC \uAD50\uD658 \uC2E0\uCCAD\uC774 \uCDE8\uC18C\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
 
 #\uBC18\uD488
 RETURN_0001=\uBC18\uD488 \uC2E0\uCCAD\uC774 \uC811\uC218\uB418\uC5C8\uC2B5\uB2C8\uB2E4.

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

@@ -147,7 +147,7 @@
 					<input type="hidden" name="pageNo" value=1 />
 					<input type="hidden" name="pageSize" value=5 />
 					<input type="hidden" name="pageUnit" value=10 />
-					<input type="hidden" name="ordDtlStat" value="" />
+					<input type="hidden" name="chgStat" value="" />
 					<input type="hidden" name="stDate" value="" />
 					<input type="hidden" name="edDate" value="" />
 					<input type="hidden" name="custNo" th:value ="${custNo}"/>

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

@@ -408,6 +408,7 @@
 		let excDelvFee = oneData.excDelvFee;
 		let rtnDelvFee = oneData.rtnDelvFee;
 		let chgReason = $('#exchangeForm input[name=chgReason]').val();
+		let addPayCost = $('#exchangeForm input[name=addPayCost]').val();
 		
 		// 교환 사유 체크
 		if (gagajf.isNull(chgReason)) {
@@ -476,6 +477,7 @@
 		data.chgerBaseAddr = $('#exchangeForm input[name=chgerBaseAddr]').val();
 		data.chgerDtlAddr = $('#exchangeForm input[name=chgerDtlAddr]').val();
 		data.chgerRtnMemo = $('#exchangeForm input[name=chgerRtnMemo]').val();
+		data.addPayCost = addPayCost;
 		data.addPayAmt = 0;
 		data.cancelReqList = cancelReqList;
 
@@ -483,7 +485,17 @@
 
 		// 교환 처리
 		gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-			cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
+			if (addPayCost > 0) {
+				let ordChgSq = result.ordChgSq;
+				let ordNo = result.ordNo;
+				
+				$('#addPaymentForm input[name=ordChgSq]').val(ordChgSq);
+				$('#addPaymentForm input[name=ordNo]').val(ordNo);
+				
+				document.addPaymentForm.submit();
+			} else {
+				cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
+			}
 		});
 	}
 

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

@@ -436,7 +436,7 @@
 		data.ordNo = oneData.ordNo;
 		data.ordChgSq = 0;
 		data.chgReason = chgReason;
-		data.chgMemo = $('#returnForm input[name=chgMemo]').val();
+		data.chgMemo = $('#returnForm textarea[name=chgMemo]').val();
 		data.accountNo = $('#returnForm input[name=accountNo]').val();
 		data.accountNm = $('#returnForm input[name=accountNm]').val();
 		data.bankCd = $('#returnForm input[name=bankCd]').val();