Merge branch 'develop' into jsshin

src/main/java/com/style24/front/biz/service/TsfPlanningService.java

@@ -530,7 +530,7 @@ public class TsfPlanningService {
 		int custNo = TsfSession.getInfo().getCustNo();
 		plan.setCustNo(custNo);
 		plan.setEntryCustNo(custNo);
-		plan.setEntryVal1("Y");
+		plan.setEntryVal2("Y");
 		planningDao.saveAttendEntry(plan);
 	}
 

src/main/java/com/style24/front/biz/thirdparty/SearchEngineDiquest.java

@@ -4,9 +4,12 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.List;
+import java.util.Arrays;
 
 import javax.annotation.PostConstruct;
 
+import com.gagaframework.web.parameter.GagaMap;
 import org.json.simple.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -210,6 +213,12 @@ public class SearchEngineDiquest {
 		paramMap.put("adminPort", port);
 		paramMap.put("pageNumber", String.valueOf(params.getPageNo()));
 		paramMap.put("rowsPerPage", String.valueOf(params.getPageSize()));
+		paramMap.put("brandGroupArr", getStringArray(params.getBrandGroupArr()));
+		paramMap.put("sizeArr", getStringArray(params.getSizeArr()));
+		paramMap.put("ageArr", getStringArray(params.getAgeArr()));
+		paramMap.put("seasonArr", getStringArray(params.getSeasonArr()));
+		paramMap.put("colorArr", getStringArray(params.getColorArr()));
+		paramMap.put("benefitArr", getStringArray(params.getBenefitArr()));
 		log.info("///[getGoodsList] paramMap: {}", paramMap);
 
 		try {
@@ -228,6 +237,15 @@ public class SearchEngineDiquest {
 		return result;
 	}
 
+	private String[] getStringArray (String[] arr){
+		String[] arry = null;
+		if(arr != null){
+			List<String> lst = new ArrayList<String>(Arrays.asList(arr));
+			arry = lst.toArray(new String[lst.size()]);
+		}
+		return arry;
+	}
+
 	/**
 	 * 기획전 목록
 	 * @param keyword - 검색어

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

@@ -1504,20 +1504,23 @@
 		 AND DATE_FORMAT(ENTRY_DT, '%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
 		 </if>
 		 AND ENTRY_CUST_NO = #{custNo}
+		 AND ENTRY_VAL2 = 'Y'
 	</select>
 	
 	<!-- 출석한 리스트 -->
 	<select id="getCustAttendEntryList" resultType="Plan" parameterType="Plan">
 		/* TsfPlanning.getCustAttendEntryList */	
-		SELECT PLAN_ENTRY_SQ 
-		      ,PLAN_SQ 
-		      ,ENTRY_CUST_NO 
-		      ,DATE_FORMAT(ENTRY_DT,'%e') AS ENTRY_DT 
-		FROM TB_PLAN_ENTRY
-		WHERE 1=1 
-		AND DATE_FORMAT(ENTRY_DT,'%Y-%m') IN (SELECT DATE_FORMAT(P.DISP_STDT, '%Y-%m')  FROM TB_PLAN P WHERE PLAN_SQ = #{planSq})
-		AND PLAN_SQ = #{planSq}
-		AND ENTRY_CUST_NO = #{custNo}
+		SELECT  PE.PLAN_ENTRY_SQ 
+		      , P.PLAN_SQ 
+		      , PE.ENTRY_CUST_NO 
+		      , DATE_FORMAT(PE.ENTRY_DT,'%e') AS ENTRY_DT 
+		      , PE.ENTRY_DT 
+		      , PE.ENTRY_VAL2
+		FROM TB_PLAN P INNER JOIN TB_PLAN_ENTRY PE
+		    ON P.PLAN_SQ = PE.PLAN_SQ 
+		WHERE P.PLAN_SQ = #{planSq}
+		AND   PE.ENTRY_CUST_NO = #{custNo}
+		AND   PE.ENTRY_VAL2 = 'Y'
 	</select>
 	
 	<select id="getAttendBenefitList" resultType="Plan" parameterType="Plan">

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

@@ -41,6 +41,7 @@
 		FROM   TB_CUST_POINT
 		WHERE  CUST_NO = #{custNo}
 		AND    EXP_BE_DT > NOW()
+		AND    GV_PNT_AMT > 0
 		AND    EXP_BE_DT <![CDATA[<]]> DATE_ADD(NOW(),INTERVAL 31 DAY)
 	</select>
 	
@@ -354,6 +355,7 @@
 		               SELECT SUM(RM_PNT_AMT)
 		               FROM   TB_CUST_POINT
 		               WHERE  CUST_NO = C.CUST_NO
+		               AND    GV_PNT_AMT > 0
 		               AND    (EXP_BE_DT <![CDATA[<]]> NOW() OR EXP_CMP_DT IS NOT NULL)
 		               ), 0)                           AS EXPIRE_PNT_AMT -- 소멸포인트
 		     , IFNULL((

src/main/webapp/WEB-INF/views/mob/mypage/MypageGiftcardFormMob.html

@@ -150,7 +150,6 @@ function useGiftcard(result) {
 	let tmtbHtml = '';
 	
 	if (giftcardUseList.length == 0) {
-		console.log("여기 넘어와?");
 		tmtbHtml += '<div class="nodata">';
 		tmtbHtml += '<div class="txt_box">';
 		tmtbHtml += '<p>상품권 사용내역이 없습니다.<br></p>';

src/main/webapp/WEB-INF/views/mob/planning/PlanningEventPollFormMob.html

@@ -46,7 +46,7 @@
 													</th:block>
 													<th:block th:unless="${pollData.pollQval1 != '기타'}">
 														<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-1-'+${pollData.pollQsq}" th:value="${pollData.pollQval1}" class="etc"><label th:for="'rdi-1-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval1}"></span></label>
-														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id=""></textarea>
+														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id="" class="etc_input" ></textarea>
 													</th:block>
 												</li>
 												<li th:if="${pollData.pollQval2 != null && pollData.pollQval2 != ''}">
@@ -55,7 +55,7 @@
 													</th:block>
 													<th:block th:unless="${pollData.pollQval2 != '기타'}">
 														<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-2-'+${pollData.pollQsq}" th:value="${pollData.pollQval2}" class="etc"><label th:for="'rdi-2-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval2}"></span></label>
-														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id=""></textarea>
+														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id="" class="etc_input" ></textarea>
 													</th:block>
 												</li>
 												<li th:if="${pollData.pollQval3 != null && pollData.pollQval3 != ''}">
@@ -64,7 +64,7 @@
 													</th:block>
 													<th:block th:unless="${pollData.pollQval3 != '기타'}">
 														<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-3-'+${pollData.pollQsq}" th:value="${pollData.pollQval3}" class="etc"><label th:for="'rdi-3-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval3}"></span></label>
-														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id=""></textarea>
+														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id="" class="etc_input" ></textarea>
 													</th:block>
 												</li>
 												<li th:if="${pollData.pollQval4 != null && pollData.pollQval4 != ''}">
@@ -73,7 +73,7 @@
 													</th:block>
 													<th:block th:unless="${pollData.pollQval4 != '기타'}">
 														<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-4-'+${pollData.pollQsq}" th:value="${pollData.pollQval4}" class="etc"><label th:for="'rdi-4-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval4}"></span></label>
-														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id=""></textarea>
+														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id="" class="etc_input" > </textarea>
 													</th:block>
 												</li>
 												<li th:if="${pollData.pollQval5 != null && pollData.pollQval5 != ''}">
@@ -82,7 +82,7 @@
 													</th:block>
 													<th:block th:unless="${pollData.pollQval5 != '기타'}">
 														<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-5-'+${pollData.pollQsq}" th:value="${pollData.pollQval5}" class="etc"><label th:for="'rdi-5-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval5}"></span></label>
