Ver Fonte

Merge branch 'develop' into jsshin

jsshin há 5 anos atrás
pai
commit
1098a28fa7

+ 5 - 1
src/main/java/com/style24/front/biz/service/TsfSocialService.java

@@ -54,7 +54,11 @@ public class TsfSocialService {
 			Login login = TsfSession.getInfo();
 			social.setCustNo(login.getCustNo());
 		}
-		social.setSocialSq(info.getSocialSq());
+		
+		if (info!=null) {
+			social.setSocialSq(info.getSocialSq());
+		}
+		
 		return socialDao.getSocialGoodsList(social);
 	}
 

+ 13 - 2
src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -25,6 +25,7 @@ import com.gagaframework.web.rest.server.GagaResponse;
 import com.gagaframework.web.rest.server.GagaResponseStatus;
 import com.style24.core.biz.service.TscCouponService;
 import com.style24.core.biz.service.TscCustomerService;
+import com.style24.core.biz.service.TscEnvsetService;
 import com.style24.core.biz.service.TscKcpService;
 import com.style24.core.biz.service.TscOrderChangeService;
 import com.style24.core.biz.service.TscOrderRefundService;
@@ -137,6 +138,9 @@ public class TsfMypageController extends TsfBaseController {
 	
 	@Autowired
 	private TscWmsService coreWmsService;
+	
+	@Autowired
+	private TscEnvsetService eventService;
 
 	/**
 	 * 마이페이지 메인 화면
@@ -1513,6 +1517,7 @@ public class TsfMypageController extends TsfBaseController {
 		review.setCustNo(TsfSession.getInfo().getCustNo());
 		review.setSiteCd(TscConstants.Site.STYLE24.value());
 		// 작성가능한 리뷰 카운트
+		review.setReviewExpireDay(eventService.getGoodsReviewRegisterDays(TscConstants.Site.STYLE24.value()));
 		mav.addObject("completeReviewCount", reviewService.getCompleteReviewCount(review));
 
 		// 작성한 리뷰 카운트
@@ -1552,7 +1557,8 @@ public class TsfMypageController extends TsfBaseController {
 		review.setPageable(pageable);
 		log.info("pageable: {}", pageable);
 		log.info("totalCount {}", pageable.getTotalCount());
-
+		int reviewExpireDay = eventService.getGoodsReviewRegisterDays(TscConstants.Site.STYLE24.value());
+		review.setReviewExpireDay(reviewExpireDay);
 		result.set("paging", review);
 		result.set("completeReviewCount", reviewService.getCompleteReviewCount(review));
 		result.set("dataList1", reviewService.getCompleteReviewList(review));
@@ -1584,7 +1590,7 @@ public class TsfMypageController extends TsfBaseController {
 		review.setPageable2(pageable2);
 		log.info("pageable2: {}", pageable2);
 		log.info("totalCount2 {}", pageable2.getTotalCount());
-
+		review.setReviewExpireDay(eventService.getGoodsReviewPointExpireDays(TscConstants.Site.STYLE24.value()));
 		result.set("paging2", review);
 		result.set("alreadyReviewCount", reviewService.getAlreadyReviewCount(review));
 		result.set("dataList2", reviewService.getAlreadyReviewList(review));
@@ -1607,6 +1613,7 @@ public class TsfMypageController extends TsfBaseController {
 		review.setSiteCd(TscConstants.Site.STYLE24.value());
 		
 		mav.addObject("reviewStat", review.getReviewStat());
+		review.setReviewExpireDay(eventService.getGoodsReviewRegisterDays(TscConstants.Site.STYLE24.value()));
 		mav.addObject("reviewInfo", reviewService.getReviewGoodsInfo(review));
 		
 		mav.setViewName(super.getDeviceViewName("mypage/MypageReviewCreateForm"));
@@ -1650,7 +1657,11 @@ public class TsfMypageController extends TsfBaseController {
 	@ResponseBody
 	public GagaMap mypageReviewDelete(@RequestBody Review review) throws Exception {
 		GagaMap result = new GagaMap();
+		review.setCustNo(TsfSession.getInfo().getCustNo());
+		review.setSiteCd(TscConstants.Site.STYLE24.value());
 		reviewService.reviewDelete(review);
+		result.set("alreadyReviewCount",reviewService.getAlreadyReviewCount(review));
+		result.set("completeReviewCount",reviewService.getCompleteReviewCount(review));
 		result.set("status", "200");
 		return result;
 	}

+ 1 - 0
src/main/java/com/style24/persistence/domain/Review.java

@@ -103,6 +103,7 @@ public class Review extends TscBaseDomain {
 	private String colorNm;
 	private int prevReviewSq;
 	private int nextReviewSq;
+	private int reviewExpireDay;
 
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] orgFileNmArr;

+ 3 - 2
src/main/java/com/style24/persistence/mybatis/shop/TsfDisplay.xml

@@ -1405,7 +1405,8 @@
 		            , BG.BRAND_GROUP_ENM
 		            , BG.BRAND_GROUP_KNM
 		            , BG.LOGO_FILE_NM
-		      FROM	TB_BRAND B
+		      FROM  TB_CONTENTS C
+		      LEFT JOIN TB_BRAND B ON C.STR_VAR1 = B.BRAND_GROUP_NO
 		      INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
 		      WHERE	1=1
 		      AND	B.USE_YN = 'Y'
@@ -1420,7 +1421,7 @@
 		      <if test="brandGroupNm != null and brandGroupNm != ''">
 		      AND	(BG.BRAND_GROUP_ENM LIKE CONCAT('%',#{brandGroupNm},'%') OR BG.BRAND_GROUP_KNM LIKE CONCAT('%',#{brandGroupNm},'%'))
 		      </if>
-		      GROUP BY BG.BRAND_GROUP_NO
+		      GROUP BY C.STR_TITLE2, C.DISP_ORD , BG.BRAND_GROUP_NO
 		) Z
 		WHERE	1=1
 		ORDER BY (CASE  WHEN ASCII(SUBSTRING(Z.BRAND_GROUP_NM,1)) BETWEEN 48 AND 57 THEN 3

+ 272 - 184
src/main/java/com/style24/persistence/mybatis/shop/TsfReview.xml

@@ -431,7 +431,7 @@
 					 , I.ITEMKIND_NM 
 		   	         , I.ITEMKIND_CD 
 			         , I.SIZE_GB 
-			         ,DATEDIFF( DATE_ADD(O.PAY_DT,INTERVAL 90 DAY),NOW()) AS REMAIN_DT -- 남은시간
+			         ,DATEDIFF( DATE_ADD(O.PAY_DT,INTERVAL #{reviewExpireDay} DAY),NOW()) AS REMAIN_DT -- 남은시간
 				  FROM TB_ORDER O
 				 INNER JOIN TB_ORDER_DETAIL OD
 				    ON O.ORD_NO = OD.ORD_NO
@@ -458,7 +458,7 @@
 				LEFT OUTER JOIN TB_COLOR C ON ODI.OPT_CD1 = C.COLOR_CD
 		                                   AND C.USE_YN = 'Y'
 				  WHERE 1=1
-				AND O.PAY_DT >  DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL -90 DAY), '%Y%M%D%H%I%S') 
+				AND O.PAY_DT >  DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL #{reviewExpireDay} DAY), '%Y%M%D%H%I%S') 
 				AND O.ORD_NO NOT IN (SELECT R.ORD_NO FROM TB_REVIEW R WHERE R.DEL_YN = 'N' AND DISP_YN = 'Y')
 				AND O.CUST_NO = #{custNo}
 				AND O.DISP_YN = 'Y'
@@ -592,7 +592,7 @@
 					 , I.ITEMKIND_NM 
 		   	         , I.ITEMKIND_CD 
 			         , I.SIZE_GB 
-			         ,DATEDIFF( DATE_ADD(O.PAY_DT,INTERVAL 90 DAY),NOW()) AS REMAIN_DT -- 남은시간
+			         ,DATEDIFF( DATE_ADD(O.PAY_DT,INTERVAL #{reviewExpireDay} DAY),NOW()) AS REMAIN_DT -- 남은시간
 			          <if test="reviewStat == 'u'.toString()">
 			         , R.REVIEW_SQ        
 			         , R.REVIEW_GB        
@@ -656,7 +656,7 @@
 				LEFT OUTER JOIN TB_COLOR C ON ODI.OPT_CD1 = C.COLOR_CD
 		                                   AND C.USE_YN = 'Y'
 				  WHERE 1=1
-				AND O.PAY_DT >  DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL -90 DAY), '%Y%M%D%H%I%S') 
+				AND O.PAY_DT >  DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL -#{reviewExpireDay} DAY), '%Y%M%D%H%I%S') 
 				<choose>
 					<when test="reviewStat == 'u'.toString()">
 					AND O.ORD_NO IN (SELECT R.ORD_NO FROM TB_REVIEW R WHERE R.DEL_YN = 'N' AND DISP_YN = 'Y')
@@ -718,7 +718,7 @@
 			      ,G.GOODS_NM 
 			      ,G.MAIN_COLOR_CD
 			      ,B.BRAND_ENM 
-			      ,DATEDIFF( DATE_ADD(O.PAY_DT,INTERVAL 90 DAY),NOW()) AS DT -- 남은시간
+			      ,DATEDIFF( DATE_ADD(O.PAY_DT,INTERVAL #{reviewExpireDay} DAY),NOW()) AS DT -- 남은시간
 			FROM TB_ORDER O INNER JOIN TB_ORDER_DETAIL OD ON O.ORD_NO = OD.ORD_NO 
 								 				 AND OD.ORD_DTL_STAT IN ('G013_70','G013_50','G013_60') --  구매 확정인것만
 			                INNER JOIN TB_ORDER_DETAIL_ITEM ODI ON OD.ORD_DTL_NO = ODI.ORD_DTL_NO 
@@ -727,7 +727,7 @@
 			                INNER JOIN TB_GOODS G ON G.GOODS_CD = OD.GOODS_CD 
 			                INNER JOIN TB_BRAND B ON B.BRAND_CD = G.BRAND_CD
 			WHERE 1=1
-				AND O.PAY_DT <![CDATA[>]]>  DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL -90 DAY), '%Y%M%D%H%I%S') <!--  60 일이내것만 -->
+				AND O.PAY_DT <![CDATA[>]]>  DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL  -#{reviewExpireDay} DAY), '%Y%M%D%H%I%S') <!--  60 일이내것만 -->
 				AND O.ORD_NO NOT IN (SELECT R.ORD_NO FROM TB_REVIEW R WHERE R.DEL_YN = 'N' AND DISP_YN = 'Y')
 				AND O.CUST_NO = #{custNo}
 				AND O.DISP_YN = 'Y'
@@ -759,67 +759,67 @@
 	<select id="saveMypageReview" parameterType="Review" resultType="Review">
 		/* TsfReivew.saveMypageReview */
 		INSERT INTO TB_REVIEW (
-		                REVIEW_SQ
-					  ,	GOODS_CD
-					  , CUST_NO
-					  , ORD_NO
-					  , ORD_DTL_NO
-					  , REVIEW_TITLE
-					  , REVIEW_CONTENT
-					  , SCORE
-					  , HEIGHT
-					  , WEIGHT
-					  , SCORE_SIZE
-					  , SCORE_COLOR
-					  , SCORE_FIT
-					  , SCORE_THICK
-					  , SCORE_WEIGHT
-					  , SCORE_BALL
-					  , DISP_YN
-					  , DEL_YN
-					  , REG_NO
-					  , REG_DT
-					  , UPD_NO
-					  , UPD_DT
-					)
-					VALUES (
-					        #{reviewSq}
-					      ,	#{goodsCd}
-						  , #{custNo}
-						  , #{ordNo}
-						  , #{ordDtlNo}
-						  , #{reviewTitle}
-						  , #{reviewContent}
-						  , #{score}
-						  , #{height}
-						  , #{weight}
-						  , #{scoreSize}
-						  , #{scoreColor}
-						  , #{scoreFit}
-						  , #{scoreThick}
-						  , #{scoreWeight}
-						  , #{scoreBall}
-						  , #{dispYn}
-						  , #{delYn}
-						  , #{regNo}
-						  , now()
-						  , #{updNo}
-						  , now()
-					)
-					ON DUPLICATE KEY UPDATE
-						   DEL_YN = 'N'
-			               ,REVIEW_CONTENT =  #{reviewContent} 
-			               ,SCORE          =  #{score}           
-			               ,HEIGHT         =  #{height}          
-			               ,WEIGHT         =  #{weight}          
-			               ,SCORE_SIZE     =  #{scoreSize}       
-			               ,SCORE_COLOR    =  #{scoreColor}      
-			               ,SCORE_FIT      =  #{scoreFit}        
-			               ,SCORE_THICK    =  #{scoreThick}      
-			               ,SCORE_WEIGHT   =  #{scoreWeight}     
-			               ,SCORE_BALL     =  #{scoreBall}       
-			               ,UPD_DT         =  now()     
-			                           
+		                         REVIEW_SQ
+		                       , GOODS_CD
+		                       , CUST_NO
+		                       , ORD_NO
+		                       , ORD_DTL_NO
+		                       , REVIEW_TITLE
+		                       , REVIEW_CONTENT
+		                       , SCORE
+		                       , HEIGHT
+		                       , WEIGHT
+		                       , SCORE_SIZE
+		                       , SCORE_COLOR
+		                       , SCORE_FIT
+		                       , SCORE_THICK
+		                       , SCORE_WEIGHT
+		                       , SCORE_BALL
+		                       , DISP_YN
+		                       , DEL_YN
+		                       , REG_NO
+		                       , REG_DT
+		                       , UPD_NO
+		                       , UPD_DT
+		                      )
+		               VALUES (
+		                          #{reviewSq}
+		                        , #{goodsCd}
+		                        , #{custNo}
+		                        , #{ordNo}
+		                        , #{ordDtlNo}
+		                        , #{reviewTitle}
+		                        , #{reviewContent}
+		                        , #{score}
+		                        , #{height}
+		                        , #{weight}
+		                        , #{scoreSize}
+		                        , #{scoreColor}
+		                        , #{scoreFit}
+		                        , #{scoreThick}
+		                        , #{scoreWeight}
+		                        , #{scoreBall}
+		                        , #{dispYn}
+		                        , #{delYn}
+		                        , #{regNo}
+		                        , now()
+		                        , #{updNo}
+		                        , now()
+		                      )
+		                      ON DUPLICATE KEY UPDATE
+		                         DEL_YN = 'N'
+		                                     ,REVIEW_CONTENT =  #{reviewContent} 
+		                                     ,SCORE          =  #{score}           
+		                                     ,HEIGHT         =  #{height}          
+		                                     ,WEIGHT         =  #{weight}          
+		                                     ,SCORE_SIZE     =  #{scoreSize}       
+		                                     ,SCORE_COLOR    =  #{scoreColor}      
+		                                     ,SCORE_FIT      =  #{scoreFit}        
+		                                     ,SCORE_THICK    =  #{scoreThick}      
+		                                     ,SCORE_WEIGHT   =  #{scoreWeight}     
+		                                     ,SCORE_BALL     =  #{scoreBall}       
+		                                     ,UPD_DT         =  now()     
+		                                                 
 	</select>
 	
 	<select id="getAlreadyReviewCount" parameterType="Review" resultType="int">
