--- src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java
+++ src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java
... | ... | @@ -326,12 +326,11 @@ |
| 326 | 326 |
} |
| 327 | 327 |
|
| 328 | 328 |
|
| 329 |
- |
|
| 330 |
- |
|
| 331 |
- // 시스템 기본 단가 정보 불러오기 |
|
| 332 |
- JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo(); |
|
| 329 |
+ |
|
| 333 | 330 |
// 사용자 개인 단가 정보 불러오기 |
| 334 | 331 |
MberManageVO mberManageVO = mjonMsgDataService.selectMberManageInfo(kakaoVO.getUserId()); |
| 332 |
+ // 시스템 기본 단가 정보 불러오기 |
|
| 333 |
+ JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo(); |
|
| 335 | 334 |
|
| 336 | 335 |
|
| 337 | 336 |
// 치환 문구가 있는지 확인 |
... | ... | @@ -349,15 +348,31 @@ |
| 349 | 348 |
placeholders.put("[*2*]", MjonFTSendVO::getRep2);
|
| 350 | 349 |
placeholders.put("[*3*]", MjonFTSendVO::getRep3);
|
| 351 | 350 |
placeholders.put("[*4*]", MjonFTSendVO::getRep4);
|
| 352 |
- |
|
| 353 | 351 |
|
| 352 |
+ String imageType = kakaoVO.getImageType(); |
|
| 353 |
+ // 개인단가 |
|
| 354 |
+ Float kakaoMemberFtPrice = |
|
| 355 |
+ imageType == null ? mberManageVO.getKakaoFtPrice() : |
|
| 356 |
+ "I".equals(imageType) ? mberManageVO.getKakaoFtImgPrice() : |
|
| 357 |
+ "W".equals(imageType) ? mberManageVO.getKakaoFtWideImgPrice() : |
|
| 358 |
+ mberManageVO.getKakaoFtPrice(); |
|
| 359 |
+ |
|
| 360 |
+ // 시스템단가 |
|
| 361 |
+ Float kakaoSysJoinFtPrice = |
|
| 362 |
+ imageType == null ? sysJoinSetVO.getKakaoFtPrice() : |
|
| 363 |
+ "I".equals(imageType) ? sysJoinSetVO.getKakaoFtImgPrice() : |
|
| 364 |
+ "W".equals(imageType) ? sysJoinSetVO.getKakaoFtWideImgPrice() : |
|
| 365 |
+ sysJoinSetVO.getKakaoFtPrice(); |
|
| 366 |
+ |
|
| 367 |
+ Float kakaoFtPrice = |
|
| 368 |
+ getValidPrice(kakaoMemberFtPrice, kakaoSysJoinFtPrice); |
|
| 369 |
+ |
|
| 370 |
+// imageType |
|
| 354 | 371 |
// 친구통 금액 |
| 355 |
- Float kakaoFtPrice = mberManageVO.getKakaoFtPrice(); |
|
| 356 | 372 |
|
| 357 | 373 |
// 대체문자가 있을경우 사용 |
| 358 | 374 |
float shortPrice = getValidPrice(mberManageVO.getShortPrice(), sysJoinSetVO.getShortPrice()); |
| 359 | 375 |
float longPrice = getValidPrice(mberManageVO.getLongPrice(), sysJoinSetVO.getLongPrice()); |
| 360 |
- |
|
| 361 | 376 |
String shortPStr = Float.toString(shortPrice); |
| 362 | 377 |
String mmsPStr = Float.toString(longPrice); |
| 363 | 378 |
|
... | ... | @@ -439,7 +454,6 @@ |
| 439 | 454 |
boolean isMms = "MMS".equals(sendType); |
| 440 | 455 |
sendVO.setEachPrice(isMms ? mmsPStr : shortPStr); |
| 441 | 456 |
}else {
|
| 442 |
- kakaoFtPrice = getValidPrice(mberManageVO.getKakaoAtPrice(), sysJoinSetVO.getKakaoAtPrice()); |
|
| 443 | 457 |
sendVO.setEachPrice( Float.toString(kakaoFtPrice) ); |
| 444 | 458 |
} |
| 445 | 459 |
|
--- src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java
+++ src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java
... | ... | @@ -70,9 +70,9 @@ |
| 70 | 70 |
public StatusResponse insertKakaoFtSandAjax_advc(KakaoVO kakaoVO, HttpServletRequest request) throws Exception {
|
| 71 | 71 |
StatusResponse statusResponse = new StatusResponse(); |
| 72 | 72 |
|
| 73 |
-// log.info(" + kakaoVO.toString() :: [{}]", kakaoVO.toString());
|
|
| 73 |
+ log.info(" + kakaoVO.toString() :: [{}]", kakaoVO.toString());
|
|
| 74 | 74 |
|
| 75 |
-// log.info(" + kakaoVO.toString() :: [{}]", kakaoVO.ftToString());
|
|
| 75 |
+ log.info(" + kakaoVO.toString() :: [{}]", kakaoVO.ftToString());
|
|
| 76 | 76 |
|
| 77 | 77 |
|
| 78 | 78 |
|
... | ... | @@ -101,7 +101,7 @@ |
| 101 | 101 |
request.getSession().invalidate(); |
| 102 | 102 |
// UNAUTHORIZED : 인증되지 않은 사용자가 접근하려고 할 때 |
| 103 | 103 |
return new StatusResponse(HttpStatus.UNAUTHORIZED, |
| 104 |
- "현재 고객님께서는 문자온 서비스 이용이 정지된 상태로 알림톡을 발송하실 수 없습니다. 이용정지 해제를 원하시면 고객센터로 연락주시기 바랍니다."); |
|
| 104 |
+ "현재 고객님께서는 문자온 서비스 이용이 정지된 상태로 친구톡을 발송하실 수 없습니다. 이용정지 해제를 원하시면 고객센터로 연락주시기 바랍니다."); |
|
| 105 | 105 |
} |
| 106 | 106 |
|
| 107 | 107 |
|
... | ... | @@ -177,7 +177,7 @@ |
| 177 | 177 |
|
| 178 | 178 |
/** @biz_kakao_price에 insert (대체문자 환불관련 테이블)*/ |
| 179 | 179 |
kakaoVO.setMsgGroupId(sendVO.getMsgGroupId()); |
| 180 |
- kakaoVO.setKakaoAtPrice(Float.parseFloat(sendVO.getEachPrice())); |
|
| 180 |
+ kakaoVO.setKakaoFtPrice(Float.parseFloat(sendVO.getEachPrice())); |
|
| 181 | 181 |
kakaoVO.setSmsPrice(Float.parseFloat(sendVO.getSmsPrice())); |
| 182 | 182 |
kakaoVO.setMmsPrice(Float.parseFloat(sendVO.getMmsPrice())); |
| 183 | 183 |
|
--- src/main/java/itn/let/sym/site/service/JoinSettingVO.java
+++ src/main/java/itn/let/sym/site/service/JoinSettingVO.java
... | ... | @@ -1,5 +1,12 @@ |
| 1 | 1 |
package itn.let.sym.site.service; |
| 2 | 2 |
|
| 3 |
+import lombok.AllArgsConstructor; |
|
| 4 |
+import lombok.Builder; |
|
| 5 |
+import lombok.Getter; |
|
| 6 |
+import lombok.NoArgsConstructor; |
|
| 7 |
+import lombok.Setter; |
|
| 8 |
+import lombok.ToString; |
|
| 9 |
+ |
|
| 3 | 10 |
/** |
| 4 | 11 |
* 로그인정책에 대한 VO 클래스를 정의한다. |
| 5 | 12 |
* 로그인정책정보의 목록 항목을 관리한다. |
... | ... | @@ -18,13 +25,18 @@ |
| 18 | 25 |
* |
| 19 | 26 |
* </pre> |
| 20 | 27 |
*/ |
| 28 |
+ |
|
| 29 |
+@Getter |
|
| 30 |
+@Setter |
|
| 31 |
+@NoArgsConstructor |
|
| 32 |
+@AllArgsConstructor |
|
| 33 |
+@Builder |
|
| 34 |
+@ToString |
|
| 21 | 35 |
public class JoinSettingVO {
|
| 22 | 36 |
|
| 23 | 37 |
/** |
| 24 | 38 |
* serialVersionUID |
| 25 | 39 |
*/ |
| 26 |
- @SuppressWarnings("unused")
|
|
| 27 |
- private static final long serialVersionUID = 1L; |
|
| 28 | 40 |
|
| 29 | 41 |
private float shortPrice; // 단문 단가 |
| 30 | 42 |
private float longPrice; //장문 단가 |
... | ... | @@ -37,6 +49,9 @@ |
| 37 | 49 |
private float customTextPrice; // 텍스트 단순수정 |
| 38 | 50 |
private float kakaoAtPrice; // 카카오 알림톡 단가 |
| 39 | 51 |
private float kakaoFtPrice; // 카카오 친구톡 단가 |
| 52 |
+ private float kakaoFtImgPrice; // 카카오 친구톡 이미지 단가 |
|
| 53 |
+ private float kakaoFtWideImgPrice; // 카카오 친구톡 와이드 단가 |
|
| 54 |
+ |
|
| 40 | 55 |
private float faxPrice; // 팩스 단가 |
| 41 | 56 |
|
| 42 | 57 |
private float refundPer; //환불 비율 |
... | ... | @@ -51,188 +66,5 @@ |
| 51 | 66 |
private String smishingNoti; //첫결제(카드제외) 스미싱의심 알림 여부 |
| 52 | 67 |
private String holiSmishingNoti; //야간 스미싱알림 여부 |
| 53 | 68 |
|
| 54 |
- public String getSmishingNoti() {
|
|
| 55 |
- return smishingNoti; |
|
| 56 |
- } |
|
| 57 |
- |
|
| 58 |
- public void setSmishingNoti(String smishingNoti) {
|
|
| 59 |
- this.smishingNoti = smishingNoti; |
|
| 60 |
- } |
|
| 61 |
- |
|
| 62 |
- public float getShortPrice() {
|
|
| 63 |
- return shortPrice; |
|
| 64 |
- } |
|
| 65 |
- |
|
| 66 |
- public void setShortPrice(float shortPrice) {
|
|
| 67 |
- this.shortPrice = shortPrice; |
|
| 68 |
- } |
|
| 69 |
- |
|
| 70 |
- public float getLongPrice() {
|
|
| 71 |
- return longPrice; |
|
| 72 |
- } |
|
| 73 |
- |
|
| 74 |
- public void setLongPrice(float longPrice) {
|
|
| 75 |
- this.longPrice = longPrice; |
|
| 76 |
- } |
|
| 77 |
- |
|
| 78 |
- public float getPicturePrice() {
|
|
| 79 |
- return picturePrice; |
|
| 80 |
- } |
|
| 81 |
- |
|
| 82 |
- public void setPicturePrice(float picturePrice) {
|
|
| 83 |
- this.picturePrice = picturePrice; |
|
| 84 |
- } |
|
| 85 |
- |
|
| 86 |
- public float getPicture2Price() {
|
|
| 87 |
- return picture2Price; |
|
| 88 |
- } |
|
| 89 |
- |
|
| 90 |
- public void setPicture2Price(float picture2Price) {
|
|
| 91 |
- this.picture2Price = picture2Price; |
|
| 92 |
- } |
|
| 93 |
- |
|
| 94 |
- public float getPicture3Price() {
|
|
| 95 |
- return picture3Price; |
|
| 96 |
- } |
|
| 97 |
- |
|
| 98 |
- public void setPicture3Price(float picture3Price) {
|
|
| 99 |
- this.picture3Price = picture3Price; |
|
| 100 |
- } |
|
| 101 |
- |
|
| 102 |
- public float getCustomSamplePrice() {
|
|
| 103 |
- return customSamplePrice; |
|
| 104 |
- } |
|
| 105 |
- |
|
| 106 |
- public void setCustomSamplePrice(float customSamplePrice) {
|
|
| 107 |
- this.customSamplePrice = customSamplePrice; |
|
| 108 |
- } |
|
| 109 |
- |
|
| 110 |
- public float getCustomEditPrice() {
|
|
| 111 |
- return customEditPrice; |
|
| 112 |
- } |
|
| 113 |
- |
|
| 114 |
- public void setCustomEditPrice(float customEditPrice) {
|
|
| 115 |
- this.customEditPrice = customEditPrice; |
|
| 116 |
- } |
|
| 117 |
- |
|
| 118 |
- public float getCustomEdit3Price() {
|
|
| 119 |
- return customEdit3Price; |
|
| 120 |
- } |
|
| 121 |
- |
|
| 122 |
- public void setCustomEdit3Price(float customEdit3Price) {
|
|
| 123 |
- this.customEdit3Price = customEdit3Price; |
|
| 124 |
- } |
|
| 125 |
- |
|
| 126 |
- public float getCustomTextPrice() {
|
|
| 127 |
- return customTextPrice; |
|
| 128 |
- } |
|
| 129 |
- |
|
| 130 |
- public void setCustomTextPrice(float customTextPrice) {
|
|
| 131 |
- this.customTextPrice = customTextPrice; |
|
| 132 |
- } |
|
| 133 |
- |
|
| 134 |
- public float getRefundPer() {
|
|
| 135 |
- return refundPer; |
|
| 136 |
- } |
|
| 137 |
- |
|
| 138 |
- public void setRefundPer(float refundPer) {
|
|
| 139 |
- this.refundPer = refundPer; |
|
| 140 |
- } |
|
| 141 |
- |
|
| 142 |
- public float getJoinCash() {
|
|
| 143 |
- return joinCash; |
|
| 144 |
- } |
|
| 145 |
- |
|
| 146 |
- public void setJoinCash(float joinCash) {
|
|
| 147 |
- this.joinCash = joinCash; |
|
| 148 |
- } |
|
| 149 |
- |
|
| 150 |
- public float getPointPer() {
|
|
| 151 |
- return pointPer; |
|
| 152 |
- } |
|
| 153 |
- |
|
| 154 |
- public void setPointPer(float pointPer) {
|
|
| 155 |
- this.pointPer = pointPer; |
|
| 156 |
- } |
|
| 157 |
- |
|
| 158 |
- public String getLasUpdusrId() {
|
|
| 159 |
- return lasUpdusrId; |
|
| 160 |
- } |
|
| 161 |
- |
|
| 162 |
- public void setLasUpdusrId(String lasUpdusrId) {
|
|
| 163 |
- this.lasUpdusrId = lasUpdusrId; |
|
| 164 |
- } |
|
| 165 |
- |
|
| 166 |
- public String getLastUpdtPnttm() {
|
|
| 167 |
- return lastUpdtPnttm; |
|
| 168 |
- } |
|
| 169 |
- |
|
| 170 |
- public void setLastUpdtPnttm(String lastUpdtPnttm) {
|
|
| 171 |
- this.lastUpdtPnttm = lastUpdtPnttm; |
|
| 172 |
- } |
|
| 173 |
- |
|
| 174 |
- public String getJoinCertType() {
|
|
| 175 |
- return joinCertType; |
|
| 176 |
- } |
|
| 177 |
- |
|
| 178 |
- public void setJoinCertType(String joinCertType) {
|
|
| 179 |
- this.joinCertType = joinCertType; |
|
| 180 |
- } |
|
| 181 |
- |
|
| 182 |
- public String getSmsNoti() {
|
|
| 183 |
- return smsNoti; |
|
| 184 |
- } |
|
| 185 |
- |
|
| 186 |
- public void setSmsNoti(String smsNoti) {
|
|
| 187 |
- this.smsNoti = smsNoti; |
|
| 188 |
- } |
|
| 189 |
- |
|
| 190 |
- public String getEmailNoti() {
|
|
| 191 |
- return emailNoti; |
|
| 192 |
- } |
|
| 193 |
- |
|
| 194 |
- public void setEmailNoti(String emailNoti) {
|
|
| 195 |
- this.emailNoti = emailNoti; |
|
| 196 |
- } |
|
| 197 |
- |
|
| 198 |
- public String getSlackNoti() {
|
|
| 199 |
- return slackNoti; |
|
| 200 |
- } |
|
| 201 |
- |
|
| 202 |
- public void setSlackNoti(String slackNoti) {
|
|
| 203 |
- this.slackNoti = slackNoti; |
|
| 204 |
- } |
|
| 205 |
- |
|
| 206 |
- public float getKakaoAtPrice() {
|
|
| 207 |
- return kakaoAtPrice; |
|
| 208 |
- } |
|
| 209 |
- |
|
| 210 |
- public void setKakaoAtPrice(float kakaoAtPrice) {
|
|
| 211 |
- this.kakaoAtPrice = kakaoAtPrice; |
|
| 212 |
- } |
|
| 213 |
- |
|
| 214 |
- public float getKakaoFtPrice() {
|
|
| 215 |
- return kakaoFtPrice; |
|
| 216 |
- } |
|
| 217 |
- |
|
| 218 |
- public void setKakaoFtPrice(float kakaoFtPrice) {
|
|
| 219 |
- this.kakaoFtPrice = kakaoFtPrice; |
|
| 220 |
- } |
|
| 221 |
- |
|
| 222 |
- public float getFaxPrice() {
|
|
| 223 |
- return faxPrice; |
|
| 224 |
- } |
|
| 225 |
- |
|
| 226 |
- public void setFaxPrice(float faxPrice) {
|
|
| 227 |
- this.faxPrice = faxPrice; |
|
| 228 |
- } |
|
| 229 |
- |
|
| 230 |
- public String getHoliSmishingNoti() {
|
|
| 231 |
- return holiSmishingNoti; |
|
| 232 |
- } |
|
| 233 |
- |
|
| 234 |
- public void setHoliSmishingNoti(String holiSmishingNoti) {
|
|
| 235 |
- this.holiSmishingNoti = holiSmishingNoti; |
|
| 236 |
- } |
|
| 237 | 69 |
|
| 238 | 70 |
} |
--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
... | ... | @@ -2151,6 +2151,8 @@ |
| 2151 | 2151 |
, POINT_PER AS pointPer |
| 2152 | 2152 |
, KAKAO_AT_PRICE AS kakaoAtPrice |
| 2153 | 2153 |
, KAKAO_FT_PRICE AS kakaoFtPrice |
| 2154 |
+ , KAKAO_FT_IMG_PRICE AS kakaoFtImgPrice |
|
| 2155 |
+ , KAKAO_FT_WIDE_IMG_PRICE AS kakaoFtWideImgPrice |
|
| 2154 | 2156 |
, FAX_PRICE AS faxPrice |
| 2155 | 2157 |
FROM MJ_MBER_SETTING |
| 2156 | 2158 |
|
... | ... | @@ -2169,6 +2171,8 @@ |
| 2169 | 2171 |
, PICTURE3_PRICE AS picture3Price |
| 2170 | 2172 |
, KAKAO_AT_PRICE AS kakaoAtPrice |
| 2171 | 2173 |
, KAKAO_FT_PRICE AS kakaoFtPrice |
| 2174 |
+ , KAKAO_FT_IMG_PRICE AS kakaoFtImgPrice |
|
| 2175 |
+ , KAKAO_FT_WIDE_IMG_PRICE AS kakaoFtWideImgPrice |
|
| 2172 | 2176 |
, FAX_PRICE AS faxPrice |
| 2173 | 2177 |
, USER_MONEY AS userMoney |
| 2174 | 2178 |
, USER_POINT AS userPoint |
--- src/main/webapp/js/kakao/ft/ftPriceClclt.js
+++ src/main/webapp/js/kakao/ft/ftPriceClclt.js
... | ... | @@ -200,7 +200,7 @@ |
| 200 | 200 |
// fn_writePriceText() 첫 파라미터가 null이면 카카오 전송으로 인식 |
| 201 | 201 |
fn_writePriceText('', phoneSu);
|
| 202 | 202 |
// $('#totalPriceTxt').text((KAKAO_AT_PRICE * phoneSu).toFixed(1));
|
| 203 |
- fn_priceText('알림톡', phoneSu);
|
|
| 203 |
+ fn_priceText('친구톡', phoneSu);
|
|
| 204 | 204 |
} |
| 205 | 205 |
|
| 206 | 206 |
/** |
--- src/main/webapp/js/kakao/ft/ftTabulator.js
+++ src/main/webapp/js/kakao/ft/ftTabulator.js
... | ... | @@ -241,6 +241,9 @@ |
| 241 | 241 |
addPhoneInfo(tabledata); |
| 242 | 242 |
|
| 243 | 243 |
$('#callTo').val("");
|
| 244 |
+ |
|
| 245 |
+ |
|
| 246 |
+ fn_priceText('친구톡', tableL.getDataCount());
|
|
| 244 | 247 |
|
| 245 | 248 |
} |
| 246 | 249 |
|
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?