Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front into develop

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

@@ -190,6 +190,15 @@ public interface TsfDisplayDao {
 	 */
 	Collection<Contents> getBestItemCategoryList(Contents contents);
 
+	/**
+	 * 전체 브랜드 이미지 리스트
+	 * @param
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 4. 28
+	 */
+	Collection<BrandGroup> getBrandImgList(BrandGroup brandGroup);
+	
 	/**
 	 * 전체 브랜드
 	 * @param

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

@@ -4,6 +4,7 @@ import java.util.Collection;
 
 import com.style24.core.support.annotation.ShopDs;
 import com.style24.persistence.domain.Goods;
+import com.style24.persistence.domain.Point;
 import com.style24.persistence.domain.Review;
 import com.style24.persistence.domain.ReviewAttach;
 
@@ -106,6 +107,15 @@ public interface TsfReviewDao {
 	 */
 	void saveMypageReview(Review review);
 	
+	/**
+	 * 마이페이지 리뷰 업데이트
+	 * @param review
+	 * @return 
+	 * @author sowon
+	 * @since 2021. 3. 25
+	 */
+	void updateMypageReview(Review review);
+	
 	/**
 	 * 마이페이지 작성한 리뷰 건수
 	 * @param review
@@ -187,6 +197,33 @@ public interface TsfReviewDao {
 	 */
 	void saveReviewAttach(ReviewAttach reviewAttach);
 	
+	/**
+	 * 리뷰 포인트 지급 확인
+	 * @param review
+	 * @return 
+	 * @author sowon
+	 * @since 2021. 4. 28
+	 */
+	int getReviewPointGiveCount(Review review);
+	
+	
+	/**
+	 * 리뷰 포인트 생성
+	 * @param review
+	 * @return 
+	 * @author sowon
+	 * @since 2021. 4. 28
+	 */
+	void createReviewPoint(Point point);
+	
+	/**
+	 * 리뷰 포인트 이력 생성
+	 * @param review
+	 * @return 
+	 * @author sowon
+	 * @since 2021. 4. 28
+	 */
+	void createReviewPointHst(Point point);
 	
 	
 	

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

@@ -466,6 +466,17 @@ public class TsfDisplayService {
 		return goodsList;
 	}
 
+	/**
+	 * 전체 브랜드 이미지 리스트
+	 * @param
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 4. 28
+	 */
+	public Collection<BrandGroup> getBrandImgList(BrandGroup brandGroup) {
+		return displayDao.getBrandImgList(brandGroup);
+	}
+	
 	/**
 	 * 전체 브랜드
 	 * @param

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

@@ -12,10 +12,14 @@ 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;
 import com.style24.front.biz.dao.TsfReviewDao;
 import com.style24.front.support.security.session.TsfSession;
 import com.style24.persistence.domain.Goods;
 import com.style24.persistence.domain.Plan;
+import com.style24.persistence.domain.Point;
 import com.style24.persistence.domain.Review;
 import com.style24.persistence.domain.ReviewAttach;
 
@@ -34,8 +38,15 @@ public class TsfReviewService {
 	@Autowired
 	private TsfReviewDao reviewDao;
 	
+	@Autowired
+	private TscPointDao pointDao;
+	
+	
 	@Autowired
 	private Environment env;
+	
+	@Autowired
+	private TscEnvsetService envsetService;
 
 	/**
 	 * 상품 리뷰 목록 건수
@@ -162,12 +173,19 @@ public class TsfReviewService {
 		review.setDispYn("Y");
 		review.setDelYn("N");
 		review.setRegNo(TsfSession.getInfo().getCustNo());
-		review.setUpdNo(TsfSession.getInfo().getCustNo());		
+		review.setUpdNo(TsfSession.getInfo().getCustNo());
+		if (review.getKufKeyArr() == null && review.getOrgFileNmArr() == null) {
+			review.setPntGiveStat("G043_30");
+		}else if(review.getKufKeyArr() == null && review.getOrgFileNmArr() != null) {
+			review.setPntGiveStat("G043_30");
+		}else {
+			review.setPntGiveStat("G043_10");
+		}
 		reviewDao.saveMypageReview(review);
 		
 		//이미지등록
-		ReviewAttach fileReview = new ReviewAttach();
-		if(!StringUtils.isAllEmpty(review.getOrgFileNmArr())) {
+		if(review.getOrgFileNmArr() != null) {
+			ReviewAttach fileReview = new ReviewAttach();
 			fileReview.setRegNo(TsfSession.getInfo().getCustNo());
 			fileReview.setUpdNo(TsfSession.getInfo().getCustNo());
 			fileReview.setReviewSq(review.getReviewSq());
@@ -200,6 +218,125 @@ public class TsfReviewService {
 				ind++;
 			}
 		}
+		
+		if(review.getKufKeyArr() != null) {
+			ReviewAttach fileReview = new ReviewAttach();
+			fileReview.setRegNo(TsfSession.getInfo().getCustNo());
+			fileReview.setUpdNo(TsfSession.getInfo().getCustNo());
+			fileReview.setReviewSq(review.getReviewSq());
+			fileReview.setFileGb("M");
+			fileReview.setDelYn("N");
+			String[] fileItemVal1 = review.getKufKeyArr();
+			for (int j = 0; j < fileItemVal1.length; j++) {
+				fileReview.setKufKey(fileItemVal1[j]);
+				reviewDao.saveReviewAttach(fileReview);
+			}
+		}
+		
+		int count = reviewDao.getReviewPointGiveCount(review);
+		// 포인트 지급해 준 적 없을때 만 지급
+		if (count ==  0) {
+			int textReviewPnt = envsetService.getTextReviewPoint(TscConstants.Site.STYLE24.value());
+			int photoReviewPnt = envsetService.getPhotoReviewPoint(TscConstants.Site.STYLE24.value());
+			
+			Point point = new Point();
+			point.setCustNo(TsfSession.getInfo().getCustNo());
+			point.setOccurGb(TscConstants.PointOccurGb.REVIEW_POINT.value());
+			point.setOccurDtlDesc("상품평포인트 지급");
+			point.setPntUploadStat(TscConstants.PntUploadStat.APPLY_COMPLETE.value());
+			point.setOrdNo(review.getOrdNo());
+			point.setOrdDtlNo(review.getOrdDtlNo());
+			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());
+				point.setGvPntAmt(photoReviewPnt);
+				point.setRmPntAmt(photoReviewPnt);
+				reviewDao.createReviewPoint(point);
+				point.setPntAmt(photoReviewPnt);
+				point.setReviewSq(review.getReviewSq());
+				reviewDao.createReviewPointHst(point);
+			}
+			
+		}
+	}
+	
+	/**
+	 * 마이페이지 리뷰 업데이트
+	 * @param review
+	 * @return 
+	 * @author sowon
+	 * @since 2021. 3. 25
+	 */
+	public void updateMypageReview(Review review) {
+		review.setRegNo(TsfSession.getInfo().getCustNo());
+		review.setUpdNo(TsfSession.getInfo().getCustNo());		
+		reviewDao.updateMypageReview(review);
+		reviewDao.reviewAttachDelete(review);
+		
+		//이미지등록
+		if(!StringUtils.isAllEmpty(review.getOrgFileNmArr())) {
+			ReviewAttach fileReview = new ReviewAttach();
+			fileReview.setRegNo(TsfSession.getInfo().getCustNo());
+			fileReview.setUpdNo(TsfSession.getInfo().getCustNo());
+			fileReview.setReviewSq(review.getReviewSq());
+			fileReview.setFileGb("I");
+			fileReview.setDelYn("N");
+			//파일아이템 등록
+			String[] fileItemVal1 = review.getOrgFileNmArr();
+			int ind = 1;
+			for (int j = 0; j < fileItemVal1.length; j++) {
+				String imgInd = String.valueOf(ind);
+				if (ind < 10) {
+					imgInd = "0" + imgInd;
+				}
+				if (!fileItemVal1[j].contains("REVIEW_")) {
+					String planUploadPath = env.getProperty("upload.default.target.path");
+					String yearMonth = GagaDateUtil.getToday().substring(0, 6);
+					planUploadPath = GagaFileUtil.getConcatenationPath(planUploadPath, "/review");
+					File newFile = new File(GagaFileUtil.getConcatenationPath(planUploadPath, fileItemVal1[j]));
+					planUploadPath = GagaFileUtil.getConcatenationPath(planUploadPath, yearMonth);
+					String newFilename = "REVIEW_" + GagaDateUtil.getTodayDateTime() + "_" + imgInd + "." + org.springframework.util.StringUtils.getFilenameExtension(fileItemVal1[j]);
+					File uniqueFile = GagaFileUtil.getUniqueFile(new File(GagaFileUtil.getConcatenationPath(planUploadPath, newFilename)));
+					// Rename a file
+					File path = new File(planUploadPath);
+					if (!path.exists()) {
+						path.mkdir();
+					}
+					newFile.renameTo(uniqueFile);
+					fileReview.setOrgFileNm("/review/" + yearMonth + "/" + newFilename);
+					fileReview.setSysFileNm("/review/" + yearMonth + "/" + newFilename);
+					reviewDao.saveReviewAttach(fileReview);
+				}else {
+					fileReview.setOrgFileNm(fileItemVal1[j]);
+					fileReview.setSysFileNm(fileItemVal1[j]);
+					reviewDao.saveReviewAttach(fileReview);
+				}
+				
+				ind++;
+			}
+		}
+		
+		if(!StringUtils.isAllEmpty(review.getKufKeyArr())) {
+			ReviewAttach fileReview = new ReviewAttach();
+			fileReview.setRegNo(TsfSession.getInfo().getCustNo());
+			fileReview.setUpdNo(TsfSession.getInfo().getCustNo());
+			fileReview.setReviewSq(review.getReviewSq());
+			fileReview.setFileGb("M");
+			fileReview.setDelYn("N");
+			String[] fileItemVal1 = review.getKufKeyArr();
+			for (int j = 0; j < fileItemVal1.length; j++) {
+				fileReview.setKufKey(fileItemVal1[j]);
+				reviewDao.saveReviewAttach(fileReview);
+			}
+		}
 	}
 	
 	/**
@@ -296,6 +433,17 @@ public class TsfReviewService {
 		reviewDao.reviewCustomerConfirm(review);
 	}
 	
+	/**
+	 * 리뷰 포인트 지급 확인
+	 * @param review
+	 * @return 
+	 * @author sowon
+	 * @since 2021. 4. 28
+	 */
+	
+	public int getReviewPointGiveCount(Review review) {
+		return reviewDao.getReviewPointGiveCount(review);
+	}
 	
 	
 }

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

