카카오톡 추가 메일 서비스 수정

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

@@ -4,6 +4,8 @@ import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import com.style24.core.biz.thirdparty.NetpathyMailSender;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
@@ -252,6 +254,47 @@ public class TscKakaotalkService {
 			// Do nothing
 		}
 	}
+
+	/**
+	 * 휴면계정전환 안내
+	 *
+	 * @param customer - 고객 정보
+	 * @param senderNo - 보낸
+	 * @author jsshin
+	 * @since 2021. 06. 07
+	 */
+	@Transactional("shopTxnManager")
+	public void sendExpectedDormentCustomer(Customer customer, Integer senderNo) {
+		SsgDirectMessage dm = new SsgDirectMessage();
+		dm.setFuserid(String.valueOf(senderNo)); // 발송자NO
+		dm.setFdestine(customer.getCellPhnno());
+		dm.setFkkoresendtype("LMS");
+
+		GagaMap replaceInfo = new GagaMap();
+		replaceInfo.setInt("custNo", customer.getCustNo());
+		replaceInfo.setString("custId", customer.getCustId());
+		replaceInfo.setString("custNm", customer.getCustNm());
+		replaceInfo.setString("dormantDt", customer.getDormantDt());
+
+		kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.DORMANT_EXPECT.value(), dm, replaceInfo);
+
+		try {
+			// 고객접촉이력 정보
+			CustContactHst custContactHst = new CustContactHst();
+			custContactHst.setContactType(TscConstants.ContactType.DORMANT_EXPECTED.value()); // 접촉유형:회원-휴대전화인증(공통코드G054)
+			custContactHst.setContactMethod(TscConstants.ContactMethod.KAKAOTALK.value()); // 접촉방법:알림톡+문자(공통코드G055)
+			custContactHst.setContactContents("휴면계정전환안내");
+			custContactHst.setReceiverNo(customer.getCustNo());
+			custContactHst.setSenderNo(senderNo);
+			custContactHst.setRegNo(senderNo);
+			custContactHst.setUpdNo(senderNo);
+			coreCustomerService.createCustomerContactHistory(custContactHst);
+		} catch (Exception e) {
+			log.error("error", e);
+			// Do nothing
+		}
+
+	}
 	
 	/**
 	 * 이달의 등급 안내 알림톡
@@ -343,9 +386,9 @@ 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") ? "수신":"미수신";
+		String emailAgreeYn = "Y".equals(customer.getEmailAgreeYn()) ? "수신":"미수신";
+		String smsAgreeYn = "Y".equals(customer.getSmsAgreeYn()) ? "수신":"미수신";
+		String mkAgreeYn = "Y".equals(customer.getMkAgreeYn()) ? "수신":"미수신";
 
 		GagaMap replaceInfo = new GagaMap();
 		replaceInfo.setString("siteNm", siteNm);

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

@@ -269,13 +269,13 @@ public class TscMailService {
 	@Transactional("shopTxnManager")
 	public void sendMarketingAgreeNotice(Customer customer, Integer senderNo) {
 
-		String emailAgreeYn = customer.getEmailAgreeYn().equals("Y") ? "수신동의" : "미동의";		// 이메일수신동의여부
-		String smsAgreeYn = customer.getSmsAgreeYn().equals("Y") ? "수신동의" : "미동의";			// SMS수신동의여부
-		String mkAgreeYn = customer.getMkAgreeYn().equals("Y") ? "수신동의" : "미동의";				// 마케팅수신동의여부
+		String emailAgreeYn = "Y".equals(customer.getEmailAgreeYn()) ? "수신동의" : "미동의";		// 이메일수신동의여부
+		String smsAgreeYn = "Y".equals(customer.getSmsAgreeYn()) ? "수신동의" : "미동의";			// SMS수신동의여부
+		String mkAgreeYn = "Y".equals(customer.getMkAgreeYn()) ? "수신동의" : "미동의";				// 마케팅수신동의여부
 
-		String emailAgreeDt = customer.getEmailAgreeYn().equals("Y") ? customer.getEmailAgreeDt() : "";
-		String smsAgreeDt = customer.getSmsAgreeYn().equals("Y") ? customer.getSmsAgreeDt() : "";
-		String mkAgreeDt = customer.getMkAgreeYn().equals("Y") ? customer.getMkAgreeDt() : "";
+		String emailAgreeDt = "Y".equals(customer.getEmailAgreeYn()) ? customer.getEmailAgreeDt() : "";
+		String smsAgreeDt = "Y".equals(customer.getSmsAgreeYn()) ? customer.getSmsAgreeDt() : "";
+		String mkAgreeDt = "Y".equals(customer.getMkAgreeYn()) ? customer.getMkAgreeDt() : "";
 
 		GagaMap replaceInfo = new GagaMap();
 		replaceInfo.setInt("custNo", customer.getCustNo());
@@ -307,33 +307,32 @@ public class TscMailService {
 	/**
 	 * 생일쿠폰다운로드안내
 	 *
-	 * @param customer - 고객 정보
-	 * @param coupon - 쿠폰정보
+	 * @param custCoupon - 고객, 쿠폰정보
 	 * @param senderNo - 보낸
 	 * @author jsshin
 	 * @since 2021. 06. 07
 	 */
 	@Transactional("shopTxnManager")
