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

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

@@ -388,20 +388,20 @@
 		               SELECT SUM(RM_PNT_AMT)
 		               FROM   TB_CUST_POINT
 		               WHERE  CUST_NO = C.CUST_NO
-		               AND    EXP_BE_DT <![CDATA[<]]> NOW()
-		               AND    EXP_CMP_DT IS NOT NULL
+		               AND    (EXP_BE_DT <![CDATA[<]]> NOW() OR EXP_CMP_DT IS NOT NULL)
 		               ), 0)                           AS EXPIRE_PNT_AMT -- 소멸포인트
 		     , IFNULL((
 		               SELECT SUM(CPH.PNT_AMT) AS PNT_AMT
 		               FROM   TB_CUST_POINT_HST CPH
-		               WHERE  CPH.OCCUR_GB IN ('G069_12', 'G069_13')             -- 적립예정, 적립취소
+		               WHERE  CPH.CUST_NO = C.CUST_NO
 		               AND    CPH.PNT_UPLOAD_STAT IN ('G070_10')                 -- 반영예정
-		               AND    CPH.CUST_NO = #{custNo}
-		               ), 0)                           AS EXPECTED_PNT_AMT -- 적립예정포인트
+		               AND    CPH.OCCUR_GB IN ('G069_12', 'G069_13')             -- 적립예정, 적립취소
+		               ), 0)                           AS EXPECTED_PNT_AMT       -- 적립예정포인트
 		     , IFNULL((
 		               SELECT SUM(RM_PNT_AMT) AS RM_PNT_AMT
 		               FROM  TB_CUST_POINT
-		               WHERE EXP_BE_DT > NOW()
+		               WHERE CUST_NO = C.CUST_NO
+		               AND   EXP_BE_DT > NOW()
 		               AND   EXP_BE_DT <![CDATA[<]]> DATE_ADD(NOW(),INTERVAL 31 DAY)
 		                ), 0)                          AS EXPECTED_EXPIRE_PNT_AMT -- 소멸예정포인트(30일)
 		FROM   TB_CUSTOMER C

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

@@ -453,7 +453,7 @@
 		/* TsaPlan.deletePlanBrand */
 		DELETE 
 		FROM TB_PLAN_BRAND
-		WHERE PLAN_SQ = ${planSq}
+		WHERE PLAN_SQ = #{planSq}
 	</delete>
 	
 	<insert id="createPlanAfChannel" parameterType="Plan">
@@ -564,7 +564,7 @@
 		/* TsaPlan.deletePlanCate */
 		DELETE 
 		FROM TB_PLAN_CATE
-		WHERE PLAN_SQ = ${planSq}
+		WHERE PLAN_SQ = #{planSq}
 	</delete>
 	
 	<select id="getPlanCateList" parameterType="Plan" resultType="Plan">

src/main/resources/config/application-style.yml

@@ -0,0 +1,90 @@
+spring:
+    profiles:
+        active: style
+    cache.type: redis
+    redis:
+        lettuce:
+            pool:
+                max-active: 10
+                max-idle: 10
+                min-idle: 2
+        host: 172.30.90.111
+        port: 6379
+        password:
+        cluster:
+            nodes:
+                172.30.90.111:6379
+                172.30.90.112:6379
+                172.30.90.113:6379
+                172.30.90.111:6380
+                172.30.90.112:6380
+                172.30.90.113:6380
+                172.30.90.111:6381
+                172.30.90.112:6381
+                172.30.90.113:6381
+
+logging:
+    config: classpath:log/logback-run.xml
+
+domain:
+    admin: //admin.style24.com
+    style24: //www.style24.com
+    front: //www.style24.com
+    image: //image.style24.com
+    cdnimage: //image.style24.com
+    uximage: //image.style24.com
+
+upload:
+    dext.target.path: /files/data/style24/dext
+    default:
+        target.path: /files/data/style24
+        max.size: 10
+        allow.extension: jpg|gif|jpeg|png|bmp|txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
+        view: //www.style24.com
+    goods:
+        target.path: /files/data/style24/Upload/ProductImage
+        max.size: 10
+        allow.extension: jpg|gif|jpeg|png
+        view: //image.istyle24.com/Upload/ProductImage
+    image:
+        target.path: /files/data/style24
+        max.size: 10
+        allow.extension: jpg|gif|jpeg|png
+        view: //image.style24.com
+    excel:
+        target.path: /files/data/style24
+        max.size: 10
+        allow.extension: xls|xlsx
+        view: //image.style24.com/excel
+    sample:
+        target.path: /files/data/style24/sample
+        max.size: 10
+        allow.extension: txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
+        view: //image.style24.com/sample
+
+download.path: /files/data
+
+# PG
+pg:
+    kcp:
+        log.dir: /files/data/style24/logs/kcpLogs/admin
+        gw:
+            url: testpaygw.kcp.co.kr
+            port: 8090
+        js.url: https://testpay.kcp.co.kr/plugin/payplus_web.jsp
+        server: false
+        site:
+            cd: U3476
+            key:
+            name: ISTYLE TEST
+        log.level: 3
+        module.type: 01
+        tx.mode: 0
+        receipt.url : https://testadmin8.kcp.co.kr/assist/bill.BillActionNew.do
+
+# 네이버페이 API
+naverPay:
+    apiUrl: https://dev.apis.naver.com/
+    payUrl:
+        web : test-pay.naver.com
+        mob : test-m.pay.naver.com

src/main/webapp/WEB-INF/views/display/LookbookBannerPopupForm.html

@@ -19,7 +19,7 @@
 		<form id="lbBannerForm" name="lbBannerForm" action="#" th:action="@{'/display/lookbook/save'}" onsubmit="$('#btnSearch').trigger('click'); return false;">
 			<input type="hidden" id="siteCd" name="siteCd" value="G00_10"/>
 			<input type="hidden" id="lookbookSq" name="lookbookSq" th:value="${lookbookSq}"/>
-			<input type="hidden" name="mainDispYn" th:value="${lookbookMstInfo.mainDispYn}">
+			<input type="hidden" name="mainDispYn" th:value="${mode == 'N'? '' : lookbookMstInfo.mainDispYn}">
 			<input type="hidden" name="uploadDefaultBannerUrlPop" id="uploadDefaultBannerUrlPop" th:value="${@environment.getProperty('upload.image.view') + '/lookbook/banner/'}"/>
 			<div class="panelTitle">
 				<h2 th:text="${'룩북 ' + (mode == 'N' ? '등록' : '상세')}"></h2>

src/main/webapp/WEB-INF/views/marketing/PlanPopupForm.html

@@ -66,6 +66,7 @@
 									<option value="">ALL</option>
 									<option value="P">웹</option>
 									<option value="M">모바일</option>
+									<option value="A">앱</option>
 							</select></td>
 
 							<th>기획전구분</th>
@@ -73,6 +74,8 @@
 									<option value="">전체</option>
 									<option value="P">기획전</option>
 									<option value="E">이벤트</option>
+									<option value="C">출석체크</option>
+									<option value="S">총알배송</option>
 							</select></td>
 							
 							<th>오픈여부</th>