Merge branch 'develop' into bin2107

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

@@ -988,10 +988,12 @@ public class TsfCustomerService {
 	public GagaMap downloadCustGradeCoupon(Integer custNo) {
 		GagaMap result = new GagaMap();
 		Customer custInfo = getCustomerFindByCustNo(custNo);
-
+		// TB_CUST_GRADE_POLICY
 
 		// 1. 등급정책 정보
-
+		// 1.1 WELCOME 첫번째 쿠폰은 무시
+		// 1.2 두번쨰 쿠폰은 저장
+		// 1.3 세번째 쿠폰은 생일 쿠폰이여서 생일 판단 후 등록
 
 
 		return result;

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

@@ -160,10 +160,10 @@
 		     , CASE WHEN #{frontGb} = 'P' THEN CP.DC_PVAL
 		            WHEN #{frontGb} = 'M' THEN CP.DC_MVAL
 		            ELSE CP.DC_AVAL                                              END AS DC_VAL
-		     , CASE WHEN CP.PD_GB = 'D' THEN DATE_FORMAT(NOW(), '%Y%M%D%H%I%S')
-		            ELSE DATE_FORMAT(CP.AVAIL_STDT, '%Y%M%D%H%I%S')              END AS AVAIL_STDT
-		     , CASE WHEN CP.PD_GB = 'D' THEN DATE_FORMAT(DATE_ADD(NOW(), INTERVAL CP.AVAIL_DAYS DAY), '%Y%M%D%H%I%S')
-		            ELSE  DATE_FORMAT(CP.AVAIL_EDDT, '%Y%M%D%H%I%S')             END AS AVAIL_EDDT
+		     , CASE WHEN CP.PD_GB = 'D' THEN DATE_FORMAT(NOW(), '%Y%m%d%H%i%S')
+		            ELSE DATE_FORMAT(CP.AVAIL_STDT, '%Y%m%d%H%i%S')              END AS AVAIL_STDT
+		     , CASE WHEN CP.PD_GB = 'D' THEN DATE_FORMAT(DATE_ADD(NOW(), INTERVAL CP.AVAIL_DAYS DAY), '%Y%m%d%H%i%S')
+		            ELSE  DATE_FORMAT(CP.AVAIL_EDDT, '%Y%m%d%H%i%S')             END AS AVAIL_EDDT
 		FROM  TB_CUST_GRADE_POLICY CGP
 		INNER JOIN
 		      TB_COUPON CP

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

@@ -22,68 +22,93 @@
 		<!-- ORDER BY A.REG_DT DESC LIMIT 1 -->
 	</select>
 	
+	<!-- 소셜상품(=핫딜) 목록 -->
 	<select id="getSocialGoodsList" resultType="Social" parameterType="Social">
-		/* TsfSocial.getSocialGoodsList*/
-		SELECT F.* 
-			 ,  (CASE WHEN F.GOODS_TYPE = 'G056_N' THEN (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK WHERE GOODS_CD = F.GOODS_CD) 
-			    ELSE (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK_COMPOSE WHERE GOODS_CD = F.GOODS_CD) 
-			    END) AS STOCK_QTY_SUM
-			 , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = F.GOODS_CD AND COLOR_CD = F.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM
-			 , CASE IFNULL((SELECT COUNT(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = F.GOODS_CD AND COLOR_CD = F.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' ),0) 
-			            WHEN 0 THEN 'N'
-			            ELSE 'Y' END AS GOODS_IMAGE_YN
-			 ,(CASE WHEN F.WISH_GOOD IS NULL THEN 'N' ELSE 'Y' END) AS WISH_YN
-			FROM
-			(   
-				 SELECT A.SOCIAL_SQ
-				     , A.SOCIAL_NM
-				     , A.SOCIAL_TYPE
-				     , A.SITE_CD
-				     , A.FRONT_GB
-				     , A.SOCIAL_STDT
-				     , A.SOCIAL_EDDT
-				     , A.SOCIAL_TNM
-				     , A.USE_YN
-				     , A.APPLY_GB
-				     , A.REG_DT 
-				     , B.GOODS_CD 
-				     , B.CURR_BPRICE 
-				     , B.CURR_APRICE 
-				     , B.DC_BRATE 
-				     , B.DC_ARATE 
-				     , B.DEL_YN 
-				     , B.DISP_ORD 
-				     , C.GOODS_NM 
-				     , C.GOODS_TYPE 
-				     , C.GOODS_TNM 
-				     , C.LIST_PRICE
-				     , C.MAIN_COLOR_CD 
-				     , D.BRAND_KNM 
-				     , D.BRAND_ENM 
-				     , W.CUST_NO 
-				     , W.GOODS_CD AS WISH_GOOD
+		/* TsfSocial.getSocialGoodsList */
+		SELECT F.*
+		     , CASE WHEN F.GOODS_TYPE = 'G056_N' THEN
+		                IFNULL((SELECT SUM(CURR_STOCK_QTY - BASE_STOCK_QTY)
+		                        FROM   VW_STOCK WHERE GOODS_CD = F.GOODS_CD
+		                       ),0)
+		            ELSE
+		                IFNULL((SELECT SUM(CURR_STOCK_QTY - BASE_STOCK_QTY)
+		                        FROM   VW_STOCK_COMPOSE
+		                        WHERE  GOODS_CD = F.GOODS_CD
+		                       ),0)
+		       END                           AS STOCK_QTY_SUM
+		     , (SELECT MAX(SYS_IMG_NM)
+		        FROM   TB_GOODS_IMG
+		        WHERE  GOODS_CD = F.GOODS_CD
+		        AND    COLOR_CD = F.MAIN_COLOR_CD
+		        AND    DEFAULT_IMG_YN = 'Y') AS SYS_IMG_NM
+		     , CASE WHEN IFNULL((SELECT COUNT(SYS_IMG_NM)
+		                         FROM   TB_GOODS_IMG
+		                         WHERE  GOODS_CD = F.GOODS_CD
+		                         AND    COLOR_CD = F.MAIN_COLOR_CD
+		                         AND    DEFAULT_IMG_YN = 'Y'
+		                        ),0) = 0 THEN
+		                'N'
+		            ELSE
+		                'Y'
+		       END                           AS GOODS_IMAGE_YN
+		     , CASE WHEN F.WISH_GOOD IS NULL THEN
+		                'N'
+		            ELSE
+		                'Y'
+		       END                           AS WISH_YN
+		FROM   (
+		        SELECT A.SOCIAL_SQ
+		             , A.SOCIAL_NM
+		             , A.SOCIAL_TYPE
+		             , A.SITE_CD
+		             , A.FRONT_GB
+		             , A.SOCIAL_STDT
+		             , A.SOCIAL_EDDT
+		             , A.SOCIAL_TNM
+		             , A.USE_YN
+		             , A.APPLY_GB
+		             , A.REG_DT
+		             , B.GOODS_CD
+		             , B.CURR_BPRICE
+		             , B.CURR_APRICE
+		             , B.DC_BRATE
+		             , B.DC_ARATE
+		             , B.DEL_YN
+		             , B.DISP_ORD
+		             , C.GOODS_NM
+		             , C.GOODS_TYPE
+		             , C.GOODS_TNM
+		             , C.LIST_PRICE
+		             , C.MAIN_COLOR_CD
+		             , D.BRAND_KNM
+		             , D.BRAND_ENM
+		             , W.CUST_NO
+		             , W.GOODS_CD AS WISH_GOOD
 		             <choose>
-			            <when test="custNo != null and custNo > 0"> <!-- 로그인 했으면 -->
-				     , IF(W.GOODS_CD IS NULL,'','likeit')                                                           AS LIKE_IT       /*위시리스트담긴상품*/
-			            </when>
-			            <otherwise>
-				     , ''                                                                                           AS LIKE_IT       /*위시리스트담긴상품*/
-			            </otherwise>
+		                 <when test="custNo != null and custNo > 0"> <!-- 로그인 했으면 -->
+		             , IF(W.GOODS_CD IS NULL,'','likeit') AS LIKE_IT /*위시리스트담긴상품*/
+		                 </when>
+		                <otherwise>
+		             , ''                                 AS LIKE_IT /*위시리스트담긴상품*/
+		                </otherwise>
 		             </choose>
-				FROM TB_SOCIAL A INNER JOIN TB_SOCIAL_GOODS B ON A.SOCIAL_SQ = B.SOCIAL_SQ 
-				                 INNER JOIN TB_GOODS C ON B.GOODS_CD = C.GOODS_CD 
-				                 INNER JOIN TB_BRAND D ON C.BRAND_CD = D.BRAND_CD
-				                 LEFT JOIN TB_WISHLIST W ON C.GOODS_CD = W.GOODS_CD
-		                             AND W.CUST_NO  = IFNULL(#{custNo},0)
-				WHERE 1=1
-				  AND NOW() BETWEEN A.SOCIAL_STDT AND A.SOCIAL_EDDT 
-				  AND A.USE_YN = 'Y'		    		 /*사용여부*/
-				  AND A.APPLY_GB = 'A'					 /*적용구분(P:대기,A:적용,F:종료)*/
-				  AND A.FRONT_GB IN ('A',#{frontGb})	 /*프론트 구분*/
-				  AND B.DEL_YN = 'N'
-				  AND NOW() BETWEEN C.SELL_STDT AND C.SELL_EDDT
-				ORDER BY B.DISP_ORD 
-			)F
-			WHERE F.SOCIAL_SQ = #{socialSq}
+		        FROM   TB_SOCIAL A INNER JOIN TB_SOCIAL_GOODS B ON A.SOCIAL_SQ = B.SOCIAL_SQ
+		                           INNER JOIN TB_GOODS C ON B.GOODS_CD = C.GOODS_CD
+		                           INNER JOIN TB_BRAND D ON C.BRAND_CD = D.BRAND_CD
+		                           LEFT JOIN TB_WISHLIST W ON C.GOODS_CD = W.GOODS_CD
+		                                                  AND W.CUST_NO = IFNULL(#{custNo},0)
+		        WHERE  1 = 1
+		        AND    NOW() BETWEEN A.SOCIAL_STDT AND A.SOCIAL_EDDT
+		        AND    A.USE_YN = 'Y' /*사용하는소셜*/
+		        AND    A.APPLY_GB = 'A' /*적용구분(P:대기,A:적용,F:종료)*/
+		        AND    A.FRONT_GB IN ('A',#{frontGb}) /*프론트구분*/
+		        AND    B.DEL_YN = 'N' /*삭제안된상품*/
+		        AND    C.GOODS_STAT = 'G008_90' /*승인완료상품*/
+		        AND    C.SELF_MALL_YN = 'Y'   /*몰노출상품*/
+		        AND    NOW() BETWEEN C.SELL_STDT AND C.SELL_EDDT /*판매기간*/
+		        ORDER  BY B.DISP_ORD 
+		       ) F
+		WHERE  F.SOCIAL_SQ = #{socialSq}
 	</select>
+	
 </mapper>

src/main/webapp/WEB-INF/views/web/customer/JoinCompleteFormWeb.html

@@ -58,7 +58,14 @@
 				<h4>신규회원 혜택안내</h4>
 			</div>
 			<div class="cont_body">
-				신규회원 혜택안내 내용
+				<img src="/images/pc/img_mb_join_done.jpg" alt="신규회원 혜택안내 내용">
+				<div class="btn_group_block btn_group_md ui_row">
+					<div class="ui_col_12">
+						<button type="button" class="btn btn_primary btn_block" onclick="cfnGoToPage(_PAGE_MAIN);">
+							<span>쇼핑하러 가기</span>
+						</button>
+					</div>
+				</div>
 			</div>
 		</div>
 		<!--//신규가입인 경우-->