--- src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java
+++ src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java
... | ... | @@ -134,7 +134,15 @@ |
| 134 | 134 |
// 사용자 개인 단가 정보 불러오기 |
| 135 | 135 |
MberManageVO mberManageVO = mjonMsgDataService.selectMberManageInfo(kakaoVO.getUserId()); |
| 136 | 136 |
|
| 137 |
+ |
|
| 138 |
+ float shortPrice = getValidPrice(mberManageVO.getShortPrice(), sysJoinSetVO.getShortPrice()); |
|
| 139 |
+ float longPrice = getValidPrice(mberManageVO.getLongPrice(), sysJoinSetVO.getLongPrice()); |
|
| 140 |
+ float kakaoAtPrice = getValidPrice(mberManageVO.getKakaoAtPrice(), sysJoinSetVO.getKakaoAtPrice()); |
|
| 137 | 141 |
|
| 142 |
+ |
|
| 143 |
+ String shortPStr = Float.toString(shortPrice); |
|
| 144 |
+ String mmsPStr = Float.toString(longPrice); |
|
| 145 |
+ String kakaoAtPStr = Float.toString(kakaoAtPrice); |
|
| 138 | 146 |
|
| 139 | 147 |
|
| 140 | 148 |
/** @MSGID KEY값 */ |
... | ... | @@ -152,22 +160,6 @@ |
| 152 | 160 |
/** @Map에 총 갯수가 수신자 갯수와 동일함 */ |
| 153 | 161 |
List<Map<String, String>> varList = kakaoVO.getVarListMap(); |
| 154 | 162 |
|
| 155 |
- /* |
|
| 156 |
- for (int i = 0; i < varList.size(); i++) {
|
|
| 157 |
- Map<String, String> map = varList.get(i); |
|
| 158 |
- for (Map.Entry<String, String> entry : map.entrySet()) {
|
|
| 159 |
- // key=value 형태로 로그 출력 |
|
| 160 |
- log.info("varList[{}] {} = {}", i, entry.getKey(), entry.getValue());
|
|
| 161 |
- } |
|
| 162 |
- } |
|
| 163 |
- |
|
| 164 |
- if(1==1) {
|
|
| 165 |
- |
|
| 166 |
- // 강제로 예외 발생 |
|
| 167 |
- throw new RuntimeException("강제 예외 발생 테스트");
|
|
| 168 |
- } |
|
| 169 |
- */ |
|
| 170 |
- |
|
| 171 | 163 |
for (int i = 0; i < varList.size(); i++) {
|
| 172 | 164 |
// for(Map<String, String> variables : kakaoVO.getVarListMap()) {
|
| 173 | 165 |
// 치환 데이터 |
... | ... | @@ -176,6 +168,12 @@ |
| 176 | 168 |
|
| 177 | 169 |
/** @공통 기본값 */ |
| 178 | 170 |
KakaoSendAdvcVO sendVO = createATSendVO(kakaoVO); |
| 171 |
+ // 공통 가격 설정 |
|
| 172 |
+ sendVO.setSmsPrice(shortPStr); |
|
| 173 |
+ sendVO.setMmsPrice(mmsPStr); |
|
| 174 |
+ sendVO.setKakaoAtPrice(kakaoAtPStr); |
|
| 175 |
+ |
|
| 176 |
+ |
|
| 179 | 177 |
String msgId = idList.get(i); |
| 180 | 178 |
sendVO.setMsgId(msgId); |
| 181 | 179 |
|
... | ... | @@ -191,6 +189,7 @@ |
| 191 | 189 |
String templateContentTemp = templateContent; |
| 192 | 190 |
String templateTitleTemp = templateTitle; |
| 193 | 191 |
|
| 192 |
+ // api가 아니면 |
|
| 194 | 193 |
if(!isApiData) {
|
| 195 | 194 |
if (hasContentReplacement) {
|
| 196 | 195 |
templateContentTemp = mjonCommon.ATReplaceTemplateVariables(templateContent, variables); |
... | ... | @@ -199,7 +198,8 @@ |
| 199 | 198 |
} |
| 200 | 199 |
} |
| 201 | 200 |
}else {
|
| 202 |
- |
|
| 201 |
+ templateContentTemp = variables.get("templateContent");
|
|
| 202 |
+ templateTitleTemp = variables.get("templateTitle");
|
|
| 203 | 203 |
} |
| 204 | 204 |
|
| 205 | 205 |
|
... | ... | @@ -217,43 +217,18 @@ |
| 217 | 217 |
String subMsgTxtTemp = subMsgTxt; |
| 218 | 218 |
// Step 1-4: 실패 대체 문자 치환데이터 설정 |
| 219 | 219 |
if("Y".equals(kakaoVO.getSubMsgSendYn())) { // 대체문자가 있나?
|
| 220 |
- if ("Y".equals(kakaoVO.getSubMsgTxtReplYn())) { // 치환데이터가 있나?
|
|
| 221 |
- subMsgTxtTemp = mjonCommon.ATReplaceTemplateVariables(subMsgTxt, variables); |
|
| 220 |
+ // api가 아니면 |
|
| 221 |
+ if(!isApiData) {
|
|
| 222 |
+ if ("Y".equals(kakaoVO.getSubMsgTxtReplYn())) { // 치환데이터가 있나?
|
|
| 223 |
+ subMsgTxtTemp = mjonCommon.ATReplaceTemplateVariables(subMsgTxt, variables); |
|
| 224 |
+ } |
|
| 225 |
+ }else {
|
|
| 226 |
+ subMsgTxtTemp = variables.get("subMsgTxt");
|
|
| 222 | 227 |
} |
| 223 | 228 |
sendVO.setSubMsgTxt(subMsgTxtTemp);// 실패 |
| 224 | 229 |
} |
| 225 | 230 |
sendVO.setSubMsgSendYn(kakaoVO.getSubMsgSendYn()); |
| 226 | 231 |
|
| 227 |
- |
|
| 228 |
- /* |
|
| 229 |
- log.info("kakaoSendAdvcVO Details: [callTo={}\n, templateContent=\n{}\n, subMsgTxt=\n{}]\n\n\n\n",
|
|
| 230 |
- kakaoSendAdvcVO.getCallTo(), |
|
| 231 |
- kakaoSendAdvcVO.getTemplateContent(), |
|
| 232 |
- kakaoSendAdvcVO.getSubMsgTxt() |
|
| 233 |
- ); |
|
| 234 |
- */ |
|
| 235 |
- |
|
| 236 |
- // Step1 END |
|
| 237 |
- |
|
| 238 |
- |
|
| 239 |
-// step3 |
|
| 240 |
-// 바이트 수 체크 및 금액설정 |
|
| 241 |
- |
|
| 242 |
- |
|
| 243 |
- // 유효한 단가 계산 |
|
| 244 |
- float shortPrice = getValidPrice(mberManageVO.getShortPrice(), sysJoinSetVO.getShortPrice()); |
|
| 245 |
- float longPrice = getValidPrice(mberManageVO.getLongPrice(), sysJoinSetVO.getLongPrice()); |
|
| 246 |
- float kakaoAtPrice = getValidPrice(mberManageVO.getKakaoAtPrice(), sysJoinSetVO.getKakaoAtPrice()); |
|
| 247 |
- |
|
| 248 |
- |
|
| 249 |
- String shortPStr = Float.toString(shortPrice); |
|
| 250 |
- String mmsPStr = Float.toString(longPrice); |
|
| 251 |
- String kakaoAtPStr = Float.toString(kakaoAtPrice); |
|
| 252 |
- |
|
| 253 |
- // 공통 가격 설정 |
|
| 254 |
- sendVO.setSmsPrice(shortPStr); |
|
| 255 |
- sendVO.setMmsPrice(mmsPStr); |
|
| 256 |
- sendVO.setKakaoAtPrice(kakaoAtPStr); |
|
| 257 | 232 |
|
| 258 | 233 |
|
| 259 | 234 |
if("Y".equals(kakaoVO.getSubMsgSendYn())) {
|
--- src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java
+++ src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java
... | ... | @@ -1033,6 +1033,21 @@ |
| 1033 | 1033 |
apiMsgType = StringUtils.isNotEmpty(apiMsgType) |
| 1034 | 1034 |
? apiMsgType + "," + kakaoSendAdvcListVO.get(0).getMsgType() |
| 1035 | 1035 |
: kakaoSendAdvcListVO.get(0).getMsgType(); |
| 1036 |
+ |
|
| 1037 |
+ |
|
| 1038 |
+ |
|
| 1039 |
+ groupedMsgList.stream().forEach(t-> log.info("t.toString() [{}]", t.toString()));
|
|
| 1040 |
+ |
|
| 1041 |
+ |
|
| 1042 |
+ if(1==1) {
|
|
| 1043 |
+ |
|
| 1044 |
+ // 강제로 예외 발생 |
|
| 1045 |
+ throw new RuntimeException("강제 예외 발생 테스트");
|
|
| 1046 |
+ } |
|
| 1047 |
+ |
|
| 1048 |
+ |
|
| 1049 |
+ |
|
| 1050 |
+ |
|
| 1036 | 1051 |
// 발송 데이터 삽입 |
| 1037 | 1052 |
int instCnt = kakaoSendUtil.insertKakaoData_advc(groupedMsgList); |
| 1038 | 1053 |
// int instCnt = 6; |
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?