Merge remote-tracking branch '112.172.147.34/style' into ST24PRJ-198(다다익선등록오류)

src/main/java/com/style24/front/biz/dao/TsfReviewDao.java

@@ -243,9 +243,4 @@ public interface TsfReviewDao {
 	 */
 	void updateMypageReviewConfimYn(Review review);
 	
-
-
-	
-	
-	
 }

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

@@ -10,8 +10,6 @@ import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.gagaframework.web.util.GagaDateUtil;
-import com.gagaframework.web.util.GagaFileUtil;
 import com.style24.core.biz.dao.TscPointDao;
 import com.style24.core.biz.service.TscEnvsetService;
 import com.style24.core.support.env.TscConstants;
@@ -25,6 +23,9 @@ import com.vdurmont.emoji.EmojiParser;
 
 import lombok.extern.slf4j.Slf4j;
 
+import com.gagaframework.web.util.GagaDateUtil;
+import com.gagaframework.web.util.GagaFileUtil;
+
 /**
  * 상품평 Service
  *
@@ -180,25 +181,46 @@ public class TsfReviewService {
 		
 		review.setDispYn("Y");
 		review.setDelYn("N");
-		review.setConfirmYn("Y");
 		review.setRegNo(TsfSession.getInfo().getCustNo());
 		review.setUpdNo(TsfSession.getInfo().getCustNo());
 
 		int textReviewPnt = envsetService.getTextReviewPoint(TscConstants.Site.STYLE24.value());
 		int photoReviewPnt = envsetService.getPhotoReviewPoint(TscConstants.Site.STYLE24.value());
 
-		if (review.getKufKeyArr() == null && review.getOrgFileNmArr() == null) {
-			review.setPntGiveStat("G043_30");
-			review.setReviewGb("R");
+		if (review.getOrgFileNmArr() == null && review.getKufKeyArr() == null) { // 텍스트만 등록
+			review.setReviewGb("R"); // 일반상품평
 			review.setGiveDuePnt(textReviewPnt);
-		}else if(review.getKufKeyArr() == null && review.getOrgFileNmArr() != null) {
-			review.setPntGiveStat("G043_30");
-			review.setReviewGb("P");
+			review.setPntGiveStat("G043_30"); // 포인트즉시지급
+			review.setConfirmYn("Y"); // 확인완료
+			review.setConfirmUno(TsfSession.getInfo().getCustNo());
+		} else if (review.getOrgFileNmArr() == null && review.getKufKeyArr() != null) { // 동영상만 등록
+			review.setReviewGb("P"); // 프리미엄상품평
 			review.setGiveDuePnt(photoReviewPnt);
-		}else {
-			review.setPntGiveStat("G043_10");
-			review.setReviewGb("P");
+			review.setPntGiveStat("G043_10"); // 포인트지급대기
+			review.setConfirmYn("N"); // 확인대기(동영상노출안함)
+		} else if (review.getOrgFileNmArr() != null && review.getKufKeyArr() == null) { // 포토만 등록
+			review.setReviewGb("P"); // 프리미엄상품평
+			review.setGiveDuePnt(photoReviewPnt);
+			review.setPntGiveStat("G043_30"); // 포인트즉시지급
+			review.setConfirmYn("Y"); // 확인완료
+			review.setConfirmUno(TsfSession.getInfo().getCustNo());
+		} else if (review.getOrgFileNmArr() != null && review.getKufKeyArr() != null) { // 포토+동영상 등록
+			review.setReviewGb("P"); // 프리미엄상품평
 			review.setGiveDuePnt(photoReviewPnt);
+			review.setPntGiveStat("G043_30"); // 포인트즉시지급
+			review.setConfirmYn("N"); // 확인대기(동영상노출안함)
+		}
+		
+		// 당월에 지급완료한 포인트 횟수 (한 달에 10번만 지급 체크). 2021.08.11
+		int monthCount = reviewDao.getReviewPointGiveMonthCount(review);
+		if (monthCount >= 10) {
+			review.setPntGiveStat("G043_50"); // 당월지급횟수(10)초과
+		}
+		
+		// 한가지 상품을 여러 번 주문을 했어도 포인트 지급은 한번으로 수정. 2021.08.11
+		int goodsCount = reviewDao.getReviewPointGiveCount(review);
+		if (goodsCount >= 1) {
+			review.setPntGiveStat("G043_60"); // 동일상품기지급
 		}
 		
 		reviewDao.saveMypageReview(review);
@@ -255,14 +277,8 @@ public class TsfReviewService {
 			}
 		}
 		
-		// 2021.08.11 
-		// @ 1달에 10번만 포인트 지급
-		int monthCount = reviewDao.getReviewPointGiveMonthCount(review);
-		if (monthCount < 10) {
-			
-			// @ 한가지상품을 여러번 주문을 했어도 포인트 지급은 한번으로 수정
-			int goodsCount = reviewDao.getReviewPointGiveCount(review);
-			if (goodsCount < 1) {
+		if (monthCount < 10) { // 1달에 10번만 포인트 지급
+			if (goodsCount < 1) { // 한가지 상품에 대해 기등록된 상품평이 없을 때
 				Point point = new Point();
 				point.setCustNo(TsfSession.getInfo().getCustNo());
 				point.setOccurGb(TscConstants.PointOccurGb.REVIEW_POINT.value());
@@ -271,17 +287,14 @@ public class TsfReviewService {
 				point.setOrdNo(review.getOrdNo());
 				point.setOrdDtlNo(review.getOrdDtlNo());
 				
-				if (review.getKufKeyArr() == null && review.getOrgFileNmArr() == null) {
-					// 상품평만 적었을 경우
+				if (review.getKufKeyArr() == null && review.getOrgFileNmArr() == null) { // 텍스트만 등록
 					point.setGvPntAmt(textReviewPnt);
 					point.setRmPntAmt(textReviewPnt);
 					reviewDao.createReviewPoint(point);
 					point.setPntAmt(textReviewPnt);
 					point.setReviewSq(review.getReviewSq());
 					reviewDao.createReviewPointHst(point);
-				} else if(review.getKufKeyArr() == null && review.getOrgFileNmArr() != null) {
-					// 상품평 + 사진
-					point.setCustNo(TsfSession.getInfo().getCustNo());
+				} else if (review.getOrgFileNmArr() != null) { // 포토 또는 포토+동영상 등록
 					point.setGvPntAmt(photoReviewPnt);
 					point.setRmPntAmt(photoReviewPnt);
 					reviewDao.createReviewPoint(point);
@@ -290,7 +303,8 @@ public class TsfReviewService {
 					reviewDao.createReviewPointHst(point);
 				}
 				
-				reviewDao.updateMypageReviewConfimYn(review);
+				// 위에서 처리하는 것으로 로직 변경했으므로 주석 처리
+//				reviewDao.updateMypageReviewConfimYn(review);
 			} else {
 				resultStr = "FAIL";
 			}
@@ -300,7 +314,7 @@ public class TsfReviewService {
 		
 		return resultStr;
 	}
-		
+	
 	/**
 	 * 상품 리뷰 목록
 	 * @param review

src/main/java/com/style24/front/biz/web/TsfDisplayController.java

@@ -847,7 +847,7 @@ public class TsfDisplayController extends TsfBaseController {
 		
 		if (params.getBrandGroupNo() != null && params.getBrandGroupNo() > 0) {
 			cate1.setCate1No(null);
-			mav.addObject("brandCateList", diquest.getCategoryList(cate1));
+			mav.addObject("brandCateList", getSortCategoryList(cate1));
 		}
 		// 상품리스트 카테고리별 필터 목록
 		filterList = diquest.getFilterList(params);
@@ -1180,7 +1180,7 @@ public class TsfDisplayController extends TsfBaseController {
 		String syncYn = commonService.getSearchEngineSyncYn();
 		if (syncYn.equals("Y")) { // 검색엔진을 통한 상품리스트 조회
 			// 상품검색키워드 카테고리 목록
-			mav.addObject("cateList", diquest.getCategoryList(params));
+			mav.addObject("cateList", getSortCategoryList(params));
 
 			// 상품리스트 카테고리별 필터 목록
 			filterList = diquest.getFilterList(params);
@@ -1526,7 +1526,7 @@ public class TsfDisplayController extends TsfBaseController {
 		mav.addObject("allCateList", displayService.getAllCategoryList("G032_101"));
 
 		// 상품검색키워드 카테고리 목록
-		mav.addObject("cateList", diquest.getCategoryList(params));
+		mav.addObject("cateList", getSortCategoryList(params));
 
 		// 상품리스트 카테고리별 필터 목록
 		filterList = diquest.getFilterList(params);

src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -791,6 +791,8 @@ public class TsfMypageController extends TsfBaseController {
 		// 1. 세션회원조회
 		int custNo = TsfSession.getInfo().getCustNo();
 		orderChange.setCustNo(custNo);
+		orderChange.setRegNo(custNo);
+		orderChange.setUpdNo(custNo);
 
 		GagaMap map = coreOrderChangeService.returnReq(orderChange);
 

src/main/java/com/style24/front/biz/web/TsfPgController.java

@@ -1,7 +1,6 @@
 package com.style24.front.biz.web;
 
 import java.io.PrintWriter;
-import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -14,7 +13,6 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -85,6 +83,7 @@ public class TsfPgController extends TsfBaseController {
 			order.setPgTid(request.getParameter("tno"));
 			order.setCashAuthNo(request.getParameter("cash_a_no"));
 			order.setCashTradeNo(request.getParameter("cash_no"));
+			order.setPayMeans(TscConstants.PayMeans.BANK_DEPOSIT.value());
 			order.setCustNo(0);
 			order.setUpdNo(0);
 			coreOrderService.updateOrderInfoVBank(order);
@@ -157,6 +156,7 @@ public class TsfPgController extends TsfBaseController {
 			order.setPgTid(param.getTno());
 			order.setCashAuthNo(param.getCash_a_no());
 			order.setCashTradeNo(param.getCash_no());
+			order.setPayMeans(TscConstants.PayMeans.BANK_DEPOSIT.value());
 			order.setCustNo(0);
 			order.setUpdNo(0);
 			coreOrderService.updateOrderInfoVBank(order);

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

@@ -736,59 +736,65 @@
 	<insert id="saveMypageReview" parameterType="Review" useGeneratedKeys="true" keyProperty="reviewSq">
 		/* TsfReivew.saveMypageReview */
 		INSERT INTO TB_REVIEW (
-		                         REVIEW_SQ
-		                       , GOODS_CD
-		                       , REVIEW_GB
-		                       , 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
-		                       , GIVE_DUE_PNT
-		                       , PNT_GIVE_STAT
-		                       , DISP_YN
-		                       , DEL_YN
-		                       , REG_NO
-		                       , REG_DT
-		                       , UPD_NO
-		                       , UPD_DT
-		                      )
-		               VALUES (
-		                          #{reviewSq}
-		                        , #{goodsCd}
-		                        , #{reviewGb}
-		                        , #{custNo}
-		                        , #{ordNo}
-		                        , #{ordDtlNo}
-		                        , #{reviewTitle}
-		                        , #{reviewContent}
-		                        , #{score}
-		                        , #{height}
-		                        , #{weight}
-		                        , #{scoreSize}
-		                        , #{scoreColor}
-		                        , #{scoreFit}
-		                        , #{scoreThick}
-		                        , #{scoreWeight}
-		                        , #{scoreBall}
-		                        , #{giveDuePnt}
-		                        , #{pntGiveStat}
-		                        , #{dispYn}
-		                        , #{delYn}
-		                        , #{regNo}
-		                        , now()
-		                        , #{updNo}
-		                        , now()
-		                      )
+		       REVIEW_SQ
+		     , GOODS_CD
+		     , REVIEW_GB
+		     , 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
+		     , GIVE_DUE_PNT
+		     , PNT_GIVE_STAT
+		     , DISP_YN
+		     , DEL_YN
+		     , CONFIRM_YN
+		     , CONFIRM_UNO
+		     , CONFIRM_DT
+		     , REG_NO
+		     , REG_DT
+		     , UPD_NO
+		     , UPD_DT
+		)
+		VALUES (
+		       #{reviewSq}
+		     , #{goodsCd}
+		     , #{reviewGb}
+		     , #{custNo}
+		     , #{ordNo}
+		     , #{ordDtlNo}
+		     , #{reviewTitle}
+		     , #{reviewContent}
+		     , #{score}
+		     , #{height}
+		     , #{weight}
+		     , #{scoreSize}
+		     , #{scoreColor}
+		     , #{scoreFit}
+		     , #{scoreThick}
+		     , #{scoreWeight}
+		     , #{scoreBall}
+		     , #{giveDuePnt}
+		     , #{pntGiveStat}
+		     , #{dispYn}
+		     , #{delYn}
+		     , #{confirmYn}
+		     , CASE WHEN #{confirmYn} = 'Y' THEN #{confirmUno} ELSE NULL END
+		     , CASE WHEN #{confirmYn} = 'Y' THEN NOW() ELSE NULL END
+		     , #{regNo}
+		     , NOW()
+		     , #{updNo}
+		     , NOW()
+		)
 	</insert>
 	
 	<update id="updateMypageReview" parameterType="Review">