@@ -629,7 +629,7 @@ public class TsfDisplayController extends TsfBaseController {
 		ModelAndView mav = new ModelAndView(super.getDeviceViewName("display/AllBrandForm"));
 
 		brandGroup.setSelfYn("Y");
-		mav.addObject("mainBrandList", displayService.getAllBrandList(brandGroup));
+		mav.addObject("mainBrandList", displayService.getBrandImgList(brandGroup));
 
 		return mav;
 	}

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

@@ -1617,6 +1617,10 @@ public class TsfMypageController extends TsfBaseController {
 		review.setSiteCd(TscConstants.Site.STYLE24.value());
 		
 		mav.addObject("reviewStat", review.getReviewStat());
+		if (review.getReviewStat().equals("u")) {
+			// 리뷰 이미지/동영상
+			mav.addObject("alreadyReviewAttach", reviewService.getReviewAttach(review));
+		}
 		review.setReviewExpireDay(eventService.getGoodsReviewRegisterDays(TscConstants.Site.STYLE24.value()));
 		mav.addObject("reviewInfo", reviewService.getReviewGoodsInfo(review));
 		
@@ -1636,13 +1640,33 @@ public class TsfMypageController extends TsfBaseController {
 	@ResponseBody
 	public GagaMap mypageReviewSave(@RequestBody Review review) {
 
+		GagaMap result = new GagaMap();
+		review.setCustNo(TsfSession.getInfo().getCustNo());
+
+		reviewService.saveMypageReview(review);
+		result.set("status", "200");
+
+		return result;
+	}
+	
+	/**
+	 * 마이페이지 리뷰 업데이트
+	 * @param review
+	 * @return
+	 * @author sowon
+	 * @since 2021. 04. 28
+	 */
+	@PostMapping("/review/update")
+	@ResponseBody
+	public GagaMap mypageReviewUpdate(@RequestBody Review review) {
+
 		GagaMap result = new GagaMap();
 		review.setCustNo(TsfSession.getInfo().getCustNo());
 		if (reviewService.reviewDeleteConfirm(review).getCount() > 0) {
 			review.setReviewSq(reviewService.reviewDeleteConfirm(review).getReviewSq());
 		}
 
-		reviewService.saveMypageReview(review);
+		reviewService.updateMypageReview(review);
 		result.set("status", "200");
 
 		return result;

src/main/java/com/style24/persistence/domain/BrandGroup.java

@@ -29,4 +29,6 @@ public class BrandGroup extends TscBaseDomain {
 	private String brandInitial;
 	private String selfYn;
 	private String dispNmLang;
+	
+	private String cateGb;
 }

src/main/java/com/style24/persistence/domain/Review.java

@@ -105,12 +105,23 @@ public class Review extends TscBaseDomain {
 	private int nextReviewSq;
 	private int reviewExpireDay;
 	private String kmcKey;
+	
+	private Integer custPntSq;		// 고객포인트일련번호
+	private int gvPntAmt;			// 지급포인트금액
+	private String occurGb;			// 포인트발생구분
+	private String occurDtlDesc;	// 포인트발생상세설명
+	private int pntAmt;				// 포인트금액
+	private String pntUploadStat;	// 포인트반영상태
 
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] orgFileNmArr;
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] sysFileNmArr;
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private String[] kmcKeyArr;
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private String[] kufKeyArr;
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] itemNmArr;		// 옵션코드
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] optCdArr;		// 옵션코드

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

