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

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

@@ -451,8 +451,8 @@ public class TscKakaotalkService {
 	}
 	
 	/**
-	 *  쿠폰 기간만료 알림톡(30일)
-	 * @param coupon - 상품권 정보
+	 *  쿠폰 기간만료 알림톡(7일)
+	 * @param coupon - 쿠폰 정보
 	 * @param senderNo - 발송자번호(고객번호)
 	 * @author sowon
 	 * @since 2021. 5. 31
@@ -468,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 {

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

@@ -287,6 +287,7 @@ public class Order extends TscBaseDomain {
 
 	// 주문메모칼럼
 	private Integer orderMemoSq;
+	private Integer ordMemoSq;
 	private String memo;
 	private String orgFileNm;
 	private String sysFileNm;

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

@@ -1082,15 +1082,17 @@
 	<select id="getOrderMemoList" parameterType="Order" resultType="Order">
 		/* order.getOrderMemoList */
 		SELECT ORD_MEMO_SQ
-			 , OM.ORD_NO
-			 , OM.MEMO
-			 , OM.REG_NO
-			 , OM.REG_DT
-			 , OM.UPD_NO
-			 , OM.UPD_DT
-			 , (SELECT USER_NM
-				  FROM TB_USER X
-				 WHERE X.USER_NO = OM.REG_NO) AS REG_NM
+		     , OM.ORD_NO
+		     , OM.MEMO
+		     , OM.REG_NO
+		     , OM.REG_DT
+		     , OM.UPD_NO
+		     , OM.UPD_DT
+		     , (SELECT USER_NM
+		          FROM TB_USER X
+		         WHERE X.USER_NO = OM.REG_NO) AS REG_NM
+		     , OM.SYS_FILE_NM
+		     , OM.ORG_FILE_NM 
 		  FROM TB_ORDER_MEMO OM
 		 WHERE 1 = 1
 		   AND OM.ORD_NO = #{ordNo}
@@ -1278,15 +1280,17 @@
 	<select id="getOrderMemoInfo" parameterType="Order" resultType="Order">
 		/* order.getOrderMemoInfo */
 		SELECT ORD_MEMO_SQ
-			 , OM.ORD_NO
-			 , OM.MEMO
-			 , OM.REG_NO
-			 , OM.REG_DT
-			 , OM.UPD_NO
-			 , OM.UPD_DT
-			 , (SELECT USER_NM
-				  FROM TB_USER X
-				 WHERE X.USER_NO = OM.UPD_NO) AS USER_NM
+		     , OM.ORD_NO
+		     , OM.MEMO
+		     , OM.REG_NO
+		     , OM.REG_DT
+		     , OM.UPD_NO
+		     , OM.UPD_DT
+		     , (SELECT USER_NM
+		         FROM TB_USER X
+		        WHERE X.USER_NO = OM.UPD_NO) AS USER_NM
+		     , OM.SYS_FILE_NM
+		     , OM.ORG_FILE_NM
 		  FROM TB_ORDER_MEMO OM
 		 WHERE 1 = 1
 		   AND OM.ORD_NO = #{ordNo}