From a2ff6933204ba33b83b178d01df03a15c91e6e9a Mon Sep 17 00:00:00 2001
From: lmh0621 <lmh0621@ectech.co.kr>
Date: Wed, 12 Jul 2023 15:56:12 +0900
Subject: [PATCH] =?UTF-8?q?=EC=84=9C=EB=B8=8C=EC=BF=BC=EB=A6=AC=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uplus/ez/api/custMgt/CustMgtMapper.java   |  2 ++
 .../uplus/ez/api/custMgt/CustMgtService.java  | 12 +++++---
 .../mapper/mysql/custMgt/custMgt-mapper.xml   | 29 +++++++++----------
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtMapper.java b/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtMapper.java
index 57c4503..7b4ad2f 100644
--- a/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtMapper.java
+++ b/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtMapper.java
@@ -155,4 +155,6 @@ public interface CustMgtMapper {
 	void updateCancleSbscstHst(CancleSubsSttus params);
 	/** 청약상태 히스토리 업데이트 */
 	void cancleSbscstHst(CancleSubsSttus params);
+	
+	String selectEfctStDt(CancleSubsSttusReqDto params);
 }
diff --git a/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java b/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java
index 4abc69b..9ca2c82 100644
--- a/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java
+++ b/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java
@@ -1542,9 +1542,13 @@ public class CustMgtService {
 		try {
 				CancleSubsSttus selectEfctStDt = new CancleSubsSttus();
 				
+				//1.  기존 이력 정보 가져오기
+				selectEfctStDt.setEfctStDt(custMgtMapper.selectEfctStDt(cancleSubsSttusReqDto));
 				selectEfctStDt.setSubsId(cancleSubsSttusReqDto.getSubsId());
 				selectEfctStDt.setChgId(regId);
-				//1. 기존 이력 만료시키기
+				
+				
+				//2. 기존 이력 만료시키기
 				custMgtMapper.updateCancleSbscstHst(selectEfctStDt);
 				
 				selectEfctStDt.setEfctFnsDt("99991231");
@@ -1552,13 +1556,13 @@ public class CustMgtService {
 				selectEfctStDt.setRegId(regId);
 				selectEfctStDt.setUserSttusCd("98");
 				
-				//2. 취소 이력 정보 인서트
+				//3. 취소 이력 정보 인서트
 				custMgtMapper.cancleSbscstHst(selectEfctStDt);
 				
-				//3. 사용자 상태 변경
+				//4. 사용자 상태 변경
 				custMgtMapper.cancleUserSttusCd(cancleSubsSttusReqDto);
 				
-				//4. 고객 청약상태 변경
+				//5. 고객 청약상태 변경
 				custMgtMapper.cancleSubsSttusCd(cancleSubsSttusReqDto);
 			
 		} catch (Exception e) {
diff --git a/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml b/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml
index cd76093..e7e109a 100644
--- a/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml
+++ b/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml
@@ -1708,6 +1708,19 @@
 		AND			SUBS_ID = #{subsId}
 	</update>
 	
+	<select id="selectEfctStDt" parameterType="kr.co.uplus.ez.api.custMgt.dto.CancleSubsSttusReqDto" resultType="String">
+		/* CancleSubsSttus.selectEfctStDt - 청약 상태 히스토리 최신 날짜 조회 */
+		SELECT
+					EFCT_ST_DT
+		FROM
+					hubez_common.EZ_SBSCST_HST
+		WHERE
+					SUBS_ID = #{subsId}
+		ORDER BY 	EFCT_ST_DT DESC 
+		LIMIT 		1	
+		
+	</select>
+	
 	<update id="updateCancleSbscstHst" parameterType="kr.co.uplus.ez.api.custMgt.dto.CancleSubsSttus">
 		/* CancleSubsSttus.updateCancleSbscstHst - 임시개통, 가입 취소 시 청약 상태 히스토리 최신 날짜로 변경 */
 		UPDATE
@@ -1716,21 +1729,7 @@
 					EFCT_FNS_DT = NOW()
 		WHERE
 					SUBS_ID = #{subsId}
-		AND 		EFCT_ST_DT = 
-						(	SELECT 
-									EFCT_ST_DT
-							FROM
-								(	
-									SELECT
-												EFCT_ST_DT
-									FROM
-												hubez_common.EZ_SBSCST_HST
-									WHERE
-												SUBS_ID = #{subsId}
-									ORDER BY 	EFCT_ST_DT DESC 
-									LIMIT 		1	
-								)	tmp
-						)
+		AND 		EFCT_ST_DT = #{efctStDt}  
 	</update>
 	
 	<insert id="cancleSbscstHst" parameterType="kr.co.uplus.ez.api.custMgt.dto.CancleSubsSttusReqDto">