충돌수정

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

@@ -4,8 +4,6 @@ import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import com.style24.core.biz.dao.TscOrderChangeDao;
-import com.style24.persistence.domain.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -13,6 +11,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.gagaframework.web.parameter.GagaMap;
+import com.style24.core.biz.dao.TscOrderChangeDao;
 import com.style24.core.biz.thirdparty.NaverShortUrl;
 import com.style24.core.biz.thirdparty.SsgKakaoSender;
 import com.style24.core.support.env.TscConstants;
@@ -24,6 +23,7 @@ import com.style24.persistence.domain.Customer;
 import com.style24.persistence.domain.GiftCard;
 import com.style24.persistence.domain.Order;
 import com.style24.persistence.domain.OrderChange;
+import com.style24.persistence.domain.Payment;
 import com.style24.persistence.domain.Point;
 import com.style24.persistence.domain.SsgDirectMessage;
 
@@ -985,7 +985,7 @@ public class TscKakaotalkService {
 		replaceInfo.setString("회원명"				, orderChange.getOrdNm());
 		replaceInfo.setInt("ordNo"					, orderChange.getOrdNo());
 		replaceInfo.setInt("OrderNo"				, orderChange.getOrdNo());
-		replaceInfo.setString("goodsNm"				, orderChange.getGoodsNm());
+		replaceInfo.setString("goodsNm"				, goodsNm);
 		replaceInfo.setInt("goodsCnt"				, orderChange.getGoodsCnt());
 		replaceInfo.setInt("N"						, orderChange.getGoodsCnt());
 		replaceInfo.setString("payMeansNm"			, orderChange.getPayMeansNm());
@@ -1012,18 +1012,8 @@ public class TscKakaotalkService {
 				} else if (TscConstants.PayMeans.BANK_DEPOSIT.value().equals(payMeans)) {
 					ansSq = SsgKakaoSender.KakaoAnswerSq.VA_CANCEL_BY_SOLDOUT.value();
 				}
-			} else if (TscConstants.PgGb.PAYCO.value().equals(pgGb)) {
-				// TODO
-				// PAYCO 취소 알림톡 처리
-			} else if (TscConstants.PgGb.KAKAO.value().equals(pgGb)) {
-				// TODO
-				// 카카오페이 취소 알림톡 처리
-			} else if (TscConstants.PgGb.NAVER.value().equals(pgGb)) {
-				// TODO
-				// 네이버페이 취소 알림톡 처리
-			} else if (TscConstants.PgGb.ISTYLE.value().equals(pgGb)) {
-				// TODO
-				// 상품권 전체 결제 취소 알림톡 처리
+			} else if (TscConstants.PgGb.PAYCO.value().equals(pgGb) || TscConstants.PgGb.KAKAO.value().equals(pgGb) || TscConstants.PgGb.NAVER.value().equals(pgGb) || TscConstants.PgGb.ISTYLE.value().equals(pgGb)) {
+				ansSq = SsgKakaoSender.KakaoAnswerSq.CARD_CANCEL_BY_SOLDOUT.value();
 			}
 		} else {
 			// 일반 취소
@@ -1037,18 +1027,8 @@ public class TscKakaotalkService {
 				} else if (TscConstants.PayMeans.BANK_DEPOSIT.value().equals(payMeans)) {
 					ansSq = SsgKakaoSender.KakaoAnswerSq.VA_CANCEL_REFUND.value();
 				}
-			} else if (TscConstants.PgGb.PAYCO.value().equals(pgGb)) {
-				// TODO
-				// PAYCO 취소 알림톡 처리
-			} else if (TscConstants.PgGb.KAKAO.value().equals(pgGb)) {
-				// TODO
-				// 카카오페이 취소 알림톡 처리
-			} else if (TscConstants.PgGb.NAVER.value().equals(pgGb)) {
-				// TODO
-				// 네이버페이 취소 알림톡 처리
-			} else if (TscConstants.PgGb.ISTYLE.value().equals(pgGb)) {
-				// TODO
-				// 상품권 전체 결제 취소 알림톡 처리
+			} else if (TscConstants.PgGb.PAYCO.value().equals(pgGb) || TscConstants.PgGb.KAKAO.value().equals(pgGb) || TscConstants.PgGb.NAVER.value().equals(pgGb) || TscConstants.PgGb.ISTYLE.value().equals(pgGb)) {
+				ansSq = SsgKakaoSender.KakaoAnswerSq.ETC_CANCEL_REFUND.value();
 			}
 		}
 

src/main/java/com/style24/core/biz/thirdparty/SsgKakaoSender.java

@@ -13,6 +13,8 @@ import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.util.GagaStringUtil;
 import com.google.gson.Gson;
 import com.style24.core.biz.dao.SsgDirectMessageDao;
 import com.style24.core.biz.dao.TscAnswerPhaseDao;
@@ -23,9 +25,6 @@ import com.style24.persistence.domain.SsgDirectMessage;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.util.GagaStringUtil;
-
 /**
  * 신세계아이앤씨 SSG 모듈을 이용한 카카오알림톡 Sender
  * 
@@ -89,6 +88,7 @@ public class SsgKakaoSender {
 		NA_CANCEL_REFUND(1037),			// 주문취소 및 환불 안내-통신사
 		AT_CANCEL_REFUND(1038),			// 주문취소 및 환불 안내-계좌이체
 		VA_CANCEL_REFUND(1039),			// 주문취소 및 환불 안내-무통장
+		ETC_CANCEL_REFUND(1057),		// 주문취소 및 환불 안내-페이코,네이버,카카오
 
 		CARD_CANCEL_BY_SOLDOUT(1040),	// 품절 주문 취소 안내-신용카드
 		AT_CANCEL_BY_SOLDOUT(1041),		// 품절 주문 취소 안내 안내-계좌이체