-														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id=""></textarea>
+														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id="" class="etc_input" ></textarea>
 													</th:block>
 												</li>
 												<li th:if="${pollData.pollQval6 != null && pollData.pollQval6 != ''}">
@@ -91,7 +91,7 @@
 													</th:block>
 													<th:block th:unless="${pollData.pollQval6 != '기타'}">
 														<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-6-'+${pollData.pollQsq}" th:value="${pollData.pollQval6}" class="etc"><label th:for="'rdi-6-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval6}"></span></label>
-														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id=""></textarea>
+														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id="" class="etc_input" ></textarea>
 													</th:block>
 												</li>
 												<li th:if="${pollData.pollQval7 != null && pollData.pollQval7 != ''}">
@@ -100,7 +100,7 @@
 													</th:block>
 													<th:block th:unless="${pollData.pollQval7 != '기타'}">
 														<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-7-'+${pollData.pollQsq}" th:value="${pollData.pollQval7}" class="etc"><label th:for="'rdi-7-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval7}"></span></label>
-														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id=""></textarea>
+														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id="" class="etc_input" ></textarea>
 													</th:block>
 												</li>
 												<li th:if="${pollData.pollQval8 != null && pollData.pollQval8 != ''}">
@@ -109,7 +109,7 @@
 													</th:block>
 													<th:block th:unless="${pollData.pollQval8 != '기타'}">
 														<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-8-'+${pollData.pollQsq}" th:value="${pollData.pollQval8}" class="etc"><label th:for="'rdi-8-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval8}"></span></label>