@@ -59,6 +59,9 @@
 		       END              AS BRAND_GROUP_NM
 		     , LOGO_FILE_NM
 		     , RGB_CD
+		     , DEFAULT_CATE_YN
+		     , CASE WHEN DEFAULT_CATE_YN = 'Y' THEN (SELECT CD FROM TB_COMMON_CODE WHERE 1=1 AND CD_NM = 'BY ITEM')
+		            ELSE (SELECT CD FROM TB_COMMON_CODE WHERE 1=1 AND CD_NM = 'BY BRAND') END AS CATE_GB
 		FROM   TB_BRAND_GROUP
 		WHERE  BRAND_GROUP_NO = #{brandGroupNo}
 		AND    USE_YN = 'Y'
@@ -630,8 +633,11 @@
 		AND CATE_GB = #{cateGb}
 		AND FORMAL_GB = #{formalGb}
 		AND BRAND_GROUP_NO = #{brandGroupNo}
+		<if test="cateNo != null and cateNo != ''">
 		AND CATE_NO = #{cateNo}
+		</if>
 		AND FILTER_GB = #{filterGb}
+		GROUP BY FILTER_CD, FILTER_NM
 		ORDER BY DISP_ORD
 	</select>
 
@@ -651,7 +657,9 @@
 		                  FROM	 TB_CATE_4SRCH
 		                  WHERE	 1=1
 		                    AND	 LEAF_CATE_NO = CG.CATE_NO
-		                    AND	 CATE1_NO = #{cate1No}
+		                  <if test="cate1No != null and cate1No != ''">
+		                    AND CATE1_NO = #{cate1No}
+		                  </if>
 		                  <if test="cate2No != null and cate2No != ''">
 		                    AND CATE2_NO = #{cate2No}
 		                  </if>
@@ -665,6 +673,9 @@
 		                    AND CATE5_NO = #{cate5No}
 		                  </if>
 		                )
+		<if test="brandGroupNo != null and brandGroupNo !=''">
+		  AND CG.BRAND_GROUP_NO = #{brandGroupNo}
+		</if>
 		GROUP BY GB.BENEFIT_GB
 	</select>
 
@@ -728,7 +739,9 @@
 		           WHERE  C4.SITE_CD = 'G000_10'
 		           AND    C4.CATE_GB = 'G032_101'
 		           AND    C4.CATE_TYPE = 'G031_10' /*상품카테고리*/
+		           <if test="cate1No != null and cate1No != ''">
 		           AND    C4.CATE1_NO = #{cate1No}
+		           </if>
 		           <if test="cate2No != null and cate2No != ''">
 		           AND    C4.CATE2_NO = #{cate2No}
 		           </if>
@@ -743,7 +756,7 @@
 		           </if>
 		           <choose>
 		               <when test="brandGroupNo != null and brandGroupNo != ''">
-		           AND    CG.BRAND_GROUP_NO = #{brandGroupNo}
+		           AND    B.BRAND_GROUP_NO = #{brandGroupNo}
 		               </when>
 		               <otherwise>
 		           AND    CG.BRAND_GROUP_NO = 0 /*브랜드메인에서 접근한 것이 아니면*/
@@ -901,11 +914,14 @@
 		                    WHERE  C4.SITE_CD = 'G000_10'
 		                    AND    C4.CATE_GB = 'G032_101'
 		                    AND    C4.CATE_TYPE = 'G031_10' /*상품카테고리*/
+		                <if test="cate1No != null and cate1No != ''">
 		                    AND    C4.CATE1_NO = #{cate1No}
+		                </if>
 		                <if test="cate2No != null and cate2No != ''">
 		                    AND    C4.CATE2_NO = #{cate2No}
 		                </if>
-		                <if test="cate3No != null and cate3No != ''">AND    C4.CATE3_NO = #{cate3No}
+		                <if test="cate3No != null and cate3No != ''">
+		                    AND    C4.CATE3_NO = #{cate3No}
 		                </if>
 		                <if test="cate4No != null and cate4No != ''">
 		                    AND    C4.CATE4_NO = #{cate4No}
@@ -915,7 +931,7 @@
 		                </if>
 		                <choose>
 		                    <when test="brandGroupNo != null and brandGroupNo != ''">
-		                    AND    CG.BRAND_GROUP_NO = #{brandGroupNo}
+		                    AND    B.BRAND_GROUP_NO = #{brandGroupNo}
 		                    </when>
 		                    <otherwise>
 		                    AND    CG.BRAND_GROUP_NO = 0 /*브랜드메인에서 접근한 것이 아니면*/
@@ -1130,7 +1146,9 @@
 		                 AND SITE_CD = #{siteCd}
 		                 AND CATE_GB = 'G032_101' /*BY ITEM*/
 		                 AND CATE_TYPE = 'G031_10'
+		                 <if test="cate1No != null and cate1No != ''">
 		                 AND CATE1_NO = #{cate1No}
+		                 </if>
 		                 <if test="cate2No != null and cate2No != ''">
 		                 AND CATE2_NO = #{cate2No}
 		                 </if>
@@ -1389,6 +1407,46 @@
 		AND	CONTENTS_LOC = #{contentsLoc}
 	</select>
 
