Merge remote-tracking branch '112.172.147.34/style' into ST24PRJ-198(다다익선등록오류)

# Conflicts:
#	src/main/java/com/style24/admin/biz/web/TsaOrderChangeScmController.java
#	src/main/webapp/WEB-INF/views/order/OrderWithdrawConfirmForm.html

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

@@ -847,6 +847,14 @@
 		     WHERE D.SELF_GOODS_YN  = 'Y'  -- 자사상품만
 		       AND B.ORD_DTL_STAT IN ('G013_20','G013_35')
 		       AND B.GOODS_TYPE    != 'G056_S'
+		       AND NOT EXISTS (
+		           SELECT 1
+		           FROM   TB_ORDER_DETAIL X
+		           WHERE  1=1
+		           AND    X.ORD_DTL_NO = B.ORD_DTL_NO
+		           AND    X.GIFT_PACK_YN = 'Y'
+		           AND    X.GIFT_ADDR_INP_YN = 'N'
+		       )
 			<include refid="getAssignListCondition_sql"/>
 		     UNION ALL
 		    SELECT B.ORD_DTL_NO   -- 주문상세번호
@@ -858,8 +866,16 @@
 		     WHERE D.SELF_GOODS_YN  = 'Y'  -- 자사상품만
 		       AND B.ORD_DTL_STAT IN ('G013_20','G013_35')
 		       AND B.GOODS_TYPE    = 'G056_S'
-		     GROUP  BY B.ORD_DTL_NO
-		          , B.GOODS_CD
+		       AND NOT EXISTS (
+		           SELECT 1
+		           FROM   TB_ORDER_DETAIL X
+		           WHERE  1=1
+		           AND    X.ORD_DTL_NO = B.ORD_DTL_NO
+		           AND    X.GIFT_PACK_YN = 'Y'
+		           AND    X.GIFT_ADDR_INP_YN = 'N'
+		       )
+		     GROUP BY B.ORD_DTL_NO
+		         , B.GOODS_CD
 			<include refid="getAssignListCondition_sql"/>
 		) A
 	</select>
@@ -920,6 +936,14 @@
 		            AND    D.SELF_GOODS_YN  = 'Y'  -- 자사상품만
 		            AND    B.ORD_DTL_STAT IN ('G013_20','G013_35')
 		            AND    B.GOODS_TYPE    != 'G056_S'
+		            AND    NOT EXISTS (
+		                SELECT 1
+		                FROM   TB_ORDER_DETAIL X
+		                WHERE  1=1
+		                AND    X.ORD_DTL_NO = B.ORD_DTL_NO
+		                AND    X.GIFT_PACK_YN = 'Y'
+		                AND    X.GIFT_ADDR_INP_YN = 'N'
+		            )
 					<include refid="getAssignListCondition_sql"/>
 		            UNION ALL
 		            SELECT A.SITE_CD      -- 사이트
@@ -953,6 +977,14 @@
 		            WHERE  D.SELF_GOODS_YN  = 'Y'  -- 자사상품만
 		            AND    B.ORD_DTL_STAT IN ('G013_20','G013_35')
 		            AND    B.GOODS_TYPE     = 'G056_S'
+		            AND    NOT EXISTS (
+		                SELECT 1
+		                FROM   TB_ORDER_DETAIL X
+		                WHERE  1=1
+		                AND    X.ORD_DTL_NO = B.ORD_DTL_NO
+		                AND    X.GIFT_PACK_YN = 'Y'
+		                AND    X.GIFT_ADDR_INP_YN = 'N'
+		            )
 					<include refid="getAssignListCondition_sql"/>
 					GROUP  BY A.SITE_CD      -- 사이트
 		                 , A.ORD_NO       -- 주문번호

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

@@ -183,6 +183,7 @@
 		    LEFT   OUTER JOIN TB_ORDER_DETAIL OD          ON B.ORDER_DTL_NO = OD.ORD_DTL_NO
 		    WHERE  1=1
 		    AND    B.REASON_CODE NOT IN('08','10')
