From 2b60c925685e2ef24cf20122fc9d1280e7cd76b7 Mon Sep 17 00:00:00 2001
From: "hehihoho3@gmail.com" <hehihoho3@gmail.com>
Date: Mon, 23 Dec 2024 13:33:08 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AC=B8=EC=9E=90=EB=B0=9C=EC=86=A1=EB=A1=9C?=
 =?UTF-8?q?=EC=A7=81=20>=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EC=B2=B4?=
 =?UTF-8?q?=ED=81=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/itn/let/mjo/mjocommon/MjonCommon.java   |  7 +++++--
 .../java/itn/let/mjo/msg/service/RefundDTO.java  |  4 +++-
 .../itn/let/mjo/test/web/TestController.java     | 16 ++++++++++++----
 .../service/impl/SchdlrManageServiceImpl.java    |  1 +
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java b/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java
index 0d05c391..b889d9cc 100644
--- a/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java
+++ b/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java
@@ -585,8 +585,11 @@ private int parseIntOrDefault(String value, int defaultValue) {
 		try {
 			// 이벤트 정보 가져오기
 			MjonEventVO eventMberInfo = mjonEventService.selectEventMsgMberDefaultInfo_advc(userId);
-			if (eventMberInfo == null || "E".equals(eventMberInfo.getEventStatus())) {
-				return statusResponse; // 이벤트 상태가 종료인 경우 처리하지 않음
+			if (eventMberInfo == null 
+					|| "E".equals(eventMberInfo.getEventStatus())
+					|| org.apache.commons.lang3.StringUtils.isEmpty(eventMberInfo.getEventEndDate()) 
+					) {
+				return statusResponse; // 이벤트 상태가 종료이거나 endDate가 없는 경우 처리하지 않음
 			}
 			log.info(" + 이벤트 진행 대상자 :: [{}]", userId);
 
diff --git a/src/main/java/itn/let/mjo/msg/service/RefundDTO.java b/src/main/java/itn/let/mjo/msg/service/RefundDTO.java
index fa35e5e4..4e2a922b 100644
--- a/src/main/java/itn/let/mjo/msg/service/RefundDTO.java
+++ b/src/main/java/itn/let/mjo/msg/service/RefundDTO.java
@@ -8,12 +8,14 @@ import lombok.Setter;
 public class RefundDTO {
 	private String userId;
 	private String msgGroupId;
+	private String userData;
 	private int msgSeq;
 	private String 	eachPrice ;	// 전송문자 개별가격
 
-	public RefundDTO(String userId, String msgGroupId, int msgSeq, String eachPrice) {
+	public RefundDTO(String userId, String msgGroupId, String userData, int msgSeq, String eachPrice) {
 		this.userId = userId;
 		this.msgGroupId = msgGroupId;
+		this.userData = userData;
 		this.msgSeq = msgSeq;
 		this.eachPrice = eachPrice;
 	}
diff --git a/src/main/java/itn/let/mjo/test/web/TestController.java b/src/main/java/itn/let/mjo/test/web/TestController.java
index 8ea99214..6fa0dcc0 100644
--- a/src/main/java/itn/let/mjo/test/web/TestController.java
+++ b/src/main/java/itn/let/mjo/test/web/TestController.java
@@ -3452,13 +3452,21 @@ public class TestController {
 			}
 			
 			
-			System.out.println("==  msgFailList  =============>  : "+ msgFailList.size());
 			// TEST
-			
+
 				// 필요한 필드만 DTO로 매핑
 				List<RefundDTO> dtoList = msgFailList.stream()
-	                .map(msg -> new RefundDTO(msg.getUserId(), msg.getMsgGroupId(), Integer.parseInt(msg.getUserData()), msg.getEachPrice()))
-	                .collect(Collectors.toList());
+//													.limit(10)
+														.map(msg -> 
+																new RefundDTO(
+																		msg.getUserId()
+																		, msg.getMsgGroupId()
+																		, msg.getUserData()
+																		, Integer.parseInt(msg.getUserData())
+																		, msg.getEachPrice())
+															)
+															.collect(Collectors.toList());
+				System.out.println("==  dtoList  =============>  : "+ dtoList.size());
 				// JSON 변환
 				ObjectMapper objectMapper = new ObjectMapper();
 				String msgFailListJson = objectMapper.writeValueAsString(dtoList);
diff --git a/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java b/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java
index a261ef9b..aa1757ad 100644
--- a/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java
+++ b/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java
@@ -520,6 +520,7 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements
 																new RefundDTO(
 																		msg.getUserId()
 																		, msg.getMsgGroupId()
+																		, msg.getUserData()
 																		, Integer.parseInt(msg.getUserData())
 																		, msg.getEachPrice())
 															)