@@ -1032,7 +1038,7 @@
 		     WHERE 1=1
 		   AND O.ORD_DT >  DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL  #{reviewExpireDay} DAY), '%Y%M%D%H%I%S') 
 		   AND O.CUST_NO =  #{custNo}
-		   AND R.CONFIRM_YN = 'Y'
+		   -- AND R.CONFIRM_YN = 'Y'
 		   AND R.ORD_NO = O.ORD_NO
 		   AND R.DEL_YN = 'N'
 		   AND R.DISP_YN = 'Y'
@@ -1227,31 +1233,22 @@
 	<!-- 2021.08.11 포인트 지급 이번달 1일부터 31일 사이의 포인트지급 카운트 -->
 	<select id="getReviewPointGiveMonthCount" parameterType="Review" resultType="int">
 		/* TsfReivew.getReviewPointGiveMonthCount */	
-		SELECT COUNT(*) AS COUNT
-		FROM   TB_REVIEW RV
-		WHERE  1=1 
-		AND    RV.PNT_GIVE_STAT = 'G043_30'
-		AND    RV.CUST_NO = #{custNo}
-		AND    RV.REG_DT BETWEEN LAST_DAY(NOW() - INTERVAL -1 MONTH) AND LAST_DAY(NOW())	
+		SELECT COUNT(*) AS CNT
+		FROM   TB_REVIEW R
+		WHERE  R.CUST_NO = #{custNo} 
+		AND    R.PNT_GIVE_STAT = 'G043_30' /*포인트반영완료된 넘*/
+		AND    R.REG_DT <![CDATA[>=]]> STR_TO_DATE(CONCAT(DATE_FORMAT(NOW(),'%Y-%m'),'-01'),'%Y-%m-%d') /*당월1일부터*/
+		AND    R.REG_DT <![CDATA[<]]> DATE_ADD(LAST_DAY(NOW()), INTERVAL 1 DAY) /*당월말일까지*/
 	</select>
 		
 	<!-- 2021.08.11 포인트 지급은 한개의 상품만 가능 -->
 	<select id="getReviewPointGiveCount" parameterType="Review" resultType="int">
