Procházet zdrojové kódy

기획전 어드민관련 미리보기 오류 수정

sowon4187 před 4 roky
rodič
revize
2cbed769be

+ 2 - 7
src/main/java/com/style24/front/biz/service/TsfPlanningService.java

@@ -113,17 +113,12 @@ public class TsfPlanningService {
 
 	/**
 	 * 접근 불가능한 기획전 메시지 조회
-	 * @param planSq - 기획전번호
+	 * @param plan
 	 * @return 접근 불가능 사유 메시지
 	 * @author gagamel
 	 * @since 2021. 3. 30
 	 */
-	public String getInaccessiblePlanningMessage(Integer planSq) {
-//		String msg = "";
-
-		Plan plan = new Plan();
-		plan.setPlanSq(planSq);
-
+	public String getInaccessiblePlanningMessage(Plan plan) {
 		// 유효한 기획전 여부 조회
 		if ("N".equals(planningDao.getAvailPlanningYn(plan))) {
 			return "진행중인 기획전/이벤트가 아닙니다.";

+ 2 - 1
src/main/java/com/style24/front/biz/web/TsfPlanningController.java

@@ -152,7 +152,8 @@ public class TsfPlanningController extends TsfBaseController {
 		ModelAndView mav = new ModelAndView();
 		plan.setFrontGb(TsfSession.getFrontGb());
 		// 접근 불가능한 기획전 메시지 조회
-		String inaccessibleMsg = planningService.getInaccessiblePlanningMessage(plan.getPlanSq());
+		String inaccessibleMsg = planningService.getInaccessiblePlanningMessage(plan);
+
 		if (StringUtils.isNotBlank(inaccessibleMsg)) {
 			if (!TsfSession.isLogin()) {
 				mav.addObject("loginYn", "N");

+ 6 - 4
src/main/java/com/style24/persistence/mybatis/shop/TsfPlanning.xml

@@ -356,13 +356,15 @@
 	
 	<!-- 유효한 기획전 여부 조회 -->
 	<select id="getAvailPlanningYn" parameterType="Plan" resultType="String">
-		/* TsfPlanning.getDeviceAccessibleYn */
+		/* TsfPlanning.getAvailPlanningYn */
 		SELECT CASE WHEN IFNULL((SELECT COUNT(*)
 		                         FROM   TB_PLAN
 		                         WHERE  PLAN_SQ = #{planSq}
-		                         AND    NOW() BETWEEN DISP_STDT AND DISP_EDDT
-		                         AND    DEL_YN = 'N'
-		                         AND    OPEN_YN = 'Y'
+		                         <if test='adminPreview != "Y"'>
+		                          AND    NOW() BETWEEN DISP_STDT AND DISP_EDDT
+		                          AND    OPEN_YN = 'Y'
+		                          AND    DEL_YN = 'N'
+		                         </if>
 		                        ),0) > 0 THEN 'Y'
 		            ELSE 'N'
 		       END