+		    AND    CD.DEL_YN = 'N'
 			<if test='customerName != null and customerName != ""'>
 		    AND    A.CUSTOMER_NAME = #{customerName}
 		    </if>
@@ -354,6 +355,7 @@
 		            LEFT   OUTER JOIN TB_GOODS G ON OD.GOODS_CD = G.GOODS_CD 
 		            WHERE  1=1
 		            AND    B.REASON_CODE IN ('09','11')
+		            AND    CD.DEL_YN = 'N'
 					<if test='customerName != null and customerName != ""'>
 		            AND    A.CUSTOMER_NAME = #{customerName}
 					</if>
@@ -467,6 +469,7 @@
 		            LEFT   OUTER JOIN TB_GOODS G ON OD.GOODS_CD = G.GOODS_CD 
 		            WHERE  1=1
 		            AND    B.REASON_CODE IN('00','02','03','04','05','06','15')
+		            AND    CD.DEL_YN = 'N'
 					<if test='customerName != null and customerName != ""'>
 		            AND    A.CUSTOMER_NAME = #{customerName}
 					</if>
@@ -580,6 +583,7 @@
 		            LEFT   OUTER JOIN TB_GOODS G ON OD.GOODS_CD = G.GOODS_CD
 		            WHERE  1=1
 		            AND    B.REASON_CODE IN('01')
+		            AND    CD.DEL_YN = 'N'
 					<if test='customerName != null and customerName != ""'>
 		            AND    A.CUSTOMER_NAME = #{customerName}
 					</if>

src/main/webapp/WEB-INF/views/order/CnclReqForm.html

@@ -514,7 +514,11 @@ var columnCancelReqList = [
 		, width			: 80
 		, cellClass		: 'text-right'
 		, cellRenderer	: function (params) {
-			return params.value.addComma();
+			if (params.data.delvFeeCrite == 'G078_30') {
+				return 0;
+			} else {
+				return params.value.addComma();
+			}
 		}
 		, hide			: temp1
 	},
@@ -765,7 +769,11 @@ var columnCancelReqToBeList = [
 				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
-					return params.value.addComma();
+					if (params.data.delvFeeCrite == 'G078_30') {
+						return 0;
+					} else {
+						return params.value.addComma();
+					}
 				}
 				, hide			: temp2
 			},
@@ -860,7 +868,11 @@ var columnDelvCdList = [
 				, width			: 100
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
-					return params.value.addComma();
+					if (params.data.delvFeeCrite == 'G078_30') {
+						return 0;
+					} else {
+						return params.value.addComma();
+					}
 				}
 				, hide			: temp2
 			},

src/main/webapp/WEB-INF/views/order/ExchangeRequestForm.html

@@ -587,7 +587,11 @@ var columnExchangeReqList = [
 				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
-					return params.value.addComma();
+					if (params.data.delvFeeCrite == 'G078_30') {
+						return 0;
+					} else {
+						return params.value.addComma();
+					}
 				}
 				, hide			: temp2
 			},
@@ -1180,7 +1184,7 @@ var fnCalculateRefundAmt = function (obj) {
 		'/orderChange/cancel/refundAmt'
 		, jsonData
 		, function(result) {
-			/*
+			
 			// 2021.12.01 취소금액설정
 			if (result.cancelOrderRefundList != null && result.cancelOrderRefundList.length > 0) {
 				for (i=0 ; i<result.cancelOrderRefundList.length ; i++) {
@@ -1203,7 +1207,6 @@ var fnCalculateRefundAmt = function (obj) {
 				// 주문변경대상정보 재설정
 				gridOptionsExchangeReqList.api.setRowData(cancelRequestTargetList);
 			}
-			*/
 		}
 	);
 }

src/main/webapp/WEB-INF/views/order/OrderDetailForm.html

@@ -807,6 +807,7 @@ var columnDefsPaymentInfo = [
 			return retStr;
 		}
 	},
