Merge branch 'develop' into bin2107

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

@@ -1595,7 +1595,7 @@ public class TsfOrderService {
 
 						// 반품배송비, 교환배송비
 						sb.append("\t\t<returnShippingFee>").append(goods.getRtnDelvFee()).append("</returnShippingFee>\n");
-						sb.append("\t\t<exchangeShippingFee>").append(goods.getDelvFee() + goods.getRtnDelvFee()).append("</exchangeShippingFee>\n");
+						sb.append("\t\t<exchangeShippingFee>").append((goods.getRtnDelvFee() * 2)).append("</exchangeShippingFee>\n");
 					}
 
 					// 옵션정보 지원여부 true

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

@@ -203,6 +203,7 @@
 		     , Z.INVOICE_NO
 		     , Z.SUPPLY_COMP_CD
 		     , Z.DELV_FEE_CD
+		     , Z.DELV_FEE_CD_GRP
 		     , Z.SHOT_DELV_YN
 		     , Z.CHANGEABLE_YN
 		     , Z.RETURNABLE_YN
@@ -251,6 +252,9 @@
 		             , OD.INVOICE_NO
 		             , OD.SUPPLY_COMP_CD
 		             , OD.DELV_FEE_CD
+		             , CASE G.SELF_GOODS_YN WHEN 'Y' THEN 'WMS'
+		                                    ELSE OD.DELV_FEE_CD
+		                END                                                                   AS DELV_FEE_CD_GRP
 		             , OD.SHOT_DELV_YN
 		             , OD.CHANGEABLE_YN
 		             , OD.RETURNABLE_YN
@@ -337,7 +341,7 @@
 		 WHERE Z.ORD_CAN_CHG_QTY > 0
 		 GROUP BY Z.ORD_NO, Z.ORD_DT, Z.ORD_NM, Z.ORD_PHNNO, Z.GIFT_ADDR_INP_YN, Z.ORD_DTL_NO, Z.ORD_EXCH_GB, Z.GOODS_CD, Z.GOODS_NM, Z.LIST_PRICE, Z.SYS_IMG_NM
 		        , 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.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.DELV_FEE_CD_GRP
 		        , 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.DELV_FEE, Z.RTN_DELV_FEE, Z.EXC_DELV_FEE
 		ORDER BY Z.ORD_DTL_NO
@@ -484,8 +488,8 @@
 		             , OC.CHG_GB
 		             , OCD.CHG_QTY
 		             , DATE_FORMAT(O.ORD_DT, '%Y.%m.%d')                                AS ORD_DT
-		             , DATE_FORMAT(OCDH.REG_DT, '%Y.%m.%d')                             AS CHG_DATE
-		             , DATE_FORMAT(OCDH.REG_DT,'%H:%i:%S')                              AS CHG_TIME
+		             , IFNULL(DATE_FORMAT(OCDH.REG_DT, '%Y.%m.%d'), '')                 AS CHG_DATE
+		             , IFNULL(DATE_FORMAT(OCDH.REG_DT,'%H:%i:%S'), '')                  AS CHG_TIME
 		             , OCD.CHG_ORD_DTL_NO
 		             , OCD.CHG_STAT
 		             , FN_GET_CODE_NM('G685', OCD.CHG_STAT)                             AS CHG_STAT_NM
