Commit @2b60c925685e2ef24cf20122fc9d1280e7cd76b7

376f75d

2b60c92

src/main/java/itn/let/mjo/mjocommon/MjonCommon.java

--- src/main/java/itn/let/mjo/mjocommon/MjonCommon.java

+++ src/main/java/itn/let/mjo/mjocommon/MjonCommon.java


 		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);
 

376f75d

2b60c92

src/main/java/itn/let/mjo/msg/service/RefundDTO.java

--- src/main/java/itn/let/mjo/msg/service/RefundDTO.java

+++ src/main/java/itn/let/mjo/msg/service/RefundDTO.java


 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;
 	}

376f75d

2b60c92

src/main/java/itn/let/mjo/test/web/TestController.java

--- src/main/java/itn/let/mjo/test/web/TestController.java

+++ src/main/java/itn/let/mjo/test/web/TestController.java


 			}
 			
 			
-			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);

376f75d

2b60c92

src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java

--- src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java

+++ src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java


 																new RefundDTO(
 																		msg.getUserId()
 																		, msg.getMsgGroupId()
+																		, msg.getUserData()
 																		, Integer.parseInt(msg.getUserData())
 																		, msg.getEachPrice())
 															)

...	...	@@ -585,8 +585,11 @@
585	585	try {
586	586	// 이벤트 정보 가져오기
587	587	MjonEventVO eventMberInfo = mjonEventService.selectEventMsgMberDefaultInfo_advc(userId);
588		- if (eventMberInfo == null \|\| "E".equals(eventMberInfo.getEventStatus())) {
589		- return statusResponse; // 이벤트 상태가 종료인 경우 처리하지 않음
	588	+ if (eventMberInfo == null
	589	+ \|\| "E".equals(eventMberInfo.getEventStatus())
	590	+ \|\| org.apache.commons.lang3.StringUtils.isEmpty(eventMberInfo.getEventEndDate())
	591	+ ) {
	592	+ return statusResponse; // 이벤트 상태가 종료이거나 endDate가 없는 경우 처리하지 않음
590	593	}
591	594	log.info(" + 이벤트 진행 대상자 :: [{}]", userId);
592	595

...	...	@@ -8,12 +8,14 @@
8	8	public class RefundDTO {
9	9	private String userId;
10	10	private String msgGroupId;
	11	+ private String userData;
11	12	private int msgSeq;
12	13	private String eachPrice ; // 전송문자 개별가격
13	14
14		- public RefundDTO(String userId, String msgGroupId, int msgSeq, String eachPrice) {
	15	+ public RefundDTO(String userId, String msgGroupId, String userData, int msgSeq, String eachPrice) {
15	16	this.userId = userId;
16	17	this.msgGroupId = msgGroupId;
	18	+ this.userData = userData;
17	19	this.msgSeq = msgSeq;
18	20	this.eachPrice = eachPrice;
19	21	}

...	...	@@ -3452,13 +3452,21 @@
3452	3452	}
3453	3453
3454	3454
3455		- System.out.println("== msgFailList =============> : "+ msgFailList.size());
3456	3455	// TEST
3457		-
	3456	+
3458	3457	// 필요한 필드만 DTO로 매핑
3459	3458	List<RefundDTO> dtoList = msgFailList.stream()
3460		- .map(msg -> new RefundDTO(msg.getUserId(), msg.getMsgGroupId(), Integer.parseInt(msg.getUserData()), msg.getEachPrice()))
3461		- .collect(Collectors.toList());
	3459	+// .limit(10)
	3460	+ .map(msg ->
	3461	+ new RefundDTO(
	3462	+ msg.getUserId()
	3463	+ , msg.getMsgGroupId()
	3464	+ , msg.getUserData()
	3465	+ , Integer.parseInt(msg.getUserData())
	3466	+ , msg.getEachPrice())
	3467	+ )
	3468	+ .collect(Collectors.toList());
	3469	+ System.out.println("== dtoList =============> : "+ dtoList.size());
3462	3470	// JSON 변환
3463	3471	ObjectMapper objectMapper = new ObjectMapper();
3464	3472	String msgFailListJson = objectMapper.writeValueAsString(dtoList);

...	...	@@ -520,6 +520,7 @@
520	520	new RefundDTO(
521	521	msg.getUserId()
522	522	, msg.getMsgGroupId()
	523	+ , msg.getUserData()
523	524	, Integer.parseInt(msg.getUserData())
524	525	, msg.getEachPrice())
525	526	)

Delete comment