+	<!-- 브랜드 전체 이미지 리스트 조회 -->
+	<select id="getBrandImgList" parameterType="BrandGroup" resultType="BrandGroup">
+		/* TsfDisplay.getBrandImgList */
+		SELECT	Z.BRAND_GROUP_NO
+		, FN_GET_BRAND_INITIAL(Z.BRAND_GROUP_NM) AS BRAND_INITIAL
+		, Z.BRAND_GROUP_NM
+		, Z.DISP_NM_LANG
+		, Z.BRAND_GROUP_ENM
+		, Z.BRAND_GROUP_KNM
+		, Z.LOGO_FILE_NM
+		FROM (
+		SELECT  BG.BRAND_GROUP_NO
+		, (CASE WHEN BG.DISP_NM_LANG = 'EN' THEN BG.BRAND_GROUP_ENM ELSE BG.BRAND_GROUP_KNM END) AS BRAND_GROUP_NM
+		, BG.DISP_NM_LANG
+		, BG.BRAND_GROUP_ENM
+		, BG.BRAND_GROUP_KNM
+		, BG.LOGO_FILE_NM
+		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'
+		AND	BG.USE_YN = 'Y'
+		<if test='selfYn != null and selfYn == "Y"'>
+			AND	B.SELF_YN = 'Y'
+			AND	(BG.LOGO_FILE_NM <![CDATA[<>]]> '' AND BG.LOGO_FILE_NM IS NOT NULL)
+		</if>
+		<if test="brandGroupNo != null and brandGroupNo != ''">
+			AND	B.BRAND_GROUP_NO = #{brandGroupNo}
+		</if>
+		<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 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
+		WHEN ASCII(SUBSTRING(Z.BRAND_GROUP_NM,1)) <![CDATA[<]]> 128 THEN 2 ELSE 1 END), Z.BRAND_GROUP_NM
+	</select>
+
 	<!-- 브랜드 전체 조회 -->
 	<select id="getAllBrandList" parameterType="BrandGroup" resultType="BrandGroup">
 		/* TsfDisplay.getAllBrandList */
@@ -1403,11 +1461,10 @@
 		      SELECT  BG.BRAND_GROUP_NO
 		            , (CASE WHEN BG.DISP_NM_LANG = 'EN' THEN BG.BRAND_GROUP_ENM ELSE BG.BRAND_GROUP_KNM END) AS BRAND_GROUP_NM
 		            , BG.DISP_NM_LANG
-		            , BG.BRAND_GROUP_ENM
-		            , BG.BRAND_GROUP_KNM
+		            , B.BRAND_ENM AS BRAND_GROUP_ENM
+		            , B.BRAND_KNM AS BRAND_GROUP_KNM
 		            , BG.LOGO_FILE_NM
-		      FROM  TB_CONTENTS C
-		      LEFT JOIN TB_BRAND B ON C.STR_VAR1 = B.BRAND_GROUP_NO
+		      FROM  TB_BRAND B
 		      INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
 		      WHERE	1=1
 		      AND	B.USE_YN = 'Y'
@@ -1422,7 +1479,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 C.STR_TITLE2, C.DISP_ORD , BG.BRAND_GROUP_NO
+		      GROUP BY 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

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

@@ -444,9 +444,6 @@
 				    ON OD.GOODS_CD = G.GOODS_CD
 				 INNER JOIN TB_BRAND B
 				    ON B.BRAND_CD = G.BRAND_CD
