Explorar el Código

상품평 관리 오류 사항 수정 커밋

card007 hace 4 años
padre
commit
ee9274dd54

+ 15 - 7
src/main/java/com/style24/admin/biz/web/TsaMarketingController.java

@@ -22,6 +22,12 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.gagaframework.excel.GagaExcelUtil;
+import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.rest.server.GagaResponse;
+import com.gagaframework.web.rest.server.GagaResponseStatus;
+import com.gagaframework.web.util.GagaDateUtil;
+import com.gagaframework.web.util.GagaFileUtil;
 import com.style24.admin.biz.service.TsaCardPromotionService;
 import com.style24.admin.biz.service.TsaCommonService;
 import com.style24.admin.biz.service.TsaFreegiftPromotionService;
@@ -69,13 +75,6 @@ import com.style24.persistence.domain.User;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.excel.GagaExcelUtil;
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.rest.server.GagaResponse;
-import com.gagaframework.web.rest.server.GagaResponseStatus;
-import com.gagaframework.web.util.GagaDateUtil;
-import com.gagaframework.web.util.GagaFileUtil;
-
 /**
  * 마케팅 Controller
  * @author xodud1202
@@ -206,12 +205,21 @@ public class TsaMarketingController extends TsaBaseController {
 			review.setGoodsCds(review.getGoodsCd().replaceAll("\r", "").split("\n"));
 		}
 
+		// 고객 관련 정보 암호화 처리
+		if (StringUtils.isNotBlank(review.getSearchTxt())) {
+			review.encryptData();
+		}
+
+		log.info("pageNo >>> {}", review.getPageNo());
+
 		review.setPageable(new TscPageRequest(review.getPageNo() - 1, review.getPageSize()));
 		review.getPageable().setTotalCount(reviewService.getReviewTotalCount(review));
 
 		// 상품평 목록
 		Collection<Review> reviewList = reviewService.getReviewList(review);
 
+		log.info("dataList >>> {}", reviewList);
+
 		result.set("paging", review);
 		result.set("dataList", reviewList);
 

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

@@ -96,4 +96,7 @@ public class Review extends TscBaseDomain {
 	private int pntAmt;				// 포인트금액
 	private String pntUploadStat;	// 포인트반영상태
 
+	public void encryptData () {
+		this.searchTxt = CryptoUtils.encryptAES(this.searchTxt);
+	}
 }

+ 3 - 2
src/main/webapp/WEB-INF/views/marketing/ReviewForm.html

@@ -68,7 +68,7 @@
 								<option value="memNm">회원명</option>
 								<option value="email">이메일</option>
 							</select>
-							<input type="text" name="seachTxt" class="w100" maxlength="50"/>
+							<input type="text" name="searchTxt" class="w100" maxlength="50"/>
 						</td>
 						<th>포인트지급상태</th>
 						<td>
@@ -261,7 +261,8 @@
 	// 조회
 	$('#btnSearch').on('click', function() {
 		gagaPaging.init('searchForm', fnSearchCallBack, 'pagination', $('#searchForm input[name=pageSize]').val());
-		gagaPaging.load($("#searchForm input[name=pageNo]").val());
+		//gagaPaging.load($("#searchForm input[name=pageNo]").val());
+		gagaPaging.load(1);
 	});
 	
 	// 조회 콜백함수