Merge branch 'card007' into develop

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);
 

src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java

@@ -265,20 +265,33 @@ public class TsaOrderChangeController extends TsaBaseController {
 		}
 		// 취소완료
 		else {
-			result = coreOrderChangeService.partialCancel(map, userNo);
-			
+			String allCanYn = refundPreInfo.getString("allCanYn");
+
+			if ("Y".equals(allCanYn)) {
+				cnclReq.setChgGb(TscConstants.OrderChangeGb.CANCEL.value());
+				cnclReq.setPgStat("N");
+				cnclReq.setRegNo(userNo);
+				cnclReq.setUpdNo(userNo);
+
+				// 전체 취소 처리
+				Integer ordChgSq = coreOrderChangeService.allCnclComplete(cnclReq);
+				result.setInt("ordChgSq", ordChgSq);
+			} else {
+				result = coreOrderChangeService.partialCancel(map, userNo);
+			}
+
 			String pgGb = map.getString("pgGb");
-			
+
 			if (TscConstants.PgGb.NAVER_ORDER.value().equals(pgGb)) {
 				List<Order> cancelOrderRefundList 	= (List<Order>) map.get("cancelOrderRefundList");
 
 				for(Order vo : cancelOrderRefundList) {
-					
+
 					try {
 						// 2021.07.30 수정
 						if (vo.getOrdCanChgQty() > 0) {
 							Order order = coreNaverPayService.getOrderDetailInfoFromOrdDtlNo(vo);
-							
+
 							if ("O".equals(order.getOrdExchGb())) {
 								// 취소 완료
 								if ("scm".equals(env.getProperty("server.site.name"))) {
@@ -300,11 +313,11 @@ public class TsaOrderChangeController extends TsaBaseController {
 									// coreNaverPayService.sendNaverPayRejectExchange(exception, userNo);        // 교환반려
 									addUrl = "/naverpay/send/reject/exchange?ordDtlNo=" + order.getOrdDtlNo() + "&userNo=" + userNo;
 									coreNaverPayService.sendScmServerForNaverpay(addUrl);                        // 교환 반려
-	
+
 									// coreNaverPayService.sendNaverPaySoldoutReturnReq(param, userNo);				// 품절반품접수
 									addUrl = "/naverpay/send/soldout/return/req?ordDtlNo=" + order.getOrdDtlNo() + "&userNo=" + userNo;
 									coreNaverPayService.sendScmServerForNaverpay(addUrl);                            // 품절반품접수
-	
+
 									// coreNaverPayService.sendNaverPayReturnComplete(exception, userNo);		// 반품완료
 									addUrl = "/naverpay/send/return/complete?ordDtlNo=" + order.getOrdDtlNo() + "&userNo=" + userNo;
 									coreNaverPayService.sendScmServerForNaverpay(addUrl);                        // 반품완료

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);
+	}
 }

src/main/resources/i18n/messages/message_ko_KR.properties

@@ -82,7 +82,7 @@ DELIVERY_0001=\uB4F1\uB85D \uC2E4\uD328\uD558\uC600\uC2B5\uB2C8\uB2E4. \uC774\uB
 
 #\uCFE0\uD3F0
 COUPON_0001=\uCD1D {0}\uC7A5\uC758 \uCFE0\uD3F0\uC744 \uB2E4\uC6B4\uB85C\uB4DC \uD558\uC600\uC2B5\uB2C8\uB2E4.
-COUPON_0002=\uC774\uBBF8 \uB2E4\uC6B4\uB85C\uB4DC\uB97C \uC644\uB8CC \uD558\uC168\uC2B5\uB2C8\uB2E4.
+COUPON_0002=\uBC1B\uC744 \uCFE0\uD3F0\uC774 \uC5C6\uC2B5\uB2C8\uB2E4. 1\uAC74 \uAD6C\uB9E4 \uD558\uC2DC\uACE0 \uB2E4\uC74C\uB2EC \uB4F1\uAE09 \uCFE0\uD3F0\uC744 \uBC1B\uC544\uBCF4\uC138\uC694!
 
 #\uAD50\uD658
 EXCHANGE_0001=\uAD50\uD658 \uC2E0\uCCAD\uC774 \uC811\uC218\uB418\uC5C8\uC2B5\uB2C8\uB2E4.

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);
 	});
 	
 	// 조회 콜백함수