--- src/main/java/itn/com/cmm/MjonFTSendVO.java
+++ src/main/java/itn/com/cmm/MjonFTSendVO.java
... | ... | @@ -86,6 +86,7 @@ |
| 86 | 86 |
* @description : 메세지타입(4: SMS 전송, 5: URL 전송, 6: MMS전송, 7: BARCODE전송, 8: 카카오 알림톡 전송) |
| 87 | 87 |
*/ |
| 88 | 88 |
private String msgType; |
| 89 |
+ |
|
| 89 | 90 |
|
| 90 | 91 |
/** |
| 91 | 92 |
* @description : 첨부파일 갯수 |
--- src/main/java/itn/let/kakao/kakaoComm/KakaoSendAdvcVO.java
+++ src/main/java/itn/let/kakao/kakaoComm/KakaoSendAdvcVO.java
... | ... | @@ -45,7 +45,13 @@ |
| 45 | 45 |
private String subMsgType; // 대체문자 타입 |
| 46 | 46 |
private String reqDate; // 예약일시 |
| 47 | 47 |
|
| 48 |
+ private String msgKind; // 예약일시 |
|
| 49 |
+ |
|
| 48 | 50 |
private String jsonStr; // jsonStr |
| 51 |
+ |
|
| 52 |
+ |
|
| 53 |
+ |
|
| 54 |
+ private String adFlag; //친구톡 광고성 정보 사용 유무(Y:사용 , N:미사용) |
|
| 49 | 55 |
|
| 50 | 56 |
// ===== |
| 51 | 57 |
// ===== |
--- src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java
+++ src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java
... | ... | @@ -315,7 +315,16 @@ |
| 315 | 315 |
log.info(" + StringUtils.isNotEmpty(subMsgTxt) :: [{}]", StringUtils.isNotEmpty(subMsgTxt));
|
| 316 | 316 |
if(StringUtils.isNotEmpty(subMsgTxt)) {
|
| 317 | 317 |
kakaoVO.setSubMsgSendYn("Y");
|
| 318 |
+ |
|
| 319 |
+ // 광고문자면 처리 - 광고 Y |
|
| 320 |
+ if ("Y".equals(kakaoVO.getAdFlag())) {
|
|
| 321 |
+ subMsgTxt = "(광고)" + subMsgTxt + "\n" + "무료거부 0808800858"; |
|
| 322 |
+ } |
|
| 323 |
+ |
|
| 318 | 324 |
} |
| 325 |
+ |
|
| 326 |
+ |
|
| 327 |
+ |
|
| 319 | 328 |
|
| 320 | 329 |
// 시스템 기본 단가 정보 불러오기 |
| 321 | 330 |
JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo(); |
... | ... | @@ -434,7 +443,7 @@ |
| 434 | 443 |
|
| 435 | 444 |
|
| 436 | 445 |
// 타이틀과 버튼이 있고 |
| 437 |
- if(hasButtons) {
|
|
| 446 |
+ if(hasButtons || StringUtils.isNotEmpty(kakaoVO.getTemplateImageUrl())) {
|
|
| 438 | 447 |
// |
| 439 | 448 |
if (StringUtils.isEmpty(sharedJsonStr)) {
|
| 440 | 449 |
// 치환 데이터가 없고 아직 생성되지 않았으면 한 번만 생성 |
... | ... | @@ -554,6 +563,10 @@ |
| 554 | 563 |
sendVO.setUserId(kakaoVO.getUserId()); |
| 555 | 564 |
sendVO.setCallFrom(kakaoVO.getCallFrom()); |
| 556 | 565 |
sendVO.setSubMsgSendYn(kakaoVO.getSubMsgSendYn()); |
| 566 |
+ |
|
| 567 |
+ sendVO.setAdFlag(kakaoVO.getAdFlag()); |
|
| 568 |
+ |
|
| 569 |
+ |
|
| 557 | 570 |
return sendVO; |
| 558 | 571 |
} |
| 559 | 572 |
|
... | ... | @@ -1592,6 +1605,7 @@ |
| 1592 | 1605 |
sendVO.setReserveYn(kakaoVO.getReserveYn()); |
| 1593 | 1606 |
sendVO.setBefCash(priceAndPoint.getBefCash(sendVO.getUserId())); |
| 1594 | 1607 |
sendVO.setBefPoint(priceAndPoint.getBefPoint(sendVO.getUserId())); |
| 1608 |
+ sendVO.setAdFlag(kakaoVO.getAdFlag()); |
|
| 1595 | 1609 |
|
| 1596 | 1610 |
Float eachPrice = Float.parseFloat(sendVO.getEachPrice()); |
| 1597 | 1611 |
|
--- src/main/java/itn/let/kakao/kakaoComm/kakaoApi/KakaoApiProfile.java
+++ src/main/java/itn/let/kakao/kakaoComm/kakaoApi/KakaoApiProfile.java
... | ... | @@ -230,7 +230,8 @@ |
| 230 | 230 |
if(code.equals("200")) {
|
| 231 | 231 |
|
| 232 | 232 |
JSONObject templateProfile = (JSONObject) object.get("data");
|
| 233 |
- |
|
| 233 |
+ System.out.println("templateProfile = " + templateProfile.toJSONString());
|
|
| 234 |
+ |
|
| 234 | 235 |
String senderKey = getStringValue(templateProfile, "senderKey"); //발신프로필키 |
| 235 | 236 |
String uuid = getStringValue(templateProfile, "uuid"); //카카오톡 채널 |
| 236 | 237 |
String name = getStringValue(templateProfile, "name"); //카카오톡 채널 발신프로필 명 |
--- src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java
+++ src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java
... | ... | @@ -177,7 +177,7 @@ |
| 177 | 177 |
|
| 178 | 178 |
priceAndPoint.insertCashAndPoint(kakaoVO.getUserId() |
| 179 | 179 |
, -Float.parseFloat(sendVO.getTotPrice()) |
| 180 |
- , "카카오 알림톡 총 "+groupedMsgList.size()+"건 중 " + instCnt + "건 발송" |
|
| 180 |
+ , "카카오 친구톡 총 "+groupedMsgList.size()+"건 중 " + instCnt + "건 발송" |
|
| 181 | 181 |
, nextMsgGroupId |
| 182 | 182 |
); |
| 183 | 183 |
|
--- src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java
+++ src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java
... | ... | @@ -119,4 +119,6 @@ |
| 119 | 119 |
|
| 120 | 120 |
private String yellowId; |
| 121 | 121 |
|
| 122 |
+ private String adFlag; |
|
| 123 |
+ |
|
| 122 | 124 |
} |
--- src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java
+++ src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java
... | ... | @@ -140,6 +140,9 @@ |
| 140 | 140 |
List<KakaoSentVO> resultList = new ArrayList<KakaoSentVO>(); |
| 141 | 141 |
|
| 142 | 142 |
resultList = kakaoSentDAO.selectAllKakaoSentList_advc(kakaoSentVO); |
| 143 |
+ |
|
| 144 |
+ System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
|
|
| 145 |
+ |
|
| 143 | 146 |
|
| 144 | 147 |
//totPrice 계산 및 상태코드 set |
| 145 | 148 |
resultList = resultList.stream().map(t -> setPriceNCode(t)).collect(Collectors.toList()); |
--- src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java
+++ src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java
... | ... | @@ -46,7 +46,9 @@ |
| 46 | 46 |
import itn.let.kakao.user.sent.service.KakaoSentDetailVO; |
| 47 | 47 |
import itn.let.kakao.user.sent.service.KakaoSentService; |
| 48 | 48 |
import itn.let.kakao.user.sent.service.KakaoSentVO; |
| 49 |
+import lombok.extern.slf4j.Slf4j; |
|
| 49 | 50 |
|
| 51 |
+@Slf4j |
|
| 50 | 52 |
@Controller |
| 51 | 53 |
public class KakaoSentController {
|
| 52 | 54 |
|
... | ... | @@ -182,6 +184,7 @@ |
| 182 | 184 |
|
| 183 | 185 |
//전체 발송 리스트 불러오기 |
| 184 | 186 |
List<KakaoSentVO> resultAllSentList = kakaoSentService.selectAllKakaoSentList(kakaoSentVO); |
| 187 |
+ |
|
| 185 | 188 |
model.addAttribute("resultAllSentList", resultAllSentList);
|
| 186 | 189 |
// model.addAttribute("resultAllSentCnt", resultAllSentList.size());
|
| 187 | 190 |
|
... | ... | @@ -1039,11 +1042,13 @@ |
| 1039 | 1042 |
|
| 1040 | 1043 |
//발송 관리 문자발송 내용 상세보기 팝업 => 문자내용(MJ_MSG_DATA) |
| 1041 | 1044 |
MjonKakaoATVO mjonKakaoATResultVO = kakaoSentService.selectKakaoSentDetailDataAjax(mjonKakaoATVO); |
| 1045 |
+ log.info(" 1 resultMsgDetail.bizKakaoResendOrgnlTxt : [{}]", mjonKakaoATResultVO.getBizKakaoResendOrgnlTxt());
|
|
| 1042 | 1046 |
// 대체문자 엔터키 치환 |
| 1043 | 1047 |
if(StringUtils.isNotEmpty(mjonKakaoATResultVO.getSmsTxt())) {
|
| 1044 | 1048 |
mjonKakaoATResultVO.setSmsTxt(StringUtil2.replaceBR(mjonKakaoATResultVO.getSmsTxt())); |
| 1045 | 1049 |
} |
| 1046 | 1050 |
model.addAttribute("resultMsgDetail", mjonKakaoATResultVO);
|
| 1051 |
+ log.info(" 2 resultMsgDetail.bizKakaoResendOrgnlTxt : [{}]", mjonKakaoATResultVO.getBizKakaoResendOrgnlTxt());
|
|
| 1047 | 1052 |
|
| 1048 | 1053 |
String msgType = mjonKakaoATResultVO.getMsgType(); |
| 1049 | 1054 |
|
... | ... | @@ -1075,6 +1080,8 @@ |
| 1075 | 1080 |
} |
| 1076 | 1081 |
model.addAttribute("msgType", msgType);
|
| 1077 | 1082 |
|
| 1083 |
+ log.info(" 3 resultMsgDetail.bizKakaoResendOrgnlTxt : [{}]", mjonKakaoATResultVO.getBizKakaoResendOrgnlTxt());
|
|
| 1084 |
+ |
|
| 1078 | 1085 |
} catch (Exception e) {
|
| 1079 | 1086 |
e.printStackTrace(); |
| 1080 | 1087 |
// TODO: handle exception |
--- src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml
... | ... | @@ -1395,6 +1395,8 @@ |
| 1395 | 1395 |
B.AT_DELAY_COMPLETE_YN AS atDelayCompleteYn, |
| 1396 | 1396 |
A.MSG_NOTICETALK_SENDER_KEY AS msgNoticetalkSenderKey, |
| 1397 | 1397 |
A.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn, |
| 1398 |
+ A.BIZ_KAKAO_RESEND_DATA as bizKakaoResendData, |
|
| 1399 |
+ B.AD_FLAG as adFlag , |
|
| 1398 | 1400 |
CASE |
| 1399 | 1401 |
WHEN B.AT_DELAY_YN = 'Y' AND B.AT_DELAY_COMPLETE_YN = 'N' |
| 1400 | 1402 |
THEN DATE_ADD(B.REQ_DATE, INTERVAL -30 MINUTE) |
... | ... | @@ -1403,7 +1405,7 @@ |
| 1403 | 1405 |
C.YELLOW_ID AS yellowId |
| 1404 | 1406 |
FROM MJ_MSG_GROUP_DATA B |
| 1405 | 1407 |
INNER JOIN ( |
| 1406 |
- select MSG_GROUP_ID, MSG_TYPE, DEL_FLAG, MSG_NOTICETALK_SENDER_KEY, BIZ_KAKAO_RESEND_YN |
|
| 1408 |
+ select MSG_GROUP_ID, MSG_TYPE, DEL_FLAG, MSG_NOTICETALK_SENDER_KEY, BIZ_KAKAO_RESEND_YN, BIZ_KAKAO_RESEND_DATA |
|
| 1407 | 1409 |
from MJ_MSG_DATA |
| 1408 | 1410 |
where DEL_FLAG = 'N' |
| 1409 | 1411 |
<isNotEmpty property="tabType"> |
... | ... | @@ -1899,6 +1901,7 @@ |
| 1899 | 1901 |
|
| 1900 | 1902 |
<!-- 발신 내용 상세보기 조회 (상세보기 버튼 클릭시)--> |
| 1901 | 1903 |
<select id="KakaoSentDAO.selectKakaoSentDetailViewPhoneAjax" parameterClass="mjonKakaoATVO" resultClass="mjonKakaoATVO"> |
| 1904 |
+ /* KakaoSentDAO.selectKakaoSentDetailViewPhoneAjax */ |
|
| 1902 | 1905 |
|
| 1903 | 1906 |
SELECT |
| 1904 | 1907 |
MGD.MSG_GROUP_ID as msgGroupId |
--- src/main/resources/egovframework/sqlmap/let/mjo/kakao/Kakao_AT_SQL_Mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/mjo/kakao/Kakao_AT_SQL_Mysql.xml
... | ... | @@ -72,6 +72,7 @@ |
| 72 | 72 |
|
| 73 | 73 |
, SMS_TXT |
| 74 | 74 |
, BIZ_KAKAO_TITLE |
| 75 |
+ , AD_FLAG |
|
| 75 | 76 |
|
| 76 | 77 |
, BIZ_KAKAO_RESEND_YN |
| 77 | 78 |
, BIZ_KAKAO_RESEND_DATA |
... | ... | @@ -95,6 +96,7 @@ |
| 95 | 96 |
|
| 96 | 97 |
, #[].templateContent# |
| 97 | 98 |
, #[].templateTitle# |
| 99 |
+ , #[].adFlag# |
|
| 98 | 100 |
|
| 99 | 101 |
, #[].subMsgSendYn# |
| 100 | 102 |
, #[].subMsgTxt# |
... | ... | @@ -131,6 +133,7 @@ |
| 131 | 133 |
REQ_DATE, |
| 132 | 134 |
MSG_GROUP_CNT, |
| 133 | 135 |
MSG_TYPE, |
| 136 |
+ AD_FLAG, |
|
| 134 | 137 |
|
| 135 | 138 |
AGENT_CODE, |
| 136 | 139 |
EACH_PRICE, |
... | ... | @@ -153,6 +156,7 @@ |
| 153 | 156 |
#reqDate#, |
| 154 | 157 |
#msgGroupCnt#, |
| 155 | 158 |
#msgType#, |
| 159 |
+ #adFlag#, |
|
| 156 | 160 |
|
| 157 | 161 |
#agentCode#, |
| 158 | 162 |
#eachPrice#, |
--- src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp
... | ... | @@ -142,8 +142,47 @@ |
| 142 | 142 |
}); |
| 143 | 143 |
|
| 144 | 144 |
|
| 145 |
+ // 광고포함여부 체크 이벤트 |
|
| 146 |
+ $("#ad_Y").click(function () {
|
|
| 147 |
+ const isChecked = $(this).prop("checked");
|
|
| 148 |
+ $('#adFlag').val(isChecked ? 'Y' : 'N');
|
|
| 149 |
+ }); |
|
| 150 |
+ |
|
| 151 |
+ |
|
| 145 | 152 |
$("input[name='img_file_add']").change(function () {
|
| 146 | 153 |
console.log('$(this).attr("id") :: ', $(this).attr("id"));
|
| 154 |
+ |
|
| 155 |
+ var imageUrl = $("#templateImageUrl").val();
|
|
| 156 |
+ |
|
| 157 |
+ if(imageUrl == ''){
|
|
| 158 |
+ return false; |
|
| 159 |
+ } |
|
| 160 |
+ |
|
| 161 |
+ $("#imgLink").val("");
|
|
| 162 |
+ $("#imgFile").val("");
|
|
| 163 |
+ |
|
| 164 |
+ $('#imgTitle').addClass('file_none')
|
|
| 165 |
+ .text("이미지 없음");
|
|
| 166 |
+ |
|
| 167 |
+ $('#imgLink').prop('disabled', false); // 회색 처리 제거 + 입력 불가 제거
|
|
| 168 |
+ |
|
| 169 |
+ $("#templateImageUrl").val("");
|
|
| 170 |
+ $('.kakao_image').css("display", "none");
|
|
| 171 |
+ $("#kakaoImg").attr("src", "");
|
|
| 172 |
+ $("#imageFileName").val(""); //이미지 파일명 삭제
|
|
| 173 |
+ |
|
| 174 |
+ |
|
| 175 |
+ |
|
| 176 |
+// if(imageUrl == ''){
|
|
| 177 |
+ |
|
| 178 |
+// alert("등록된 이미지가 없습니다.");
|
|
| 179 |
+// return false; |
|
| 180 |
+ |
|
| 181 |
+// } |
|
| 182 |
+ |
|
| 183 |
+ |
|
| 184 |
+// fnImageDel() |
|
| 185 |
+ |
|
| 147 | 186 |
/* if ($("input[name='img_file_add']:checked").attr("id") == "img_file_1") {
|
| 148 | 187 |
$(".basic_img_add_wrap").show().siblings(".wide_img_add_wrap").hide();
|
| 149 | 188 |
$(".img_file_info_wrap").show();
|
... | ... | @@ -267,6 +306,7 @@ |
| 267 | 306 |
} |
| 268 | 307 |
|
| 269 | 308 |
function initFormChk(){
|
| 309 |
+ console.log(':: initFormChk ::');
|
|
| 270 | 310 |
|
| 271 | 311 |
//채널ID 정보 미리보기에 표시해주기 |
| 272 | 312 |
fnAgentCodeChg(); |
... | ... | @@ -308,10 +348,6 @@ |
| 308 | 348 |
var tmpContents = $('#inputTemplateContent').val();
|
| 309 | 349 |
setContentsLengForFriends(tmpContents); |
| 310 | 350 |
|
| 311 |
- //초기 광고포함 여부 처리 |
|
| 312 |
-// var adFlagVal = $("#ad_Y").is(":checked") ? "Y" : "N";
|
|
| 313 |
-// advTextChange(adFlagVal); |
|
| 314 |
- |
|
| 315 | 351 |
var reserYn = $("input[name=reserYn]:checked").val();
|
| 316 | 352 |
if(reserYn == 'N'){
|
| 317 | 353 |
|
... | ... | @@ -321,6 +357,17 @@ |
| 321 | 357 |
$('#bizForm #reserveYn').val('N');
|
| 322 | 358 |
|
| 323 | 359 |
} |
| 360 |
+ |
|
| 361 |
+ |
|
| 362 |
+ // 광고포함여부 체크 |
|
| 363 |
+ // 기본 |
|
| 364 |
+ // - adFlag = Y |
|
| 365 |
+ // - ad_Y = Y |
|
| 366 |
+ console.log('!!!!! : ',$('#adFlag').val());
|
|
| 367 |
+ if($('#adFlag').val() == 'N'){
|
|
| 368 |
+ $('#ad_Y').click();
|
|
| 369 |
+ } |
|
| 370 |
+ |
|
| 324 | 371 |
|
| 325 | 372 |
} |
| 326 | 373 |
|
... | ... | @@ -340,9 +387,11 @@ |
| 340 | 387 |
if ($("#ad_Y").is(":checked")) {
|
| 341 | 388 |
|
| 342 | 389 |
$("#adTxt").show(); // 내용
|
| 343 |
- $("#adTxt p").html("(광고) " + cleanYellowId + ""); // 내용
|
|
| 390 |
+// $("#adTxt p").html("(광고) " + cleanYellowId + ""); // 내용
|
|
| 391 |
+ $("#adTxt p").html("(광고)"); // 내용
|
|
| 344 | 392 |
|
| 345 |
- $("#talkTitle").html("<span>(광고)</span> " + cleanYellowId); // 미리보기 화면 상단
|
|
| 393 |
+// $("#talkTitle").html("<span>(광고)</span> " + cleanYellowId); // 미리보기 화면 상단
|
|
| 394 |
+ $("#talkTitle").html("<span>(광고)</span> "); // 미리보기 화면 상단
|
|
| 346 | 395 |
} |
| 347 | 396 |
|
| 348 | 397 |
}else{
|
... | ... | @@ -354,9 +403,11 @@ |
| 354 | 403 |
if ($("#ad_Y").is(":checked")) {
|
| 355 | 404 |
|
| 356 | 405 |
$("#adTxt").show(); // 내용
|
| 357 |
- $("#adTxt p").html("(광고) " + channelId + ""); // 내용
|
|
| 406 |
+// $("#adTxt p").html("(광고) " + channelId + ""); // 내용
|
|
| 407 |
+ $("#adTxt p").html("(광고)"); // 내용
|
|
| 358 | 408 |
|
| 359 |
- $("#talkTitle").html("<span>(광고)</span> " + channelId); // 미리보기 화면 상단
|
|
| 409 |
+// $("#talkTitle").html("<span>(광고)</span> " + channelId); // 미리보기 화면 상단
|
|
| 410 |
+ $("#talkTitle").html("<span>(광고)</span>"); // 미리보기 화면 상단
|
|
| 360 | 411 |
} else {
|
| 361 | 412 |
$("#adTxt").hide(); // 내용
|
| 362 | 413 |
$("#talkTitle").html(channelId); // 미리보기 화면 상단
|
... | ... | @@ -602,12 +653,6 @@ |
| 602 | 653 |
|
| 603 | 654 |
bizForm.senderKey.value = $("select[name='selectAgentCode']").val(); // 선택 채널ID
|
| 604 | 655 |
|
| 605 |
- |
|
| 606 |
- $('#imgTitle').addClass('file_none')
|
|
| 607 |
- .text("이미지 없음");
|
|
| 608 |
- $('#imgLink').prop('disabled', false); // 회색 처리 + 입력 불가
|
|
| 609 |
- |
|
| 610 |
- |
|
| 611 | 656 |
if(imageUrl == ''){
|
| 612 | 657 |
|
| 613 | 658 |
alert("등록된 이미지가 없습니다.");
|
... | ... | @@ -655,11 +700,20 @@ |
| 655 | 700 |
|
| 656 | 701 |
$('#imgTitle').addClass('file_none')
|
| 657 | 702 |
.text("이미지 없음");
|
| 703 |
+ |
|
| 704 |
+ $('#imgLink').prop('disabled', false); // 회색 처리 제거 + 입력 불가 제거
|
|
| 705 |
+ |
|
| 658 | 706 |
$("#templateImageUrl").val("");
|
| 659 | 707 |
$('.kakao_image').css("display", "none");
|
| 660 | 708 |
$("#kakaoImg").attr("src", "");
|
| 661 | 709 |
$("#imageFileName").val(""); //이미지 파일명 삭제
|
| 662 | 710 |
$("#img_file_0").click(); //이미지 첨부 안함 선택
|
| 711 |
+ |
|
| 712 |
+ |
|
| 713 |
+ |
|
| 714 |
+ |
|
| 715 |
+ |
|
| 716 |
+ |
|
| 663 | 717 |
return false; |
| 664 | 718 |
|
| 665 | 719 |
}else{
|
... | ... | @@ -730,7 +784,6 @@ |
| 730 | 784 |
var imageType = $("input[name=img_file_add]:checked").val(); // 첨부 이미지 종류(없음, 일반, 와이드 이미지)
|
| 731 | 785 |
var imageTitle = $("#imgTitle").text(); //첨부이미지 제목
|
| 732 | 786 |
var imageLink = $("#imgLink").val(); //첨부이미지 클릭시 이동 링크 주소
|
| 733 |
- var inputTemplateAd = $("#ad_Y:checked").val(); // 광고성메시지 선택 여부
|
|
| 734 | 787 |
var inputTemplateContent = $("#inputTemplateContent").val(); // 템플릿 내용
|
| 735 | 788 |
|
| 736 | 789 |
var inputTemplateImageName = $("#templateImageName").val(); // 템플릿 이미지 파일명
|
... | ... | @@ -794,7 +847,6 @@ |
| 794 | 847 |
bizForm.templateName.value = inputTemplateName; |
| 795 | 848 |
//bizForm.imageType.value = imageType; |
| 796 | 849 |
//bizForm.imgLink.value = imageLink; |
| 797 |
- bizForm.adFlag.value = inputTemplateAd; |
|
| 798 | 850 |
bizForm.templateContent.value = inputTemplateContent; |
| 799 | 851 |
|
| 800 | 852 |
var data = new FormData(bizForm); |
... | ... | @@ -1031,8 +1083,6 @@ |
| 1031 | 1083 |
$("#templateContent").val(tmpContents);
|
| 1032 | 1084 |
|
| 1033 | 1085 |
//광고포함 여부 |
| 1034 |
- var adFlag = $("#ad_Y:checked").val();
|
|
| 1035 |
- $("#adFlag").val(adFlag);
|
|
| 1036 | 1086 |
/* var adFlag = $("input[name=adFlag]:checked").val();
|
| 1037 | 1087 |
$("#adFlag").val(adFlag); */
|
| 1038 | 1088 |
|
... | ... | @@ -1084,7 +1134,7 @@ |
| 1084 | 1134 |
}); |
| 1085 | 1135 |
|
| 1086 | 1136 |
// VO에 정의되어있지 않는 필요없는 값은 제거 |
| 1087 |
- ["adFlag", "img_file_add", "userMoney", "callToList"].forEach(function(key) {
|
|
| 1137 |
+ ["img_file_add", "userMoney", "callToList"].forEach(function(key) {
|
|
| 1088 | 1138 |
delete formData[key]; |
| 1089 | 1139 |
}); |
| 1090 | 1140 |
|
... | ... | @@ -1352,13 +1402,13 @@ |
| 1352 | 1402 |
var imgLink = $("#imgLink").val();
|
| 1353 | 1403 |
var imgFileName = $("#imageFileName").val();
|
| 1354 | 1404 |
|
| 1355 |
- |
|
| 1405 |
+ /* |
|
| 1356 | 1406 |
if(imgLink == ''){
|
| 1357 | 1407 |
|
| 1358 | 1408 |
alert("친구톡 이미지 선택시 이동할 링크 주소를 입력해 주세요.");
|
| 1359 | 1409 |
return false; |
| 1360 | 1410 |
|
| 1361 |
- } |
|
| 1411 |
+ } */ |
|
| 1362 | 1412 |
|
| 1363 | 1413 |
if(imgFileName == ''){
|
| 1364 | 1414 |
|
... | ... | @@ -2188,7 +2238,8 @@ |
| 2188 | 2238 |
<!-- 텍스트 미리보기 --> |
| 2189 | 2239 |
<div class="text_preview"> |
| 2190 | 2240 |
<p class="friend_talk_title" id="talkTitle"> |
| 2191 |
- <span>(광고)</span> 채널ID |
|
| 2241 |
+<!-- <span>(광고)</span> 채널ID --> |
|
| 2242 |
+ <span>(광고)</span> |
|
| 2192 | 2243 |
</p> |
| 2193 | 2244 |
<div class="allimtalk_content"> |
| 2194 | 2245 |
<div class="kakao_image" style="display:none;"> |
--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp
... | ... | @@ -227,9 +227,15 @@ |
| 227 | 227 |
<span class="di">분할</span> |
| 228 | 228 |
</c:if> |
| 229 | 229 |
</c:if> |
| 230 |
- <a href="#none" onclick="fn_sentDetailView('${resultAllSentList.msgGroupId}');">
|
|
| 230 |
+ <%-- <a href="#none" onclick="fn_sentDetailView('${resultAllSentList.msgGroupId}');">
|
|
| 231 | 231 |
<c:out value="${resultAllSentList.smsTxt}"/>
|
| 232 |
+ </a> --%> |
|
| 233 |
+ <a href="#none" onclick="fn_sentDetailView('${resultAllSentList.msgGroupId}');">
|
|
| 234 |
+ <c:if test="${resultAllSentList.adFlag eq 'Y'}">(광고)</c:if>
|
|
| 235 |
+ <c:out value="${resultAllSentList.smsTxt}" />
|
|
| 236 |
+ <c:if test="${resultAllSentList.adFlag eq 'Y'}">무료거부 0808800858</c:if>
|
|
| 232 | 237 |
</a> |
| 238 |
+ |
|
| 233 | 239 |
</div> |
| 234 | 240 |
</td> |
| 235 | 241 |
<td> |
--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp
... | ... | @@ -77,13 +77,21 @@ |
| 77 | 77 |
|
| 78 | 78 |
<c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
|
| 79 | 79 |
<!-- 문자 미리보기 --> |
| 80 |
- <div class="tab_phone" id="tab_phone_2"> |
|
| 80 |
+ <div class="tab_phone" id="tab_phone_2" style="display: none;position:relative;"> |
|
| 81 | 81 |
<div class="phoneIn"> |
| 82 | 82 |
<div> |
| 83 | 83 |
<p class="prev_p"><img src="/publish/images/search.png"> 문자내용</p> |
| 84 | 84 |
<div class="text_length2 clearfix"> |
| 85 | 85 |
<c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
|
| 86 | 86 |
<c:choose> |
| 87 |
+ <c:when test="${resultMsgDetail.bizKakaoResendType eq 'SMS'}">
|
|
| 88 |
+ <span class="msg_com msg_short">단문</span> |
|
| 89 |
+ </c:when> |
|
| 90 |
+ <c:otherwise> |
|
| 91 |
+ <span class="msg_com msg_long">장문</span> |
|
| 92 |
+ </c:otherwise> |
|
| 93 |
+ </c:choose> |
|
| 94 |
+<%-- <c:choose> |
|
| 87 | 95 |
<c:when test="${resultMsgDetail.bizKakaoResendTypeCnt > 1}">
|
| 88 | 96 |
<span class="msg_com msg_short">단문</span> |
| 89 | 97 |
<span class="msg_com msg_long">장문</span> |
... | ... | @@ -95,7 +103,7 @@ |
| 95 | 103 |
<c:otherwise> |
| 96 | 104 |
<span class="msg_com msg_long">장문</span> |
| 97 | 105 |
</c:otherwise> |
| 98 |
- </c:choose> |
|
| 106 |
+ </c:choose> --%> |
|
| 99 | 107 |
</c:if> |
| 100 | 108 |
<div> |
| 101 | 109 |
<span>글자크기</span> |
--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp
... | ... | @@ -364,6 +364,7 @@ |
| 364 | 364 |
|
| 365 | 365 |
cntView('allCnt', response.allCnt);
|
| 366 | 366 |
cntView('atCnt', response.atCnt);
|
| 367 |
+ cntView('ftCnt', response.ftCnt);
|
|
| 367 | 368 |
//cntView('ftCnt', response.ftCnt);
|
| 368 | 369 |
}, |
| 369 | 370 |
error: function(error) {
|
... | ... | @@ -564,6 +565,15 @@ |
| 564 | 565 |
<table class="tType4"><tbody><tr><td>LOADING...</td></tr></tbody></table> |
| 565 | 566 |
</div> |
| 566 | 567 |
</div> |
| 568 |
+ <div class="rev_admin_in"> |
|
| 569 |
+ <div class="rev_admin_top clearfix"> |
|
| 570 |
+ <p>친구톡</p> |
|
| 571 |
+ <p></p> |
|
| 572 |
+ </div> |
|
| 573 |
+ <div class="rev_admin_btm admin_btm"> |
|
| 574 |
+ <table class="tType4"><tbody><tr><td>LOADING...</td></tr></tbody></table> |
|
| 575 |
+ </div> |
|
| 576 |
+ </div> |
|
| 567 | 577 |
</div> |
| 568 | 578 |
|
| 569 | 579 |
<div class="rev_admin" id="lodingAfter" style="display:none;"> |
... | ... | @@ -607,26 +617,26 @@ |
| 607 | 617 |
</dl> |
| 608 | 618 |
</div> |
| 609 | 619 |
</div> |
| 610 |
- <%-- <div class="rev_admin_in" id="ftCnt"> |
|
| 620 |
+ <div class="rev_admin_in" id="ftCnt"> |
|
| 611 | 621 |
<div class="rev_admin_top clearfix"> |
| 612 | 622 |
<p>친구톡</p> |
| 613 |
- <p><span><fmt:formatNumber value="${totFtCnt}" pattern="#,###"/></span> 건</p>
|
|
| 623 |
+ <p><span name="allCnt">0</span> 건</p> |
|
| 614 | 624 |
</div> |
| 615 | 625 |
<div class="rev_admin_btm"> |
| 616 | 626 |
<dl> |
| 617 | 627 |
<dt>대기</dt> |
| 618 |
- <dd><span class="c_002c9a" name="waitCnt"><fmt:formatNumber value="${waitFtCnt}" pattern="#,###"/></span>건</dd>
|
|
| 628 |
+ <dd><span class="c_002c9a" name="waitCnt">0</span>건</dd> |
|
| 619 | 629 |
</dl> |
| 620 | 630 |
<dl> |
| 621 | 631 |
<dt>성공</dt> |
| 622 |
- <dd><span class="c_002c9a" name="succCnt"><fmt:formatNumber value="${succFtCnt}" pattern="#,###"/></span>건</dd>
|
|
| 632 |
+ <dd><span class="c_002c9a" name="succCnt">0</span>건</dd> |
|
| 623 | 633 |
</dl> |
| 624 | 634 |
<dl> |
| 625 | 635 |
<dt>실패</dt> |
| 626 |
- <dd><span class="c_e40000" name="failCnt"><fmt:formatNumber value="${failFtCnt}" pattern="#,###"/></span>건</dd>
|
|
| 636 |
+ <dd><span class="c_e40000" name="failCnt">0</span>건</dd> |
|
| 627 | 637 |
</dl> |
| 628 | 638 |
</div> |
| 629 |
- </div> --%> |
|
| 639 |
+ </div> |
|
| 630 | 640 |
</div> |
| 631 | 641 |
|
| 632 | 642 |
<div class="list_tab_wrap2 type4"> |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?