-				 LEFT OUTER JOIN TB_REVIEW R
-				    ON R.ORD_NO = OD.ORD_NO
-				   AND R.ORD_DTL_NO = OD.ORD_DTL_NO
 				 LEFT JOIN TB_ITEMKIND I 
 				    ON G.ITEMKIND_CD = I.ITEMKIND_CD 
 				  LEFT OUTER JOIN (SELECT OD.ORD_DTL_NO
@@ -462,7 +459,7 @@
 		                                   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 R.REVIEW_SQ IS NULL
+				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'
 			 	AND O.SITE_CD = #{siteCd}
@@ -596,7 +593,7 @@
 		   	         , I.ITEMKIND_CD 
 			         , I.SIZE_GB 
 			         ,DATEDIFF( DATE_ADD(O.PAY_DT,INTERVAL #{reviewExpireDay} DAY),NOW()) AS REMAIN_DT -- 남은시간
-			          <!-- <if test="reviewStat == 'u'.toString()"> -->
+			          <if test="reviewStat == 'u'.toString()">
 			         , R.REVIEW_SQ        
 			         , R.REVIEW_GB        
 				     , R.REVIEW_TITLE     
@@ -627,7 +624,7 @@
 				     , R.ADM_RPL          
 				     , R.ADM_RPL_REG_NO   
 				     , R.ADM_RPL_DT   
-				    <!--  </if> -->
+				     </if>
 				  FROM TB_ORDER O
 				 INNER JOIN TB_ORDER_DETAIL OD
 				    ON O.ORD_NO = OD.ORD_NO
@@ -642,11 +639,12 @@
 				    ON B.BRAND_CD = G.BRAND_CD
 				 LEFT JOIN TB_ITEMKIND I 
 				    ON G.ITEMKIND_CD = I.ITEMKIND_CD 
-				 <!-- <if test="reviewStat == 'u'.toString()"> -->
-				 LEFT JOIN TB_REVIEW R ON R.ORD_NO = O.ORD_NO 
+				 <if test="reviewStat == 'u'.toString()">
+				 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
-			      <!-- </if>  -->                         
+			                                      AND R.DEL_YN = 'N'
+			      </if>
 				  LEFT OUTER JOIN (SELECT OD.ORD_DTL_NO
 										, SUM(OCD.CHG_QTY) AS ORD_REQ_CHG_QTY
 									 FROM TB_ORDER_CHANGE_DETAIL OCD
@@ -660,14 +658,14 @@
 		                                   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') 
-				<choose>
+			<!-- 	<choose>
 					<when test="reviewStat == 'u'.toString()">
-					AND R.REVIEW_SQ IS NOT NULL
+					AND O.ORD_NO IN (SELECT R.ORD_NO FROM TB_REVIEW R WHERE R.DEL_YN = 'N' AND DISP_YN = 'Y')
 					</when>
 					<otherwise>
-					AND R.REVIEW_SQ IS NULL
+					AND O.ORD_NO NOT IN (SELECT R.ORD_NO FROM TB_REVIEW R WHERE R.DEL_YN = 'N' AND DISP_YN = 'Y')
 					</otherwise>
-				</choose> 
+				</choose> -->
 				AND O.CUST_NO = #{custNo}
 				AND O.DISP_YN = 'Y'
 			 	AND O.SITE_CD = 'G000_10'
@@ -701,67 +699,65 @@
 		SELECT  COUNT(*) AS CNT 
 		FROM
 		(
-		     SELECT 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 
-		           ,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 
-		                       					 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 G.GOODS_CD = OD.GOODS_CD 
-		                     INNER JOIN TB_BRAND B ON B.BRAND_CD = G.BRAND_CD
-		                     LEFT OUTER JOIN TB_REVIEW R  ON R.ORD_NO = OD.ORD_NO
-		                                          AND R.ORD_DTL_NO = OD.ORD_DTL_NO
-		     WHERE 1=1
-		     	AND O.PAY_DT <![CDATA[>]]>  DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL  -#{reviewExpireDay} DAY), '%Y%M%D%H%I%S') <!--  60 일이내것만 -->
-		     	AND O.CUST_NO = #{custNo}
-		     	AND O.DISP_YN = 'Y'
-		     	AND R.REVIEW_SQ IS NULL
-		     	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 
+			SELECT 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 
+			      ,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 
+			                  					 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 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  -#{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'
+				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
 	</select>
 	
-	<select id="saveMypageReview" parameterType="Review" resultType="Review">
+	<insert id="saveMypageReview" parameterType="Review" useGeneratedKeys="true" keyProperty="reviewSq">
 		/* TsfReivew.saveMypageReview */
 		INSERT INTO TB_REVIEW (
 		                         REVIEW_SQ
@@ -780,6 +776,7 @@
 		                       , SCORE_THICK
 		                       , SCORE_WEIGHT
 		                       , SCORE_BALL
+		                       , PNT_GIVE_STAT
 		                       , DISP_YN
 		                       , DEL_YN
 		                       , REG_NO
@@ -804,6 +801,7 @@
 		                        , #{scoreThick}
 		                        , #{scoreWeight}
 		                        , #{scoreBall}
+		                        , #{pntGiveStat}
 		                        , #{dispYn}
 		                        , #{delYn}
 		                        , #{regNo}
@@ -811,21 +809,32 @@
 		                        , #{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>
+	</insert>
+	
+	<update id="updateMypageReview" parameterType="Review">
+		/* TsfReivew.updateMypageReview */
+		UPDATE TB_REVIEW
+		SET 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}  
+		   , DEL_YN        = 'N'     
+		   ,UPD_DT         =  now()     
+		WHERE REVIEW_SQ  = #{reviewSq}
+		AND   ORD_NO     = #{ordNo}
+		AND   ORD_DTL_NO = #{ordDtlNo}
+		AND   CUST_NO    = #{custNo}
+		AND   GOODS_CD   = #{goodsCd}
+	</update>
+	
+	
+	
 	
 	<select id="getAlreadyReviewCount" parameterType="Review" resultType="int">
 		/* TsfReivew.getAlreadyReviewCount */
@@ -852,7 +861,7 @@
 			      ,G.GOODS_NM 
 			      ,G.MAIN_COLOR_CD
 			      ,B.BRAND_ENM 
-			      ,DATEDIFF( DATE_ADD(O.PAY_DT,INTERVAL 60 DAY),NOW()) AS DT -- 남은시간
+			      ,DATEDIFF( DATE_ADD(O.PAY_DT,INTERVAL 90 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 
@@ -863,11 +872,12 @@
 			                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'
 			WHERE 1=1
+				AND O.PAY_DT >  DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL -90 DAY), '%Y%M%D%H%I%S')
 				AND O.CUST_NO = #{custNo}
 				AND O.DISP_YN = 'Y'
-				AND R.DEL_YN = 'N'
-				AND R.DISP_YN = 'Y'
+ 				AND O.SITE_CD = #{siteCd}
 			GROUP BY O.ORD_NO 
 			      ,O.ORD_NM 
 			      ,O.PAY_DT 
@@ -1179,7 +1189,6 @@
 		SET R.DEL_YN = 'Y'
 		WHERE 1=1
  		AND R.REVIEW_SQ = #{reviewSq}
- 		-- AND R.ADM_RPL IS NULL
  		AND R.CUST_NO = #{custNo}
 	</update>
 	
@@ -1197,7 +1206,7 @@
 		FROM TB_REVIEW R
 		WHERE 1=1
 		  AND R.ORD_NO = #{ordNo}
-		  AND R.ORD_DTL_NO =#{ordDtlNo}
+		  AND R.ORD_DTL_NO = #{ordDtlNo}
 		  AND R.DEL_YN ='Y'
 		  AND R.GOODS_CD = #{goodsCd}
 		  AND R.CUST_NO = #{custNo}
@@ -1241,4 +1250,94 @@
 		, CURRENT_TIMESTAMP
 		)
 	</insert>
+	
+	<!-- 포인트 지급 전 확인 -->
+	<select id="getReviewPointGiveCount" parameterType="Review" resultType="int">
+		/* TsfReivew.getReviewPointGiveCount */	
+		SELECT COUNT(*) AS COUNT
+		FROM TB_REVIEW 
+		WHERE CUST_NO = #{custNo}
+		AND DEL_YN = 'Y'
+		AND PNT_GIVE_STAT = 'G043_30'
+		AND ORD_NO        = #{ordNo}
+		AND ORD_DTL_NO    = #{ordDtlNo}
+		AND GOODS_CD      = #{goodsCd}
+	</select>
+	
+	<insert id="createReviewPoint" parameterType="Point" useGeneratedKeys="true" keyProperty="custPntSq">
+		/* TsfReivew.createReviewPoint */
+		INSERT INTO TB_CUST_POINT (
+		       CUST_PNT_SQ
+		     , CUST_NO
+		     , GV_PNT_AMT
+		     , US_PNT_AMT
+		     , RM_PNT_AMT
+		     , EXP_BE_DT
+		     , EXP_CMP_DT
+		     , REG_NO
+		     , REG_DT
+		     , UPD_NO
+		     , UPD_DT
+		) VALUES (
+		       #{custPntSq}
+		     , #{custNo}
+		     , #{gvPntAmt}
+		     , 0
+		     , #{rmPntAmt}
+		     , DATE_FORMAT(CONCAT(DATE_ADD(CURRENT_DATE, INTERVAL 1 YEAR), ' 23:59:59'), '%Y-%m-%d %H:%i:%S')
+		     , #{expCmpDt}
+		     , #{custNo}
+		     , NOW()
+		     , #{custNo}
+		     , NOW()	
+		     )
+	</insert>
+	
+	<insert id="createReviewPointHst" parameterType="Point">
+		/* TsfReivew.createReviewPoint */
+		INSERT INTO TB_CUST_POINT_HST (
+		       CUST_NO
+		     , OCCUR_GB
+		     , OCCUR_DTL_DESC
+		     , PNT_AMT
+		     , CUST_PNT_SQ
+		     , ORD_NO
+		     , ORD_DTL_NO
+		     , REVIEW_SQ
+		     , SWITCH_DUE_DT
+		     , PNT_UPLOAD_STAT
+		     , PNT_UPLOAD_DT
+		     , REG_NO
+		     , REG_DT
+		     , UPD_NO
+		     , UPD_DT
+		) VALUES (
+		       #{custNo}
+		     , #{occurGb}
+		     , #{occurDtlDesc}
+		     , #{pntAmt}
+		     , #{custPntSq}
+		     , #{ordNo}
+		     , #{ordDtlNo}
+		     , #{reviewSq}
+		     <if test='pntUploadStat == "G070_30"'>
+		     , NOW()                                -- SWITCH_DUE_DT
+		     </if>
+		     <if test='pntUploadStat != "G070_30"'>
+		     , DATE_FORMAT(#{switchDueDt}, '%Y%m%d%H%i%S') -- SWITCH_DUE_DT
+		     </if>
+		     , #{pntUploadStat}
+		     <if test='pntUploadStat == "G070_30"'>
+		     , NOW()                                -- PNT_UPLOAD_DT
+		     </if>
+		     <if test='pntUploadStat != "G070_30"'>
+		     , NULL                                 -- PNT_UPLOAD_DT
+		     </if>
+		     , #{custNo}
+		     , NOW()                                -- REG_DT
+		     , #{custNo}
+		     , NOW()                                -- UPD_DT
+		)
+	</insert>
+	
 </mapper>

src/main/resources/config/application-tsit.yml

@@ -35,7 +35,7 @@ upload:
         target.path: /TSIT/servers/files/data/style24/Upload/ProductImage
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
-        view: //tdimage.style24.com/Upload/ProductImage
+        view: //image.istyle24.com/Upload/ProductImage
     image:
         target.path: /TSIT/servers/files/data/style24
         max.size: 10

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

@@ -40,7 +40,7 @@
 				<ul class="bundle" id="ulGnbTab">
 					<li class="home"><a href="javascript:void(0);" th:onclick="cfnGoToBrandMain([[${brandGroupInfo.brandGroupNo}]]);">브랜드 홈</a></li>
 					<li class="has_depth"><!-- depth_menu 있을 시 has_depth 클래스 추가 -->
-						<a href="#">상품</a>
+						<a href="javascript:void(0);" th:onclick="cfnGoToGoodsList([[${brandGroupInfo.brandGroupNo}]],[[${brandGroupInfo.cateGb}]]);">상품</a>
 						<!-- 상품 depth -->
 						<div class="depth_menu category">
 							<div class="head_category">
@@ -138,6 +138,7 @@
 	
 	// 브랜드 카테고리 생성
 	let fnCreateBrandCategory = function() {
+		console.log('fnCreateBrandCategory brandNo::'+[[${brandGroupInfo.brandGroupNo}]]);
 		$.getJSON('/display/brand/cate/list?brandGroupNo=' + [[${brandGroupInfo.brandGroupNo}]]
 			, function(result, status) {
 				if (status == 'success') {

src/main/webapp/WEB-INF/views/web/display/CategoryGoodsListFormWeb.html

@@ -23,7 +23,7 @@
 		<div class="breadcrumb">
 			<ul id="navArea">
 				<li class="bread_home"><a href="javascript:void(0);" id="navHome">홈</a></li>
-				<li class="bread_2depth" id="navNm">여성</li>
+				<li class="bread_2depth" id="navNm"></li>
 			</ul>
 		</div>
 		<div class="wrap">
@@ -472,26 +472,52 @@
 		}
 
 		var fnCreateCategoryList = function (){
-			$.getJSON('/display/gnb/tab/list'
-					, function(result, status) {
-						if (status == 'success') {
-							if (result.length > 0) {
-								$('#ulAllCate').html('');
-								$('#ulAllCate').append('<li><a href="javascript:void(0);">전체</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) {
-												$('#ulAllCate').append(fnGetCategoryList(allCateItem));
-											}
-										});
+			let actionUrl = '';
+			let brandGroupNo = [[${cateInfo.brandGroupNo}]];
+			console.log('brand::'+[[${cateInfo.brandGroupNo}]]);
+			if(gagajf.isNull(brandGroupNo) || brandGroupNo == 0){
+				actionUrl = '/display/gnb/tab/list';
+			}else{
+				actionUrl = '/display/brand/cate/list?brandGroupNo=' + [[${cateInfo.brandGroupNo}]];
+			}
+			
+			$.getJSON(actionUrl
+				, function(result, status) {
+					console.log('result.length>>'+result.length);
+					//if (status == 'success') {
+					if (result.length > 0) {
+						let cateGb = 'G032_101';
+						$('#ulAllCate').html('');
+						$('#ulAllCate').append('<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(0,\''+cateGb+'\');">전체</a></li>\n');
+						
+						if(gagajf.isNull($("#searchGoodsForm").find("[name=cate1No]").val())){
+							$("#navArea").append('전체');
+							$("#formTitle").text('전체');
+						}
+
+						let allCate = [[${allCateList}]];
+						if(gagajf.isNull(brandGroupNo) || brandGroupNo == 0){
+							$.each(result, function(idx, item) {
+								if (item.contentsType == 'C') { // 컨텐츠유형:카테고리
+									$.each(allCate, function(allCateIdx, allCateItem) {
+										if (item.cate1No == allCateItem.cate1No) {
+											$('#ulAllCate').append(fnGetCategoryList(allCateItem));
+										}
+									});
+								}
+							});
+						}else{
+							$.each(result, function(idx, item) {
+								$.each(allCate, function(allCateIdx, allCateItem) {
+									if (item.cate1No == allCateItem.cate1No) {
+										$('#ulAllCate').append(fnGetCategoryList(allCateItem));
 									}
 								});
-							}
+							});
 						}
-					});
+					}
+					//}
+				});
 		}
 
 		let fnGetCategoryList = function (cate1){
@@ -510,66 +536,66 @@
 
 			if (cate1 != null) {
 				tag += '<li';
-				if(cate1.cate1No == cate1No){
+				if (cate1.cate1No == cate1No) {
 					tag += ' class="on"';
 				}
 				tag += '>\n';
 				tag += '	<a href="javascript:javascript:void(0);"';
-				if(cate1.cate1No == cate1No && cate2No == null){
+				if (cate1.cate1No == cate1No && cate2No == null) {
 					tag += ' class="on"';
 					formTitle = cate1.cate1Nm;
 					$("#formTitle").text(formTitle);
-					if(brandGroupNo==0){
+					if (brandGroupNo == 0) {
 						$("#navHome").attr('href', '/');
 						$("#navNm").text(cate1.cate1Nm);
-					}else{
-						$("#navHome").attr('onclick', 'cfnGoToBrandMain('+brandGroupNo+');');
+					} else {
+						$("#navHome").attr('onclick', 'cfnGoToBrandMain(' + brandGroupNo + ');');
 						$("#navNm").text(cate1.cate1Nm);
 					}
 				}
-				tag += '	onclick="cfnGoToGoodsList('+brandGroupNo+',\''+cateGb+'\','+cate1.cate1No+');" >' + cate1.cate1Nm + '</a>\n';
+				tag += '	onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + cate1.cate1No + ');" >' + cate1.cate1Nm + '</a>\n';
 				if (cate1.leafYn == 'N' && cate1.cate2List.length > 0) {
 					tag += '<div class="sub_cate"';
-					if(cate1.cate1No == cate1No){
+					if (cate1.cate1No == cate1No) {
 						tag += ' style="display: block;"';
 					}
 					tag += '>\n';
 					tag += '	<ul>\n';
-					$.each(cate1.cate2List, function(idx2, cate2) {
+					$.each(cate1.cate2List, function (idx2, cate2) {
 						tag += '		<li';
-						if(cate2.cate2No == cate2No && cate3No == null){
+						if (cate2.cate2No == cate2No && cate3No == null) {
 							tag += ' class="on"';
 						}
 						tag += '		>\n';
 						tag += '		<a href="javascript:javascript:void(0);" ';
-						if(cate2.cate2No == cate2No && cate3No == null){
+						if (cate2.cate2No == cate2No && cate3No == null) {
 							tag += ' class="on"';
-							navNm = '<li class="bread_2depth" id="navNm2">'+cate2.cate2Nm+'</li>';
+							navNm = '<li class="bread_2depth" id="navNm2">' + cate2.cate2Nm + '</li>';
 							$("#navArea").append(navNm);
 							$("#formTitle").text(cate2.cate2Nm);
 						}
-						tag += '	onclick="cfnGoToGoodsList('+brandGroupNo+',\''+cateGb+'\','+cate1.cate1No+','+cate2.cate2No+');">' + cate2.cate2Nm + '</a>\n';
+						tag += '	onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + cate1.cate1No + ',' + cate2.cate2No + ');">' + cate2.cate2Nm + '</a>\n';
 						if (cate2.leafYn == 'N' && cate2.cate3List != null && cate2.cate3List.length > 0) {
 							tag += '<div class="sub_cate"';
-							if(cate2.cate2No == cate2No){
+							if (cate2.cate2No == cate2No) {
 								tag += ' style="display: block;"';
 							}
 							tag += '>\n';
 							tag += '	<ul>\n';
-							$.each(cate2.cate3List, function (idx3, cate3){
+							$.each(cate2.cate3List, function (idx3, cate3) {
 								tag += '<li';
-								if(cate3.cate3No == cate3No && cate4No == null){
+								if (cate3.cate3No == cate3No && cate4No == null) {
 									tag += ' class="on"';
 								}
 								tag += '>';
 								tag += '		<a href="javascript:javascript:void(0);" ';
-								if(cate3.cate3No == cate3No && cate4No == null){
+								if (cate3.cate3No == cate3No && cate4No == null) {
 									tag += ' class="on"';
-									navNm = '<li class="bread_2depth" id="navNm2">'+cate2.cate2Nm+'</li><li class="bread_2depth" id="navNm3">'+cate3.cate3Nm+'</li>';
+									navNm = '<li class="bread_2depth" id="navNm2">' + cate2.cate2Nm + '</li><li class="bread_2depth" id="navNm3">' + cate3.cate3Nm + '</li>';
 									$("#navArea").append(navNm);
 									$("#formTitle").text(cate3.cate3Nm);
 								}
-								tag += ' onclick="cfnGoToGoodsList('+brandGroupNo+',\''+cateGb+'\','+cate1.cate1No+','+cate2.cate2No+','+cate3.cate3No+');">' + cate3.cate3Nm + '</a>';
+								tag += ' onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + cate1.cate1No + ',' + cate2.cate2No + ',' + cate3.cate3No + ');">' + cate3.cate3Nm + '</a>';
 								tag += '</li>\n';
 							});
 							tag += '	</ul>\n';

src/main/webapp/WEB-INF/views/web/goods/GoodsDetailFormWeb.html

@@ -1529,6 +1529,10 @@
 					if (minutes < '10') { minutes = '0' + minutes; }
 					if (seconds < '10') { seconds = '0' + seconds; }
 					
+					if (Number(days) > 0 ){
+						hours = Number(hours) + (Number(days) * 24);
+					}
+					
 					$('#d-hours').html(hours);
 					$('#d-minutes').html(minutes);
 					$('#d-seconds').html(seconds);		

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

@@ -381,6 +381,8 @@
 <script th:inline="javascript">
 let reviewList = [[${reviewInfo}]];
 let reviewStat = [[${reviewStat}]];
+let reviewAttach = [[${alreadyReviewAttach}]];
+let reviewUrl =[[${@environment.getProperty('upload.image.view')}]];
 // 별점 class="on"
 var $starEls = $('#star button#starBtn');
 var rate = 0;
@@ -514,28 +516,43 @@ var reviewUpdate = function() {
         cancelBtnText: "취소",
         sureBtnText: "확인",
         sureBtnClick: function(){
-        	gagajf.ajaxFormSubmit($('#reviewForm').prop('action'), '#reviewForm', fnUpdateCallback);
+        	gagajf.ajaxFormSubmit("/mypage/review/update", '#reviewForm', fnUpdateCallback);
         }
     });
 	
 }
 var fnSaveCallback = function (result) {
 	if(result.status == "200"){
-		mcxDialog.confirm("상품리뷰를 등록 하였습니다. 150P 적립 예정입니다.", {
-			sureBtnText: "확인",
-			sureBtnClick: function() { 
-				//cfnGoToPage(_PAGE_MYPAGE_REVIEW);
-			}
-		});
+		if (document.getElementById("kufKey1")==null && document.getElementById("orgFileNm1")==null) {
+			mcxDialog.confirm("상품리뷰를 등록 하였습니다. 150P 적립 예정입니다.", {
+				sureBtnText: "확인",
+				sureBtnClick: function() { 
+					cfnGoToPage(_PAGE_MYPAGE_REVIEW);
+				}
+			});
+		}else{
+			mcxDialog.confirm("상품리뷰를 등록 하였습니다. 350P 적립 예정입니다.", {
+				sureBtnText: "확인",
+				sureBtnClick: function() { 
+					cfnGoToPage(_PAGE_MYPAGE_REVIEW);
+				}
+			});
+		}
+		
+	
 	}
 }
 
 var fnUpdateCallback = function (result) {
 	if(result.status == "200"){
-		//포인트 예정금액 고지해야함
-		//cfnGoToPage(_PAGE_MYPAGE_REVIEW);
-		//$("#alreadyReview").trigger('click');
-		//mcxDialog.alert("상품 리뷰를 수정하였습니다.");
+		if (document.getElementById("kufKey1")==null && document.getElementById("orgFileNm1")==null) {
+			mcxDialog.confirm("상품 리뷰를 수정하였습니다.", {
+				sureBtnText: "확인",
+				sureBtnClick: function() { 
+					cfnGoToPage(_PAGE_MYPAGE_REVIEW);
+				}
+			});
+		}
 	}
 }
 
@@ -573,9 +590,10 @@ var fnChooseFile = function(obj) {
 						}
 				); 
 		}else if((new RegExp("mp4", "i")).test(file.name)){
-			$(".pics").children().eq(0).append("<input type='hidden' name='kufKey' id='kufKey"+(picLength+1)+"'>");
-			$(".pics").children().eq(0).append("<input type='hidden' name='kmcKey' id='kmcKey"+(picLength+1)+"'>");
-			//gagaKollus.upload('Review', file, $('#kufKey'+(picLength+1)));
+			setTimeout(function(){
+				$(".pics").children().eq(0).append("<input type='hidden' name='kufKeyArr' id='kufKey"+(picLength+1)+"'>");
+				gagaKollus.upload('Review', file, $('#kufKey'+(picLength+1)));
+			}, 2000);
 		}else{
 			mcxDialog.alertC('첨부할 수 없는 파일 형식입니다.', {
 				sureBtnText: "확인",
@@ -619,7 +637,7 @@ $(document).ready(function() {
 	}
 	
 	 if(reviewStat=='u'){
-		 var reviewScore = reviewList.score -1;
+		 var reviewScore = reviewList.score-1;
 		 $("#score").val(reviewScore);
 		 rating(reviewScore);
 		$("#reviewForm input[name=height]").val(reviewList.height);
@@ -672,6 +690,29 @@ $(document).ready(function() {
 		}else if(reviewList.scoreBall == "3"){
 			$('#reviewForm input:radio[name=scoreBall]:radio[value="3"]').prop('checked', true);
 		}
+		
+		if(reviewAttach.length>0){
+			for (var i = 0; i < reviewAttach.length; i++) {
+				if(reviewAttach[i].fileGb == "I"){
+					$("<span class=\"pics\">" +
+							"<img class=\"picsThumbs\" src=\"" + reviewUrl + '/' + reviewAttach[i].sysFileNm + "\" />" +
+							"<input type='hidden' name='orgFileNmArr' value='"+reviewAttach[i].orgFileNm+"'>" +
+							"<input type='hidden' name='sysFileNmArr' value='"+reviewAttach[i].sysFileNm+"'>" +
+							"<br/><span class=\"removes\">Removes image</span>" +
+							"</span>").insertAfter("#fileAdd");
+				}else{
+					$("<span class=\"pics\">" +
+							"<img class=\"picsThumbs\" src=\"" + _kollusMediaUrl + '/' + attachList[i].kmcKey + "\" />" +
+							"<input type='hidden' name='kufKeyArr' value='" + attachList[i].kmcKey + "'>" + 
+							"<br/><span class=\"removes\">Removes image</span>" +
+							"</span>").insertAfter("#fileAdd");
+				}
+			}
+			$(".removes").click(function(){
+				$(this).parent(".pics").remove();
+			});
+			
+		}
 	} 
 	// 마이페이지 LNB 설정
 	fnSetMypageLnbList(7);

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

@@ -322,7 +322,6 @@
 					html+='								<ul>';
 					for (var i = 0; i < attachList.length; i++) {
 						if (attachList[i].reviewSq == item.reviewSq) {
-
 						html+='									<li>';
 						html+='										<a onclick="cfGoodsReviewDetail(\''+item.goodsCd+'\',\'\', \'Y\',\''+item.reviewSq+'\');">';
 						html+='											<div class="pic">';

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

@@ -48,14 +48,13 @@
                             <p id="planningTotCnt"><span>0</span>개의 기획전</p>
                         </div>
                     </div>
-					 <div class="list_content nodata" style="display: none;" id="divPlanningNoData"> 
-						<div class="list_defult">
+					 <div class="nodata" style="display: none;" id="divPlanningNoData"> 
+						<div class="txt_box">
 							<div>
-								<img src="/images/pc/ico_content_find.png" alt=""/>
 								<p>등록된 기획전이 없습니다.</p>
 							</div>
-							<div class="ui_row">
-								<button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_MAIN);"><span>메인으로 가기</span></button>
+							<div class="btn_box">
+								<button class="btn btn_default" onclick="cfnGoToPage(_PAGE_MAIN);"><span>메인으로 가기</span></button>
 							</div>
 						</div>
 					</div> 

src/main/webapp/ux/style24_link.js

@@ -1069,7 +1069,8 @@ var cfnGoToOutletMain = function(cateGb, cate1No) {
  * @author : gagamel
  */
 var cfnGoToGoodsList = function(brandGroupNo, cateGb, cate1No, cate2No, cate3No, cate4No, cate5No, formalGb) {
-	var params = '?brandGroupNo=' + brandGroupNo + '&cateGb=' + cateGb + '&cate1No=' + cate1No;
+	var params = '?brandGroupNo=' + brandGroupNo + '&cateGb=' + cateGb;
+	if (typeof (cate1No) != 'undefined') params += '&cate1No=' + cate1No;
 	if (typeof (cate2No) != 'undefined') params += '&cate2No=' + cate2No;
 	if (typeof (cate3No) != 'undefined') params += '&cate3No=' + cate3No;
 	if (typeof (cate4No) != 'undefined') params += '&cate4No=' + cate4No;