-	public void sendBirthDayCouponNotice(Customer customer, CustCoupon coupon, Integer senderNo) {
+	public void sendBirthDayCouponNotice(CustCoupon custCoupon, Integer senderNo) {
 		GagaMap replaceInfo = new GagaMap();
-		replaceInfo.setInt("custNo", customer.getCustNo());
-		replaceInfo.setString("custId", customer.getCustId());
-		replaceInfo.setString("custNm", customer.getCustNm());
-		replaceInfo.setInt("dcVal", coupon.getDcVal());
-		replaceInfo.setString("dcWay", coupon.getDcWay());
-		replaceInfo.setString("availStdtTime", coupon.getAvailStdtTime());
-		replaceInfo.setString("availEddtTime", coupon.getAvailEddtTime());
-		if (StringUtils.isNotBlank(coupon.getAvailStdtTime())) {
-			String[] availStdt = coupon.getAvailStdtTime().split(" ");
+		replaceInfo.setInt("custNo", custCoupon.getCustNo());
+		replaceInfo.setString("custId", custCoupon.getCustId());
+		replaceInfo.setString("custNm", custCoupon.getCustNm());
+		replaceInfo.setInt("dcVal", custCoupon.getDcVal());
+		replaceInfo.setString("dcWay", custCoupon.getDcWay());
+		replaceInfo.setString("availStdtTime", custCoupon.getAvailStdtTime());
+		replaceInfo.setString("availEddtTime", custCoupon.getAvailEddtTime());
+		if (StringUtils.isNotBlank(custCoupon.getAvailStdtTime())) {
+			String[] availStdt = custCoupon.getAvailStdtTime().split(" ");
 			replaceInfo.setString("availStdt", availStdt[0]);
 		}
-		if (StringUtils.isNotBlank(coupon.getAvailEddtTime())) {
-			String[] availEddt = coupon.getAvailEddtTime().split(" ");
+		if (StringUtils.isNotBlank(custCoupon.getAvailEddtTime())) {
+			String[] availEddt = custCoupon.getAvailEddtTime().split(" ");
 			replaceInfo.setString("availEddt", availEddt[0]);
 		}
-		replaceInfo.setString("tgtCondition",coupon.getTgtCondition());
-		replaceInfo.setString("useCondition",coupon.getUseCondition());
-		netpathyMailSender.send(NetpathyMailSender.MailAnswerSq.BIRTH_COUPON_NOTICE.value(), customer.getEmail(), replaceInfo);
+		replaceInfo.setString("tgtCondition",custCoupon.getTgtCondition());
+		replaceInfo.setString("useCondition",custCoupon.getUseCondition());
+		netpathyMailSender.send(NetpathyMailSender.MailAnswerSq.BIRTH_COUPON_NOTICE.value(), custCoupon.getEmail(), replaceInfo);
 
 		try {
 			// 고객접촉이력 정보
@@ -341,7 +340,7 @@ public class TscMailService {
 			custContactHst.setContactType(TscConstants.ContactType.BIRTH_COUPON_NOTICE.value()); // 접촉유형:임시비밀번호발급(공통코드G054)
 			custContactHst.setContactMethod(TscConstants.ContactMethod.EMAIL.value()); // 접촉방법:알림톡+문자(공통코드G055)
 			custContactHst.setContactContents("생일쿠폰다운로드안내");
-			custContactHst.setReceiverNo(customer.getCustNo());
+			custContactHst.setReceiverNo(custCoupon.getCustNo());
 			custContactHst.setSenderNo(senderNo);
 			custContactHst.setRegNo(senderNo);
 			coreCustomerService.createCustomerContactHistory(custContactHst);
@@ -356,12 +355,12 @@ public class TscMailService {
 	 *
 	 * @param customer - 고객 정보
 	 * @param coupon - 쿠폰정보
-	 * @param senderNo - 보낸
+	 * @param senderNo - 발송자NO
 	 * @author jsshin
 	 * @since 2021. 06. 07
 	 */
 	@Transactional("shopTxnManager")
-	public void sendCombackCouponNotice(Customer customer, CustCoupon coupon,Integer senderNo){
+	public void sendCombackCoupon(Customer customer, CustCoupon coupon,Integer senderNo){
 		GagaMap replaceInfo = new GagaMap();
 		replaceInfo.setInt("custNo", customer.getCustNo());
 		replaceInfo.setString("custId", customer.getCustId());