-		/* TsfReivew.getReviewPointGiveCount */	
-		SELECT COUNT(*) AS COUNT
-		FROM   TB_REVIEW RV
-		WHERE  1=1 
-		AND    RV.PNT_GIVE_STAT = 'G043_30'
-		AND    RV.CUST_NO = #{custNo}
-		AND    EXISTS (
-		    SELECT 1
-		    FROM   TB_ORDER_DETAIL OD
-		    WHERE  1=1
-		    AND    OD.ORD_NO = #{ordNo}
-		    AND    OD.ORD_DTL_NO = #{ordDtlNo}
-		    AND    OD.GOODS_CD = RV.GOODS_CD
-		)
-		AND    RV.REVIEW_SQ    != #{reviewSq}
+		/* TsfReivew.getReviewPointGiveCount */
+		SELECT COUNT(*) AS CNT
+		FROM   TB_REVIEW R
+		WHERE  R.CUST_NO = #{custNo}
+		AND    R.GOODS_CD = #{goodsCd} /*동일상품으로 등록된 상품평이 있는지*/
+		AND    R.PNT_GIVE_STAT = 'G043_30' /*포인트반영완료된 넘*/
 	</select>
 	
 	<insert id="createReviewPoint" parameterType="Point" useGeneratedKeys="true" keyProperty="custPntSq">

