Merge branch 'develop' into eskim

src/main/java/com/style24/admin/biz/dao/TsaCouponDao.java

@@ -264,4 +264,13 @@ public interface TsaCouponDao {
 	 * @since 2021. 02. 02
 	 */
 	ArrayList<Coupon> getCouponPayTypeList(int cpnId);
+
+	/**
+	 * 쿠폰발급받은 회원리스트 팝업
+	 * @param
+	 * @return
+	 * @author bin2107
+	 * @since 2021-02-03
+	 */
+	Collection<Coupon> getCpnPubCustList(int cpnId);
 }

src/main/java/com/style24/admin/biz/service/TsaCouponService.java

@@ -432,4 +432,15 @@ public class TsaCouponService {
 	public ArrayList<Coupon> getCouponPayTypeList(int cpnId) {
 		return couponDao.getCouponPayTypeList(cpnId);
 	}
+
+	/**
+	 * 쿠폰발급받은 회원리스트 팝업
+	 * @param
+	 * @return
+	 * @author bin2107
+	 * @since 2021-02-03
+	 */
+	public Collection<Coupon> getCpnPubCustList(int cpnId) {
+		return couponDao.getCpnPubCustList(cpnId);
+	}
 }

src/main/java/com/style24/admin/biz/service/TsaMorebetterService.java

