diff --git a/src/main/java/itn/com/cmm/MjonFTSendVO.java b/src/main/java/itn/com/cmm/MjonFTSendVO.java index 59aac5ba..edc815dc 100644 --- a/src/main/java/itn/com/cmm/MjonFTSendVO.java +++ b/src/main/java/itn/com/cmm/MjonFTSendVO.java @@ -86,6 +86,7 @@ public class MjonFTSendVO{ * @description : 메세지타입(4: SMS 전송, 5: URL 전송, 6: MMS전송, 7: BARCODE전송, 8: 카카오 알림톡 전송) */ private String msgType; + /** * @description : 첨부파일 갯수 diff --git a/src/main/java/itn/let/kakao/kakaoComm/KakaoSendAdvcVO.java b/src/main/java/itn/let/kakao/kakaoComm/KakaoSendAdvcVO.java index 54a7331e..20366d92 100644 --- a/src/main/java/itn/let/kakao/kakaoComm/KakaoSendAdvcVO.java +++ b/src/main/java/itn/let/kakao/kakaoComm/KakaoSendAdvcVO.java @@ -45,7 +45,13 @@ public class KakaoSendAdvcVO implements Serializable { private String subMsgType; // 대체문자 타입 private String reqDate; // 예약일시 + private String msgKind; // 예약일시 + private String jsonStr; // jsonStr + + + + private String adFlag; //친구톡 광고성 정보 사용 유무(Y:사용 , N:미사용) // ===== // ===== diff --git a/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java b/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java index 4e82a5a8..a7ddbd85 100644 --- a/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java +++ b/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java @@ -315,8 +315,17 @@ public class KakaoSendUtil { log.info(" + StringUtils.isNotEmpty(subMsgTxt) :: [{}]", StringUtils.isNotEmpty(subMsgTxt)); if(StringUtils.isNotEmpty(subMsgTxt)) { kakaoVO.setSubMsgSendYn("Y"); + + // 광고문자면 처리 - 광고 Y + if ("Y".equals(kakaoVO.getAdFlag())) { + subMsgTxt = "(광고)" + subMsgTxt + "\n" + "무료거부 0808800858"; + } + } + + + // 시스템 기본 단가 정보 불러오기 JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo(); // 사용자 개인 단가 정보 불러오기 @@ -434,7 +443,7 @@ public class KakaoSendUtil { // 타이틀과 버튼이 있고 - if(hasButtons) { + if(hasButtons || StringUtils.isNotEmpty(kakaoVO.getTemplateImageUrl())) { // if (StringUtils.isEmpty(sharedJsonStr)) { // 치환 데이터가 없고 아직 생성되지 않았으면 한 번만 생성 @@ -554,6 +563,10 @@ public class KakaoSendUtil { sendVO.setUserId(kakaoVO.getUserId()); sendVO.setCallFrom(kakaoVO.getCallFrom()); sendVO.setSubMsgSendYn(kakaoVO.getSubMsgSendYn()); + + sendVO.setAdFlag(kakaoVO.getAdFlag()); + + return sendVO; } @@ -1592,6 +1605,7 @@ public class KakaoSendUtil { sendVO.setReserveYn(kakaoVO.getReserveYn()); sendVO.setBefCash(priceAndPoint.getBefCash(sendVO.getUserId())); sendVO.setBefPoint(priceAndPoint.getBefPoint(sendVO.getUserId())); + sendVO.setAdFlag(kakaoVO.getAdFlag()); Float eachPrice = Float.parseFloat(sendVO.getEachPrice()); diff --git a/src/main/java/itn/let/kakao/kakaoComm/kakaoApi/KakaoApiProfile.java b/src/main/java/itn/let/kakao/kakaoComm/kakaoApi/KakaoApiProfile.java index 76583507..01d434b7 100644 --- a/src/main/java/itn/let/kakao/kakaoComm/kakaoApi/KakaoApiProfile.java +++ b/src/main/java/itn/let/kakao/kakaoComm/kakaoApi/KakaoApiProfile.java @@ -230,7 +230,8 @@ public class KakaoApiProfile { if(code.equals("200")) { JSONObject templateProfile = (JSONObject) object.get("data"); - + System.out.println("templateProfile = " + templateProfile.toJSONString()); + String senderKey = getStringValue(templateProfile, "senderKey"); //발신프로필키 String uuid = getStringValue(templateProfile, "uuid"); //카카오톡 채널 String name = getStringValue(templateProfile, "name"); //카카오톡 채널 발신프로필 명 diff --git a/src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java b/src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java index c2b78c20..24b47cf2 100644 --- a/src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java +++ b/src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java @@ -177,7 +177,7 @@ public class KakaoFriendsTalkServiceImpl extends EgovAbstractServiceImpl implem priceAndPoint.insertCashAndPoint(kakaoVO.getUserId() , -Float.parseFloat(sendVO.getTotPrice()) - , "카카오 알림톡 총 "+groupedMsgList.size()+"건 중 " + instCnt + "건 발송" + , "카카오 친구톡 총 "+groupedMsgList.size()+"건 중 " + instCnt + "건 발송" , nextMsgGroupId ); diff --git a/src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java b/src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java index 1a2e7682..5429c61d 100644 --- a/src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java +++ b/src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java @@ -119,4 +119,6 @@ public class KakaoSentVO extends UserDefaultVO{ private String yellowId; + private String adFlag; + } diff --git a/src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java b/src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java index 7f4e1e1e..2930037d 100644 --- a/src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java +++ b/src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java @@ -140,6 +140,9 @@ public class KakaoSentServiceImpl extends EgovAbstractServiceImpl implements Ka List resultList = new ArrayList(); resultList = kakaoSentDAO.selectAllKakaoSentList_advc(kakaoSentVO); + + System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); + //totPrice 계산 및 상태코드 set resultList = resultList.stream().map(t -> setPriceNCode(t)).collect(Collectors.toList()); diff --git a/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java b/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java index 7347f228..0cd9b891 100644 --- a/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java +++ b/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java @@ -46,7 +46,9 @@ import itn.let.kakao.kakaoComm.kakaoApi.KakaoApiTemplate; import itn.let.kakao.user.sent.service.KakaoSentDetailVO; import itn.let.kakao.user.sent.service.KakaoSentService; import itn.let.kakao.user.sent.service.KakaoSentVO; +import lombok.extern.slf4j.Slf4j; +@Slf4j @Controller public class KakaoSentController { @@ -182,6 +184,7 @@ public class KakaoSentController { //전체 발송 리스트 불러오기 List resultAllSentList = kakaoSentService.selectAllKakaoSentList(kakaoSentVO); + model.addAttribute("resultAllSentList", resultAllSentList); // model.addAttribute("resultAllSentCnt", resultAllSentList.size()); @@ -1039,11 +1042,13 @@ public class KakaoSentController { //발송 관리 문자발송 내용 상세보기 팝업 => 문자내용(MJ_MSG_DATA) MjonKakaoATVO mjonKakaoATResultVO = kakaoSentService.selectKakaoSentDetailDataAjax(mjonKakaoATVO); + log.info(" 1 resultMsgDetail.bizKakaoResendOrgnlTxt : [{}]", mjonKakaoATResultVO.getBizKakaoResendOrgnlTxt()); // 대체문자 엔터키 치환 if(StringUtils.isNotEmpty(mjonKakaoATResultVO.getSmsTxt())) { mjonKakaoATResultVO.setSmsTxt(StringUtil2.replaceBR(mjonKakaoATResultVO.getSmsTxt())); } model.addAttribute("resultMsgDetail", mjonKakaoATResultVO); + log.info(" 2 resultMsgDetail.bizKakaoResendOrgnlTxt : [{}]", mjonKakaoATResultVO.getBizKakaoResendOrgnlTxt()); String msgType = mjonKakaoATResultVO.getMsgType(); @@ -1075,6 +1080,8 @@ public class KakaoSentController { } model.addAttribute("msgType", msgType); + log.info(" 3 resultMsgDetail.bizKakaoResendOrgnlTxt : [{}]", mjonKakaoATResultVO.getBizKakaoResendOrgnlTxt()); + } catch (Exception e) { e.printStackTrace(); // TODO: handle exception diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml index 3a31bf63..c571a6d8 100644 --- a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml @@ -1395,6 +1395,8 @@ B.AT_DELAY_COMPLETE_YN AS atDelayCompleteYn, A.MSG_NOTICETALK_SENDER_KEY AS msgNoticetalkSenderKey, A.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn, + A.BIZ_KAKAO_RESEND_DATA as bizKakaoResendData, + B.AD_FLAG as adFlag , CASE WHEN B.AT_DELAY_YN = 'Y' AND B.AT_DELAY_COMPLETE_YN = 'N' THEN DATE_ADD(B.REQ_DATE, INTERVAL -30 MINUTE) @@ -1403,7 +1405,7 @@ C.YELLOW_ID AS yellowId FROM MJ_MSG_GROUP_DATA B INNER JOIN ( - select MSG_GROUP_ID, MSG_TYPE, DEL_FLAG, MSG_NOTICETALK_SENDER_KEY, BIZ_KAKAO_RESEND_YN + select MSG_GROUP_ID, MSG_TYPE, DEL_FLAG, MSG_NOTICETALK_SENDER_KEY, BIZ_KAKAO_RESEND_YN, BIZ_KAKAO_RESEND_DATA from MJ_MSG_DATA where DEL_FLAG = 'N' @@ -1899,6 +1901,7 @@