Commit @ffd779dd668bcf141b86bdd89ac93682b23e7b4d

이호영 2025-07-16

친구톡 환불로직 수정

@ffd779dd668bcf141b86bdd89ac93682b23e7b4d

1f0c38b

ffd779d

src/main/java/itn/let/kakao/kakaoComm/KakaoSendAdvcVO.java

--- src/main/java/itn/let/kakao/kakaoComm/KakaoSendAdvcVO.java

+++ src/main/java/itn/let/kakao/kakaoComm/KakaoSendAdvcVO.java


 	private String bizKakaoResendType;	// 카카오 알림톡 단가
 	private String filePath1;	// 대체문자 이미지 
 	private String fileCnt;	// 파일 카운트
+	private String bizKakaoImageType;	// 파일 카운트
 	
 	
 	

 			"\n , bizKakaoResendOrgnlTxt=[" + bizKakaoResendOrgnlTxt + "]" +
 			"\n , bizKakaoResendType=[" + bizKakaoResendType + "]" +
 			"\n , filePath1=[" + filePath1 + "]" +
+			"\n , bizKakaoImageType=[" + bizKakaoImageType + "]" +
 			"\n ]";
 	}
 

1f0c38b

ffd779d

src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java

--- src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java

+++ src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java


 	}
 
 