src/main/webapp/WEB-INF/views/mob/common/fragments/FooterMob.html

@@ -308,29 +308,36 @@
 
 	// 퀵메뉴탭 생성
 	let fnCreateQuickMenuTab = function() {
-		$.getJSON('/display/gnb/tab/list'
+		$.getJSON('/display/searchengine/all/cate/list'
 			, function(result, status) {
-				if (status == 'success') {
-					if (result.length > 0) {
-						$('#ulQuickMenuCate').html('');
-						$('#ulQuickMenuCate').append('<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_ALL_BRAND);"><span>브랜드</span></a></li>\n');
-
-						let allCate = [[${allCateList}]];
-						$.each(result, function(idx, item) {
-							if (item.contentsType == 'C') { // 컨텐츠유형: 카테고리
-								$.each(allCate, function(allCateIdx, allCateItem) {
-									if (item.cate1No == allCateItem.cate1No) {
-										$('#ulQuickMenuCate').append(fnGetQuickMenuCategory(allCateItem));
+				let allCate = [];
+				if (result.length > 0) {
+					allCate = result;	// 21.12.23 검색엔진 카테고리 가져오도록 변경
+				}
+				
+				$.getJSON('/display/gnb/tab/list'
+					, function(result, status) {
+						if (status == 'success') {
+							if (result.length > 0) {
+								$('#ulQuickMenuCate').html('');
+								$('#ulQuickMenuCate').append('<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_ALL_BRAND);"><span>브랜드</span></a></li>\n');
+								
+								$.each(result, function(idx, item) {
+									if (item.contentsType == 'C') { // 컨텐츠유형: 카테고리
+										$.each(allCate, function(allCateIdx, allCateItem) {
+											if (item.cate1No == allCateItem.cate1No) {
+												$('#ulQuickMenuCate').append(fnGetQuickMenuCategory(allCateItem));
+											}
+										});
+									} else if (item.contentsType == 'O') { // 컨텐츠유형: 아울렛
+										$('#ulQuickContents').append('<li><a href="javascript:void(0);" onclick="cfnGoToOutletMain(\'G032_103\');"><span>' + item.gtabNm + '</span></a></li>\n');
+									} else if (item.contentsType == 'L') { // 컨텐츠유형:링크
+										$('#ulQuickContents').append('<li><a href="' + item.linkUrl + '"><span>' + item.gtabNm + '</span></a></li>\n');
 									}
 								});
-							} else if (item.contentsType == 'O') { // 컨텐츠유형: 아울렛
-								$('#ulQuickContents').append('<li><a href="javascript:void(0);" onclick="cfnGoToOutletMain(\'G032_103\');"><span>' + item.gtabNm + '</span></a></li>\n');
-							} else if (item.contentsType == 'L') { // 컨텐츠유형:링크
-								$('#ulQuickContents').append('<li><a href="' + item.linkUrl + '"><span>' + item.gtabNm + '</span></a></li>\n');
 							}
-						});
-					}
-				}
+						}
+				});
 			});
 	}
 

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

@@ -470,6 +470,7 @@ var fnExchange = function() {
 			let jsonData 	= JSON.parse(json);
 			$.each(jsonData, function (index, chgOpt) {
 				let cancelReq 	= {};
+				cancelReq.ordNo				= oneData.ordNo;
 				cancelReq.ordDtlNo 			= chgOpt.ordDtlNo;
 				cancelReq.ordDtlItemSq 		= chgOpt.ordDtlItemSq;
 				cancelReq.delvFeeCd 		= delvFeeCd;

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

@@ -472,6 +472,7 @@ var fnExchange = function() {
 			let jsonData 	= JSON.parse(json);
 			$.each(jsonData, function (index, chgOpt) {
 				let cancelReq 				= {};
+				cancelReq.ordNo				= oneData.ordNo;
 				cancelReq.ordDtlNo 			= chgOpt.ordDtlNo;
 				cancelReq.ordDtlItemSq 		= chgOpt.ordDtlItemSq;
 				cancelReq.delvFeeCd 		= delvFeeCd;

src/main/webapp/WEB-INF/views/web/common/fragments/FooterWeb.html

@@ -368,6 +368,23 @@
 	$(window).unload(function(){
 		gagajf.setCookie("st24ck_site_preference", null);
 	});
+	
+	let fnGetSearchEngineAllCategoryFooter = function() {
+		// GNB가 먼저 로딩될 경우 gAllCate가 존재하므로, 값이 없을 때만 세팅한다.
+		if( null != gAllCate ){
+			if(0 == gAllCate.length){
+				$.getJSON('/display/searchengine/all/cate/list'
+					, function(result, status) {
+						if (result.length > 0) {
+							gAllCate = result;
+						}
+						fnCreateQuickMenuTab();
+				});
+			}
+		}else{
+			fnCreateQuickMenuTab();
+		}
+	}
 
 	// 패밀리 사이트
 	let fnGetFamilySite = function() {
@@ -1306,10 +1323,12 @@
 		return false;
 	});
 
-
+	// 검색엔진
+	fnGetSearchEngineAllCategoryFooter();
+	
 	//퀵메뉴
 // 	$('#ulQuickMenuCate').load('FooterWeb.html', function() {
-		fnCreateQuickMenuTab();
+		//fnCreateQuickMenuTab();
 // 	});
 
 	//Family Site load 후

src/main/webapp/WEB-INF/views/web/mypage/MypageExchangeFormWeb.html

@@ -454,6 +454,7 @@
 				let jsonData = JSON.parse(json);
 				$.each(jsonData, function (index, chgOpt) {
 					let cancelReq = {};
+					cancelReq.ordNo = oneData.ordNo;
 					cancelReq.ordDtlNo = chgOpt.ordDtlNo;
 					cancelReq.ordDtlItemSq = chgOpt.ordDtlItemSq;
 					cancelReq.delvFeeCd = delvFeeCd;

src/main/webapp/WEB-INF/views/web/mypage/NoMemberExchangeFormWeb.html

@@ -452,6 +452,7 @@
 				let jsonData = JSON.parse(json);
 				$.each(jsonData, function (index, chgOpt) {
 					let cancelReq = {};
+					cancelReq.ordNo = oneData.ordNo;
 					cancelReq.ordDtlNo = chgOpt.ordDtlNo;
 					cancelReq.ordDtlItemSq = chgOpt.ordDtlItemSq;
 					cancelReq.delvFeeCd = delvFeeCd;