Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.core into develop

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

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Repository;
 public interface NetpathyMailDao {
 
 	/**
-	 * 메일 생성
+	 * 메일 생성 - 운영
 	 * @param netpathy - 넷퍼시메일 정보
 	 * @return
 	 * @author gagamel
@@ -23,4 +23,13 @@ public interface NetpathyMailDao {
 	 */
 	void createMail(Netpathy netpathy);
 
+	/**
+	 * 메일 생성 - 개발
+	 * @param netpathy - 넷퍼시메일 정보
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 5. 10
+	 */
+	void createMailDev(Netpathy netpathy);
+
 }

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

@@ -2,6 +2,9 @@ package com.style24.core.biz.dao;
 
 import com.style24.core.support.annotation.ShopDs;
 import com.style24.persistence.domain.Clause;
+import org.springframework.stereotype.Repository;
+
+import java.util.Collection;
 
 /**
  * 약관 Dao
@@ -10,6 +13,7 @@ import com.style24.persistence.domain.Clause;
  * @since 2020. 10. 29
  */
 @ShopDs
+@Repository
 public interface TscClauseDao {
 
 	/**
@@ -21,4 +25,23 @@ public interface TscClauseDao {
 	 */
 	String getClause(Clause clause);
 
+	/**
+	 * 약관목록
+	 * @param  clause - 약관타입, 사이트코드
+	 * @return Collection<Clause> - 약관목록
+	 * @author jsshin
+	 * @since 2021. 06. 10
+	 */
+	Collection<Clause> getClauseList(Clause clause);
+
+	/**
+	 * 약관정보
+	 * @param  clauseSq - 약관시퀀스
+	 * @return String - 약관내용
+	 * @author jsshin
+	 * @since 2021. 06. 10
+	 */
+	Clause getClauseInfo(Integer clauseSq);
+
+
 }

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

@@ -9,6 +9,8 @@ import com.style24.persistence.domain.Clause;
 
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.Collection;
+
 /**
  * 약관 Service
  * 
@@ -38,4 +40,31 @@ public class TscClauseService {
 		return clauseDao.getClause(clause);
 	}
 
+	/**
+	 * 약관목록
+	 * @param  siteCd - 사이트코드
+	 * @param  clauseType - 약관타입
+	 * @return Collection<Clause> - 약관목록
+	 * @author jsshin
+	 * @since 2021. 06. 10
+	 */
+	public Collection<Clause> getClauseList(String siteCd, String clauseType) {
+		Clause clause = new Clause();
+		clause.setSiteCd(siteCd);
+		clause.setClauseType(clauseType);
+		return clauseDao.getClauseList(clause);
+	}
+
+	/**
+	 * 약관정보
+	 * @param  clauseSq - 약관시퀀스
+	 * @return String - 약관내용
+	 * @author jsshin
+	 * @since 2021. 06. 10
+	 */
+	public Clause getClauseInfo(Integer clauseSq) {
+		return clauseDao.getClauseInfo(clauseSq);
+	}
+
+
 }

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