@@ -519,7 +523,7 @@
 		          LEFT OUTER JOIN (SELECT ORD_CHG_SQ
 		                                , ORD_DTL_NO
 		                                , CHG_STAT
-		                                , MAX(REG_DT) AS REG_DT
+		                                , IFNULL(MAX(REG_DT), '') AS REG_DT
 		                             FROM TB_ORDER_CHANGE_DETAIL_HST
 		<where>
 			<if test="ordChgSqArr != null">
@@ -636,7 +640,7 @@
 		         INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
 		            ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
 		           AND OCD.CHG_STAT NOT IN ('G685_10', 'G685_11')
-		         INNER JOIN TB_ORDER_CHANGE_DETAIL_HST OCDH
+		          LEFT OUTER JOIN TB_ORDER_CHANGE_DETAIL_HST OCDH
 		            ON OCD.ORD_CHG_SQ = OCDH.ORD_CHG_SQ
 		           AND OCD.ORD_DTL_NO = OCDH.ORD_DTL_NO
 		           AND OCD.CHG_STAT = OCDH.CHG_STAT
@@ -723,7 +727,7 @@
 		 INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
 		    ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
 		   AND OCD.CHG_STAT NOT IN ('G685_10', 'G685_11')
-		INNER JOIN TB_ORDER_CHANGE_DETAIL_HST OCDH
+		  LEFT OUTER JOIN TB_ORDER_CHANGE_DETAIL_HST OCDH
 		    ON OCD.ORD_CHG_SQ = OCDH.ORD_CHG_SQ
 		   AND OCD.ORD_DTL_NO = OCDH.ORD_DTL_NO
 		   AND OCD.CHG_STAT = OCDH.CHG_STAT

src/main/resources/config/application.yml

@@ -17,6 +17,8 @@ spring:
             repositories:
                 enabled: true
 
+server.site.name: front
+
 server:
 #    servlet:
 #        session:

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

@@ -648,7 +648,7 @@ var fnChangeExchangeReason = function(param) {
 // 추가 배송비 계산
 var fnAddCost = function() {
 	let addPayCost 		= 0;
-	let delvFee 		= oneData.delvFee;
+	let delvFee 		= oneData.rtnDelvFee;
 	let rtnDelvFee 		= oneData.rtnDelvFee;
 
 	// 교환 수량 체크

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

@@ -598,6 +598,7 @@ var fnReturn = function() {
 	data.wdInvoiceNo 		= $('#returnForm input[name=wdInvoiceNo]').val();
 	data.addPayCost 		= addPayCost;
 	data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;
+	data.delvFeeCdGrp 		= oneData.delvFeeCdGrp;
 
 	let jsonData = JSON.stringify(data);
 
@@ -654,6 +655,7 @@ var fnChangeReturnQty = function(param) {
 		data.chgGb 				= 'G680_30';
 		data.ordDtlNoArr 		= ordDtlNoArr;
 		data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;
+		data.delvFeeCdGrp 		= oneData.delvFeeCdGrp;
 		
 		let jsonData = JSON.stringify(data);
 		

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

@@ -650,7 +650,7 @@ var fnChangeExchangeReason = function(param) {
 // 추가 배송비 계산
 var fnAddCost = function() {
 	let addPayCost 		= 0;
-	let delvFee 		= oneData.delvFee;
+	let delvFee 		= oneData.rtnDelvFee;
 	let rtnDelvFee 		= oneData.rtnDelvFee;
 
 	// 교환 수량 체크

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

@@ -603,6 +603,7 @@ var fnReturn = function() {
 	data.wdInvoiceNo 		= $('#returnForm input[name=wdInvoiceNo]').val();
 	data.addPayCost 		= addPayCost;
 	data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;
+	data.delvFeeCdGrp 		= oneData.delvFeeCdGrp;
 
 	let jsonData = JSON.stringify(data);
 
@@ -659,6 +660,7 @@ var fnChangeReturnQty = function(param) {
 		data.chgGb 				= 'G680_30';
 		data.ordDtlNoArr 		= ordDtlNoArr;
 		data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;
+		data.delvFeeCdGrp 		= oneData.delvFeeCdGrp;
 		
 		let jsonData = JSON.stringify(data);
 		

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

@@ -565,7 +565,7 @@
 	// 추가 배송비 계산
 	var fnAddCost = function() {
 		let addPayCost = 0;
-		let delvFee = oneData.delvFee;
+		let delvFee = oneData.rtnDelvFee;
 		let rtnDelvFee = oneData.rtnDelvFee;
 
 		// 교환 수량 체크

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

@@ -452,6 +452,7 @@
 		data.wdInvoiceNo = $('#returnForm input[name=wdInvoiceNo]').val();
 		data.addPayCost = addPayCost;
 		data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;
+		data.delvFeeCdGrp = oneData.delvFeeCdGrp;
 
 		let jsonData = JSON.stringify(data);
 
@@ -500,6 +501,7 @@
 			data.chgGb = 'G680_30';
 			data.ordDtlNoArr = ordDtlNoArr;
 			data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;
+			data.delvFeeCdGrp = oneData.delvFeeCdGrp;
 			
 			let jsonData = JSON.stringify(data);
 			

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

@@ -564,7 +564,7 @@
 	// 추가 배송비 계산
 	var fnAddCost = function() {
 		let addPayCost = 0;
-		let delvFee = oneData.delvFee;
+		let delvFee = oneData.rtnDelvFee;
 		let rtnDelvFee = oneData.rtnDelvFee;
 
 		// 교환 수량 체크

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

@@ -452,6 +452,7 @@
 		data.wdInvoiceNo = $('#returnForm input[name=wdInvoiceNo]').val();
 		data.addPayCost = addPayCost;
 		data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;
+		data.delvFeeCdGrp = oneData.delvFeeCdGrp;
 
 		let jsonData = JSON.stringify(data);
 
@@ -502,6 +503,7 @@
 			data.chgGb = 'G680_30';
 			data.ordDtlNoArr = ordDtlNoArr;
 			data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;
+			data.delvFeeCdGrp = oneData.delvFeeCdGrp;
 			
 			let jsonData = JSON.stringify(data);