-														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id=""></textarea>
+														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id="" class="etc_input" ></textarea>
 													</th:block>
 												</li>
 												<li th:if="${pollData.pollQval9 != null && pollData.pollQval9 != ''}">
@@ -118,7 +118,7 @@
 													</th:block>
 													<th:block th:unless="${pollData.pollQval9 != '기타'}">
 														<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-9-'+${pollData.pollQsq}" th:value="${pollData.pollQval9}"class="etc"><label th:for="'rdi-9-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval9}"></span></label>
-														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id=""></textarea>
+														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id="" class="etc_input" ></textarea>
 													</th:block>
 												</li>
 												<li th:if="${pollData.pollQval10 != null && pollData.pollQval10 != ''}">
@@ -127,7 +127,7 @@
 													</th:block>
 													<th:block th:unless="${pollData.pollQval10 != '기타'}">
 														<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-10-'+${pollData.pollQsq}" th:value="${pollData.pollQval10}" class="etc"><label th:for="'rdi-10-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval10}"></span></label>
-														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id=""></textarea>
+														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id="" class="etc_input" ></textarea>
 													</th:block>
 												</li>
 											</ul>
@@ -359,6 +359,16 @@ $(document).ready(function(){
 		}
 	});
 	
+	$('.ev .survey_wrap .survey_con .survey_row input[type="radio"]').change(function(){
+		if ($('.etc_radio').is(':checked')) {
+			// $('.etc_input').removeAttr('disabled');
+			$('.etc_input').css({'visibility': 'visible'}); 
+		} else {
+			// $('.etc_input').attr('disabled', true);
+			$('.etc_input').css({'visibility': 'hidden'}); 
+		}   
+	});				
+	
 	
 })
 </script>

src/main/webapp/WEB-INF/views/web/planning/PlanningEventPollFormWeb.html

@@ -68,7 +68,7 @@
 															</th:block>
 															<th:block th:unless="${pollData.pollQval1 != '기타'}">
 																<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-1-'+${pollData.pollQsq}" th:value="${pollData.pollQval1}" class="etc_radio"><label th:for="'rdi-1-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval1}"></span></label>
-																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="etc_input" />
+																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="form_control etc_input" />
 															</th:block>
 														</li>
 														<li th:if="${pollData.pollQval2 != null && pollData.pollQval2 != ''}">
@@ -77,7 +77,7 @@
 															</th:block>
 															<th:block th:unless="${pollData.pollQval2 != '기타'}">
 																<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-2-'+${pollData.pollQsq}" th:value="${pollData.pollQval2}" class="etc_radio"><label th:for="'rdi-2-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval2}"></span></label>