-	public Float getValidPrice(Float personalPrice, Float defaultPrice) {
+	public static Float getValidPrice(Float personalPrice, Float defaultPrice) {
 		return (personalPrice != null && personalPrice > 0) ? personalPrice : defaultPrice;
 	}
 

 		sendVO.setAtDelayYn(kakaoVO.getAtSmishingYn()); 
 		sendVO.setBizKakaoResendOrgnlTxt(kakaoVO.getSubMsgTxt());
 		sendVO.setBizKakaoResendType(sendVO.getSubMsgType());
+		sendVO.setBizKakaoImageType(kakaoVO.getImageType());
 		
 		kakaoAlimTalkDAO.insertKakaoGroupDataTb_advc(sendVO);
 		

1f0c38b

ffd779d

src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java

--- src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java

+++ src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java


 				kakaoSendUtil.insertKakaoGroupDataTb_advc(instCnt, kakaoVO, sendVO);
 
 
-/** @biz_kakao_price에 insert (대체문자 환불관련 테이블)*/ 
-				kakaoVO.setMsgGroupId(sendVO.getMsgGroupId());
-				kakaoVO.setKakaoFtPrice(Float.parseFloat(sendVO.getEachPrice()));
-				kakaoVO.setSmsPrice(Float.parseFloat(sendVO.getSmsPrice()));
-				kakaoVO.setMmsPrice(Float.parseFloat(sendVO.getMmsPrice()));
-				kakaoVO.setPicturePrice(Float.parseFloat(sendVO.getPicturePrice()));
 				
-				kakaoAlimTalkDAO.insertKakaoSendPrice(kakaoVO);
+/** @biz_kakao_price에 insert (대체문자 환불관련 테이블)*/
+				priceAndPoint.insertBizFtKakaoPrice(kakaoVO.getUserId(), sendVO.getMsgGroupId()); 
 				
 				
 				priceAndPoint.insertCashAndPoint(kakaoVO.getUserId()

1f0c38b

ffd779d

src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java

--- src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java

+++ src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java


 	private String bizLogCallStatusCode;	//다우기술 biz_log 테이블의 발송결과 코드 값 성공/실패/대기 코드값 변환(성공:S, 대기:W, 실패:F).
 	private String bizLogCallStatusTxt;	//다우기술 biz_log 테이블의 발송결과 내용 텍스트.
 	private String bizLogStatus;		//다우기술 biz_log 테이블의 전송상태값 
+	
+	private String bizKakaoImageType;	// 비즈 발송 img 값 
 
 	private String  accessKey; // 'API Key',
 

1f0c38b

ffd779d

src/main/java/itn/let/module/base/PriceAndPoint.java

--- src/main/java/itn/let/module/base/PriceAndPoint.java

+++ src/main/java/itn/let/module/base/PriceAndPoint.java


 import org.springframework.stereotype.Component;
 
 import egovframework.rte.fdl.idgnr.EgovIdGnrService;
+import itn.let.kakao.kakaoComm.KakaoSendAdvcVO;
+import itn.let.kakao.kakaoComm.KakaoSendUtil;
+import itn.let.kakao.kakaoComm.KakaoVO;
+import itn.let.kakao.user.kakaoAt.service.impl.KakaoAlimTalkDAO;
 import itn.let.mjo.event.service.MjonEventService;
 import itn.let.mjo.event.service.MjonEventVO;
 import itn.let.mjo.event.service.impl.MjonEventDAO;
 import itn.let.mjo.msg.service.MjonMsgVO;
+import itn.let.mjo.msgdata.service.MjonMsgDataService;
 import itn.let.mjo.msgdata.service.impl.MjonMsgDataDAO;
 import itn.let.mjo.pay.service.MjonPayVO;
 import itn.let.mjo.pay.service.impl.MjonPayDAO;
+import itn.let.sym.site.service.JoinSettingVO;
 import itn.let.uss.umt.service.MberManageVO;
+import lombok.extern.slf4j.Slf4j;
  
 /**
  * 

  * 
  * 
  */
+@Slf4j
 @Component
 public class PriceAndPoint {
  

 
     @Resource(name = "egovMjonCashIdGnrService")
     private EgovIdGnrService idgenMjonCashId;
+
+	@Resource(name="kakaoAlimTalkDAO")
+	private KakaoAlimTalkDAO kakaoAlimTalkDAO;
+
+
  
 	/** 
 	 * @methodName	: getBefCash 

 		mjonPayDAO.updateMemberCash(mjonPayVO); //회원정보 업데이트
 		
 	}
+
+	public void insertBizFtKakaoPrice(String userId, String msgGroupId) throws Exception {
+		KakaoVO kakaoVO = new KakaoVO();
+
+		// 사용자 개인 단가 정보 불러오기
+		MberManageVO mberManageVO = mjonMsgDataDAO.selectMberManageInfo(userId);
+		// 시스템 기본 단가 정보 불러오기
+		JoinSettingVO sysJoinSetVO = mjonMsgDataDAO.selectJoinSettingInfo();
+		KakaoSendUtil.getValidPrice(mberManageVO.getShortPrice(), sysJoinSetVO.getShortPrice());
+		// TODO Auto-generated method stub
+		kakaoVO.setMsgGroupId(msgGroupId);
+		
+		kakaoVO.setSmsPrice(KakaoSendUtil.getValidPrice(mberManageVO.getShortPrice(), sysJoinSetVO.getShortPrice()));     
+		kakaoVO.setMmsPrice(KakaoSendUtil.getValidPrice(mberManageVO.getLongPrice(), sysJoinSetVO.getLongPrice()));       
+		kakaoVO.setPicturePrice(KakaoSendUtil.getValidPrice(mberManageVO.getPicturePrice(), sysJoinSetVO.getPicturePrice())); 
+		
+		kakaoVO.setKakaoFtPrice(KakaoSendUtil.getValidPrice(mberManageVO.getKakaoFtPrice(), sysJoinSetVO.getKakaoFtPrice())); 
+		kakaoVO.setKakaoFtImgPrice(KakaoSendUtil.getValidPrice(mberManageVO.getKakaoFtImgPrice(), sysJoinSetVO.getKakaoFtImgPrice())); 
+		kakaoVO.setKakaoFtWideImgPrice(KakaoSendUtil.getValidPrice(mberManageVO.getKakaoFtWideImgPrice(), sysJoinSetVO.getKakaoFtWideImgPrice())); 
+		
+		
+		
+		kakaoAlimTalkDAO.insertKakaoSendPrice(kakaoVO);
+		
+	}
  
  
 }

1f0c38b

ffd779d

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

+++ src/main/resources/egovframework/sqlmap/let/mjo/kakao/Kakao_AT_SQL_Mysql.xml


             
             AT_DELAY_YN,
             BIZ_KAKAO_RESEND_ORGNL_TXT,
-            BIZ_KAKAO_RESEND_TYPE
+            BIZ_KAKAO_RESEND_TYPE,
+            BIZ_KAKAO_IMAGE_TYPE
 		)VALUES
 		(
            #msgGroupId#,

            
            #atDelayYn#,
            #bizKakaoResendOrgnlTxt#,
-           #bizKakaoResendType#
+           #bizKakaoResendType#,
+           #bizKakaoImageType#
 		)
 	</insert>
 	

 			MMD.USER_ID									AS userId
 			, MMD.MSG_GROUP_ID							AS msgGroupId
 			, MMD.MSG_SEQ								AS msgSeq
+			, MMGD.BIZ_KAKAO_IMAGE_TYPE 				AS bizKakaoImageType
 			, MMD.USERDATA								AS userData
 			, MMD.REFUND_YN								AS refundYn
 			, MMD.RSLT_CODE								AS rsltCode

 			, MMD.BIZ_KAKAO_RESEND_TYPE					AS subMsgType
 			, MMD.FILE_CNT 								AS fileCnt
 			, MMD.BIZ_KAKAO_RESEND_TYPE  				AS bizKakaoResendType
-			
 		FROM
 			MJ_MSG_DATA MMD
 			INNER JOIN LETTNGNRLMBER MB
 			ON MMD.USER_ID = MB.MBER_ID
+			INNER JOIN mj_msg_group_data MMGD
+			on MMD.MSG_GROUP_ID = MMGD.MSG_GROUP_ID 
 		WHERE 1=1
 			AND	MMD.CUR_STATE          = '3'
 			AND	MMD.REFUND_YN          = 'N'

 	
 	<!-- 카카오 친구톡 전송 환불 프로시저 실행 (카카오 전송 성공 관련 - 대체문자 선택시 차액 환불 처리) -->
 	<procedure id="kakaoAlimTalkDAO.updateKakaoFtSend" parameterClass="kakaoVO">
-		{call kakaoFt_Send(#userId#, #msgGroupId#, #userData#, #fileCnt#, #bizKakaoResendType#)}
+		{call kakaoFt_Send(#userId#, #msgGroupId#, #userData#, #fileCnt#, #bizKakaoResendType#, #bizKakaoImageType#)}
 	</procedure>
 	
 	<!-- 카카오 친구톡 전송 환불 프로시저 실행 (카카오 전송 실패시 대체문자 관련 - 대체문자 발송 완료 된 경우) -->

Add a comment

Open 0
Closed 0

List

...	...	@@ -71,6 +71,7 @@
71	71	private String bizKakaoResendType; // 카카오 알림톡 단가
72	72	private String filePath1; // 대체문자 이미지
73	73	private String fileCnt; // 파일 카운트
	74	+ private String bizKakaoImageType; // 파일 카운트
74	75
75	76
76	77
...	...	@@ -113,6 +114,7 @@
113	114	"\n , bizKakaoResendOrgnlTxt=[" + bizKakaoResendOrgnlTxt + "]" +
114	115	"\n , bizKakaoResendType=[" + bizKakaoResendType + "]" +
115	116	"\n , filePath1=[" + filePath1 + "]" +
	117	+ "\n , bizKakaoImageType=[" + bizKakaoImageType + "]" +
116	118	"\n ]";
117	119	}
118	120

...	...	@@ -698,7 +698,7 @@
698	698	}
699	699
700	700
701		- public Float getValidPrice(Float personalPrice, Float defaultPrice) {
	701	+ public static Float getValidPrice(Float personalPrice, Float defaultPrice) {
702	702	return (personalPrice != null && personalPrice > 0) ? personalPrice : defaultPrice;
703	703	}
704	704
...	...	@@ -1691,6 +1691,7 @@
1691	1691	sendVO.setAtDelayYn(kakaoVO.getAtSmishingYn());
1692	1692	sendVO.setBizKakaoResendOrgnlTxt(kakaoVO.getSubMsgTxt());
1693	1693	sendVO.setBizKakaoResendType(sendVO.getSubMsgType());
	1694	+ sendVO.setBizKakaoImageType(kakaoVO.getImageType());
1694	1695
1695	1696	kakaoAlimTalkDAO.insertKakaoGroupDataTb_advc(sendVO);
1696	1697

...	...	@@ -175,14 +175,9 @@
175	175	kakaoSendUtil.insertKakaoGroupDataTb_advc(instCnt, kakaoVO, sendVO);
176	176
177	177
178		-/** @biz_kakao_price에 insert (대체문자 환불관련 테이블)*/
179		- kakaoVO.setMsgGroupId(sendVO.getMsgGroupId());
180		- kakaoVO.setKakaoFtPrice(Float.parseFloat(sendVO.getEachPrice()));
181		- kakaoVO.setSmsPrice(Float.parseFloat(sendVO.getSmsPrice()));
182		- kakaoVO.setMmsPrice(Float.parseFloat(sendVO.getMmsPrice()));
183		- kakaoVO.setPicturePrice(Float.parseFloat(sendVO.getPicturePrice()));
184	178
185		- kakaoAlimTalkDAO.insertKakaoSendPrice(kakaoVO);
	179	+/** @biz_kakao_price에 insert (대체문자 환불관련 테이블)*/
	180	+ priceAndPoint.insertBizFtKakaoPrice(kakaoVO.getUserId(), sendVO.getMsgGroupId());
186	181
187	182
188	183	priceAndPoint.insertCashAndPoint(kakaoVO.getUserId()

...	...	@@ -302,6 +302,8 @@
302	302	private String bizLogCallStatusCode; //다우기술 biz_log 테이블의 발송결과 코드 값 성공/실패/대기 코드값 변환(성공:S, 대기:W, 실패:F).
303	303	private String bizLogCallStatusTxt; //다우기술 biz_log 테이블의 발송결과 내용 텍스트.
304	304	private String bizLogStatus; //다우기술 biz_log 테이블의 전송상태값
	305	+
	306	+ private String bizKakaoImageType; // 비즈 발송 img 값
305	307
306	308	private String accessKey; // 'API Key',
307	309

...	...	@@ -9,14 +9,21 @@
9	9	import org.springframework.stereotype.Component;
10	10
11	11	import egovframework.rte.fdl.idgnr.EgovIdGnrService;
	12	+import itn.let.kakao.kakaoComm.KakaoSendAdvcVO;
	13	+import itn.let.kakao.kakaoComm.KakaoSendUtil;
	14	+import itn.let.kakao.kakaoComm.KakaoVO;
	15	+import itn.let.kakao.user.kakaoAt.service.impl.KakaoAlimTalkDAO;
12	16	import itn.let.mjo.event.service.MjonEventService;
13	17	import itn.let.mjo.event.service.MjonEventVO;
14	18	import itn.let.mjo.event.service.impl.MjonEventDAO;
15	19	import itn.let.mjo.msg.service.MjonMsgVO;
	20	+import itn.let.mjo.msgdata.service.MjonMsgDataService;
16	21	import itn.let.mjo.msgdata.service.impl.MjonMsgDataDAO;
17	22	import itn.let.mjo.pay.service.MjonPayVO;
18	23	import itn.let.mjo.pay.service.impl.MjonPayDAO;
	24	+import itn.let.sym.site.service.JoinSettingVO;
19	25	import itn.let.uss.umt.service.MberManageVO;
	26	+import lombok.extern.slf4j.Slf4j;
20	27
21	28	/**
22	29	*
...	...	@@ -32,6 +39,7 @@
32	39	*
33	40	*
34	41	*/
	42	+@Slf4j
35	43	@Component
36	44	public class PriceAndPoint {
37	45
...	...	@@ -46,6 +54,11 @@
46	54
47	55	@Resource(name = "egovMjonCashIdGnrService")
48	56	private EgovIdGnrService idgenMjonCashId;
	57	+
	58	+ @Resource(name="kakaoAlimTalkDAO")
	59	+ private KakaoAlimTalkDAO kakaoAlimTalkDAO;
	60	+
	61	+
49	62
50	63	/**
51	64	* @methodName : getBefCash
...	...	@@ -127,6 +140,31 @@
127	140	mjonPayDAO.updateMemberCash(mjonPayVO); //회원정보 업데이트
128	141
129	142	}
	143	+
	144	+ public void insertBizFtKakaoPrice(String userId, String msgGroupId) throws Exception {
	145	+ KakaoVO kakaoVO = new KakaoVO();
	146	+
	147	+ // 사용자 개인 단가 정보 불러오기
	148	+ MberManageVO mberManageVO = mjonMsgDataDAO.selectMberManageInfo(userId);
	149	+ // 시스템 기본 단가 정보 불러오기
	150	+ JoinSettingVO sysJoinSetVO = mjonMsgDataDAO.selectJoinSettingInfo();
	151	+ KakaoSendUtil.getValidPrice(mberManageVO.getShortPrice(), sysJoinSetVO.getShortPrice());
	152	+ // TODO Auto-generated method stub
	153	+ kakaoVO.setMsgGroupId(msgGroupId);
	154	+
	155	+ kakaoVO.setSmsPrice(KakaoSendUtil.getValidPrice(mberManageVO.getShortPrice(), sysJoinSetVO.getShortPrice()));
	156	+ kakaoVO.setMmsPrice(KakaoSendUtil.getValidPrice(mberManageVO.getLongPrice(), sysJoinSetVO.getLongPrice()));
	157	+ kakaoVO.setPicturePrice(KakaoSendUtil.getValidPrice(mberManageVO.getPicturePrice(), sysJoinSetVO.getPicturePrice()));
	158	+
	159	+ kakaoVO.setKakaoFtPrice(KakaoSendUtil.getValidPrice(mberManageVO.getKakaoFtPrice(), sysJoinSetVO.getKakaoFtPrice()));
	160	+ kakaoVO.setKakaoFtImgPrice(KakaoSendUtil.getValidPrice(mberManageVO.getKakaoFtImgPrice(), sysJoinSetVO.getKakaoFtImgPrice()));
	161	+ kakaoVO.setKakaoFtWideImgPrice(KakaoSendUtil.getValidPrice(mberManageVO.getKakaoFtWideImgPrice(), sysJoinSetVO.getKakaoFtWideImgPrice()));
	162	+
	163	+
	164	+
	165	+ kakaoAlimTalkDAO.insertKakaoSendPrice(kakaoVO);
	166	+
	167	+ }
130	168
131	169
132	170	} (No newline at end of file)

...	...	@@ -151,7 +151,8 @@
151	151
152	152	AT_DELAY_YN,
153	153	BIZ_KAKAO_RESEND_ORGNL_TXT,
154		- BIZ_KAKAO_RESEND_TYPE
	154	+ BIZ_KAKAO_RESEND_TYPE,
	155	+ BIZ_KAKAO_IMAGE_TYPE
155	156	)VALUES
156	157	(
157	158	#msgGroupId#,
...	...	@@ -174,7 +175,8 @@
174	175
175	176	#atDelayYn#,
176	177	#bizKakaoResendOrgnlTxt#,
177		- #bizKakaoResendType#
	178	+ #bizKakaoResendType#,
	179	+ #bizKakaoImageType#
178	180	)
179	181	</insert>
180	182
...	...	@@ -230,6 +232,7 @@
230	232	MMD.USER_ID AS userId
231	233	, MMD.MSG_GROUP_ID AS msgGroupId
232	234	, MMD.MSG_SEQ AS msgSeq
	235	+ , MMGD.BIZ_KAKAO_IMAGE_TYPE AS bizKakaoImageType
233	236	, MMD.USERDATA AS userData
234	237	, MMD.REFUND_YN AS refundYn
235	238	, MMD.RSLT_CODE AS rsltCode
...	...	@@ -241,11 +244,12 @@
241	244	, MMD.BIZ_KAKAO_RESEND_TYPE AS subMsgType
242	245	, MMD.FILE_CNT AS fileCnt
243	246	, MMD.BIZ_KAKAO_RESEND_TYPE AS bizKakaoResendType
244		-
245	247	FROM
246	248	MJ_MSG_DATA MMD
247	249	INNER JOIN LETTNGNRLMBER MB
248	250	ON MMD.USER_ID = MB.MBER_ID
	251	+ INNER JOIN mj_msg_group_data MMGD
	252	+ on MMD.MSG_GROUP_ID = MMGD.MSG_GROUP_ID
249	253	WHERE 1=1
250	254	AND MMD.CUR_STATE = '3'
251	255	AND MMD.REFUND_YN = 'N'
...	...	@@ -281,7 +285,7 @@
281	285
282	286	<!-- 카카오 친구톡 전송 환불 프로시저 실행 (카카오 전송 성공 관련 - 대체문자 선택시 차액 환불 처리) -->
283	287	<procedure id="kakaoAlimTalkDAO.updateKakaoFtSend" parameterClass="kakaoVO">
284		- {call kakaoFt_Send(#userId#, #msgGroupId#, #userData#, #fileCnt#, #bizKakaoResendType#)}
	288	+ {call kakaoFt_Send(#userId#, #msgGroupId#, #userData#, #fileCnt#, #bizKakaoResendType#, #bizKakaoImageType#)}
285	289	</procedure>
286	290
287	291	<!-- 카카오 친구톡 전송 환불 프로시저 실행 (카카오 전송 실패시 대체문자 관련 - 대체문자 발송 완료 된 경우) -->

Delete comment