Merge branch 'develop' into bin2107

src/main/java/com/style24/admin/biz/service/TsaReviewService.java

@@ -81,6 +81,7 @@ public class TsaReviewService {
 		// 동영상(=포토)상품평포인트금액
 		int pntAmt = envsetService.getPhotoReviewPoint(TscConstants.Site.STYLE24.value());
 		review.setGvPntAmt(pntAmt);
+		review.setRmPntAmt(pntAmt);
 		review.setRegNo(TsaSession.getInfo().getUserNo());
 		review.setUpdNo(TsaSession.getInfo().getUserNo());
 
@@ -119,6 +120,7 @@ public class TsaReviewService {
 
 		for (Review review : reviewList) {
 			review.setGvPntAmt(bestPntAmt);
+			review.setRmPntAmt(bestPntAmt);
 			review.setRegNo(TsaSession.getInfo().getUserNo());
 			review.setUpdNo(TsaSession.getInfo().getUserNo());
 

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

@@ -89,6 +89,7 @@ public class Review extends TscBaseDomain {
 	// 베스트상품평포인트 생성
 	private Integer custPntSq;		// 고객포인트일련번호
 	private int gvPntAmt;			// 지급포인트금액
+	private int rmPntAmt;			// 잔여포인트
 	private String occurGb;			// 포인트발생구분
 	private String occurDtlDesc;	// 포인트발생상세설명
 	private int pntAmt;				// 포인트금액

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

@@ -182,7 +182,7 @@
 		     , CUST_NO
 		     , #{gvPntAmt}                      AS GV_PNT_AMT
 		     , 0                                AS US_PNT_AMT
-		     , 0                                AS RM_PNT_AMT
+		     , #{rmPntAmt}                      AS RM_PNT_AMT
 		     , DATE_ADD(NOW(), INTERVAL 1 YEAR) AS EXP_BE_DT
 		     , NULL                             AS EXP_CMP_DT
 		     , #{regNo}                         AS REG_NO
@@ -272,7 +272,7 @@
 		     , CUST_NO
 		     , #{gvPntAmt}                      AS GV_PNT_AMT
 		     , 0                                AS US_PNT_AMT
-		     , 0                                AS RM_PNT_AMT
+		     , #{rmPntAmt}                      AS RM_PNT_AMT
 		     , DATE_ADD(NOW(), INTERVAL 1 YEAR) AS EXP_BE_DT
 		     , NULL                             AS EXP_CMP_DT
 		     , #{regNo}                         AS REG_NO

src/main/webapp/WEB-INF/views/marketing/PlanTemplatePopupForm.html

@@ -396,7 +396,7 @@
 										</colgroup>
 										<tr>
 											<th>상품 구분 1<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn1" value="Y" checked></label>]<br>
-												<button type="button" class="btn btn-danger btn-lg" id="" onclick="btnDeleteGridNum1();">구분 삭제</button>
+												<button type="button" class="btn btn-danger btn-lg" id="" onclick="btnDeleteGridNum1('gridOptions_c1');">구분 삭제</button>
 											</th>
 											<td>
 												<div class="">
@@ -462,7 +462,7 @@
 											<th>상품 구분 2<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn2" value="Y" checked></label>]<br>
 											<br>
 												<button type="button" class="btn btn-danger btn-lg" id=""
-													onclick="btnDeleteGridNum2();">구분 삭제</button>
+													onclick="btnDeleteGridNum2('gridOptions_c2');">구분 삭제</button>
 											</th>
 											<td>
 												<div class="">
@@ -2073,10 +2073,6 @@ $(document).ready(function() {
 		})
 		
 		
-		
-		
-		
-		
 		if(mode == 'U'){
 			if(typeof reviewList[0] != 'undefined'){
 				// 리뷰