@@ -835,123 +835,211 @@
 	<select id="getAlreadyReviewList" parameterType="Review" resultType="Goods">
 		/* TsfReivew.getAlreadyReviewList */
 		<include refid="selectForPagingHeader"/>
-		SELECT F.*
-		      , (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
-		FROM
-		(
-		     SELECT O.ORD_NO 
-		           ,O.ORD_NM
-		           ,DATE_FORMAT(O.PAY_DT, '%Y-%m-%d') AS PAY_DT 
-		           ,O.CUST_NO 
-		           ,OD.ORD_DTL_NO
-		           ,OD.ORD_EXCH_GB 
-		           ,OD.GOODS_CD 
-		           ,OD.REAL_ORD_AMT 
-		           ,OD.SAVE_PNT_AMT 
-		           ,OD.GFCD_USE_AMT 
-		           ,ODI.ORD_DTL_ITEM_SQ 
-		           ,ODI.ITEM_CD 
-		           ,ODI.OPT_CD 
-		           ,ODI.OPT_CD1
-		           ,ODI.OPT_CD2
-		           ,IFNULL(C.COLOR_KNM, ODI.OPT_CD1) AS OPT_CD1_NM
-		           ,ODI.ITEM_QTY 
-		           ,ODI.ITEM_PRICE
-		           ,G.GOODS_NM 
-		           ,G.MAIN_COLOR_CD
-		           ,B.BRAND_ENM 
-		           ,I.ITEMKIND_NM 
-		           ,I.ITEMKIND_CD 
-		           ,I.SIZE_GB 
-		           ,R.REVIEW_SQ
-		           ,R.REVIEW_GB
-		           ,R.REVIEW_CONTENT
-		           ,R.SCORE
-		           ,R.HEIGHT
-		           ,R.WEIGHT
-		           ,(CASE R.SCORE_SIZE   WHEN 1 THEN '작음' 
-		                               	WHEN 2 THEN '딱맞음'
-		                                WHEN 3 THEN '큼'
-		                                                   END) AS SCORE_SIZE
-		           ,(CASE R.SCORE_COLOR  WHEN 1 THEN '밝음' 
-		           						WHEN 2 THEN '똑같음'
-		           						WHEN 3 THEN '어두움'   
-		           						 					END) AS SCORE_COLOR
-		           ,(CASE R.SCORE_FIT    WHEN 1 THEN '슬림' 
-		           						WHEN 2 THEN '레귤러' 
-		           						WHEN 3 THEN '오버' 
-		           											END) AS SCORE_FIT
-		           ,(CASE R.SCORE_THICK  WHEN 1 THEN '얇음' 
-		           						WHEN 2 THEN '적당함' 
-		           						WHEN 3 THEN '도톰함'
-		           											END) AS SCORE_THICK
-		           ,(CASE R.SCORE_WEIGHT WHEN 1 THEN '가벼움' 
-		           						WHEN 2 THEN '적당함'
-		           						WHEN 3 THEN '무거움'
-		           											END) AS SCORE_WEIGHT
-		           ,(CASE R.SCORE_BALL   WHEN 1 THEN '작음'
-		           						WHEN 2 THEN '딱맞음'
-	                                     WHEN 3 THEN '큼' 
-		                                					END) AS SCORE_BALL
-		        ,R.GIVE_DUE_PNT
-		        ,R.PNT_GIVE_STAT
-		        ,R.BEST_YN
-		        ,R.GIVE_DUE_BPNT
-		        ,R.BPNT_GIVE_YN
-		        ,R.DISP_YN
-		        ,R.DEL_YN
-		        ,R.CONFIRM_YN
-		        ,R.CONFIRM_UNO
-		        ,R.CONFIRM_DT
-		        ,R.REG_NO
-		        ,DATE_FORMAT(R.REG_DT , '%Y-%m-%d') AS REG_DT
-		        ,R.UPD_NO
-		        ,DATE_FORMAT(R.UPD_DT , '%Y-%m-%d') AS UPD_DT
-		        ,R.ADM_RPL
-		        ,R.ADM_RPL_REG_NO
-		        ,DATE_FORMAT(R.ADM_RPL_DT , '%Y-%m-%d %H:%i:%s') AS ADM_RPL_DT
-		        ,DATEDIFF( DATE_ADD(O.PAY_DT,INTERVAL 90 DAY),NOW()) AS REMAIN_DT -- 남은시간
-		        , RANK() OVER(ORDER BY O.PAY_DT DESC) AS RNUM
-		  FROM TB_ORDER O INNER JOIN TB_ORDER_DETAIL OD ON O.ORD_NO = OD.ORD_NO 
-		                  INNER JOIN TB_ORDER_DETAIL_ITEM ODI ON OD.ORD_DTL_NO = ODI.ORD_DTL_NO 
-		                    					 AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-		                  INNER JOIN TB_GOODS G ON G.GOODS_CD = OD.GOODS_CD 
-		                  INNER JOIN TB_BRAND B ON B.BRAND_CD = G.BRAND_CD
-		                  INNER JOIN TB_REVIEW R ON R.ORD_NO = O.ORD_NO 
-		                                		AND R.ORD_NO = O.ORD_NO
-		                                		AND R.ORD_DTL_NO = OD.ORD_DTL_NO 
-		                                		AND R.DEL_YN = 'N'
-		                                		AND R.DISP_YN = 'Y'
-		                  LEFT JOIN TB_ITEMKIND I ON G.ITEMKIND_CD = I.ITEMKIND_CD 
-		                  LEFT OUTER JOIN TB_COLOR C ON ODI.OPT_CD1 = C.COLOR_CD
-		  	                                           AND C.USE_YN = 'Y'
-		       WHERE 1=1
-		     AND O.CUST_NO = #{custNo}
-		     AND O.DISP_YN = 'Y'
-		     AND O.SITE_CD = #{siteCd}
-		     GROUP BY O.ORD_NO 
-		           ,O.ORD_NM 
-		           ,O.PAY_DT 
-		           ,O.CUST_NO 
-		           ,OD.ORD_DTL_NO
-		           ,OD.ORD_EXCH_GB 
-		           ,OD.GOODS_CD 
-		           ,OD.REAL_ORD_AMT 
-		           ,OD.SAVE_PNT_AMT 
-		           ,OD.GFCD_USE_AMT 
-		           ,ODI.ORD_DTL_ITEM_SQ 
-		           ,ODI.ITEM_CD 
-		           ,ODI.OPT_CD 
-		           ,ODI.OPT_CD1
-		           ,ODI.OPT_CD2
-		           ,ODI.ITEM_QTY 
-		           ,ODI.ITEM_PRICE
-		           ,G.GOODS_NM 
-		           ,G.MAIN_COLOR_CD
-		           ,B.BRAND_ENM 
-		     )F
-		ORDER BY F.PAY_DT DESC
-		<include refid="selectForPagingFooter"/>
+	        SELECT GROUP_CONCAT(Z.ITEM_NM ORDER BY Z.ORD_DTL_ITEM_SQ SEPARATOR '!@!') AS ITEM_NM
+	             , GROUP_CONCAT(Z.COLOR_NM ORDER BY Z.ORD_DTL_ITEM_SQ) AS COLOR_NM
+	             , GROUP_CONCAT(Z.OPT_CD1 ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD1
+	             , GROUP_CONCAT(Z.OPT_CD2 ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD2
+	             , GROUP_CONCAT(Z.OPT_CD1_NM ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD1_NM
+	             , Z.ORD_NO
+	             , Z.ORD_DT
+	             , Z.PAY_DT
+	             , Z.DELV_EDDT
+	             , Z.ORD_DTL_NO
+	             , Z.ORD_EXCH_GB
+	             , Z.GOODS_CD
+	             , Z.GOODS_NM
+	             , Z.LIST_PRICE
+	             , Z.GOODS_TYPE
+	             , Z.SYS_IMG_NM
+	             , Z.ORD_DTL_STAT
+	             , Z.ORD_QTY
+	             , Z.CNCL_RTN_QTY
+	             , Z.ORD_AMT
+	             , Z.REAL_ORD_AMT
+	             , Z.SAVE_PNT_AMT
+	             , Z.CNCL_RTN_AMT
+	             , Z.PNT_DC_AMT
+	             , Z.GFCD_USE_AMT
+	             , Z.INVOICE_NO
+	             , Z.SUPPLY_COMP_CD
+	             , Z.DELV_FEE_CD
+	             , Z.SHOT_DELV_YN
+	             , Z.CHANGEABLE_YN
+	             , Z.RETURNABLE_YN
+	             , Z.SELF_GOODS_YN
+	             , Z.BRAND_NM
+	             , Z.BRAND_ENM
+	             , Z.ORD_DTL_STAT_NM
+	             , Z.ORD_REQ_CHG_QTY
+	             , Z.ORD_CAN_CHG_QTY
+	             , Z.ITEMKIND_NM 
+	             , Z.ITEMKIND_CD 
+	             , Z.SIZE_GB 
+	             , Z.REMAIN_DT
+	             , Z.REVIEW_SQ
+	             , Z.REVIEW_GB
+	             , Z.REVIEW_CONTENT
+	             , Z.SCORE
+	             , Z.HEIGHT
+	             , Z.WEIGHT
+	             , Z.SCORE_SIZE
+	             , Z.SCORE_COLOR
+	             , Z.SCORE_FIT
+	             , Z.SCORE_THICK
+	             , Z.SCORE_WEIGHT
+	             , Z.SCORE_BALL
+	             , Z.GIVE_DUE_PNT
+	             , Z.PNT_GIVE_STAT
+	             , Z.BEST_YN
+	             , Z.GIVE_DUE_BPNT
+	             , Z.BPNT_GIVE_YN
+	             , Z.DISP_YN
+	             , Z.DEL_YN
+	             , Z.CONFIRM_YN
+	             , Z.CONFIRM_UNO
+	             , Z.CONFIRM_DT
+	             , Z.REG_NO
+	             , Z.REG_DT
+	             , Z.UPD_NO
+	             , Z.UPD_DT
+	             , Z.ADM_RPL
+	             , Z.ADM_RPL_REG_NO
+	             , Z.ADM_RPL_DT
+	             , RANK() OVER(ORDER BY Z.PAY_DT DESC) AS RNUM
+	       FROM (SELECT O.ORD_NO
+	                  , DATE_FORMAT(O.ORD_DT, '%Y.%m.%d') AS ORD_DT
+	                  , DATE_FORMAT(O.PAY_DT, '%Y-%m-%d') AS PAY_DT 
+	                  , DATE_FORMAT(OD.DELV_EDDT, '%m/%d')								AS DELV_EDDT
+	                  , OD.ORD_DTL_NO
+	                  , OD.ORD_EXCH_GB
+	                  , OD.GOODS_CD
+	                  , OD.GIFT_ADDR_INP_YN
+	                  , G.GOODS_NM
+	                  , IFNULL((SELECT COLOR_KNM FROM TB_COLOR C WHERE COLOR_CD = IFNULL(NULLIF(ODI.OPT_CD1,'') , G.MAIN_COLOR_CD ) AND USE_YN  = 'Y'), ODI.OPT_CD1) AS COLOR_NM
+	                  , (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD = ODI.ITEM_CD)		AS ITEM_NM
+	                  , ODI.ORD_DTL_ITEM_SQ
+	                  , ODI.OPT_CD1
+	                  , ODI.OPT_CD2
+	                  , IFNULL(C.COLOR_KNM, ODI.OPT_CD1) AS OPT_CD1_NM
+	                  , G.LIST_PRICE
+	                  , G.GOODS_TYPE
+	                  , CASE WHEN G.GOODS_TYPE != 'G056_S' AND G.SELF_GOODS_YN = 'Y' THEN (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = ODI.OPT_CD1 AND DEFAULT_IMG_YN = 'Y')
+	                         ELSE (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IFNULL(G.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y') END AS SYS_IMG_NM
+	                  , OD.ORD_DTL_STAT
+	                  , OD.ORD_QTY
+	                  , OD.CNCL_RTN_QTY
+	                  , OD.ORD_AMT
+	                  , OD.REAL_ORD_AMT
+	                  , OD.SAVE_PNT_AMT
+	                  , OD.CNCL_RTN_AMT
+	                  , OD.PNT_DC_AMT
+	                  , OD.GFCD_USE_AMT
+	                  , OD.INVOICE_NO
+	                  , OD.SUPPLY_COMP_CD
+	                  , OD.DELV_FEE_CD
+	                  , OD.SHOT_DELV_YN
+	                  , OD.CHANGEABLE_YN
+	                  , OD.RETURNABLE_YN
+	                  , G.SELF_GOODS_YN
+	                  , CONCAT(B.BRAND_ENM, ' ', B.BRAND_KNM)							AS BRAND_NM
+	                  , B.BRAND_ENM
+	                  , FN_GET_CODE_NM('G013', OD.ORD_DTL_STAT)							AS ORD_DTL_STAT_NM
+	                  , IFNULL(OCD.ORD_REQ_CHG_QTY, 0) AS ORD_REQ_CHG_QTY
+	                  , OD.ORD_QTY - OD.CNCL_RTN_QTY - IFNULL(OCD.ORD_REQ_CHG_QTY, 0)    AS ORD_CAN_CHG_QTY
+	                  , I.ITEMKIND_NM 
+	                  , I.ITEMKIND_CD 
+	                  , I.SIZE_GB 
+	                  , R.REVIEW_SQ
+	                  , R.REVIEW_GB
+	                  , R.REVIEW_CONTENT
+	                  , R.SCORE
+	                  , R.HEIGHT
+	                  , R.WEIGHT
+	                  , (CASE R.SCORE_SIZE   WHEN 1 THEN '작음' 
+	                                          WHEN 2 THEN '딱맞음'
+	                                         WHEN 3 THEN '큼'
+	                                                            END) AS SCORE_SIZE
+	                  , (CASE R.SCORE_COLOR  WHEN 1 THEN '밝음' 
+	                                         WHEN 2 THEN '똑같음'
+	                                         WHEN 3 THEN '어두움'   
+	                                                            END) AS SCORE_COLOR
+	                  , (CASE R.SCORE_FIT    WHEN 1 THEN '슬림' 
+	                                         WHEN 2 THEN '레귤러' 
+	                                         WHEN 3 THEN '오버' 
+	                                                            END) AS SCORE_FIT
+	                  , (CASE R.SCORE_THICK  WHEN 1 THEN '얇음' 
+	                                         WHEN 2 THEN '적당함' 
+	                                         WHEN 3 THEN '도톰함'
+	                                                            END) AS SCORE_THICK
+	                   , (CASE R.SCORE_WEIGHT WHEN 1 THEN '가벼움' 
+	                                         WHEN 2 THEN '적당함'
+	                                         WHEN 3 THEN '무거움'
+	                                                            END) AS SCORE_WEIGHT
+	                   , (CASE R.SCORE_BALL   WHEN 1 THEN '작음'
+	                                          WHEN 2 THEN '딱맞음'
+	                                          WHEN 3 THEN '큼' 
+	                                                            END) AS SCORE_BALL
+	                   , R.GIVE_DUE_PNT
+	                   , R.PNT_GIVE_STAT
+	                   , R.BEST_YN
+	                   , R.GIVE_DUE_BPNT
+	                   , R.BPNT_GIVE_YN
+	                   , R.DISP_YN
+	                   , R.DEL_YN
+	                   , R.CONFIRM_YN
+	                   , R.CONFIRM_UNO
+	                   , R.CONFIRM_DT
+	                   , R.REG_NO
+	                   , DATE_FORMAT(R.REG_DT , '%Y-%m-%d') AS REG_DT
+	                   , R.UPD_NO
+	                   , DATE_FORMAT(R.UPD_DT , '%Y-%m-%d') AS UPD_DT
+	                   , R.ADM_RPL
+	                   , R.ADM_RPL_REG_NO
+	                   , DATE_FORMAT(R.ADM_RPL_DT , '%Y-%m-%d %H:%i:%s') AS ADM_RPL_DT
+	                   , DATEDIFF( DATE_ADD(O.PAY_DT,INTERVAL  #{reviewExpireDay} DAY),NOW()) AS REMAIN_DT -- 남은시간
+	    FROM TB_ORDER O
+	   INNER JOIN TB_ORDER_DETAIL OD
+	      ON O.ORD_NO = OD.ORD_NO
+	      AND OD.ORD_DTL_STAT IN ('G013_70','G013_50','G013_60') -- 구매 확정인것만
+	   INNER JOIN TB_ORDER_DETAIL_ITEM ODI
+	      ON OD.ORD_NO = ODI.ORD_NO
+	     AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
+	      AND ODI.ORD_DTL_STAT IN('G013_70','G013_50','G013_60') -- 구매 확정인것만
+	   INNER JOIN TB_GOODS G
+	      ON OD.GOODS_CD = G.GOODS_CD
+	   INNER JOIN TB_BRAND B
+	      ON B.BRAND_CD = G.BRAND_CD
+	   INNER JOIN TB_REVIEW R ON R.ORD_NO = O.ORD_NO 
+	  	AND R.ORD_NO = O.ORD_NO
+	  	AND R.ORD_DTL_NO = OD.ORD_DTL_NO 
+	  	AND R.DEL_YN = 'N'
+	  	AND R.DISP_YN = 'Y'
+	   LEFT JOIN TB_ITEMKIND I 
+	      ON G.ITEMKIND_CD = I.ITEMKIND_CD 
+	    LEFT OUTER JOIN (SELECT OD.ORD_DTL_NO
+	                      	, SUM(OCD.CHG_QTY) AS ORD_REQ_CHG_QTY
+	                       FROM TB_ORDER_CHANGE_DETAIL OCD
+	                      INNER JOIN TB_ORDER_DETAIL OD
+	                         ON OCD.ORD_DTL_NO = OD.ORD_DTL_NO
+	                      WHERE OCD.DEL_YN = 'N'
+	                      GROUP BY OCD.ORD_DTL_NO
+	            ) OCD
+	      ON OD.ORD_DTL_NO = OCD.ORD_DTL_NO
+	  LEFT OUTER JOIN TB_COLOR C ON ODI.OPT_CD1 = C.COLOR_CD
+	                               AND C.USE_YN = 'Y'
+	     WHERE 1=1
+	   AND O.PAY_DT >  DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL  #{reviewExpireDay} DAY), '%Y%M%D%H%I%S') 
+	   AND O.CUST_NO =  #{custNo}
+	   AND O.DISP_YN = 'Y'
+	   AND O.SITE_CD =  #{siteCd}
+	   	) Z
+	 GROUP BY Z.ORD_NO, Z.ORD_DT, Z.DELV_EDDT, Z.ORD_DTL_NO, Z.ORD_EXCH_GB
+	        , Z.GOODS_CD, Z.GOODS_NM, Z.LIST_PRICE, Z.SYS_IMG_NM, Z.ORD_DTL_STAT, Z.ORD_QTY, Z.CNCL_RTN_QTY, Z.ORD_AMT, Z.REAL_ORD_AMT
+	        , Z.SAVE_PNT_AMT, Z.CNCL_RTN_AMT, Z.PNT_DC_AMT, Z.GFCD_USE_AMT, Z.INVOICE_NO
+	        , Z.SUPPLY_COMP_CD, Z.DELV_FEE_CD, Z.SHOT_DELV_YN, Z.CHANGEABLE_YN, Z.SELF_GOODS_YN, Z.BRAND_NM, Z.BRAND_ENM, Z.ORD_DTL_STAT_NM
+	        , Z.ORD_REQ_CHG_QTY, Z.ORD_CAN_CHG_QTY
+	ORDER BY Z.ORD_NO DESC, Z.ORD_DTL_STAT, Z.SELF_GOODS_YN DESC, Z.SHOT_DELV_YN DESC, Z.SUPPLY_COMP_CD
+	<include refid="selectForPagingFooter"/>
 	</select>
 	
 	<select id="getReviewAttach" parameterType="Review" resultType="Review">

+ 6 - 5
src/main/webapp/WEB-INF/views/web/mypage/MypageReviewFormWeb.html

@@ -48,8 +48,8 @@
 							<div class="taps" id="tpasReview">
 								<div>
 									<ul>
-										<li id="completeReview"><a href="javascript:void(0);" >작성 가능한 리뷰<span th:text="'('+${#numbers.formatInteger(completeReviewCount,0,'COMMA')}+')'"></span></a></li>
-										<li id="alreadyReview"><a href="javascript:void(0);" >내가 쓴 리뷰<span th:text="'('+${#numbers.formatInteger(alreadyReviewCount,0,'COMMA')}+')'"></span></a></li>
+										<li id="completeReview"><a href="javascript:void(0);" >작성 가능한 리뷰<span id="comReview" th:text="'('+${#numbers.formatInteger(completeReviewCount,0,'COMMA')}+')'"></span></a></li>
+										<li id="alreadyReview"><a href="javascript:void(0);" >내가 쓴 리뷰<span id="alrReview" th:text="'('+${#numbers.formatInteger(alreadyReviewCount,0,'COMMA')}+')'"></span></a></li>
 									</ul>
 								</div>
 							</div>
@@ -212,6 +212,7 @@
 	
 	// 주문 목록 조회 콜백
 	var fnSearchCallback2 = function(result) {
+		
 		$('#nodata1').hide();
 		$('#nodata2').hide();
 		
@@ -404,10 +405,10 @@
 			sureBtnText : "확인",
 			sureBtnClick : function() {
 
-				gagajf.ajaxJsonSubmit('/mypage/review/delete', jsonData, function() {
-					
+				gagajf.ajaxJsonSubmit('/mypage/review/delete', jsonData, function(e) {
 					mcxDialog.alert("삭제되었습니다.");
-					
+					$("#alrReview").text("("+e.alreadyReviewCount+")");
+					$("#comReview").text("("+e.completeReviewCount+")");
 					$("#alreadyReview").trigger('click');	
 				});
 			}

+ 15 - 0
src/main/webapp/WEB-INF/views/web/social/SocialMainFormWeb.html

@@ -27,6 +27,7 @@
 			</ul> 
 		</div>
 		<div class="wrap">
+		<th:block th:if="${socialInfo != null}">
 			<div class="content wide dp_hotdeal"> <!-- 페이지특정 클래스 = dp_hotdeal -->
 				<div class="cont_body">
                     <div class="hotdeal">
@@ -69,10 +70,24 @@
                     </div>
                 </div>
 		    </div>
+		</th:block>
+		<th:block th:unless="${socialInfo != null}">
+				<div class="nodata" >
+					<div class="txt_box">
+						<p>
+							진행하는 핫딜이 없습니다.
+						</p>
+					</div>
+					<div class="btn_box">
+						<button class="btn btn_default" th:onclick="cfnGoToPage(_PAGE_MAIN);"><span>홈으로 가기</span></button>
+					</div>
+				</div>	
+		</th:block>
         </div>
     </div>   
 <script th:inline="javascript">
 var socialInfo = [[${socialInfo}]];
+console.log(socialInfo);
 var socialAddCart = function (obj) {
 	let btnType = "C";
 	let params = [];