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

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

@@ -40,6 +40,14 @@ public interface TscPopupDao {
      */
     void savePopup(Popup popup);
 
+    /**
+     * 팝업 삭제
+     * @return
+     * @author bin2107
+     * @since 2021. 3. 3
+     */
+    void deletePopup(Popup popup);
+
     /**
      * 팝업 프런트 화면 삭제
      * @return
@@ -47,4 +55,12 @@ public interface TscPopupDao {
      * @since 2021. 3. 3
      */
     void deletePopupFront(Popup popup);
+
+    /**
+     * 팝업 프런트 적용
+     * @return
+     * @author bin2107
+     * @since 2021. 3. 4
+     */
+    void savePopupFront(Popup popup);
 }

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

@@ -3,7 +3,7 @@ package com.style24.core.biz.service;
 import com.gagaframework.web.util.GagaDateUtil;
 import com.gagaframework.web.util.GagaFileUtil;
 import com.style24.core.biz.dao.TscPopupDao;
-import com.style24.persistence.domain.Popup;
+import com.style24.persistence.domain.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -58,11 +58,10 @@ public class TscPopupService {
      */
     @Transactional("shopTxnManager")
     public void savePopup(Popup popup) {
-        String popupImgNm = "";
-        String displayUploadPath = env.getProperty("upload.default.target.path");
-
-        if(!StringUtils.isEmpty(popup.getNewImgFileNm1())){
-            String newFilename = "POPUP_" + GagaDateUtil.getTodayDateTime() + "." + StringUtils.getFilenameExtension(popup.getNewImgFileNm1());
+        if(!StringUtils.isEmpty(popup.getNewSysFileNm())){
+            String displayUploadPath = env.getProperty("upload.default.target.path");
+            displayUploadPath = GagaFileUtil.getConcatenationPath(displayUploadPath, "display/popup");
+            String newFilename = "POPUP_" + GagaDateUtil.getTodayDateTime() + "." + StringUtils.getFilenameExtension(popup.getNewSysFileNm());
 
             // 기존이미지 삭제
             try{
@@ -74,7 +73,7 @@ public class TscPopupService {
             }
 
             File uniqueFile = GagaFileUtil.getUniqueFile(new File(GagaFileUtil.getConcatenationPath(displayUploadPath, newFilename)));
-            File file = new File(GagaFileUtil.getConcatenationPath(displayUploadPath, popup.getNewImgFileNm1()));
+            File file = new File(GagaFileUtil.getConcatenationPath(displayUploadPath, popup.getNewSysFileNm()));
 
             // Rename a file
             file.renameTo(uniqueFile);
@@ -86,4 +85,32 @@ public class TscPopupService {
         popupDao.deletePopupFront(popup);
     }
 
+    /**
+     * 팝업관리 삭제
+     * @return
+     * @author bin2107
+     * @since 2021. 3. 4
+     */
+    @Transactional("shopTxnManager")
+    public void deletePopup(Popup popup){
+        for(String popupSq : popup.getSelectDataArr()){
+            popup.setPopupSq(Integer.parseInt(popupSq));
+            popupDao.deletePopup(popup);
+            popupDao.deletePopupFront(popup);
+        }
+    }
+
+    /**
+     * 팝업관리 프론트 적용
+     * @return
+     * @author bin2107
+     * @since 2021. 3. 4
+     */
+    @Transactional("shopTxnManager")
+    public void savePopupFront(Popup popup) {
+        for(String popupSq : popup.getSelectDataArr()){
+            popup.setPopupSq(Integer.parseInt(popupSq));
+            popupDao.savePopupFront(popup);
+        }
+    }
 }

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

@@ -37,4 +37,5 @@ public class Point extends TscBaseDomain {
 	private int expectedPntAmt;			// 적립예정포인트
 	private int expectedExpirePntAmt;	// 소멸예정포인트
 
+	private String searchDt;			// 검색일자
 }

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

@@ -1,5 +1,6 @@
 package com.style24.persistence.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.style24.persistence.TscBaseDomain;
 import com.style24.persistence.TscPageRequest;
 import lombok.Data;
@@ -49,6 +50,11 @@ public class Popup extends TscBaseDomain {
     private String  newImgFileNm5;
     private String  orgFileNm;
     private String  sysFileNm;
+    private String  newSysFileNm;
+    private String  viewPageNm;
+
+    @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+    private String[] selectDataArr;
 
     // Pagination
     private TscPageRequest pageable;

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

@@ -17,12 +17,12 @@
 		<if test='frontGb != null and frontGb != "" and frontGb != "A"'>
 			AND (A.FRONT_GB = 'A' OR A.FRONT_GB = #{frontGb} )
 		</if>
-		<if test="dispEddt != null and dispEddt ==''">
+		<if test="dispEddt != null and dispEddt !=''">
 		<![CDATA[
 		  AND 	A.DISP_STDT <= STR_TO_DATE(CONCAT(#{dispEddt},#{dispEdTime}),'%Y-%m-%d %H:%i:%S')
 		]]>
 		</if>
-		<if test="dispStdt != null and dispStdt ==''">
+		<if test="dispStdt != null and dispStdt !=''">
 		<![CDATA[
 		  AND 	A.DISP_STDT >= STR_TO_DATE(CONCAT(#{dispStdt},#{dispStTime}),'%Y-%m-%d %H:%i:%S')
 		]]>
@@ -47,6 +47,7 @@
 			, A.LINK_URL4
 			, A.LINK_URL5
 			, A.VIEW_PAGE
+			, (SELECT CD_NM FROM TB_COMMON_CODE WHERE CD_GB = 'G037' AND CD = A.VIEW_PAGE) AS VIEW_PAGE_NM
 			, A.CATE1_NO
 			, A.BRAND_CD
 			, A.PLAN_SQ
@@ -62,6 +63,7 @@
 			, DATE_FORMAT(A.DISP_EDDT,'%H:%i:%S') AS DISP_ED_TIME
 			, IFNULL(B.USE_YN, 'N') AS DISPLAY_YN
 			, A.REG_NO
+			, FN_GET_USER_NM(A.REG_NO) AS REG_NM
 			, DATE_FORMAT(A.REG_DT,'%Y-%m-%d %H:%i:%S') AS REG_DT
 		FROM	TB_POPUP A
 		LEFT OUTER JOIN TB_POPUP_FRONT B
@@ -74,17 +76,17 @@
 		<if test='frontGb != null and frontGb != "" and frontGb != "A"'>
 			AND (A.FRONT_GB = 'A' OR A.FRONT_GB = #{frontGb} )
 		</if>
-		<if test="dispEddt != null and dispEddt ==''">
+		<if test="dispEddt != null and dispEddt !=''">
 		<![CDATA[
 		  AND 	A.DISP_STDT <= STR_TO_DATE(CONCAT(#{dispEddt},#{dispEdTime}),'%Y-%m-%d %H:%i:%S')
 		]]>
 		</if>
-		<if test="dispStdt != null and dispStdt ==''">
+		<if test="dispStdt != null and dispStdt !=''">
 		<![CDATA[
 		  AND 	A.DISP_STDT >= STR_TO_DATE(CONCAT(#{dispStdt},#{dispStTime}),'%Y-%m-%d %H:%i:%S')
 		]]>
 		</if>
-		ORDER BY A.FRONT_GB, A.DISP_ORD, A.POPUP_SQ DESC
+		ORDER BY A.POPUP_SQ DESC
 	</select>
 
 	<!-- 팝업관리 등록/수정 -->
@@ -111,14 +113,17 @@
 			,DISP_EDDT
 			,UNEXP_DAYS
 			,DISP_ORD
+			,USE_YN
 			,REG_NO
 			,REG_DT
+			,UPD_NO
+			,UPD_DT
 		) VALUES (
 			#{popupSq}
 			,#{siteCd}
 			,#{frontGb}
 			,#{popupGb}
-			,#{imgUrl1}
+			,#{sysFileNm}
 			,#{linkUrl1}
 			,#{viewPage}
 		<if test='cate1No != null and cate1No != ""'>
@@ -134,11 +139,14 @@
 			,#{dispEddt}
 			,#{unexpDays}
 			,#{dispOrd}
+			,#{useYn}
 			,#{regNo}
 			,NOW()
+			,#{updNo}
+		    ,NOW()
 		) ON DUPLICATE KEY UPDATE
 			FRONT_GB	= #{frontGb}
-			,IMG_URL1	= #{imgUrl1}
+			,IMG_URL1	= #{sysFileNm}
 			,LINK_URL1	= #{linkUrl1}
 			,VIEW_PAGE	= #{viewPage}
 		<if test='cate1No != null and cate1No != ""'>
@@ -154,17 +162,97 @@
 			,DISP_EDDT	= #{dispEddt}
 			,UNEXP_DAYS	= #{unexpDays}
 			,DISP_ORD	= #{dispOrd}
+		    ,USE_YN = #{useYn}
 			,UPD_NO = #{updNo}
 			,UPD_DT = NOW()
 	</insert>
 
+	<!-- 팝업관리 팝업 삭제 -->
+	<update id="deletePopup" parameterType="Popup">
+		/* TscPopup.deletePopup */
+		UPDATE TB_POPUP
+		SET UPD_NO = #{updNo}
+		  , UPD_DT = NOW()
+		  , USE_YN = 'N'
+		WHERE POPUP_SQ = #{popupSq}
+	</update>
+
 	<!-- 팝업관리 프론트 삭제 -->
-	<delete id="deletePopupFront" parameterType="Popup">
+	<update id="deletePopupFront" parameterType="Popup">
 		/* TscPopup.deletePopupFront */
 		UPDATE TB_POPUP_FRONT
-		SET UPD_ID = #{updNo}
+		SET UPD_NO = #{updNo}
 		  , UPD_DT = (SELECT UPD_DT FROM TB_POPUP WHERE POPUP_SQ = #{popupSq})
 		  , USE_YN = 'N'
 		WHERE POPUP_SQ = #{popupSq}
-	</delete>
+	</update>
+
+	<!-- 팝업관리 프론트 적용 -->
+	<insert id="savePopupFront" parameterType="Popup">
+		/* TscPopup.savePopupFront */
+		INSERT INTO TB_POPUP_FRONT ( POPUP_SQ
+								   , SITE_CD
+								   , FRONT_GB
+								   , POPUP_GB
+								   , IMG_URL1
+								   , LINK_URL1
+								   , VIEW_PAGE
+								   , CATE1_NO
+								   , BRAND_CD
+								   , PLAN_SQ
+								   , DISP_STDT
+								   , DISP_EDDT
+								   , UNEXP_DAYS
+								   , DISP_ORD
+								   , USE_YN
+								   , REG_NO
+								   , REG_DT
+								   , UPD_NO
+								   , UPD_DT)
+			(
+				SELECT *
+				FROM (
+						 SELECT POPUP_SQ
+							  , SITE_CD
+							  , FRONT_GB
+							  , POPUP_GB
+							  , IMG_URL1
+							  , LINK_URL1
+							  , VIEW_PAGE
+							  , CATE1_NO
+							  , BRAND_CD
+							  , PLAN_SQ
+							  , DISP_STDT
+							  , DISP_EDDT
+							  , UNEXP_DAYS
+							  , DISP_ORD
+							  , USE_YN
+							  , #{regNo} 	AS REG_NO
+							  , NOW()		AS REG_DT
+							  , #{updNo}	AS UPD_NO
+							  , NOW()		AS UPD_DT
+						 FROM TB_POPUP
+						 WHERE POPUP_SQ = #{popupSq}
+					 ) B
+			) ON DUPLICATE KEY
+		UPDATE
+			SITE_CD = B.SITE_CD
+			,FRONT_GB = B.FRONT_GB
+			,POPUP_GB = B.POPUP_GB
+			,IMG_URL1 = B.IMG_URL1
+			,LINK_URL1 = B.LINK_URL1
+			,VIEW_PAGE = B.VIEW_PAGE
+			,CATE1_NO = B.CATE1_NO
+			,BRAND_CD = B.BRAND_CD
+			,PLAN_SQ = B.PLAN_SQ
+			,DISP_STDT = B.DISP_STDT
+			,DISP_EDDT = B.DISP_EDDT
+			,UNEXP_DAYS = B.UNEXP_DAYS
+			,DISP_ORD = B.DISP_ORD
+			,USE_YN = B.USE_YN
+		    ,REG_NO = B.REG_NO
+		    ,REG_DT = B.REG_DT
+			,UPD_NO = #{updNo}
+			,UPD_DT = NOW()
+	</insert>
 </mapper>