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

src/main/java/com/style24/core/biz/dao/SsgDirectMessageDao.java

@@ -36,4 +36,28 @@ public interface SsgDirectMessageDao {
 	 */
 	void createKakao(SsgDirectMessage dm);
 
+	/**
+	 * SMS발송 생성 - 개발DB
+	 * @param dm - Direct message 정보
+	 * @author gagamel
+	 * @since 2020. 11. 9
+	 */
+	void createSmsDev(SsgDirectMessage dm);
+
+	/**
+	 * LMS발송 생성 - 개발DB
+	 * @param dm - Direct message 정보
+	 * @author gagamel
+	 * @since 2020. 11. 9
+	 */
+	void createLmsDev(SsgDirectMessage dm);
+
+	/**
+	 * 카카오알림톡발송 생성 - 개발DB
+	 * @param dm - Direct message 정보
+	 * @author gagamel
+	 * @since 2020. 11. 9
+	 */
+	void createKakaoDev(SsgDirectMessage dm);
+
 }

src/main/java/com/style24/core/biz/dao/TscMailTemplateDao.java

@@ -6,6 +6,7 @@ import com.style24.core.support.annotation.ShopDs;
 import com.style24.persistence.domain.MailTemplate;
 import com.style24.persistence.domain.MailTemplateCorner;
 import com.style24.persistence.domain.MailTemplateGoods;
+import org.springframework.stereotype.Repository;
 
 /**
  * 메일템플릿 Dao
@@ -14,6 +15,7 @@ import com.style24.persistence.domain.MailTemplateGoods;
  * @since 2021. 5. 28
  */
 @ShopDs