+	{headerName: "입금자명"		, field: "vaNm"			, width: 100	, cellClass: 'text-center'},
 	{
 		headerName		: "승인번호"
 		, field			: "pgTradeNo"
@@ -1279,8 +1280,17 @@ $(document).ready(function () {
 		param.elementCustNo =    ""; 
 		param.pageGb = 'delv';
 		cfnOpenLmsPopup2(param);
-		
-	});	
+	});
+
+	// 입금자명 처리
+	let payMeans = orderPaymentInfo[0].payMeans;
+	let payMeansChk = false;
+	
+	if (payMeans == 'G014_20') {
+		payMeansChk = true;
+	}
+
+	gagaAgGrid.showOrHideColumn(gridOptionsPaymentInfo, 'vaNm', payMeansChk);
 });
 
 //0원이하이면 '-' 처리 삭제 함수

src/main/webapp/WEB-INF/views/order/RtnReqForm.html

@@ -531,7 +531,11 @@ var columnCancelReqList = [
 		, width			: 80		
 		, cellClass		: 'text-right'
 		, cellRenderer	: function (params) {
-			return params.value.addComma();
+			if (params.data.delvFeeCrite == 'G078_30') {
+				return 0;
+			} else {
+				return params.value.addComma();
+			}
 		}
 		, hide			: temp1
 	},
@@ -782,7 +786,11 @@ var columnCancelReqToBeList = [
 				, width			: 80		
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
-					return params.value.addComma();
+					if (params.data.delvFeeCrite == 'G078_30') {
+						return 0;
+					} else {
+						return params.value.addComma();
+					}
 				}
 				, hide			: temp2
 			},
@@ -877,7 +885,11 @@ var columnDelvInfoList = [
 				, width			: 100		
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
-					return params.value.addComma();
+					if (params.data.delvFeeCrite == 'G078_30') {
+						return 0;
+					} else {
+						return params.value.addComma();
+					}
 				}
 				, hide			: temp2
 			},

src/main/webapp/WEB-INF/views/withdraw/RefundDetailForm.html

@@ -219,21 +219,21 @@
 
 <script th:inline="javascript">
 /*<![CDATA[*/
-	var ordChgSq 		= [[${ordChgSq}]];	// 주문변경번호
-	var ordNo    		= [[${ordNo}]];	// 주문번호 
-	var userNo   		= [[${userNo}]]; 
+	var ordChgSq 		= [[${ordChgSq}]];				// 주문변경번호
+	var ordNo    		= [[${ordNo}]];					// 주문번호 
+	var userNo   		= [[${userNo}]]; 				// 회원번호
 
-	var ordChgCnt 		= 0;	//회수신청건수
-	var chgGb 			= "반품";
+	var ordChgCnt 		= 0;							// 회수신청건수
+	var chgGb 			= "반품";						// 변경구분값
 	
-	var toTalOrdQty 	= 0;	// 주문 총수량 
-	var ordInQty  		= 0;	// 반품 입고총수량 
-	var ordChgQty		= 0;	// 반품 신청총수량 
-	var delvExpnYn  	= "";   // 출고예외(확정후 품절,불량)여부
-	var wdGb        	= "";
-	var mallGb      	= "";
-	var reFundInfo  	= [[${refundConfirmPreInfo}]]; // 환불컨펌 정보
-	var temp1			= true;
+	var toTalOrdQty 	= 0;							// 주문 총수량 
+	var ordInQty  		= 0;							// 반품 입고총수량 
+	var ordChgQty		= 0;							// 반품 신청총수량 
+	var delvExpnYn  	= "";							// 출고예외(확정후 품절,불량)여부
+	var wdGb        	= "";							// 회수요청구분
+	var mallGb      	= "";							// 몰구분
+	var reFundInfo  	= [[${refundConfirmPreInfo}]];	// 환불컨펌 정보
+	var temp1			= false;
 
 	var returnOrderInfo;
 	var columnDefsDetail = [