Merge remote-tracking branch 'origin/develop' into jsh77b

src/main/java/com/style24/core/biz/service/TscKakaotalkService.java

@@ -296,7 +296,7 @@ public class TscKakaotalkService {
 	/**
 	 * 개인정보 이용내역 안내
 	 *
-	 * @param customer - 인증번호 발송
+	 * @param customer - 고객정보
 	 * @author jsshin
 	 * @since 2021. 05. 31
 	 */
@@ -317,7 +317,7 @@ public class TscKakaotalkService {
 			CustContactHst custContactHst = new CustContactHst();
 			custContactHst.setContactType(TscConstants.ContactType.PRIVACY_POLICY.value()); // 접촉유형:회원-휴대전화인증(공통코드G054)
 			custContactHst.setContactMethod(TscConstants.ContactMethod.KAKAOTALK.value()); // 접촉방법:알림톡+문자(공통코드G055)
-			custContactHst.setContactContents("개인정보 이용내역");
+			custContactHst.setContactContents("개인정보이용내역");
 			custContactHst.setReceiverNo(customer.getCustNo());
 			custContactHst.setSenderNo(senderNo);
 			custContactHst.setRegNo(senderNo);
@@ -332,7 +332,7 @@ public class TscKakaotalkService {
 	/**
 	 * 마케팅 수신동의내역 안내
 	 *
-	 * @param customer - 인증번호 발송
+	 * @param customer - 고객정보
 	 * @author jsshin
 	 * @since 2021. 05. 31
 	 */
@@ -342,10 +342,18 @@ public class TscKakaotalkService {
 		dm.setFuserid(String.valueOf(senderNo)); // 발송자NO
 		dm.setFdestine(customer.getCellPhnno());
 		dm.setFkkoresendtype("LMS");
+		String emailAgreeYn = customer.getEmailAgreeYn().equals("Y") ? "수신":"미수신";
+		String smsAgreeYn = customer.getSmsAgreeYn().equals("Y") ? "수신":"미수신";
+		String mkAgreeYn = customer.getMkAgreeYn().equals("Y") ? "수신":"미수신";
 
 		GagaMap replaceInfo = new GagaMap();
 		replaceInfo.setString("siteNm", siteNm);
-
+		replaceInfo.setString("emailAgreeDt", customer.getEmailAgreeDt());
+		replaceInfo.setString("emailAgreeYn", emailAgreeYn);
+		replaceInfo.setString("smsAgreeDt", customer.getSmsAgreeDt());
+		replaceInfo.setString("smsAgreeYn", smsAgreeYn);
+		replaceInfo.setString("mkAgreeDt", customer.getMkAgreeDt());
+		replaceInfo.setString("mkAgreeYn", mkAgreeYn);
 		kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.MARKETING_AGREE.value(), dm, replaceInfo);
 
 		try {
@@ -443,8 +451,8 @@ public class TscKakaotalkService {
 	}
 	
 	/**
-	 *  쿠폰 기간만료 알림톡(30일)
-	 * @param coupon - 상품권 정보
+	 *  쿠폰 기간만료 알림톡(7일)
+	 * @param coupon - 쿠폰 정보
 	 * @param senderNo - 발송자번호(고객번호)
 	 * @author sowon
 	 * @since 2021. 5. 31
@@ -460,7 +468,8 @@ public class TscKakaotalkService {
 		replaceInfo.setString("siteNm", siteNm);
 		replaceInfo.setString("custNm", coupon.getCustNm());
 		replaceInfo.setString("cpnNm", coupon.getCpnNm());
-		replaceInfo.setString("expBeDt", coupon.getAvailEddt());
+		replaceInfo.setInt("dcVal", coupon.getDcVal());
+		replaceInfo.setString("dcWay", coupon.getDcWay());
 		kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.COUPON_EXTNC_EXPECT.value(), dm, replaceInfo);
 		
 		try {