@@ -344,12 +344,13 @@ public class TsaMorebetterService {
 
         morebetterDao.deleteTmtbApplyGoodsTemp(moreBetterGoods);
 
+        // 적용상품 그리드 데이터
         List<MoreBetterGoods> applyGoodsList = moreBetterGoods.getApplyGoodsList();
 
         if(moreBetterGoods.getMultiSupplyCompCd().length > 0 || moreBetterGoods.getMultiBrand().length > 0){
+            // 공급업체, 브랜드에 해당하는 상품
             List<MoreBetterGoods> compBrandGoodsList = morebetterDao.getMorebetterCompBrandGoodsList(moreBetterGoods);
             if(compBrandGoodsList.size() > 0){
-
                 for(int i=0; i<compBrandGoodsList.size(); i++){
                     moreBetterGoods.setGoodsCd(compBrandGoodsList.get(i).getGoodsCd());
                     morebetterDao.createTmtbApplyGoodsTemp(moreBetterGoods);

src/main/java/com/style24/admin/biz/web/TsaMarketingController.java

@@ -728,6 +728,7 @@ public class TsaMarketingController extends TsaBaseController {
 
 			// TMTB_GOODS_TEMP TABLE TRUNCATE -> 다른 다다에서 사용중인 상품 조회 -> INSERT
 			moreBetterGoods.setApplyGoodsList(moreBetter.getApplyGoodsList());
+			moreBetterGoods.setSectionGb(moreBetter.getSectionGb());
 			morebetterService.createMorebetterGoodsTemp(moreBetterGoods);
 
 			morebetterService.saveMoreBetterDetail(moreBetter);
@@ -862,6 +863,25 @@ public class TsaMarketingController extends TsaBaseController {
 
 		return super.ok(message.getMessage("SUCC_0003"));
 	}
+
+	/**
+	 * 쿠폰발급받은 회원리스트 팝업
+	 * @param
+	 * @return
+	 * @author bin2107
+	 * @since 2021-02-03
+	 */
+	@GetMapping("/coupon/pubCust/popup/form")
+	@ResponseBody
+	public ModelAndView couponPubCustListPopup(@RequestParam(value = "cpnId", required = true)int cpnId) {
+		ModelAndView mav = new ModelAndView();
+
+		mav.addObject("cpnPubCustList", couponService.getCpnPubCustList(cpnId));
+
+		mav.setViewName("marketing/CouponPubCustListPopupForm");
+		return mav;
+	}
+
 	/* // CSB 진행 */
 
 	/**

src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java

@@ -226,6 +226,11 @@ public class TsaOrderChangeController extends TsaBaseController {
 		List<Order> cancelRequestTargetList 		= orderChangeService.getCancelRequestTargetList(order);
 		List<Order> orderChangeDetailList 			= orderChangeService.getOrderChangeDetailList(order);
 		Collection<Order> orderInfoList 			= orderService.getOrderInfoList(order);
+
+		if (ordChgSq > 0) {
+			Collection<Order> exchangeInfoList = orderChangeService.getExchangeInfo(order);
+			mav.addObject("exchangeInfoList"		, exchangeInfoList);								// 교환정보
+		}
 		
 		// 3. 화면으로 데이타 전송
 		// 2021.01.26 취소요청 화면, 취소요청정보확인 화면 통합
@@ -286,6 +291,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		
 		mav.set("allCanYn"		, rtnReq.getAllCanYn());			// 무통장입금전 전체취소 여부 
 		mav.set("isCustomer"	, rtnReq.getIsCustomer());			// 변경사유 (고객, 회사)
+		mav.set("wdGb"			, rtnReq.getWdGb());				// 회수방법
 		
 		// 4. 주문변경 회수지정보 추가
 		mav.set("chgerNm"		, rtnReq.getChgerNm());				// 변경자명
@@ -295,6 +301,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		mav.set("chgerDtlAddr"	, rtnReq.getChgerDtlAddr());		// 회수지상세주소
 		mav.set("chgerPhnno"	, rtnReq.getChgerPhnno());			// 변경자핸드폰번호
 		mav.set("chgerTelno"	, rtnReq.getChgerTelno());			// 변경자전화번호
+		mav.set("chgerRtnMemo"	, rtnReq.getChgerRtnMemo());		// 반품메모
 		
 		// 5. 주문변경 DB 등록 (TB_ORDER_CHANGE, TB_ORDER_CHANGE_DETAIL, TB_REFUND)
 		orderChangeService.rtnReq(mav, userNo);
@@ -353,21 +360,6 @@ public class TsaOrderChangeController extends TsaBaseController {
 		return mav;
 	}
 	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
 	/**
 	 * 환불계좌목록
 	 *
@@ -496,7 +488,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 	 *
 	 * @param Collection<OrderChange>
 	 * @return
-	 * @author card007rtn
+	 * @author card007
 	 * @since 2021. 01. 22
 	 */
 	@PostMapping("/exchangeRequest")
@@ -530,7 +522,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 	}
 
 	/**
-	 * 교환신청 (관리자)
+	 * 교환철회 (관리자)
 	 *
 	 * @param Collection<OrderChange>
 	 * @return
@@ -543,7 +535,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		GagaMap result = new GagaMap();
 		result.set("status", GagaResponseStatus.FAIL.getCode());
 
-		// 교환요청 데이터 확인
+		// 교환철회 요청 데이터 확인
 		if (excReq == null) {
 			result.set("message", message.getMessage("FAIL_1001"));
 			return result;
@@ -554,7 +546,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		excReq.setUpdNo(userNo);
 		excReq.setRegNo(userNo);
 
-		// 교환처리
+		// 교환철회 처리
 		result = orderChangeService.exchangeCancel(excReq);
 
 		// 처리 결과 코드에 따른 메세지 설정

src/main/java/com/style24/admin/biz/web/TsaOrderController.java

@@ -123,12 +123,6 @@ public class TsaOrderController extends TsaBaseController {
 			}
 		}
 
-		// 주문취소상태 CD_GB 변경
-		if (order.getChgGb() != null) {
-			String chgDtlStat = order.getChgGb().replace("G680", "G685");
-			order.setChgGb(chgDtlStat);
-		}
-
 		// 주문전체건수 조회
 		int totalCount = orderService.getOrderListCount(order);
 		order.getPageable().setTotalCount(totalCount);

src/main/java/com/style24/persistence/domain/Coupon.java

@@ -60,6 +60,16 @@ public class Coupon extends TscBaseDomain {
     private String dcCdGb;                  // 할인코드유형 (공통코드G233)
     private String rdCpnNm;                 // 랜덤쿠폰 사용키 (시리얼명 or 난수)
 
+    private String custNo;
+    private String custNm;
+    private String custGbNm;
+    private String custGradeNm;
+    private String useYn;
+    private String usedDt;
+    private String pubReason;
+    private String pubReasonNm;
+    private String pubReasonDtl;
+
     // 그리드 파라미터
     /*private String supplyCompList;          // 공급업체 리스트
     private String brandList;               // 브랜드 리스트

src/main/java/com/style24/persistence/domain/CustomerSearch.java

@@ -33,6 +33,9 @@ public class CustomerSearch extends TscBaseDomain {
 	private String custNm;
 	private String email;
 	private String custId;
+	
+	// 쿠폰발행팝업
+	private String cpnPubPopYn;		// 쿠폰발행팝업
 
 	private TscPageRequest pageable;
 	private int pageNo = 1;

src/main/java/com/style24/persistence/domain/MoreBetterGoods.java

@@ -32,6 +32,8 @@ public class MoreBetterGoods extends TscBaseDomain {
 	private String goodsCd;
 	private String goodsNm;
 
+	private String sectionGb;		// 구간설정 구분값(G810_10:수량,G810_11:금액)
+
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] arrCompanySq;
 

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

@@ -739,4 +739,31 @@
 		FROM TB_COUPON_PAYTYPE
 		WHERE CPN_ID = #{cpnId}
 	</select>
+
+	<!-- 쿠폰발급받은회원 조회-->
+	<select id="getCpnPubCustList" parameterType="int" resultType="Coupon">
+		/* TsaCoupon.getCpnPubCustList */
+		SELECT	A.CUST_NO
+			 ,B.CUST_NM
+			 ,B.CUST_GB
+			 ,FN_GET_CODE_NM('G100',B.CUST_GB) AS CUST_GB_NM
+			 ,B.CUST_GRADE
+			 ,FN_GET_CODE_NM('G110',B.CUST_GRADE) AS CUST_GRADE_NM
+			 ,A.AVAIL_STDT
+			 ,A.AVAIL_EDDT
+			 ,CASE WHEN A.USED_DT IS NOT NULL THEN 'Y'
+				   ELSE 'N' END USE_YN
+			 ,A.USED_DT
+			 ,A.PUB_REASON
+			 ,FN_GET_CODE_NM('G068',A.PUB_REASON) AS PUB_REASON_NM
+			 ,A.PUB_REASON_DTL
+			 ,A.REG_NO
+			 ,A.REG_DT
+		FROM 	TB_CUST_COUPON A
+		LEFT OUTER JOIN TB_CUSTOMER B
+		ON		A.CUST_NO = B.CUST_NO
+		WHERE 1=1
+		AND A.CPN_ID = #{cpnId}
+	</select>
+
 </mapper>

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

@@ -80,7 +80,9 @@
 	<!-- 활동회원목록 -->
 	<select id="getCustomerActiveList" parameterType="CustomerSearch" resultType="Customer">
 		/* TsaCustomer.getCustomerActiveList */
+		<if test='cpnPubPopYn != null and cpnPubPopYn != "Y"'>
 		<include refid="selectForPagingHeader"/>
+		</if>
 		SELECT CUST_NO
 		     , CUST_ID
 		     , CUST_NM
@@ -194,7 +196,9 @@
 		<if test="custId != null and custId != ''">
 		AND    CUST_ID = #{custId}
 		</if>
+		<if test='cpnPubPopYn != null and cpnPubPopYn != "Y"'>
 		<include refid="selectForPagingFooter"/>
+		</if>
 	</select>
 
 	<!--회원정보 수정-->

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

@@ -186,14 +186,14 @@
 			 , DATE_FORMAT(FG.REG_DT, '%Y.%m.%d %H:%i:%S') AS REG_DT
 			 , (SELECT USER_NM FROM TB_USER WHERE USER_NO = FG.UPD_NO) AS UPD_NM
 			 , DATE_FORMAT(FG.UPD_DT, '%Y.%m.%d %H:%i:%S') AS UPD_DT
-		FROM TB_FREEGIFT_GOODS FG
-		INNER JOIN TB_GOODS G
-		ON G.GOODS_CD = FG.TARGET_VAL
-		WHERE DEL_YN = 'N'
-		AND FG.TARGET_GB = 'G260_10'		/* G260_10|상품, G260_12|브랜드, G260_13|공급처 */
-		AND FG.GOODS_GB = #{goodsGb}		/* G800_10|기본상품, G800_20|적용상품, G800_30|제외상품, G800_40|ALL */
-		AND FG.FREEGIFT_SQ = #{freegiftSq}	/* 사은품 프로모션 번호 */
-		ORDER BY TARGET_VAL ASC
+		  FROM TB_FREEGIFT_GOODS FG
+		 INNER JOIN TB_GOODS G
+		    ON G.GOODS_CD = FG.TARGET_VAL
+		 WHERE DEL_YN = 'N'
+		   AND FG.TARGET_GB = 'G260_10'		/* G260_10|상품, G260_12|브랜드, G260_13|공급처 */
+		   AND FG.GOODS_GB = #{goodsGb}		/* G800_10|기본상품, G800_20|적용상품, G800_30|제외상품, G800_40|ALL */
+		   AND FG.FREEGIFT_SQ = #{freegiftSq}	/* 사은품 프로모션 번호 */
+		 ORDER BY TARGET_VAL ASC
 	</select>
 
 	<!-- 사은품 프로모션 섹션정보 리스트 조회 -->
@@ -202,10 +202,10 @@
 		SELECT FC.FREEGIFT_SECTION_SQ
 		     , FC.SECTION_GB
 		     , FC.SECTION_VAL
-		FROM   TB_FREEGIFT_SECTION FC
-		WHERE  FC.DEL_YN = 'N'
-		AND    FC.FREEGIFT_SQ = #{freegiftSq}	/* 사은품 프로모션 번호 */
-		ORDER BY FC.FREEGIFT_SECTION_SQ ASC
+		  FROM TB_FREEGIFT_SECTION FC
+		 WHERE FC.DEL_YN = 'N'
+		   AND FC.FREEGIFT_SQ = #{freegiftSq}	/* 사은품 프로모션 번호 */
+		 ORDER BY FC.FREEGIFT_SECTION_SQ ASC
 	</select>
 
 	<!-- 사은품 프로모션 섹션정보 리스트 조회 -->
@@ -219,13 +219,13 @@
 		     , FV.ITEM_CD
 			 , FG.PRODUCT_NO
 			 , FG.GOODS_NM
-		FROM TB_FREEGIFT_VAL FV
-		INNER JOIN TB_FREE_GOODS FG
-		ON FV.ITEM_CD = FG.PRODUCT_NO
-		WHERE FV.DEL_YN = 'N'
-		AND FV.FREEGIFT_SQ = #{freegiftSq}					/* 사은품 프로모션 번호 */
-		AND FV.FREEGIFT_SECTION_SQ = #{freegiftSectionSq}	/* 사은품 프로모션 섹션 번호 */
-		ORDER BY FV.FREEGIFT_SECTION_SQ, FV.ITEM_CD
+		  FROM TB_FREEGIFT_VAL FV
+		 INNER JOIN TB_FREE_GOODS FG
+		    ON FV.ITEM_CD = FG.PRODUCT_NO
+		 WHERE FV.DEL_YN = 'N'
+		   AND FV.FREEGIFT_SQ = #{freegiftSq}					/* 사은품 프로모션 번호 */
+		   AND FV.FREEGIFT_SECTION_SQ = #{freegiftSectionSq}	/* 사은품 프로모션 섹션 번호 */
+		 ORDER BY FV.FREEGIFT_SECTION_SQ, FV.ITEM_CD
 	</select>
 
 	<!-- 사은품 프로모션 마스터 정보 저장 -->

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

@@ -267,7 +267,7 @@
 			,DATE_FORMAT(#{tmtbStdt},'%Y-%m-%d %H:%i:%s')
 			,DATE_FORMAT(#{tmtbEddt},'%Y-%m-%d %H:%i:%s')
 			,#{applyGb}
-			,#{multiYn}
+			,'Y'
 			,'N'
 			,#{regNo}
 			,NOW()
@@ -279,7 +279,7 @@
 			,TMTB_STAT = #{tmtbStat}
 			,TMTB_ST_DT = #{tmtbStdt}
 			,TMTB_ED_DT = #{tmtbEddt}
-			,MULTI_YN = #{multiYn}
+			,APPLY_GB = #{applyGb}
 			,UPD_NO = #{updNo}
 			,UPD_DT = NOW()
 	</insert>
@@ -537,64 +537,48 @@
 	<insert id="createTmtbGoodsTemp" parameterType="MoreBetterGoods">
 		/* TsaMarketing.createTmtbGoodsTemp */
 		INSERT INTO TB_TMTB_USING_GOODS_TEMP
-			SELECT 	#{regNo} AS REG_NO
-			        ,B.GOODS_CD
-					,G.GOODS_NM
-			  FROM 	TB_TMTB A
-		INNER JOIN  TB_TMTB_APPLY_GOODS B
-				ON  A.TMTB_SQ = B.TMTB_SQ
-		INNER JOIN  TB_GOODS G
-				ON  B.GOODS_CD = G.GOODS_CD
+			SELECT Z.REG_NO
+				, Z.GOODS_CD
+				, Z.GOODS_NM
+			FROM (
+					SELECT 	#{regNo} AS REG_NO
+							, B.GOODS_CD
+							, G.GOODS_NM
+							, (SELECT SECTION_GB FROM TB_TMTB_SECTION WHERE A.TMTB_SQ = TMTB_SQ GROUP BY SECTION_GB) AS SECTION_GB
+					  FROM 	TB_TMTB A
+				INNER JOIN  TB_TMTB_APPLY_GOODS B
+						ON  A.TMTB_SQ = B.TMTB_SQ
+				INNER JOIN  TB_GOODS G
+						ON  B.GOODS_CD = G.GOODS_CD
+					WHERE 1=1
+					  AND NOW() BETWEEN DATE_FORMAT(A.TMTB_ST_DT, '%Y-%m-%d %H:%i:%S') AND DATE_FORMAT(A.TMTB_ED_DT, '%Y-%m-%d %H:%i:%S')
+					  AND A.TMTB_STAT = 'G232_11'
+					  AND B.GOODS_GB IN ('G800_10','G800_20')
+					  AND B.DEL_YN = 'N'
+					  AND B.GOODS_CD NOT IN (
+											SELECT	GOODS_CD
+											FROM	TB_TMTB_APPLY_GOODS C
+											WHERE	1=1
+											  AND		B.TMTB_SQ = C.TMTB_SQ
+											  AND		C.GOODS_GB = 'G800_30'
+										)
+			) Z
 			WHERE 1=1
-			  AND NOW() BETWEEN DATE_FORMAT(A.TMTB_ST_DT, '%Y-%m-%d %H:%i:%S') AND DATE_FORMAT(A.TMTB_ED_DT, '%Y-%m-%d %H:%i:%S')
-			  AND A.TMTB_STAT = 'G232_11'
-			  AND B.GOODS_GB IN ('G800_10','G800_20')
-			  AND B.DEL_YN = 'N'
-			  AND B.GOODS_CD NOT IN (
-									SELECT	GOODS_CD
-									FROM	TB_TMTB_APPLY_GOODS C
-									WHERE	1=1
-									  AND		B.TMTB_SQ = C.TMTB_SQ
-									  AND		C.GOODS_GB = 'G800_30'
-								)
+			AND Z.SECTION_GB = #{sectionGb}
 	</insert>
 
 	<select id="getMorebetterDuplicateList" parameterType="MoreBetterGoods" resultType="MoreBetterGoods">
 		/* TsaMarketing.getMorebetterDuplicateList */
-		SELECT TMP.GOODS_CD
-			  ,TMP.GOODS_NM
-		  FROM TB_TMTB_USING_GOODS_TEMP TMP
-		 WHERE 1=1
-		   AND TMP.REG_NO = #{regNo}
-		   AND TMP.GOODS_CD IN (
-				   SELECT  G.GOODS_CD
-					 FROM  TB_GOODS G
-					WHERE  1=1
-						<if test="multiSupplyCompCd != null and multiSupplyCompCd.length>0">
-							AND G.SUPPLY_COMP_CD IN
-							<foreach collection="multiSupplyCompCd" item="item" index="index"  open="(" close=")" separator=",">
-								#{item}
-							</foreach>
-						</if>
-						<if test="multiBrand != null and multiBrand.length>0">
-							AND G.BRAND_CD IN
-							<foreach collection="multiBrand" item="item" index="index"  open="(" close=")" separator=",">
-								#{item}
-							</foreach>
-						</if>
-						<if test="multiApplyGoods != null and multiApplyGoods.length>0">
-							OR G.GOODS_CD IN
-							<foreach collection="multiApplyGoods" item="item" index="index"  open="(" close=")" separator=",">
-								#{item}
-							</foreach>
-						</if>
-				)
-		   <if test="multiExceptGoods != null and multiExceptGoods.length>0">
-		   AND TMP.GOODS_CD NOT IN
-			   <foreach collection="multiExceptGoods" item="item" index="index"  open="(" close=")" separator=",">
-				   #{item}
-			   </foreach>
-		   </if>
+		SELECT 	B.REG_NO
+				, B.GOODS_CD
+				, B.GOODS_NM
+		FROM 	TB_TMTB_APPLY_GOODS_TEMP A
+		JOIN 	TB_TMTB_USING_GOODS_TEMP B
+			ON 	A.REG_NO = B.REG_NO
+			AND A.GOODS_CD = B.GOODS_CD
+		WHERE 1=1
+		  AND A.REG_NO = #{regNo}
+		;
 	</select>
 
 	<update id="updateMorebetterStat" parameterType="MoreBetter">

src/main/webapp/WEB-INF/views/marketing/CouponPopupForm.html

@@ -845,21 +845,21 @@
 		if(usableCustGbCnt<1){
 			mcxDialog.alert("사용가능고객구분을 체크해주세요.");
 			$('#CouponForm input:checkbox[name=usableCustGbArr]').focus();
-			return;
+			return false;
 		}
 		// 사용가능고객등급 체크박스 체크
 		var usableCustGradeCnt = $('#CouponForm input:checkbox[name=usableCustGradeArr]').length;
 		if(usableCustGradeCnt<1){
 			mcxDialog.alert("사용가능고객등급을 체크해주세요.");
 			$('#CouponForm input:checkbox[name=usableCustGradeArr]').focus();
-			return;
+			return false;
 		}
 		// 결제수단 체크박스 체크
 		var payTypeCnt = $('#CouponForm input:checkbox[name=payTypeArr]').length;
 		if(payTypeCnt<1){
 			mcxDialog.alert("사용가능고객등급을 체크해주세요.");
 			$('#CouponForm input:checkbox[name=payTypeArr]').focus();
-			return;
+			return false;
 		}
 
 		//신규가입 지급한다면 validation 체크
@@ -1460,9 +1460,10 @@
 	}
 
 	// 발급받은회원 팝업
-	function fnPubCustListPopUp(){
-		var cpnId = $('#CouponForm #cpnId').val();
-		cfnCpnPubCustListPopup(cpnId);
+	var fnPubCustListPopUp = function (){
+		let cpnId = $("#CouponForm #cpnId").val();
+		var actionUrl = "/marketing/coupon/pubCust/popup/form?cpnId=" + cpnId;
+		cfnOpenModalPopup(actionUrl, 'CpnPubCustListPopup');
 	};
 
 	// 쿠폰발행팝업

src/main/webapp/WEB-INF/views/marketing/CouponPubCustListPopupForm.html

@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<html lang="ko"
+	  xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : CouponPubCustListPopupForm.html
+ * @desc    : 쿠폰 발급받은 회원리스트 팝업 화면
+ *============================================================================
+ * ISTYLE24
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.02.03   bin2107       최초 작성
+ *******************************************************************************
+ -->
+<div class="modalPopup" data-width="960" data-height="500" >
+	<div class="panelStyle" >
+		<div class="panelTitle">
+			<h2>쿠폰 발급받은 회원</h2>
+			<button type="button" class="close" onclick="uifnPopupClose('CpnPubCustListPopup')"><i class="fa fa-times"></i></button>
+		</div>
+		<div class="panelContent">
+			<div id="pubCustgridList" style="width:100%; height:420px;" class="ag-theme-balham"></div>
+		</div>
+	</div>
+</div>
+<script th:inline="javascript">
+	/*<![CDATA[*/
+	var cpnPubCustList = [[${cpnPubCustList}]]; //gagajf.convertToArray([[${cpnPubCustList}]]);
+
+	var columnDefs = [
+		{ headerName: "회원번호" , field:"custNo" , width:100, cellClass:"text-center"} ,
+		{ headerName: "회원명" , field:"custNm" , width:120, cellClass:"text-center" } ,
+		{ headerName: "회원구분" , field:"custGbNm" , width:120, cellClass:"text-center" } ,
+		{ headerName: "회원등급" , field:"custGradeNm" , width:120, cellClass:"text-center" } ,
+		{ headerName: "시작유효기간" , field:"availStdt" , width:150, cellClass:"text-center"
+			,valueGetter	: function (params) {
+				return gagaAgGrid.toDateTimeFormat(params.data.availStdt);
+			}
+		} ,
+		{ headerName: "종료유효기간" , field:"availEddt" , width:150, cellClass:"text-center"
+			,valueGetter	: function (params) {
+				return gagaAgGrid.toDateTimeFormat(params.data.availEddt);
+			}
+		} ,
+		{ headerName: "사용여부" , field:"useYn" , width:120, cellClass:"text-center" } ,
+		/*{ headerName: "사용일" , field:"usedDt" , width:150, cellClass:"text-center"
+			,valueGetter	: function (params) {
+				return gagaAgGrid.toDateTimeFormat(params.data.usedDt);
+			}
+		} ,*/
+		{ headerName: "발급사유" , field:"pubReasonNm" , width:200, cellClass:"text-center"} ,
+		{ headerName: "발급상세사유" , field:"pubReasonDtl" , width:200, cellClass:"text-center"} ,
+		{ headerName: "발급인ID" , field:"regNo" , width:100, cellClass:"text-center"} ,
+		{ headerName: "발급시간" , field:"regDt" , width:150, cellClass:"text-center"
+			,valueGetter	: function (params) {
+				return gagaAgGrid.toDateTimeFormat(params.data.regDt);
+			}
+		}
+	];
+
+	let pubCustGridOptions = gagaAgGrid.getGridOptions(columnDefs);
+
+	$(document).ready(function(){
+		gagaAgGrid.createGrid('pubCustgridList', pubCustGridOptions);
+		pubCustGridOptions.api.setRowData(cpnPubCustList);
+	});
+
+	/*]]>*/
+</script>
+</html>

src/main/webapp/WEB-INF/views/marketing/CouponPubForCustPopupForm.html

@@ -22,7 +22,7 @@
 		</div>
 		<div class="panelContent">
 			<form id="custSearchForm" name="custSearchForm" action="#" th:action="@{'/customer/active/list'}" >
-				<input type="hidden" name="searchDateGb" value="joinDt"/>
+				<input type="hidden" name="cpnPubPopYn" value="Y"/>
 				<table class="frmStyle">
 					<colgroup>
 						<col width="10%">

src/main/webapp/WEB-INF/views/marketing/MorebetterPopupForm.html

@@ -103,11 +103,6 @@
 						</td>
 					</tr>
 					<tr>
-						<th>상품여부<em class="required" title="필수"></em></th>
-						<td>
-							<label class="rdoBtn"><input type="radio" name="multiYn" id="multiYnY" value="Y" checked="checked"/>복합상품</label>
-							<label class="rdoBtn"><input type="radio" name="multiYn" id="multiYnN" value="N"/>단일상품</label>
-						</td>
 						<th>상태<em class="required" title="필수"></em></th>
 						<td>
 							<!-- 상태 입력 : before
@@ -525,7 +520,6 @@
 			$("input:radio[name='disTmtbStat']:radio[value="+tmtbMstInfo.tmtbStat+"]").prop('checked', true); // 선택하기
 			$("input:radio[name='sectionGb']:radio[value="+tmtbMstInfo.sectionGb+"]").prop('checked', true); // 선택하기
 			$("input:radio[name='dcWay']:radio[value="+tmtbMstInfo.dcWay+"]").prop('checked', true); // 선택하기
-			$("input:radio[name='multiYn']:radio[value="+tmtbMstInfo.multiYn+"]").prop('checked', true); // 선택하기
 
 			let edDtArr = tmtbMstInfo.tmtbEddt.split(" ");
 			if(edDtArr[1] == "23:59:59") {
@@ -584,6 +578,8 @@
 			mcxDialog.alert("기본상품을 1개 이상 지정해주세요.");
 			return false;
 		}
+
+		return true;
 	};
 
 	var fnBurdenValueCheck = function (){
@@ -597,6 +593,8 @@
 			mcxDialog.alert("업체분담율의 합이 100을 넘을수 없습니다.");
 			return false;
 		}
+
+		return true;
 	};
 
 	// 저장
@@ -647,11 +645,15 @@
 		}
 
 		// 적용상품 그리드에 기본상품 1개이상 있는지 체크
-		fnGoodsGbCheck();
+		if(!fnGoodsGbCheck()) {
+			return false;
+		}
 
 		// 업체분담율 토탈 100% 넘는지 체크
-		fnBurdenValueCheck();
-
+		if(!fnBurdenValueCheck()) {
+			return false;
+		}
+		
 		// 공급업체+브랜드 상품조회
 		var multiSupplyCompCd = [];
 		$.each(allSupplyCompData, function(idx, item) {
@@ -683,7 +685,6 @@
 			, sectionGb : $('input:radio[name="sectionGb"]:checked').val()
 			, applyGb : $('input:radio[name="sectionGb"]:checked').val()
 			, dcWay : $('input:radio[name="dcWay"]:checked').val()
-			, multiYn : $('#moreBetterForm input[name=multiYn]').val()
 			, supplyCompList : allSupplyCompData
 			, brandList : allBrandData
 			, applyGoodsList : allApplyGoodsData
@@ -702,8 +703,7 @@
 	});
 
 	var fnMorebetterSaveCollback = function(result){
-		mcxDialog.alert(result.message);
-
+		//mcxDialog.alert(result.message);
 		if(result.duplicateYn == "Y"){
 			//console.log('duplicateGoodsList Size::'+ result.duplicateGoodsList.length);
 			for(let i=0; i<result.duplicateGoodsList.length; i++){
@@ -1191,7 +1191,8 @@
 
 	// 진행 버튼 클릭
 	$("#moreBetterForm #btnChangeStatIng").on("click", function() {
-		mcxDialog.confirmC("프로모션을 진행하시겠습니까?<br/>진행 후에는 수정이 제한될 수 있습니다.", {
+		console.log('1111111111111');
+		/*mcxDialog.confirmC("프로모션을 진행하시겠습니까?<br/>진행 후에는 수정이 제한될 수 있습니다.", {
 			btn: confirmBtnText,
 			btnClick: function(index) {
 				if(index == 1) {
@@ -1202,7 +1203,7 @@
 					gagajf.ajaxJsonSubmit('/marketing/morebetter/changeStat', jsonData, fnMorebetterFormClose);
 				}
 			}
-		});
+		});*/
 	});
 
 	// 진행 버튼 클릭

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

@@ -780,7 +780,6 @@ var fnExchangeCancel = function() {
 var fnOpenDaumAddr = function(loc) {
 	let daumZip = new daum.Postcode({
 		oncomplete: function(data) {
-			console.log(data);
 			// 우편번호와 주소 정보를 해당 필드에 넣는다.
 			if (loc == 'withdraw') {
 				$('#exchangeRequestFrm input[name=chgerZipcode]').val(data.zonecode);

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

@@ -167,7 +167,8 @@ var orderRefundInfo 		= [[${orderRefundInfo}]];				// 환불정보
 var orderCounselInfo 		= [[${orderCounselInfo}]];				// 상담내역
 var orderAdminMemoInfo 		= [[${orderAdminMemoInfo}]];			// 관리자메모
 
-var canChgDelvStat			= ['G013_10', 'G013_11', 'G013_17', 'G013_20', 'G013_30', 'G013_40'];
+var canChgDelvOrdStat		= ['G013_10', 'G013_11', 'G013_17', 'G013_20', 'G013_30', 'G013_40'];
+var canChgDelvChgStat		= ['G685_30', 'G685_33', 'G685_40'];
 </script>
 
 <!-- AgGrid 컬럼 세팅 -->
@@ -513,7 +514,7 @@ var columnDefsDeliveryInfo = [
 		, cellClass		: 'text-center'
 		, cellRenderer	: function (params) {
 			var rtnStr = ""
-			if (canChgDelvStat.includes(params.data.ordDtlStat)) {
+			if (canChgDelvOrdStat.includes(params.data.ordDtlStat)) {
 				// 배송지 수정 (주문배송, 교환배송)
 				rtnStr += params.value;
 				rtnStr += "<button type=\"button\" style=\"margin-left:10px\" class=\"btn btn-info\" onclick=\"fnOpenDaumAddr('" + params.node.rowIndex + "', 'ADDR');\">POST</button>";
@@ -647,7 +648,6 @@ var columnDefsOrderChangeInfo = [
 	{
 		headerName: "회수구분", field: "wdGb", width: 100, cellClass: 'text-center',
 		cellRenderer: function (params) {
-			console.log(params);
 			return params.value == 'W' ? '회수요청' : '직접배송'; 
 		}
 	},
@@ -662,10 +662,9 @@ var columnDefsOrderChangeInfo = [
 		, cellRenderer	: function (params) {
 			var rtnStr = ""
 			
+			rtnStr += params.value;
 			// 회수지수정가능(교환요청, 반품요청)
-			if (params.data.wdGb != 'D' && (params.data.chgStat == 'G685_30' || params.data.chgStat == 'G685_33' || params.data.chgStat == 'G685_40')) {
-				
-				rtnStr += params.value;			
+			if (params.data.wdGb != 'D' && canChgDelvChgStat.includes(params.data.chgStat)) {
 				rtnStr += "<button type=\"button\" style=\"margin-left:10px\" class=\"btn btn-info\" onclick=\"fnOpenDaumAddr('" + params.node.rowIndex + "', 'CLAIM');\">POST</button>";
 				rtnStr += "<button type=\"button\" class=\"btn btn-info\" onclick=\"fnSaveChgerAddr('" + params.node.rowIndex + "');\">저장</button>";
 			} else {
@@ -971,7 +970,7 @@ $(document).ready(function () {
 	});
 	// 교환요청
 	$('#btnExchange').on('click', function () {
-		fnExchangeRequest(ordNo, 'N');
+		fnExchangeRequest();
 	});
 	// 메모등록
 	$('#btnCreateOrderMemo').on('click', function () {
@@ -1043,7 +1042,7 @@ var fnReturnRequest = function (ordChgSq) {
 // 교환요청
 var fnExchangeRequest = function (ordChgSq) {
 	
-	// 취소요청 구분 (orChgSq null 이면 취소요청화면 있으면 취소요청정보화면)
+	// 교환요청 구분 (orChgSq null 이면 교환요청화면 있으면 교환요청정보화면)
 	if (ordChgSq == null) {
 		ordChgSq = 0;
 	}

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

@@ -192,9 +192,6 @@
 							<select name="searchDateGb">
 								<option value="ordDt">주문일자</option>
 								<option value="delvStdt">출고일자</option>
-								<option value="cnclReqDt">@취소요청일자</option>
-								<option value="changReqDt">@교환요청일자</option>
-								<option value="rtnReqDt">@반품요청일자</option>
 								<option value="soldoutDt">품절일자</option>
 							</select>
 							<span id="terms"></span>
@@ -400,21 +397,7 @@ var columnDefsOrderList = [
 			{headerName: "상품코드"	, field: "goodsCd"		, width: 100	, cellClass: 'text-center'	, sortable: true},
 			{headerName: "브랜드"		, field: "brandEnm"		, width: 100	, cellClass: 'text-center'	, sortable: true},
 			{headerName: "구성유형"	, field: "goodsTypeNm"	, width: 100	, cellClass: 'text-center'	, sortable: true},
-			{
-				headerName		: "상품명"
-				, field			: 'goodsNm'
-				, width			: 200
-				, cellClass		: 'text-center'
-				, sortable		: true
-				, cellRenderer	: function (params) {
-					var roleCd = [[${sessionInfo.roleCd}]];
-					if (!roleCd.startsWith("C")) {
-						return "<a href=\"javascript:void(0);\" onclick=\"fnOpenOrderDetailPopup('" + params.value + "');\">" + params.value + "</a>";
-					} else {
-						return params.value;
-					}
-				}
-			}
+			{headerName: "상품명"		, field: "goodsNm"		, width: 200	, cellClass: 'text-center'	, sortable: true}
 		]
 	},
 	{
@@ -567,36 +550,36 @@ var columnDefsOrderList = [
 				}
 			},
 			{headerName: "품절처리자", field: "soldoutRegId", width: 120, cellClass: 'text-center'},
-			{
-				headerName		: "변경요청번호"
-				, field			: "ordChgSq"
-				, width			: 120
-				, cellClass		: 'text-center'
-				, valueGetter	: function (params) {
-					return params.data.ordChgSq === 0 ? '' : params.data.ordChgSq;
-				}
-			},
-			{
-				headerName		: "변경구분"
-				, field			: "chgGb"
-				, width			: 120
-				, cellClass		: 'text-center'
-				, valueGetter: function (params) { 
-					return gagaAgGrid.lookupValue(chgGbList, params.data.chgGb); 
-				}
-			},
-			{
-				headerName		: "변경상태"
-				, field			: "chgStat"
-				, width			: 120
-				, cellClass		: 'text-center'
-				, valueGetter	: function (params) { 
-					return gagaAgGrid.lookupValue(chgStatList, params.data.chgStat); 
-				}
-			},
-			{headerName: "회수지시여부"		, field: "wdInvoiceSendYn"		, width: 100, cellClass: 'text-center'},
-			{headerName: "회수택배사"		, field: "wdShipCompNm"			, width: 100, cellClass: 'text-center'},
-			{headerName: "회수송장"		, field: "wdInvoiceNo"			, width: 120, cellClass: 'text-center'},
+			//{
+			//	headerName		: "변경요청번호"
+			//	, field			: "ordChgSq"
+			//	, width			: 120
+			//	, cellClass		: 'text-center'
+			//	, valueGetter	: function (params) {
+			//		return params.data.ordChgSq === 0 ? '' : params.data.ordChgSq;
+			//	}
+			//},
+			//{
+			//	headerName		: "변경구분"
+			//	, field			: "chgGb"
+			//	, width			: 120
+			//	, cellClass		: 'text-center'
+			//	, valueGetter: function (params) { 
+			//		return gagaAgGrid.lookupValue(chgGbList, params.data.chgGb); 
+			//	}
+			//},
+			//{
+			//	headerName		: "변경상태"
+			//	, field			: "chgStat"
+			//	, width			: 120
+			//	, cellClass		: 'text-center'
+			//	, valueGetter	: function (params) { 
+			//		return gagaAgGrid.lookupValue(chgStatList, params.data.chgStat); 
+			//	}
+			//},
+			//{headerName: "회수지시여부"		, field: "wdInvoiceSendYn"		, width: 100, cellClass: 'text-center'},
+			//{headerName: "회수택배사"		, field: "wdShipCompNm"			, width: 100, cellClass: 'text-center'},
+			//{headerName: "회수송장"		, field: "wdInvoiceNo"			, width: 120, cellClass: 'text-center'},
 			{headerName: "수취인명"		, field: "recipNm"				, width: 100, cellClass: 'text-center'},
 			{headerName: "수취인연락처"		, field: "recipPhnno"			, width: 120, cellClass: 'text-center'},
 			{headerName: "수취인주소"		, field: "recipAddr"			, width: 500, cellClass: 'text-left'},
@@ -749,6 +732,11 @@ var fnCreateSampleOrder = function() {
 	var actionUrl = "/order/sample/create/form";
 	cfnOpenModalPopup(actionUrl, "popupOrderSample");
 }
+
+var fnRemoveEmojis = function (str) {
+	var regex = /(?:[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\udbff][\udc00-\udfff]|[\u0023-\u0039]\ufe0f?\u20e3|\u3299|\u3297|\u303d|\u3030|\u24c2|\ud83c[\udd70-\udd71]|\ud83c[\udd7e-\udd7f]|\ud83c\udd8e|\ud83c[\udd91-\udd9a]|\ud83c[\udde6-\uddff]|\ud83c[\ude01-\ude02]|\ud83c\ude1a|\ud83c\ude2f|\ud83c[\ude32-\ude3a]|\ud83c[\ude50-\ude51]|\u203c|\u2049|[\u25aa-\u25ab]|\u25b6|\u25c0|[\u25fb-\u25fe]|\u00a9|\u00ae|\u2122|\u2139|\ud83c\udc04|[\u2600-\u26FF]|\u2b05|\u2b06|\u2b07|\u2b1b|\u2b1c|\u2b50|\u2b55|\u231a|\u231b|\u2328|\u23cf|[\u23e9-\u23f3]|[\u23f8-\u23fa]|\ud83c\udccf|\u2934|\u2935|[\u2190-\u21ff])/g;
+	return str.replace(regex, '');
+};
 </script>
 
 </html>

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

@@ -44,6 +44,8 @@
 				
 				<table class="frmStyle">
 					<colgroup>
+						<col style="width:160px;" />
+						<col style="width:320px;" />
 						<col style="width:160px;" />
 						<col style="width:320px;" />
 						<col style="width:160px;" />
@@ -58,12 +60,17 @@
 									<option th:if="${chgReasonList}" th:each="oneData, status : ${chgReasonList}" th:value="|${oneData.cd}|" th:text="|${oneData.cdNm}|"></option>
 								</select>
 							</td>
+							<th>회수방법</th>
+							<td>
+								<label class="rdoBtn"><input type="radio" name="wdGb" th:id="wdGb" value="W" onclick="fnChangeWdGb(this)"/>회수요청<span></span></label>
+								<label class="rdoBtn"><input type="radio" name="wdGb" th:id="wdGb" value="D" onclick="fnChangeWdGb(this)"/>직접발송<span></span></label>
+							</td>
 							<th>귀책사유</th>
 							<td><span id="imputeReason"></span></td>
 						</tr>
 						<tr>
 							<th>요청메모</th>
-							<td colspan="3">
+							<td colspan="5">
 								<textarea id="chgMemo" name="chgMemo" style="height:80px;" placeholder="취소사유를 300자내외로 작성해 주세요"></textarea>
 							</td>
 						</tr>
@@ -145,7 +152,7 @@
 							<th>회수지주소 <i class="star"></i></th>
 							<td colspan="3">
 								<input type="text" name ="chgerZipcode" class="w100" readonly="readonly"/>
-								<button type="button" class="btn btn-info" onclick="fnOpenDaumAddr('delvLoc');">우편번호찾기</button>
+								<button type="button" class="btn btn-info" th:unless="${ordChgSq > 0}" onclick="fnOpenDaumAddr('delvLoc');">우편번호찾기</button>
 								<input type="text" name ="chgerBaseAddr" class="w300"/>
 								<input type="text" name ="chgerDtlAddr" class="w300"/>
 							</td>
@@ -157,8 +164,8 @@
 									<option value="">[선택하세요]</option>
 									<option th:if="${TelExcNoList}" th:each="oneData, status : ${TelExcNoList}" th:value="${oneData.cd}" th:text="${oneData.cd}"></option>
 								</select>
-								- <input type="text" name ="chgerTelno2" class="w60" value="0000" />
-								- <input type="text" name ="chgerTelno3" class="w60" value="0000" />
+								- <input type="text" name ="chgerTelno2" class="w60"/>
+								- <input type="text" name ="chgerTelno3" class="w60"/>
 							</td>
 							<th>휴대전화 <i class="star"></i></th>
 							<td>
@@ -166,8 +173,14 @@
 									<option value="">[선택하세요]</option>
 									<option th:if="${PhnExcNoList}" th:each="oneData, status : ${PhnExcNoList}" th:value="${oneData.cd}" th:text="${oneData.cd}"></option>
 								</select>
-								- <input type="text" name ="chgerPhnno2" class="w60" value="0000" />
-								- <input type="text" name ="chgerPhnno3" class="w60" value="0000" />
+								- <input type="text" name ="chgerPhnno2" class="w60"/>
+								- <input type="text" name ="chgerPhnno3" class="w60"/>
+							</td>
+						</tr>
+						<tr>
+							<th>반품메모</th>
+							<td colspan="3">
+								<textarea id="chgerRtnMemo" name="chgerRtnMemo" style="height:80px;" placeholder="반품메모(수거시요청사항)를 300자내외로 작성해 주세요"></textarea>
 							</td>
 						</tr>
 					</tbody>
@@ -196,11 +209,13 @@ var orderChangeDetailList 	= [[${orderChangeDetailList}]];					// 취소/반품/
 var payMeans 				= orderInfoList[0].payMeans;					// 결제수단
 var chgReason				= "";											// 변경사유코드
 var chgMemo					= "";											// 변경사유메모
+var wdGb;																	// 회수방법
 
 // 변경요청정보 승인, 철회
 if (ordChgSq > 0) {
 	chgReason				= orderChangeDetailList[0].chgReason;			// 변경사유코드
 	chgMemo					= orderChangeDetailList[0].chgMemo;				// 변경사유메모
+	wdGb					= orderChangeDetailList[0].wdGb;				// 회수방법
 }
 
 var temp1 = true;
@@ -917,10 +932,16 @@ var fnCalculateRefundAmt = function (obj) {
 			$("#spanTotExcDelvFee").text(result.spanTotExcDelvFee.addComma());		//교환 환불 배송 금액
 
 			if (result.spanRealCnclRtnAmt > 0) {
-				// 고객사유 : 환불금액게산 = (취소금액 + 배송비) - 추가배송비 - 반품배송비
-				if (isCustomer) {
+				let wdGb = $('#wdGb:checked').val();
+
+				// 고객사유(회수요청) : 환불금액게산 = (취소금액 + 배송비) - 추가배송비 - 반품배송비
+				if (isCustomer && wdGb == 'W') {
 					result.spanRefundAmt = (result.spanRealCnclRtnAmt + result.sumDeliveryFee) - result.spanTotDeliveryFee - result.spanTotRtnDelvFee;
 				} 
+				// 고객사유(직접발송) : 환불금액계산 = (취소금액 + 배송비) - 추가배송비
+				else if (isCustomer && wdGb == 'D') {
+					result.spanRefundAmt = (result.spanRealCnclRtnAmt + result.sumDeliveryFee) - result.spanTotDeliveryFee;
+				}
 				// 회사사유 : 환불금액게산 = (취소금액 + 배송비)
 				else {
 					result.spanRefundAmt = (result.spanRealCnclRtnAmt + result.sumDeliveryFee);
@@ -984,6 +1005,7 @@ var fnCnclReq = function (reqGbn) {
 	var chgerPhnno 		= "";
 	var chgerTelno 		= "";
 	var chgerEmail 		= "";
+	var chgerRtnMemo	= "";
 	
 	if (reqGbn == "rtnReq") {
 		// 1. 취소수량 체크
@@ -1066,9 +1088,15 @@ var fnCnclReq = function (reqGbn) {
 			mcxDialog.alert("휴대전화를 입력하세요."); return;
 		}
 		
-		chgerPhnno 		= chgerPhnno1 + chgerPhnno2 + chgerPhnno3;
-		chgerTelno 		= chgerTelno1 + chgerTelno2 + chgerTelno3;
+		chgerPhnno 		= chgerPhnno1 + '-' + chgerPhnno2 + '-' + chgerPhnno3;
 		chgerEmail 		= orderInfoList[0].ordEmail;
+		chgerRtnMemo	= $("#cancelRequestFrm textarea[name=chgerRtnMemo]").val();
+		
+		if (gagajf.isNull(chgerTelno1) && gagajf.isNull(chgerTelno2) && gagajf.isNull(chgerTelno3)) {
+			chgerTelno 		= '';
+		} else {
+			chgerTelno = chgerTelno1 + '-' + chgerTelno2 + '-' + chgerTelno3;
+		}
 	} else {
 		
 	}
@@ -1107,7 +1135,9 @@ var fnCnclReq = function (reqGbn) {
 		,"chgerDtlAddr"		: chgerDtlAddr
 		,"chgerPhnno"		: chgerPhnno
 		,"chgerTelno"		: chgerTelno
+		,"chgerRtnMemo"		: chgerRtnMemo
 		,"ordChgSq"			: ordChgSq
+		,"wdGb"				: $('#wdGb:checked').val()
 	}
 
 	// 주문번호, 취소사유, 취소메모, (취소, 반품, 교환 신청 정보 목록), 환불계좌
@@ -1174,6 +1204,7 @@ var fnSetChger = function(){
 	$("#cancelRequestFrm input[name=chgerZipcode]").val(data.recipZipcode);
 	$("#cancelRequestFrm input[name=chgerBaseAddr]").val(data.recipBaseAddr);
 	$("#cancelRequestFrm input[name=chgerDtlAddr]").val(data.recipDtlAddr);
+	$("#cancelRequestFrm textarea[name=chgerRtnMemo]").val(data.chgerRtnmemo);
 	
 	if (spRecipPhnno) {
 		$("#cancelRequestFrm select[name=chgerPhnno1]").val(spRecipPhnno[0]);
@@ -1186,6 +1217,34 @@ var fnSetChger = function(){
 		$("#cancelRequestFrm input[name=chgerTelno2]").val(spRecipTelno[1]);
 		$("#cancelRequestFrm input[name=chgerTelno3]").val(spRecipTelno[2]);
 	}
+	
+	if (ordChgSq > 0) {
+		$('input[name=chgerNm]').attr('readOnly', true);				// 회수지정보 > 보내는사람 비활성화
+		$('input[name=chgerBaseAddr]').attr('readOnly', true);			// 회수지정보 > 기본주소 비활성화
+		$('input[name=chgerDtlAddr]').attr('readOnly', true);			// 회수지정보 > 상세주소 비활성화
+		$('select[name=chgerTelno1]').attr('disabled', true);			// 회수지정보 > 일반전화 비활성화
+		$('input[name=chgerTelno2]').attr('readOnly', true);			// 회수지정보 > 일반전화 비활성화
+		$('input[name=chgerTelno3]').attr('readOnly', true);			// 회수지정보 > 일반전화 비활성화
+		$('select[name=chgerPhnno1]').attr('disabled', true);			// 회수지정보 > 휴대전화 비활성화
+		$('input[name=chgerPhnno2]').attr('readOnly', true);			// 회수지정보 > 휴대전화 비활성화
+		$('input[name=chgerPhnno3]').attr('readOnly', true);			// 회수지정보 > 휴대전화 비활성화
+		$('#chgerRtnMemo').attr('readOnly', true);						// 회수지정보 > 반품메모 비활성화
+	}
+}
+
+// 회수방법 라디오 클릭 이벤트
+var fnChangeWdGb = function(param) {
+	let wdGb = $(param).val();
+	
+	// 회수지정보 히든 처리
+	if (wdGb == 'D') {
+		$('.chger').css('display', 'none');
+	} else {
+		$('.chger').css('display', '');
+	}
+	
+	//환불예정금액 계산
+	fnCalculateRefundAmt();
 }
 
 $(document).ready(function() {
@@ -1203,6 +1262,12 @@ $(document).ready(function() {
 	gagaAgGrid.hideStatusBar('gridDelvCdList');
 	gagaAgGrid.hideStatusBar('gridRefundAccountInfo');
 	
+	if (wdGb == 'D') {
+		$('input:radio[name="wdGb"]:radio[value="D"]').prop('checked', true);
+	} else {
+		$('input:radio[name="wdGb"]:radio[value="W"]').prop('checked', true);
+	}
+	
 	// 3. 환불정보계산
 	fnCalculateRefundAmt(null);
 	
@@ -1226,10 +1291,11 @@ $(document).ready(function() {
 	// 7. 취소사유 선택
 	if (ordChgSq > 0) {
 		$("select[name='selectChgReason']").val(chgReason);										// 변경사유코드
-		$("select[name='selectChgReason']").attr("disabled", "true");							// 변경사유 비활성화
+		$("select[name='selectChgReason']").attr('disabled', true);								// 변경사유 비활성화
 		$("#chgMemo").text(chgMemo);															// 변경사유메모
-		$("#chgMemo").attr("disabled", "true");													// 변경사유메모 비활성화
+		$("#chgMemo").attr('readOnly', true);													// 변경사유메모 비활성화
 		fnChangeChgReason(chgReason);															// 귀책사유
+		$('input:radio[name=wdGb]').attr('disabled', true);										// 회수방법 비활성화
 	}
 	
 	// debug mode 해제