-																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="etc_input" />
+																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="form_control etc_input" />
 															</th:block>
 														</li>
 														<li th:if="${pollData.pollQval3 != null && pollData.pollQval3 != ''}">
@@ -86,7 +86,7 @@
 															</th:block>
 															<th:block th:unless="${pollData.pollQval3 != '기타'}">
 																<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-3-'+${pollData.pollQsq}" th:value="${pollData.pollQval3}" class="etc_radio"><label th:for="'rdi-3-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval3}"></span></label>
-																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="etc_input" />
+																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="form_control etc_input" />
 															</th:block>
 														</li>
 														<li th:if="${pollData.pollQval4 != null && pollData.pollQval4 != ''}">
@@ -95,7 +95,7 @@
 															</th:block>
 															<th:block th:unless="${pollData.pollQval4 != '기타'}">
 																<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-4-'+${pollData.pollQsq}" th:value="${pollData.pollQval4}" class="etc_radio"><label th:for="'rdi-4-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval4}"></span></label>
-																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="etc_input" />
+																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="form_control etc_input" />
 															</th:block>
 														</li>
 														<li th:if="${pollData.pollQval5 != null && pollData.pollQval5 != ''}">
@@ -104,7 +104,7 @@
 															</th:block>
 															<th:block th:unless="${pollData.pollQval5 != '기타'}">
 																<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-5-'+${pollData.pollQsq}" th:value="${pollData.pollQval5}" class="etc_radio"><label th:for="'rdi-5-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval5}"></span></label>
-																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="etc_input" />
+																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="form_control etc_input" />
 															</th:block>
 														</li>
 														<li th:if="${pollData.pollQval6 != null && pollData.pollQval6 != ''}">
@@ -113,7 +113,7 @@
 															</th:block>
 															<th:block th:unless="${pollData.pollQval6 != '기타'}">
 																<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-6-'+${pollData.pollQsq}" th:value="${pollData.pollQval6}" class="etc_radio"><label th:for="'rdi-6-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval6}"></span></label>
-																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="etc_input" />
+																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="form_control etc_input" />
 															</th:block>
 														</li>
 														<li th:if="${pollData.pollQval7 != null && pollData.pollQval7 != ''}">
@@ -122,7 +122,7 @@
 															</th:block>
 															<th:block th:unless="${pollData.pollQval7 != '기타'}">
 																<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-7-'+${pollData.pollQsq}" th:value="${pollData.pollQval7}" class="etc_radio"><label th:for="'rdi-7-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval7}"></span></label>
-																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="etc_input" />
+																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="form_control etc_input" />
 															</th:block>
 														</li>
 														<li th:if="${pollData.pollQval8 != null && pollData.pollQval8 != ''}">
@@ -131,7 +131,7 @@
 															</th:block>
 															<th:block th:unless="${pollData.pollQval8 != '기타'}">
 																<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-8-'+${pollData.pollQsq}" th:value="${pollData.pollQval8}" class="etc_radio"><label th:for="'rdi-8-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval8}"></span></label>
-																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="etc_input" />
+																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="form_control etc_input"/>
 															</th:block>
 														</li>
 														<li th:if="${pollData.pollQval9 != null && pollData.pollQval9 != ''}">
@@ -140,7 +140,7 @@
 															</th:block>
 															<th:block th:unless="${pollData.pollQval9 != '기타'}">
 																<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-9-'+${pollData.pollQsq}" th:value="${pollData.pollQval9}"class="etc_radio"><label th:for="'rdi-9-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval9}"></span></label>
-																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="etc_input" />
+																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="form_control etc_input" />
 															</th:block>
 														</li>
 														<li th:if="${pollData.pollQval10 != null && pollData.pollQval10 != ''}">
@@ -149,7 +149,7 @@
 															</th:block>
 															<th:block th:unless="${pollData.pollQval10 != '기타'}">
 																<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-10-'+${pollData.pollQsq}" th:value="${pollData.pollQval10}" class="etc_radio"><label th:for="'rdi-10-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval10}"></span></label>
-																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="etc_input" />
+																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="form_control etc_input" />
 															</th:block>
 														</li>
 													</ul>