+@Repository
 public interface TscMailTemplateDao {
 
 	/**

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

@@ -123,6 +123,7 @@ public class TscKcpService {
 					result.setPayDt(c_PayPlus.mf_get_res("app_time"));			// 승인 시간
 					result.setCashAuthNo(c_PayPlus.mf_get_res("cash_authno"));	// 현금영수증 승인번호
 					result.setCashTradeNo(c_PayPlus.mf_get_res("cash_no"));		// 현금영수증 거래번호
+					result.setVaBank(c_PayPlus.mf_get_res("bank_code").replaceAll("BK", ""));	// 입금 은행 코드(공통코드 G940)
 					result.setBankNm(c_PayPlus.mf_get_res("bank_name"));			// 은행명 (보증보험에서 사용)
 					result.setPayMeans(TscConstants.PayMeans.ACCOUNT_TRANSFER.value());
 				} else if ("001000000000".equals(result.getUsePayMethod())) {

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

@@ -44,6 +44,8 @@ public class SsgKakaoSender {
 
 	private String domainUrl;
 
+	private String active;
+
 	@Autowired
 	private Environment env;
 
@@ -124,7 +126,7 @@ public class SsgKakaoSender {
 	public void init() {
 		domainUrl = env.getProperty("domain.front");
 		callbackTelNo = TscConstants.CALLCENTER_TEL_NO;
-
+		active = env.getProperty("spring.profiles.active");
 		log.debug("\n\n---- SsgKakaoSender initialization started ----");
 		log.debug("profile: [{}]", profile);
 		log.debug("callbackTelNo: [{}]", callbackTelNo);
@@ -177,7 +179,12 @@ public class SsgKakaoSender {
 		}
 
 		// 카카오 알림톡 발송
-		dmDao.createKakao(dm);
+		if ("run".equals(active) || "style".equals(active)) {
+			dmDao.createKakao(dm);
+		} else {
+			dmDao.createKakaoDev(dm);
+		}
+
 	}
 
 	/**
@@ -194,7 +201,11 @@ public class SsgKakaoSender {
 		AnswerPhase ansPhase = this.getAnswerPhase(ansSq, replaceInfo);
 		dm.setFmessage(ansPhase.getAnsContent());
 		dm.setFcallback(callbackTelNo);
-		dmDao.createSms(dm);
+		if ("run".equals(active) || "style".equals(active)) {
+			dmDao.createSms(dm);
+		} else {
+			dmDao.createSmsDev(dm);
+		}
 	}
 
 	/**
@@ -212,7 +223,11 @@ public class SsgKakaoSender {
 		dm.setFsubject(ansPhase.getAnsTitle());
 		dm.setFmessage(ansPhase.getAnsContent());
 		dm.setFcallback(callbackTelNo);
-		dmDao.createLms(dm);
+		if ("run".equals(active) || "style".equals(active)) {
+			dmDao.createLms(dm);
+		} else {
+			dmDao.createLmsDev(dm);
+		}
 	}
 
 	/**

src/main/java/com/style24/core/support/env/TscConstants.java

@@ -369,8 +369,9 @@ public class TscConstants {
 		KCP("KCP"),							// KCP
 		KAKAO("KAKAO"),						// 카카오페이
 		NAVER("NAVER"),						// NAVERPAY
+		NAVER_ORDER("NAVER_ORDER"),			// NAVERPAY
 		PAYCO("PAYCO"),						// PAYCO
-		ISTYLE("ISTYLE");					// 아이스타일 (상품권으로만결제시)
+		ISTYLE("ISTYLE");						// 아이스타일 (상품권으로만결제시)
 
 		private String value;
 

src/main/java/com/style24/persistence/domain/Order.java

@@ -35,6 +35,7 @@ public class Order extends TscBaseDomain {
 	private String siteCd;							// 사이트코드
 	private String siteCdNm;						// 사이트코드명
 	private int npayOrdNo;							// 네이버페이주문번호
+	private int npayOrdDtlNo;						// 네이버페이 상품주문번호(주문상세번호)
 	private String frontGb;							// 프론트구분 (P, M, A)
 	private String frontGbNm;						// 프론트구분명 (PC, MOBILE, APP)
 	private String extmallNm;						// 외부몰명

src/main/java/com/style24/persistence/mybatis/shop/SsgDirectMessage.xml

@@ -5,7 +5,7 @@
 	<!-- SMS발송 생성 -->
 	<insert id="createSms" parameterType="SsgDirectMessage">
 		/* SsgDirectMessage.createSms */
-		INSERT INTO SSG_SEND_TRAN_SMS (
+		INSERT INTO style24_msg.SSG_SEND_TRAN_SMS (
 		       FSEQ
 		     , FUSERID
 		     , FSECTIONCODE
@@ -32,7 +32,7 @@
 	<!-- LMS발송 생성 -->
 	<insert id="createLms" parameterType="SsgDirectMessage">
 		/* SsgDirectMessage.createLms */
-		INSERT INTO SSG_SEND_TRAN_MMS (
+		INSERT INTO style24_msg.SSG_SEND_TRAN_MMS (
 		       FSEQ
 		     , FUSERID
 		     , FSECTIONCODE
@@ -60,6 +60,101 @@
 	
 	<!-- 카카오알림톡발송 생성 -->
 	<insert id="createKakao" parameterType="SsgDirectMessage">
+		/* SsgDirectMessage.createKakao */
+		INSERT INTO style24_msg.SSG_SEND_TRAN_KKO (
+		       FSEQ            /*메시지SEQ*/
+		     , FUSERID         /*사용자계정*/
+		     , FSECTIONCODE    /*계층코드(SINC로부터 부여받은 코드값)*/
+		     , FCAMPCODE       /*캠페인코드(CRM전송 등에 이용)*/
+		     , FYELLOWID       /*KKO발신프로필키(카카오 전송을 위해 승인받은 프로필키)*/
+		     , FKKOSUBJECT     /*KKO친구툭전용제목*/
+		     , FTEMPLATEKEY    /*KKO템플릿키*/
+		     , FKKOBUTTON      /*KKO버튼(링크기능, JSON 이용)*/
+		     , FMSGTYPE        /*메시지타입(4:KKO)*/
+		     , FMESSAGE        /*메시지본문*/
+		     , FSENDDATE       /*메시지발송시간(예약메시지인경우 해당 예약일시)*/
+		     , FKKORESENDTYPE  /*KKO/KKF재발송메시지타입(SMS/LMS)*/
+		     , FKKORESENDMSG   /*KKO/KKF재발송메시지내용*/
+		     , FDESTINE        /*수신자전화번호*/
+		     , FCALLBACK       /*발신자전화번호(회신번호)*/
+		)
+		VALUES (
+		       NULL
+		     , #{fuserid}
+		     , #{fsectioncode}
+		     , #{fcampcode}
+		     , #{fyellowid}
+		     , #{fkkosubject}
+		     , #{ftemplatekey}
+		     , #{fkkobutton}
+		     , '4'
+		     , #{fmessage}
+		     , NOW()
+		     , #{fkkoresendtype}
+		     , #{fkkoresendmsg}
+		     , #{fdestine}
+		     , #{fcallback}
+		)
+	</insert>
+
+		<!-- SMS발송 생성 -->
+	<insert id="createSmsDev" parameterType="SsgDirectMessage">
+		/* SsgDirectMessage.createSmsDev */
+		INSERT INTO SSG_SEND_TRAN_SMS (
+		       FSEQ
+		     , FUSERID
+		     , FSECTIONCODE
+		     , FCAMPCODE
+		     , FMSGTYPE
+		     , FMESSAGE
+		     , FSENDDATE
+		     , FDESTINE
+		     , FCALLBACK
+		)
+		VALUES (
+		       NULL
+		     , #{fuserid}
+		     , #{fsectioncode}
+		     , #{fcampcode}
+		     , '0'
+		     , #{fmessage}
+		     , NOW()
+		     , #{fdestine}
+		     , #{fcallback}
+		)
+	</insert>
+
+	<!-- LMS발송 생성 -->
+	<insert id="createLmsDev" parameterType="SsgDirectMessage">
+		/* SsgDirectMessage.createLms */
+		INSERT INTO SSG_SEND_TRAN_MMS (
+		       FSEQ
+		     , FUSERID
+		     , FSECTIONCODE
+		     , FCAMPCODE
+		     , FMSGTYPE
+		     , FSUBJECT
+		     , FMESSAGE
+		     , FSENDDATE
+		     , FDESTINE
+		     , FCALLBACK
+		)
+		VALUES (
+		       NULL
+		     , #{fuserid}
+		     , #{fsectioncode}
+		     , #{fcampcode}
+		     , '2'
+		     , #{fsubject}
+		     , #{fmessage}
+		     , NOW()
+		     , #{fdestine}
+		     , #{fcallback}
+		)
+	</insert>
+
+	<!-- 카카오알림톡발송 생성 -->
+	<insert id="createKakaoDev" parameterType="SsgDirectMessage">
 		/* SsgDirectMessage.createKakao */
 		INSERT INTO SSG_SEND_TRAN_KKO (
 		       FSEQ            /*메시지SEQ*/

src/main/java/com/style24/persistence/mybatis/shop/TscOrderChange.xml

@@ -3564,6 +3564,9 @@
 		     , OD.SAVE_PNT_AMT
 		     , OD.REAL_ORD_AMT
 		     , OD.GFCD_USE_AMT
+			 , OD.GOODS_CD
+		     , ODI.OPT_CD
+		     , ODI.ITEM_CD
 		  FROM TB_ORDER_DETAIL OD
 		 INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 		    ON OD.ORD_NO = ODI.ORD_NO