@@ -37,6 +37,8 @@ public class NetpathyMailSender {
 
 	private String domainUrl;
 
+	private String active;
+
 	@Autowired
 	private Environment env;
 
@@ -85,6 +87,7 @@ public class NetpathyMailSender {
 	public void init() {
 		domainUrl = env.getProperty("domain.front");
 		callbackTelNo = TscConstants.CALLCENTER_TEL_NO;
+		active = env.getProperty("spring.profiles.active");
 
 		log.debug("\n\n---- NetpathyMailSender initialization started ----");
 		log.debug("domainUrl: [{}]", domainUrl);
@@ -127,12 +130,16 @@ public class NetpathyMailSender {
 		netpathy.setLegacyid(custId);
 		netpathy.setAutotype("TST");
 		netpathy.setEmail(toAddress);
-//		netpathy.setName(name);
 		netpathy.setTitle(mailTemplate.getMailtNm());
 		netpathy.setContent(contentBuilder.toString());
 
 		// 메일 생성
-		netpathyDao.createMail(netpathy);
+		if ("run".equals(active) || "style".equals(active) || "locp".equals(active)) {
+			netpathyDao.createMail(netpathy);
+		} else {
+			netpathyDao.createMailDev(netpathy);
+		}
+
 	}
 
 	/**

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

@@ -182,7 +182,7 @@ public class SsgKakaoSender {
 		}
 
 		// 카카오 알림톡 발송
-		if ("run".equals(active) || "style".equals(active)) {
+		if ("run".equals(active) || "style".equals(active) || "locp".equals(active)) {
 			dmDao.createKakao(dm);
 		} else {
 			dmDao.createKakaoDev(dm);

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

@@ -21,5 +21,6 @@ public class Clause extends TscBaseDomain {
 	private String clauseContent;
 	private String effectDt;
 	private String dispYn;
+	private String effectYn;
 
 }

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

@@ -5,6 +5,63 @@
 	<!-- 메일 생성 -->
 	<insert id="createMail" parameterType="Netpathy">
 		/* NetpathyMail.createMail */
+		INSERT INTO style24_msg.AUTOMAIL_INTERFACE (
+		       LEGACYID     /*회원ID*/
+		     , AUTOTYPE     /*자동메일타입*/
+		     , EMAIL        /*이메일*/
+		     , NAME         /*이름*/
+		     , INSERTDATE   /*입력일*/
+		     , SENDTIME     /*예약전송일*/
+		     , OPENTIME
+		     , SENTTIME
+		     , SENDYN       /*전송여부*/
+		     , CMPNCODE
+		     , FROMADDRESS
+		     , FROMNAME
+		     , TITLE        /*메일제목*/
+		     , CONTENT      /*메일내용*/
+		     , TAG1
+		     , TAG2
+		     , TAG3
+		     , TAG4
+		     , TAG5
+		     , TAG6
+		     , TAG7
+		     , TAG8
+		     , TAG9
+		     , TAG10
+		)
+		VALUES (
+		       IFNULL(#{legacyid},'-')
+		     , #{autotype}
+		     , #{email}
+		     , #{name}
+		     , NOW()
+		     , IFNULL(STR_TO_DATE(#{sendtime},'%Y%m%d%H%i%S'),NOW())
+		     , NULL
+		     , NULL
+		     , 'N'
+		     , NULL
+		     , NULL
+		     , NULL
+		     , #{title}
+		     , #{content}
+		     , NULL
+		     , NULL
+		     , NULL
+		     , NULL
+		     , NULL
+		     , NULL
+		     , NULL
+		     , NULL
+		     , NULL
+		     , NULL
+		)
+	</insert>
+
+		<!-- 메일 생성 -->
+	<insert id="createMailDev" parameterType="Netpathy">
+		/* NetpathyMail.createMailDev */
 		INSERT INTO AUTOMAIL_INTERFACE (
 		       LEGACYID     /*회원ID*/
 		     , AUTOTYPE     /*자동메일타입*/

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

@@ -16,4 +16,24 @@
 		                   )
 	</select>
 
+	<!-- 약관 정보 목록 -->
+	<select id="getClauseList" parameterType="Clause" resultType="Clause">
+		/* TscClause.getClause */
+		SELECT CLAUSE_SQ
+		     , CLAUSE_TITLE
+		     , CLAUSE_CONTENT
+		FROM   TB_CLAUSE
+		WHERE  SITE_CD = #{siteCd}
+		AND    CLAUSE_TYPE = #{clauseType}
+		AND    DISP_YN = 'Y'
+		ORDER BY REG_DT
+	</select>
+
+	<!-- 약관 정보 -->
+	<select id="getClauseInfo" parameterType="Integer" resultType="Clause">
+		SELECT CLAUSE_CONTENT
+		FROM   TB_CLAUSE
+		WHERE  CLAUSE_SQ = #{clauseSq}
+	</select>
+
 </mapper>

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

@@ -105,7 +105,9 @@
 		                 , DATE_FORMAT(O.ORD_DT,'%Y%m%d%H%i%S') AS ORD_DT
 		                 , P.PG_GB
 		                 , P.PAY_MEANS
-		                 , FN_GET_CODE_NM('G014', P.PAY_MEANS  ) AS PAY_MEANS_NM
+		                 , CASE WHEN P.PG_GB = 'KCP' THEN FN_GET_CODE_NM('G014', P.PAY_MEANS)
+		                        WHEN P.PG_GB = 'ISTYLE' THEN '상품권'
+		                        ELSE FN_GET_CODE_NM('G015', P.PG_GB) END AS PAY_MEANS_NM
 		                 , O.ORD_PHNNO
 		                 , DA.RECIP_NM
 		                 , DA.RECIP_PHNNO