이지우 - 관리자 친구톡 관련 항목들 추가

src/main/java/itn/let/mjo/msgagent/service/MjonMsgAgentStsVO.java

@@ -3,12 +3,15 @@
  */
 package itn.let.mjo.msgagent.service;
 
-import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * @author woo
  *
  */
+@Getter
+@Setter
 public class MjonMsgAgentStsVO {
 
 	private String agentCode;				//전송사 구분 코드 (01: 아이하트 , 02:현대 퓨처넷 , 03: 아이엠오)
@@ -40,225 +43,8 @@ public class MjonMsgAgentStsVO {
 	private double kakaoAtCost;
 	private double kakaoFtCost;
 	private double kakaoFt2Cost;
-	private double kakaoft3Cost;
+	private double kakaoFt3Cost;
 	private double faxCost;
 	
-	public String getBlineYn() {
-		return blineYn;
-	}
-	public void setBlineYn(String blineYn) {
-		this.blineYn = blineYn;
-	}
-	public double getMinPrice() {
-		return minPrice;
-	}
-	public void setMinPrice(double minPrice) {
-		this.minPrice = minPrice;
-	}
-	public double getMaxPrice() {
-		return maxPrice;
-	}
-	public void setMaxPrice(double maxPrice) {
-		this.maxPrice = maxPrice;
-	}
-	
-	public String getUserId() {
-		return userId;
-	}
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-	public String getAgentCode() {
-		return agentCode;
-	}
-	public void setAgentCode(String agentCode) {
-		this.agentCode = agentCode;
-	}
-	public String getSendRate() {
-		return sendRate;
-	}
-	public void setSendRate(String sendRate) {
-		this.sendRate = sendRate;
-	}
-	public String getUseYn() {
-		return useYn;
-	}
-	public void setUseYn(String useYn) {
-		this.useYn = useYn;
-	}
-	public String getRegisterId() {
-		return RegisterId;
-	}
-	public void setRegisterId(String registerId) {
-		RegisterId = registerId;
-	}
-	public String getRegistPnttm() {
-		return RegistPnttm;
-	}
-	public void setRegistPnttm(String registPnttm) {
-		RegistPnttm = registPnttm;
-	}
-	public String getLastUpdtPnttm() {
-		return lastUpdtPnttm;
-	}
-	public void setLastUpdtPnttm(String lastUpdtPnttm) {
-		this.lastUpdtPnttm = lastUpdtPnttm;
-	}
-	public String getLastUpdusrId() {
-		return lastUpdusrId;
-	}
-	public void setLastUpdusrId(String lastUpdusrId) {
-		this.lastUpdusrId = lastUpdusrId;
-	}
-	public String getMsgType() {
-		return msgType;
-	}
-	public void setMsgType(String msgType) {
-		this.msgType = msgType;
-	}
-	public String getRepAgent() {
-		return repAgent;
-	}
-	public void setRepAgent(String repAgent) {
-		this.repAgent = repAgent;
-	}
-	public String getAgentPrice() {
-		return agentPrice;
-	}
-	public void setAgentPrice(String agentPrice) {
-		this.agentPrice = agentPrice;
-	}
-	public String getAgentCodeNm() {
-		return agentCodeNm;
-	}
-	public void setAgentCodeNm(String agentCodeNm) {
-		this.agentCodeNm = agentCodeNm;
-	}
-	public String getAgetnCodeDc() {
-		return agetnCodeDc;
-	}
-	public void setAgetnCodeDc(String agetnCodeDc) {
-		this.agetnCodeDc = agetnCodeDc;
-	}
-	
-	public String getSearchUseYn() {
-		return searchUseYn;
-	}
-	public void setSearchUseYn(String searchUseYn) {
-		this.searchUseYn = searchUseYn;
-	}
-	
-	
-	public String getSelectAgentCode() {
-		return selectAgentCode;
-	}
-	public void setSelectAgentCode(String selectAgentCode) {
-		this.selectAgentCode = selectAgentCode;
-	}	
-
-	// 일괄 수정 VO
-	private List<String> repAgents;
-
-	public List<String> getRepAgents() {
-		return repAgents;
-	}
-	public void setRepAgents(List<String> repAgents) {
-		this.repAgents = repAgents;
-	}
-	
-	private List<String> msgTypes;
-	public List<String> getMsgTypes() {
-		return msgTypes;
-	}
-	public void setMsgTypes(List<String> msgTypes) {
-		this.msgTypes = msgTypes;
-	}
-	
-	private List<String> useYns;
-	public List<String> getUseYns() {
-		return useYns;
-	}
-	public void setUseYns(List<String> useYns) {
-		this.useYns = useYns;
-	}
-	
-	private List<String> sendRates;
-	public List<String> getSendRates() {
-		return sendRates;
-	}
-	public void setSendRates(List<String> sendRates) {
-		this.sendRates = sendRates;
-	}
-	
-	private List<String> agentPrices;
-	public List<String> getAgentPrices() {
-		return agentPrices;
-	}
-	public void setAgentPrices(List<String> agentPrices) {
-		this.agentPrices = agentPrices;
-	}
-	
-	private List<String> agentCodes;
-	public List<String> getAgentCodes() {
-		return agentCodes;
-	}
-	public void setAgentCodes(List<String> agentCodes) {
-		this.agentCodes = agentCodes;
-	}
-	public String getCostId() {
-		return costId;
-	}
-	public void setCostId(String costId) {
-		this.costId = costId;
-	}
-	public double getShortCost() {
-		return shortCost;
-	}
-	public void setShortCost(double shortCost) {
-		this.shortCost = shortCost;
-	}
-	public double getLongCost() {
-		return longCost;
-	}
-	public void setLongCost(double longCost) {
-		this.longCost = longCost;
-	}
-	public double getPictureCost() {
-		return pictureCost;
-	}
-	public void setPictureCost(double pictureCost) {
-		this.pictureCost = pictureCost;
-	}
-	public double getKakaoAtCost() {
-		return kakaoAtCost;
-	}
-	public void setKakaoAtCost(double kakaoAtCost) {
-		this.kakaoAtCost = kakaoAtCost;
-	}
-	public double getKakaoFtCost() {
-		return kakaoFtCost;
-	}
-	public void setKakaoFtCost(double kakaoFtCost) {
-		this.kakaoFtCost = kakaoFtCost;
-	}
-	public double getKakaoFt2Cost() {
-		return kakaoFt2Cost;
-	}
-	public void setKakaoFt2Cost(double kakaoFt2Cost) {
-		this.kakaoFt2Cost = kakaoFt2Cost;
-	}
-	public double getKakaoft3Cost() {
-		return kakaoft3Cost;
-	}
-	public void setKakaoft3Cost(double kakaoft3Cost) {
-		this.kakaoft3Cost = kakaoft3Cost;
-	}
-	public double getFaxCost() {
-		return faxCost;
-	}
-	public void setFaxCost(double faxCost) {
-		this.faxCost = faxCost;
-	}	
-	
 	
 }

src/main/java/itn/let/sym/site/service/JoinSettingVO.java

@@ -1,5 +1,8 @@
 package itn.let.sym.site.service;
 
+import lombok.Getter;
+import lombok.Setter;
+
 /**
  * 로그인정책에 대한 VO 클래스를 정의한다.
  * 로그인정책정보의 목록 항목을 관리한다.
@@ -18,6 +21,8 @@ package itn.let.sym.site.service;
  *
  * </pre>
  */
+@Getter
+@Setter
 public class JoinSettingVO  {
 
 	/**
@@ -37,6 +42,8 @@ public class JoinSettingVO  {
 	private float customTextPrice;			// 텍스트 단순수정
 	private float kakaoAtPrice;				// 카카오 알림톡 단가
 	private float kakaoFtPrice;				// 카카오 친구톡 단가
+	private float kakaoFtImgPrice;			// 카카오 친구톡 이미지 단가
+	private float kakaoFtWideImgPrice;		// 카카오 친구톡 와이드 이미지 단가
 	private float faxPrice;					// 팩스 단가
 	
 	private float refundPer; //환불 비율
@@ -51,188 +58,5 @@ public class JoinSettingVO  {
 	private String smishingNoti;	//첫결제(카드제외) 스미싱의심 알림 여부
 	private String holiSmishingNoti; //야간 스미싱알림 여부
 
-	public String getSmishingNoti() {
-		return smishingNoti;
-	}
-
-	public void setSmishingNoti(String smishingNoti) {
-		this.smishingNoti = smishingNoti;
-	}
-
-	public float getShortPrice() {
-		return shortPrice;
-	}
-
-	public void setShortPrice(float shortPrice) {
-		this.shortPrice = shortPrice;
-	}
-
-	public float getLongPrice() {
-		return longPrice;
-	}
-
-	public void setLongPrice(float longPrice) {
-		this.longPrice = longPrice;
-	}
-
-	public float getPicturePrice() {
-		return picturePrice;
-	}
-
-	public void setPicturePrice(float picturePrice) {
-		this.picturePrice = picturePrice;
-	}
-
-	public float getPicture2Price() {
-		return picture2Price;
-	}
-
-	public void setPicture2Price(float picture2Price) {
-		this.picture2Price = picture2Price;
-	}
-
-	public float getPicture3Price() {
-		return picture3Price;
-	}
-
-	public void setPicture3Price(float picture3Price) {
-		this.picture3Price = picture3Price;
-	}
-
-	public float getCustomSamplePrice() {
-		return customSamplePrice;
-	}
-
-	public void setCustomSamplePrice(float customSamplePrice) {
-		this.customSamplePrice = customSamplePrice;
-	}
-
-	public float getCustomEditPrice() {
-		return customEditPrice;
-	}
-
-	public void setCustomEditPrice(float customEditPrice) {
-		this.customEditPrice = customEditPrice;
-	}
-
-	public float getCustomEdit3Price() {
-		return customEdit3Price;
-	}
-
-	public void setCustomEdit3Price(float customEdit3Price) {
-		this.customEdit3Price = customEdit3Price;
-	}
-
-	public float getCustomTextPrice() {
-		return customTextPrice;
-	}
-
-	public void setCustomTextPrice(float customTextPrice) {
-		this.customTextPrice = customTextPrice;
-	}
-	
-	public float getRefundPer() {
-		return refundPer;
-	}
-
-	public void setRefundPer(float refundPer) {
-		this.refundPer = refundPer;
-	}
-
-	public float getJoinCash() {
-		return joinCash;
-	}
-
-	public void setJoinCash(float joinCash) {
-		this.joinCash = joinCash;
-	}
-
-	public float getPointPer() {
-		return pointPer;
-	}
-
-	public void setPointPer(float pointPer) {
-		this.pointPer = pointPer;
-	}
-
-	public String getLasUpdusrId() {
-		return lasUpdusrId;
-	}
-
-	public void setLasUpdusrId(String lasUpdusrId) {
-		this.lasUpdusrId = lasUpdusrId;
-	}
-
-	public String getLastUpdtPnttm() {
-		return lastUpdtPnttm;
-	}
-
-	public void setLastUpdtPnttm(String lastUpdtPnttm) {
-		this.lastUpdtPnttm = lastUpdtPnttm;
-	}
-
-	public String getJoinCertType() {
-		return joinCertType;
-	}
-
-	public void setJoinCertType(String joinCertType) {
-		this.joinCertType = joinCertType;
-	}
-
-	public String getSmsNoti() {
-		return smsNoti;
-	}
-
-	public void setSmsNoti(String smsNoti) {
-		this.smsNoti = smsNoti;
-	}
-
-	public String getEmailNoti() {
-		return emailNoti;
-	}
-
-	public void setEmailNoti(String emailNoti) {
-		this.emailNoti = emailNoti;
-	}
-	
-	public String getSlackNoti() {
-		return slackNoti;
-	}
-
-	public void setSlackNoti(String slackNoti) {
-		this.slackNoti = slackNoti;
-	}
-
-	public float getKakaoAtPrice() {
-		return kakaoAtPrice;
-	}
-
-	public void setKakaoAtPrice(float kakaoAtPrice) {
-		this.kakaoAtPrice = kakaoAtPrice;
-	}
-
-	public float getKakaoFtPrice() {
-		return kakaoFtPrice;
-	}
-
-	public void setKakaoFtPrice(float kakaoFtPrice) {
-		this.kakaoFtPrice = kakaoFtPrice;
-	}
-
-	public float getFaxPrice() {
-		return faxPrice;
-	}
-
-	public void setFaxPrice(float faxPrice) {
-		this.faxPrice = faxPrice;
-	}
-
-	public String getHoliSmishingNoti() {
-		return holiSmishingNoti;
-	}
-
-	public void setHoliSmishingNoti(String holiSmishingNoti) {
-		this.holiSmishingNoti = holiSmishingNoti;
-	}	
 	
 }

src/main/java/itn/let/uss/umt/web/EgovUserManageController.java

@@ -1050,6 +1050,8 @@ public class EgovUserManageController {
 		model.addAttribute("sysPicture3Price", sysJoinSetVO.getPicture3Price());
 		model.addAttribute("sysKakaoAtPrice", sysJoinSetVO.getKakaoAtPrice());
 		model.addAttribute("sysKakaoFtPrice", sysJoinSetVO.getKakaoFtPrice());
+		model.addAttribute("sysKakaoFtImgPrice", sysJoinSetVO.getKakaoFtImgPrice());
+		model.addAttribute("sysKakaoFtWideImgPrice", sysJoinSetVO.getKakaoFtWideImgPrice());
 		
 		// 등급제 단가 추출 => 시스템 단가에 적용
 		 
@@ -1062,6 +1064,8 @@ public class EgovUserManageController {
 		Float picture3Price = mberManageVO.getPicture3Price();
 		Float kakaoAtPrice = mberManageVO.getKakaoAtPrice();
 		Float kakaoFtPrice = mberManageVO.getKakaoFtPrice();
+		Float kakaoFtImgPrice = mberManageVO.getKakaoFtImgPrice();
+		Float kakaoFtWideImgPrice = mberManageVO.getKakaoFtWideImgPrice();
 		Float faxPrice = mberManageVO.getFaxPrice();
 		System.out.println("mberManageVO.getFaxPrice() : " + mberManageVO.getFaxPrice());
 		
@@ -1082,6 +1086,14 @@ public class EgovUserManageController {
 			kakaoFtPrice = sysJoinSetVO.getKakaoFtPrice();
 		}
 		
+		if(kakaoFtImgPrice < 1) {
+			kakaoFtImgPrice = sysJoinSetVO.getKakaoFtImgPrice();
+		}
+		
+		if(kakaoFtWideImgPrice < 1) {
+			kakaoFtWideImgPrice = sysJoinSetVO.getKakaoFtWideImgPrice();
+		}
+		
 		if(faxPrice < 1) {
 			faxPrice = sysJoinSetVO.getFaxPrice();
 		}
@@ -1093,6 +1105,8 @@ public class EgovUserManageController {
 		model.addAttribute("picture3Price", picture3Price);
 		model.addAttribute("kakaoAtPrice", kakaoAtPrice);
 		model.addAttribute("kakaoFtPrice", kakaoFtPrice);
+		model.addAttribute("kakaoFtImgPrice", kakaoFtImgPrice);
+		model.addAttribute("kakaoFtWideImgPrice", kakaoFtWideImgPrice);
 		model.addAttribute("faxPrice", faxPrice);
 		model.addAttribute("sysJoinSetVO", sysJoinSetVO);
 		
@@ -1278,6 +1292,12 @@ public class EgovUserManageController {
 			double kakaoFtCost = 0.00;
 			double kakaoFtMargin = 0.00;
 			
+			double kakaoFtImgCost = 0.00;
+			double kakaoFtImgMargin = 0.00;
+			
+			double kakaoFtWideImgCost = 0.00;
+			double kakaoFtWideImgMargin = 0.00;
+			
 			double faxCost = 0.00;
 			double faxMargin = 0.00;
 			
@@ -1320,6 +1340,8 @@ public class EgovUserManageController {
 			MjonMsgAgentStsVO resultAgentCost = mjonMsgAgentStsService.selectHotLineAgentCost("04");
 			kakaoAtCost = resultAgentCost.getKakaoAtCost();	//알림톡 원가
 			kakaoFtCost = resultAgentCost.getKakaoFtCost();	//친구톡 원가
+			kakaoFtImgCost = resultAgentCost.getKakaoFt2Cost();	//친구톡 이미지 원가
+			kakaoFtWideImgCost = resultAgentCost.getKakaoFt3Cost();	//친구톡 와이드 이미지 원가
 			
 			// kakao 알림톡 마진률 계산
 			//kakaoAtCost = kakaoApiService.selectKakaoCost();
@@ -1328,6 +1350,12 @@ public class EgovUserManageController {
 			//kakao 친구톡 마진률 계산
 			kakaoFtMargin = (1-(kakaoFtCost / kakaoFtPrice))*100;
 			
+			//kakao 친구톡 이미지 마진률 계산
+			kakaoFtImgMargin = (1-(kakaoFtImgCost / kakaoFtImgPrice))*100;
+			
+			//kakao 친구톡 와이드 이미지 마진률 계산
+			kakaoFtWideImgMargin = (1-(kakaoFtWideImgCost / kakaoFtWideImgPrice))*100;
+			
 			// fax 원가 SELECT
 			faxCost = faxService.getFaxCost();
 			// fax 마직 계산 :: 1-원가/단가
@@ -1345,8 +1373,12 @@ public class EgovUserManageController {
 			model.addAttribute("avgPriceP", avgPriceP);
 			model.addAttribute("kakaoAtCost", kakaoAtCost);
 			model.addAttribute("kakaoFtCost", kakaoFtCost);
+			model.addAttribute("kakaoFtImgCost", kakaoFtImgCost);
+			model.addAttribute("kakaoFtWideImgCost",kakaoFtWideImgCost);
 			model.addAttribute("kakaoAtMargin", kakaoAtMargin);
 			model.addAttribute("kakaoFtMargin", kakaoFtMargin);
+			model.addAttribute("kakaoFtImgMargin", kakaoFtImgMargin);
+			model.addAttribute("kakaoFtWideImgMargin", kakaoFtWideImgMargin);
 			model.addAttribute("faxCost", faxCost);
 			model.addAttribute("faxMargin", faxMargin);
 		}		
@@ -3042,6 +3074,15 @@ public class EgovUserManageController {
             	mberManageVO.setKakaoFtPrice(0);
             }
             
+            // 친구톡 이미지=> 수정하려는 단가가 시스템기본단가와 동일할경우 0으로 세팅
+            if (Float.compare(sysJoinSetVO.getKakaoFtImgPrice(), mberManageVO.getKakaoFtImgPrice()) == 0) {
+            	mberManageVO.setKakaoFtImgPrice(0);
+            }
+            // 친구톡 와이드 이미지=> 수정하려는 단가가 시스템기본단가와 동일할경우 0으로 세팅
+            if (Float.compare(sysJoinSetVO.getKakaoFtWideImgPrice(), mberManageVO.getKakaoFtWideImgPrice()) == 0) {
+            	mberManageVO.setKakaoFtWideImgPrice(0);
+            }
+            
     		int resultCnt = mberManageService.updateUserPrice(mberManageVO);
     		
     		if(resultCnt > 0) {

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

@@ -2139,18 +2139,20 @@
 	<select id="mjonMsgDAO.selectJoinSettingInfo" resultClass="joinSettingVO">
 	
 		SELECT 
-			SHORT_PRICE				AS shortPrice
+			SHORT_PRICE					AS shortPrice
-			, LONG_PRICE			AS longPrice
+			, LONG_PRICE				AS longPrice
-			, PICTURE_PRICE			AS picturePrice
+			, PICTURE_PRICE				AS picturePrice
-			, PICTURE2_PRICE		AS picture2Price
+			, PICTURE2_PRICE			AS picture2Price
-			, PICTURE3_PRICE		AS picture3Price
+			, PICTURE3_PRICE			AS picture3Price
-			, CUSTOM_SAMPLE_PRICE	AS customSamplePrice
+			, CUSTOM_SAMPLE_PRICE		AS customSamplePrice
-			, CUSTOM_EDIT_PRICE		AS customEditPrice
+			, CUSTOM_EDIT_PRICE			AS customEditPrice
-			, CUSTOM_EDIT3_PRICE	AS customEdit3Price
+			, CUSTOM_EDIT3_PRICE		AS customEdit3Price
-			, CUSTOM_TEXT_PRICE		AS customTextPrice
+			, CUSTOM_TEXT_PRICE			AS customTextPrice
-			, POINT_PER				AS pointPer
+			, POINT_PER					AS pointPer
-			, KAKAO_AT_PRICE		AS kakaoAtPrice
+			, KAKAO_AT_PRICE			AS kakaoAtPrice
-			, KAKAO_FT_PRICE		AS kakaoFtPrice
+			, KAKAO_FT_PRICE			AS kakaoFtPrice
+			, KAKAO_FT_IMG_PRICE		AS kakaoFtImgPrice
+			, KAKAO_FT_WIDE_IMG_PRICE	AS kakaoFtWideImgPrice
 			, FAX_PRICE				AS faxPrice
 		FROM MJ_MBER_SETTING
 	

src/main/resources/egovframework/sqlmap/let/sym/site/EgovSiteManage_SQL_Mysql.xml

@@ -768,6 +768,9 @@
 			CUSTOM_EDIT3_PRICE AS customEdit3Price,
 			CUSTOM_TEXT_PRICE AS customTextPrice,
 			KAKAO_AT_PRICE AS kakaoAtPrice,
+			KAKAO_FT_PRICE AS kakaoFtPrice,
+			KAKAO_FT_IMG_PRICE AS kakaoFtImgPrice,
+			KAKAO_FT_WIDE_IMG_PRICE AS kakaoFtWideImgPrice,
 			FAX_PRICE AS faxPrice,
 			LAST_UPDUSR_ID AS lasUpdusrId,
 			LAST_UPDT_PNTTM AS lastUpdtPnttm
@@ -792,6 +795,9 @@
 			,CUSTOM_EDIT3_PRICE = #customEdit3Price#
 			,CUSTOM_TEXT_PRICE = #customTextPrice#
 			,KAKAO_AT_PRICE = #kakaoAtPrice#
+			,KAKAO_FT_PRICE = #kakaoFtPrice#
+			,KAKAO_FT_IMG_PRICE = #kakaoFtImgPrice#
+			,KAKAO_FT_WIDE_IMG_PRICE = #kakaoFtWideImgPrice#
 			,FAX_PRICE = #faxPrice#
 			,LAST_UPDUSR_ID = #lasUpdusrId#
 			,LAST_UPDT_PNTTM = NOW()

src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp

@@ -75,6 +75,9 @@ var sysPicturePrice = "${sysPicturePrice}";
 var sysPicture2Price = "${sysPicture2Price}";
 var sysPicture3Price = "${sysPicture3Price}";
 var sysKakaoAtPrice = "${sysKakaoAtPrice}";
+var sysKakaoFtPrice = "${sysKakaoFtPrice}";
+var sysKakaoFtImgPrice = "${sysKakaoFtImgPrice}";
+var sysKakaoFtWideImgPrice = "${sysKakaoFtWideImgPrice}";
 
 $(document).ready(function(){
 	console.log('${serverName}');
@@ -654,6 +657,9 @@ function fnPriceReset() {
 	form.picture2Price.value = sysPicture2Price;
 	form.picture3Price.value = sysPicture3Price;
 	form.kakaoAtPrice.value = sysKakaoAtPrice;
+	form.kakaoFtPrice.value = sysKakaoFtPrice;
+	form.kakaoFtImgPrice.value = sysKakaoFtImgPrice;
+	form.kakaoFtWideImgPrice.value = sysKakaoFtWideImgPrice;
 }
 
 
@@ -720,7 +726,7 @@ function fnPriceUpdate(mberId){
 				alert(returnData.message);
 			}
 		},
-        error: function (e) { alert("수신거부번호 등록에 실패하였습니다."); console.log("ERROR : ", e); }
+        error: function (e) { alert("문자 발송 금액 수정에 실패하였습니다."); console.log("ERROR : ", e); }
     });
 	
 }
@@ -786,7 +792,7 @@ function fnFaxPriceUpdate(mberId){
 				alert(returnData.message);
 			}
 		},
-        error: function (e) { alert("수신거부번호 등록에 실패하였습니다."); console.log("ERROR : ", e); }
+        error: function (e) { alert("팩스 발송 금액 수정에 실패하였습니다."); console.log("ERROR : ", e); }
     });
 	
 }
@@ -4668,7 +4674,7 @@ function fnInputSmsTxt(){
 					
 					<!-- 최근 카카오톡 전송 내역 -->
 					<div class="title_box">
-						<p>최근 알림톡/친구톡 전송 내역</p>
+						<p>최근 카카오톡 전송 내역</p>
 					</div>
 					<!-- 전송완료 -->
 					<div class="send_kakao_wrap">
@@ -4966,7 +4972,7 @@ function fnInputSmsTxt(){
 					<!-- 최근 알림톡 지연 내역 -->
 					<form id="kakaoATDelayForm" name="kakaoATDelayForm" mehoth="post">
 						<div class="title_box">
-							<p>최근 알림톡 지연 내역</p>
+							<p>최근 카카오톡 지연 내역</p>
 							<div class="button_box">
 								<button type="button" onclick="kakaoATDelaySendArray(); return false;" class="fillBlue">발송승인</button>
 								<button type="button" onclick="kakaoATDelayCancelArray(); return false;" class="fillRed">발송취소</button>
@@ -5468,7 +5474,7 @@ function fnInputSmsTxt(){
 				  		<button type="button" onclick="layerPopOpen('price');">발송 금액 변경</button>
 					</div>
 					<div class="title_box">
-						<p>알림톡 / 친구톡 / 팩스 금액</p>
+						<p>카톡/팩스 발송금액</p>
 					</div>
 					<!-- 알림톡 친구톡 팩스 -->
 					<table class="user_table_col">
@@ -5480,10 +5486,15 @@ function fnInputSmsTxt(){
 						</colgroup>
 						<thead>
 							<tr>
-								<th>구분</th>
+								<th rowspan="2">구분</th>
-								<th>알림톡(<fmt:formatNumber value="${sysJoinSetVO.kakaoAtPrice}" pattern="###.#" />원)</th>
+								<th rowspan="2">알림톡(<fmt:formatNumber value="${sysJoinSetVO.kakaoAtPrice}" pattern="###.#" />원)</th>
-								<th>친구톡(<fmt:formatNumber value="${sysJoinSetVO.kakaoFtPrice}" pattern="###.#" />원)</th>
+								<th colspan="3">친구톡</th>
-								<th>팩스(<fmt:formatNumber value="${sysJoinSetVO.faxPrice}" pattern="###.#" />원)</th>
+								<th rowspan="2">팩스(<fmt:formatNumber value="${sysJoinSetVO.faxPrice}" pattern="###.#" />원)</th>
+							</tr>
+							<tr>
+								<th style="border-left: 1px solid #d5d5d5;">텍스트(<fmt:formatNumber value="${sysJoinSetVO.kakaoFtPrice}" pattern="###.#" />원)</th>
+								<th >이미지(<fmt:formatNumber value="${sysJoinSetVO.kakaoFtImgPrice}" pattern="###.#" />원)</th>
+								<th >와이드(<fmt:formatNumber value="${sysJoinSetVO.kakaoFtWideImgPrice}" pattern="###.#" />원)</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -5491,6 +5502,8 @@ function fnInputSmsTxt(){
 								<td>문자온 원가</td>
 								<td><c:out value="${kakaoAtCost}"/></td>
 								<td><c:out value="${kakaoFtCost}"/></td>
+								<td><c:out value="${kakaoFtImgCost}"/></td>
+								<td><c:out value="${kakaoFtWideImgCost}"/></td>
 								<td><c:out value="${faxCost}"/></td>
 							</tr>
 							<tr>
@@ -5501,21 +5514,29 @@ function fnInputSmsTxt(){
 								<td>
 									<fmt:formatNumber value='${kakaoFtPrice}' pattern='###.#' />
 								</td>
+								<td>
+									<fmt:formatNumber value='${kakaoFtImgPrice}' pattern='###.#' />
+								</td>
+								<td>
+									<fmt:formatNumber value='${kakaoFtWideImgPrice}' pattern='###.#' />
+								</td>
 								<td>
 									<fmt:formatNumber value='${faxPrice}' pattern='###.#' />
 								</td>
 							</tr>
 							<tr>
 								<td>마진률</td>
-								<td><fmt:formatNumber value="${kakaoAtMargin}" pattern=".0" />%</td>
+								<td><fmt:formatNumber value="${kakaoAtMargin}" pattern="###.#" />%</td>
-								<td><fmt:formatNumber value="${kakaoFtMargin}" pattern=".0" />%</td>
+								<td><fmt:formatNumber value="${kakaoFtMargin}" pattern="###.#" />%</td>
-								<td><fmt:formatNumber value="${faxMargin}" pattern=".0" />%</td>
+								<td><fmt:formatNumber value="${kakaoFtImgMargin}" pattern="###.#" />%</td>
+								<td><fmt:formatNumber value="${kakaoFtWideImgMargin}" pattern="###.#" />%</td>
+								<td><fmt:formatNumber value="${faxMargin}" pattern="###.#" />%</td>
 							</tr>
 						</tbody>
 					</table>
 					<!-- //문자전송금액 -->
 				  	<div class="button_rightbox">
-				  		<button type="button" onclick="layerPopOpen('price');">알림톡 금액 변경</button>
+				  		<button type="button" onclick="layerPopOpen('price');">카톡 금액 변경</button>
 				  		<button type="button" onclick="layerPopOpen('fax');">팩스 금액 변경</button>
 					</div>
 					
@@ -5929,7 +5950,7 @@ function fnInputSmsTxt(){
 	<!-- 문자전송 금액팝업 -->
 	<form id="msgPriceForm" name="msgPriceForm" method="post">
 		<div class="layer_popup layer_price">
-			<div class="title_box">문자발송 금액<button type="button" class="close_btn" onclick="layerPopClose(this);"></button></div>
+			<div class="title_box">카톡발송 금액<button type="button" class="close_btn" onclick="layerPopClose(this);"></button></div>
 			<div class="layer_content">
 				<table>
 					<colgroup>
@@ -5966,9 +5987,17 @@ function fnInputSmsTxt(){
 							<td><input type="text" name="kakaoAtPrice" id="kakaoAtPrice" value="<c:out value='${kakaoAtPrice}'/>"/></td>
 						</tr>
 						<tr>
-							<th>친구톡 금액</th>
+							<th>친구톡 텍스트 금액</th>
 							<td><input type="text" name="kakaoFtPrice" id="kakaoFtPrice" value="<c:out value='${kakaoFtPrice}'/>"/></td>
 						</tr>
+						<tr>
+							<th>친구톡 이미지 금액</th>
+							<td><input type="text" name="kakaoFtImgPrice" id="kakaoFtImgPrice" value="<c:out value='${kakaoFtImgPrice}'/>"/></td>
+						</tr>
+						<tr>
+							<th>친구톡 와이드 금액</th>
+							<td><input type="text" name="kakaoFtWideImgPrice" id="kakaoFtWideImgPrice" value="<c:out value='${kakaoFtWideImgPrice}'/>"/></td>
+						</tr>
 					</tbody>
 				</table>
 				<div class="button_box">

src/main/webapp/WEB-INF/jsp/sym/site/baseUnitPrice.jsp

@@ -90,6 +90,18 @@
 							<th>카카오 알림톡</th>
 							<td><input type="text" name="kakaoAtPrice" style="width:50%" value="<c:out value='${joinSettingVO.kakaoAtPrice}' />" /></td>
 						</tr>
+						<tr>
+							<th>카카오 친구톡 텍스트</th>
+							<td><input type="text" name="kakaoFtPrice" style="width:50%" value="<c:out value='${joinSettingVO.kakaoFtPrice}' />" /></td>
+						</tr>
+						<tr>
+							<th>카카오 친구톡 이미지</th>
+							<td><input type="text" name="kakaoFtImgPrice" style="width:50%" value="<c:out value='${joinSettingVO.kakaoFtImgPrice}' />" /></td>
+						</tr>
+						<tr>
+							<th>카카오 친구톡 와이드</th>
+							<td><input type="text" name="kakaoFtWideImgPrice" style="width:50%" value="<c:out value='${joinSettingVO.kakaoFtWideImgPrice}' />" /></td>
+						</tr>
 						<tr>
 							<th>팩스</th>
 							<td><input type="text" name="faxPrice" style="width:50%" value="<c:out value='${joinSettingVO.faxPrice}' />" /></td>

src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp

@@ -403,8 +403,8 @@ function fnSmishingUpdate(flag) {
 	<div class="contWrap">
 		<div class="pageTitle">
 			<div class="pageIcon"><img src="/pb/img/pageTitIcon4.png" alt=""></div>
-			<h2 class="titType1 c_222222 fwBold">알림톡 예약 전송리스트(전체)</h2>
+			<h2 class="titType1 c_222222 fwBold">카톡 예약 전송리스트(전체)</h2>
-			<p class="tType6 c_999999">알림톡 예약 전송리스트 현황을 파악할 수 있습니다.</p>
+			<p class="tType6 c_999999">카톡 예약 전송리스트 현황을 파악할 수 있습니다.</p>
 		</div>
 		<div class="pageCont">
 			<div class="listSerch">

src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp

@@ -568,8 +568,8 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) {
 	<div class="contWrap">
 		<div class="pageTitle">
 			<div class="pageIcon"><img src="/pb/img/pageTitIcon4.png" alt=""></div>
-			<h2 class="titType1 c_222222 fwBold">알림톡전송리스트(전체)</h2>
+			<h2 class="titType1 c_222222 fwBold">카톡전송리스트(전체)</h2>
-			<p class="tType6 c_999999">알림톡전송리스트 현황을 파악할 수 있습니다.</p>
+			<p class="tType6 c_999999">카톡전송리스트 현황을 파악할 수 있습니다.</p>
 		</div>
 		<div class="pageCont">
 			<div class="listSerch">

src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/sendresult/KakaoSendResultList.jsp

@@ -85,8 +85,8 @@ function rstCodeListExcelDownload(){
 	<div class="contWrap">
 		<div class="pageTitle">
 			<div class="pageIcon"><img src="/pb/img/pageTitIcon4.png" alt=""></div>
-			<h2 class="titType1 c_222222 fwBold">카카오 알림톡 발송 결과 코드 리스트(중계사별)</h2>
+			<h2 class="titType1 c_222222 fwBold">카톡 발송결과 코드 리스트(DAU)</h2>
-			<p class="tType6 c_999999">카카오 알림톡 발송 결과 코드 리스트 현황을 파악할 수 있습니다.</p>
+			<p class="tType6 c_999999">카톡 발송결과 코드 리스트 현황을 파악할 수 있습니다.</p>
 		</div>
 		<div class="pageCont">
 			<div class="listSerch">