sowon4187 4 лет назад
Родитель
Сommit
25629308e7

+ 2 - 0
src/main/java/com/style24/front/biz/service/TsfGiftcardService.java

@@ -5,6 +5,7 @@ import java.util.Collection;
 import com.style24.core.biz.thirdparty.Yes24Giftcard;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.style24.front.biz.dao.TsfGiftcardDao;
 import com.style24.front.support.security.session.TsfSession;
@@ -84,6 +85,7 @@ public class TsfGiftcardService {
 	 * @throws Exception
 	 * @since 2021. 3. 15
 	 */
+	@Transactional("shopTxnManager")
 	public void createGiftcardUseConfirm(GiftCard giftcard) throws Exception {
 		// 고객번호 설정
 		int custNo = TsfSession.getInfo().getCustNo();

+ 4 - 0
src/main/java/com/style24/front/biz/service/TsfPlanningService.java

@@ -392,6 +392,7 @@ public class TsfPlanningService {
 	 * @author sowon
 	 * @date 2021. 4. 3
 	 */
+	@Transactional("shopTxnManager")
 	public void savePollCustAnswer(Poll poll) {
 		poll.setCustNo(TsfSession.getInfo().getCustNo());
 		// 단수형
@@ -533,6 +534,7 @@ public class TsfPlanningService {
 	 * @author sowon
 	 * @date 2021. 4. 7
 	 */
+	@Transactional("shopTxnManager")
 	public void saveAttendEntry(Plan plan) {
 		int custNo = TsfSession.getInfo().getCustNo();
 		plan.setCustNo(custNo);
@@ -601,6 +603,7 @@ public class TsfPlanningService {
 	 * @author sowon
 	 * @date 2021. 4. 13
 	 */
+	@Transactional("shopTxnManager")
 	public void saveEntryReply(Plan plan) {
 		int custNo = TsfSession.getInfo().getCustNo();
 		plan.setCustNo(custNo);
@@ -660,6 +663,7 @@ public class TsfPlanningService {
 	 * @author sowon
 	 * @date 2021. 4. 13
 	 */
+	@Transactional("shopTxnManager")
 	public void deleteEntryReply(Plan plan) {
 		planningDao.deleteEntryReply(plan);
 		planningDao.deleteEntryReplyAttach(plan);

+ 1 - 0
src/main/java/com/style24/front/biz/service/TsfReviewService.java

@@ -452,6 +452,7 @@ public class TsfReviewService {
 	 * @author sowon
 	 * @since 2021. 3. 26
 	 */
+	@Transactional("shopTxnManager")
 	public void reviewDelete(Review review) {
 		review.setCustNo(TsfSession.getInfo().getCustNo());
 		reviewDao.reviewDelete(review);

+ 1 - 1
src/main/webapp/WEB-INF/views/web/callcenter/NoticeFormWeb.html

@@ -120,7 +120,7 @@
 				tag += '	</div>\n';
 				tag += '	<div class="fold_cont" style="display: none;">\n';
 				tag += '		<div class="fold_detail">\n';
-				tag += '			<div>' + item.noticeContent.escapeHtml().replace(/\n/g,'<br/>') + '</div>\n';
+				tag += '			<div>' + item.noticeContent + '</div>\n';
 				tag += '		</div>\n';
 				tag += '	</div>\n';
 				tag += '</li>\n';